From 0d5d2550ee3eeff312b7d0a37fd8091b96520288 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 30 Aug 2016 10:57:06 -0400 Subject: [PATCH] P4 to Git Change 1308590 by lmoriche@lmoriche_opencl_dev on 2016/08/30 10:50:08 SWDEV-101656 - Implement -save-temps/-save-temps-all in the OpenCL/LC Program Manager. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#10 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#17 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#8 edit [ROCm/clr commit: 0b39d297760c72adb21045054459109b45668166] --- .../runtime/device/rocm/roccompiler.cpp | 30 ++++++- .../rocclr/runtime/device/rocm/rocprogram.cpp | 90 +++++++++++++++---- .../rocclr/runtime/device/rocm/rocprogram.hpp | 3 +- 3 files changed, 102 insertions(+), 21 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp b/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp index 7969e5bca0..d536137a39 100644 --- a/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp +++ b/projects/clr/rocclr/runtime/device/rocm/roccompiler.cpp @@ -44,6 +44,17 @@ HSAILProgram::compileImpl_LC(const std::string& sourceCode, Compiler* C = device().compiler(); std::vector inputs; + if (options->isDumpFlagSet(amd::option::DUMP_CL)) { + std::ofstream f(options->getDumpFileName(".cl").c_str(), std::ios::trunc); + if(f.is_open()) { + f << "/* Compiler options:\n" << options->origOptionStr + << "\n*/\n\n" << sourceCode; + } else { + buildLog_ += + "Warning: opening the file to dump the OpenCL source failed.\n"; + } + } + Data* input = C->NewBufferReference(DT_CL, sourceCode.c_str(), sourceCode.length()); if (input == NULL) { @@ -107,7 +118,10 @@ HSAILProgram::compileImpl_LC(const std::string& sourceCode, //Set the options for the compiler - std::string driverOptions(compileOptions_); + std::ostringstream ostrstr; + std::copy(options->clangOptions.begin(), options->clangOptions.end(), + std::ostream_iterator(ostrstr, " ")); + std::string driverOptions(ostrstr.str()); //Set the include path for the temp folder that contains the includes if(!headers.empty()) { @@ -172,8 +186,8 @@ HSAILProgram::compileImpl_LC(const std::string& sourceCode, } // Tokenize the options string into a vector of strings - std::istringstream strstr(driverOptions); - std::istream_iterator sit(strstr), end; + std::istringstream istrstr(driverOptions); + std::istream_iterator sit(istrstr), end; std::vector params(sit, end); // Compile source to IR @@ -187,6 +201,16 @@ HSAILProgram::compileImpl_LC(const std::string& sourceCode, llvmBinary_.assign(output->Buf().data(), output->Size()); elfSectionType_ = amd::OclElf::LLVMIR; + if (options->isDumpFlagSet(amd::option::DUMP_BC_ORIGINAL)) { + std::ofstream f(options->getDumpFileName("_original.bc").c_str(), std::ios::trunc); + if(f.is_open()) { + f.write(llvmBinary_.data(), llvmBinary_.size()); + } else { + buildLog_ += + "Warning: opening the file to dump the compiled IR failed.\n"; + } + } + if (clBinary()->saveSOURCE()) { clBinary()->elfOut()->addSection( amd::OclElf::SOURCE, sourceCode.data(), sourceCode.size()); diff --git a/projects/clr/rocclr/runtime/device/rocm/rocprogram.cpp b/projects/clr/rocclr/runtime/device/rocm/rocprogram.cpp index 8155590efd..60d935184e 100644 --- a/projects/clr/rocclr/runtime/device/rocm/rocprogram.cpp +++ b/projects/clr/rocclr/runtime/device/rocm/rocprogram.cpp @@ -180,10 +180,16 @@ namespace roc { bool HSAILProgram::initBuild(amd::option::Options *options) { compileOptions_ = options->origOptionStr; - + if (!device::Program::initBuild(options)) { return false; } + + const char* devName = dev().deviceInfo().machineTarget_; + options->setPerBuildInfo( + (devName && (devName[0] != '\0')) ? devName : "gpu", + clBinary()->getEncryptCode(), true); + // Elf Binary setup std::string outFileName; @@ -760,13 +766,33 @@ namespace roc { // open the control functions std::pair isa_version; switch (dev().deviceInfo().gfxipVersion_) { - case 701: isa_version = std::make_pair(isa_version_701_amdgcn, isa_version_701_amdgcn_size); break; - case 800: isa_version = std::make_pair(isa_version_800_amdgcn, isa_version_800_amdgcn_size); break; - case 801: isa_version = std::make_pair(isa_version_801_amdgcn, isa_version_801_amdgcn_size); break; - case 802: isa_version = std::make_pair(isa_version_802_amdgcn, isa_version_802_amdgcn_size); break; - case 803: isa_version = std::make_pair(isa_version_803_amdgcn, isa_version_803_amdgcn_size); break; - case 810: isa_version = std::make_pair(isa_version_810_amdgcn, isa_version_810_amdgcn_size); break; - default: buildLog_ += "Error: Linking for this device is not supported\n"; return false; + case 701: + isa_version = std::make_pair( + isa_version_701_amdgcn, isa_version_701_amdgcn_size); + break; + case 800: + isa_version = std::make_pair( + isa_version_800_amdgcn, isa_version_800_amdgcn_size); + break; + case 801: + isa_version = std::make_pair( + isa_version_801_amdgcn, isa_version_801_amdgcn_size); + break; + case 802: + isa_version = std::make_pair( + isa_version_802_amdgcn, isa_version_802_amdgcn_size); + break; + case 803: + isa_version = std::make_pair( + isa_version_803_amdgcn, isa_version_803_amdgcn_size); + break; + case 810: + isa_version = std::make_pair( + isa_version_810_amdgcn, isa_version_810_amdgcn_size); + break; + default: + buildLog_ += "Error: Linking for this device is not supported\n"; + return false; } Data* isa_version_bc = C->NewBufferReference(DT_LLVM_BC, @@ -819,7 +845,7 @@ namespace roc { // open the linked output std::vector linkOptions; - Data* linked_bc = C->NewBuffer(DT_LLVM_BC); + Buffer* linked_bc = C->NewBuffer(DT_LLVM_BC); if (!linked_bc) { buildLog_ += "Error: Failed to open the linked program.\n"; @@ -833,8 +859,18 @@ namespace roc { return false; } + if (options->isDumpFlagSet(amd::option::DUMP_BC_LINKED)) { + std::ofstream f(options->getDumpFileName("_linked.bc").c_str(), std::ios::trunc); + if(f.is_open()) { + f.write(linked_bc->Buf().data(), linked_bc->Size()); + } else { + buildLog_ += + "Warning: opening the file to dump the linked IR failed.\n"; + } + } + // open the optimized output - Data* opt_bc = C->NewBuffer(DT_LLVM_BC); + Buffer* opt_bc = C->NewBuffer(DT_LLVM_BC); if (!opt_bc) { buildLog_ += "Error: Failed to open the optimized program.\n"; @@ -857,6 +893,16 @@ namespace roc { return false; } + if (options->isDumpFlagSet(amd::option::DUMP_BC_OPTIMIZED)) { + std::ofstream f(options->getDumpFileName("_optimized.bc").c_str(), std::ios::trunc); + if(f.is_open()) { + f.write(opt_bc->Buf().data(), opt_bc->Size()); + } else { + buildLog_ += + "Warning: opening the file to dump the optimized IR failed.\n"; + } + } + inputs.clear(); inputs.push_back(opt_bc); @@ -866,27 +912,37 @@ namespace roc { return false; } - std::string optionsstr = options->origOptionStr + hsailOptions(options); + std::string codegenOptions(options->llvmOptions); // Set the machine target - optionsstr.append(" -mcpu="); - optionsstr.append(dev().deviceInfo().machineTarget_); + codegenOptions.append(" -mcpu="); + codegenOptions.append(dev().deviceInfo().machineTarget_); // Set the -O# - optionsstr.append(" ").append(optLevel.str()); + codegenOptions.append(" ").append(optLevel.str()); // Tokenize the options string into a vector of strings - std::istringstream strstr(optionsstr); + std::istringstream strstr(codegenOptions); std::istream_iterator sit(strstr), end; - std::vector optionsvec(sit, end); + std::vector params(sit, end); - ret = C->CompileAndLinkExecutable(inputs, out_exec, optionsvec); + ret = C->CompileAndLinkExecutable(inputs, out_exec, params); buildLog_ += C->Output(); if (!ret) { buildLog_ += "Error: Creating the executable failed: Compiling LLVM IRs to exe.\n"; return false; } + if (options->isDumpFlagSet(amd::option::DUMP_O)) { + std::ofstream f(options->getDumpFileName(".co").c_str(), std::ios::trunc); + if(f.is_open()) { + f.write(out_exec->Buf().data(), out_exec->Size()); + } else { + buildLog_ += + "Warning: opening the file to dump the code object failed.\n"; + } + } + hsa_status_t status; status = hsa_code_object_deserialize( out_exec->Buf().data(), out_exec->Size(), diff --git a/projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp b/projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp index 17520d4c3c..2422cbc0c0 100644 --- a/projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp +++ b/projects/clr/rocclr/runtime/device/rocm/rocprogram.hpp @@ -41,7 +41,8 @@ namespace roc { //! Returns the aclBinary associated with the program const aclBinary* binaryElf() const { - return static_cast(binaryElf_); } + return static_cast(binaryElf_); + } #if defined(WITH_LIGHTNING_COMPILER) //! Returns the program metadata.