From d13ba8f18cb6fe5146f6174b54d02b76e18c4d0d Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 25 Sep 2014 13:01:27 -0400 Subject: [PATCH] P4 to Git Change 1080972 by emankov@em-hsa-amd on 2014/09/25 12:41:03 ECR #333753 - HSA RT: avoiding superfluous recompilations on ORCA RT/HSA path (part 2) + support of -fno-bin-llvmir & -fno-bin-hsail options: do not check compiler options for recompilation decision. As a result if the binary contains ISA, BRIG & HSAIL and the above options are specified when compiling from binary, then compilation options are not compared, recompilation doesn't occur. This makes possible to compile from binary with different set of options, for example: -just-kernel. P.S. Brig & HSAIL should be in binary in order to initialize & execute kernel (even if ISA is presented). Testing: pre check-in, compiler, api & basic ocl conformance 2.0 tests Reviewers: German Andryeyev, Artem Tamazov Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#178 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#56 edit --- rocclr/runtime/device/gpu/gpuprogram.cpp | 82 ++++++++++++++++-------- rocclr/runtime/device/gpu/gpuprogram.hpp | 5 +- 2 files changed, 57 insertions(+), 30 deletions(-) diff --git a/rocclr/runtime/device/gpu/gpuprogram.cpp b/rocclr/runtime/device/gpu/gpuprogram.cpp index a3ad5d2a0a..a938e04008 100644 --- a/rocclr/runtime/device/gpu/gpuprogram.cpp +++ b/rocclr/runtime/device/gpu/gpuprogram.cpp @@ -1913,12 +1913,13 @@ HSAILProgram::linkImpl( } aclType -HSAILProgram::getCompilationStagesFromBinary(std::vector& complete_stages) +HSAILProgram::getCompilationStagesFromBinary(std::vector& completeStages, bool& needOptionsCheck) { acl_error errorCode; size_t secSize = 0; - complete_stages.clear(); + completeStages.clear(); aclType from = ACL_TYPE_DEFAULT; + needOptionsCheck = true; //! @todo Should we also check for ACL_TYPE_OPENCL & ACL_TYPE_LLVMIR_TEXT? // Checking llvmir in .llvmir section @@ -1936,7 +1937,7 @@ HSAILProgram::getCompilationStagesFromBinary(std::vector& complete_stag isOpts = false; } if (isLlvmirText && isOpts) { - complete_stages.push_back(from); + completeStages.push_back(from); from = ACL_TYPE_LLVMIR_BINARY; } bool isHsailText = true; @@ -1967,8 +1968,10 @@ HSAILProgram::getCompilationStagesFromBinary(std::vector& complete_stag if (errorCode != ACL_SUCCESS) { isBrigOps = false; } + bool isBrig = false; if (isBrigStrtab && isBrigCode && isBrigOps) { - complete_stages.push_back(from); + isBrig = true; + completeStages.push_back(from); from = ACL_TYPE_HSAIL_BINARY; // Here we should check that CG stage was done. // Right now there are 2 criterions to check it (besides BRIG itself): @@ -1977,12 +1980,12 @@ HSAILProgram::getCompilationStagesFromBinary(std::vector& complete_stag // Unfortunately there is no appropriate way in Compiler Lib to check 1. // because kernel names are unknown here, therefore only 2. if (isHsailText) { - complete_stages.push_back(from); + completeStages.push_back(from); from = ACL_TYPE_CG; } } else if (isHsailText) { - complete_stages.push_back(from); + completeStages.push_back(from); from = ACL_TYPE_HSAIL_TEXT; } // Checking ISA in .text section @@ -1993,23 +1996,45 @@ HSAILProgram::getCompilationStagesFromBinary(std::vector& complete_stag isShaderIsa = false; } if (isShaderIsa) { - switch (from) { - case ACL_TYPE_LLVMIR_BINARY: - complete_stages.clear(); - from = ACL_TYPE_DEFAULT; - break; - case ACL_TYPE_HSAIL_BINARY: - case ACL_TYPE_CG: - complete_stages.push_back(from); - from = ACL_TYPE_ISA; - break; - case ACL_TYPE_HSAIL_TEXT: - default: - break; - } + completeStages.push_back(from); + from = ACL_TYPE_ISA; } - if (complete_stages.empty()) { - complete_stages.push_back(from); + std::string sCurOptions = compileOptions_ + linkOptions_; + amd::option::Options curOptions; + amd::option::parseAllOptions(sCurOptions, curOptions); + switch (from) { + // compile from HSAIL text, no matter prev. stages and options + case ACL_TYPE_HSAIL_TEXT: + needOptionsCheck = false; + break; + case ACL_TYPE_HSAIL_BINARY: + case ACL_TYPE_CG: + // do not check options, if LLVMIR is absent or might be absent + if (curOptions.oVariables->BinLLVMIR || !isLlvmirText) { + needOptionsCheck = false; + } + break; + case ACL_TYPE_ISA: + // do not check options, if LLVMIR is absent or might be absent + if (curOptions.oVariables->BinLLVMIR || !isLlvmirText) { + needOptionsCheck = false; + } + if (isBrig && isHsailText) { + if (curOptions.oVariables->BinHSAIL) { + needOptionsCheck = false; + } + // recompile from prev. stage, if BRIG || HSAIL are absent + } else { + from = completeStages.back(); + completeStages.pop_back(); + needOptionsCheck = true; + } + break; + // recompilation might be needed + case ACL_TYPE_LLVMIR_BINARY: + case ACL_TYPE_DEFAULT: + default: + break; } return from; } @@ -2030,12 +2055,13 @@ HSAILProgram::getNextCompilationStageFromBinary(amd::option::Options* options) { } // Calculate the next stage to compile from, based on sections in binaryElf_; // No any validity checks here - std::vector complete_stages; - continueCompileFrom = getCompilationStagesFromBinary(complete_stages); + std::vector completeStages; + bool needOptionsCheck = true; + continueCompileFrom = getCompilationStagesFromBinary(completeStages, needOptionsCheck); // Saving binary in the interface class, // which also load compile & link options from binary setBinary(static_cast(mem), binary.second); - if (!options) { + if (!options || !needOptionsCheck) { return continueCompileFrom; } bool recompile = false; @@ -2072,13 +2098,13 @@ HSAILProgram::getNextCompilationStageFromBinary(amd::option::Options* options) { break; } if (recompile) { - while (!complete_stages.empty()) { - continueCompileFrom = complete_stages.back(); + while (!completeStages.empty()) { + continueCompileFrom = completeStages.back(); if (continueCompileFrom == ACL_TYPE_LLVMIR_BINARY || continueCompileFrom == ACL_TYPE_DEFAULT) { break; } - complete_stages.pop_back(); + completeStages.pop_back(); } } } diff --git a/rocclr/runtime/device/gpu/gpuprogram.hpp b/rocclr/runtime/device/gpu/gpuprogram.hpp index dff3917783..6916a8b77f 100644 --- a/rocclr/runtime/device/gpu/gpuprogram.hpp +++ b/rocclr/runtime/device/gpu/gpuprogram.hpp @@ -424,9 +424,10 @@ protected: ); /* \brief Returns the next stage to compile from, based on sections in binary, - * also returns completed stages in vector, which contains at least ACL_TYPE_DEFAULT + * also returns completeStages in a vector, which contains at least ACL_TYPE_DEFAULT, + * sets needOptionsCheck to true if options check is needed to decide whether or not to recompile */ - aclType getCompilationStagesFromBinary(std::vector& complete_stages); + aclType getCompilationStagesFromBinary(std::vector& completeStages, bool& needOptionsCheck); /* \brief Returns the next stage to compile from, based on sections and options in binary */