P4 to Git Change 1358358 by wchau@wchau_OCL_boltzmann on 2017/01/04 10:21:31
SWDEV-102698 - Back out changelist 1358063 Affected files ... ... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#147 edit ... //depot/stg/opencl/drivers/opencl/compiler/tools/Makefile#21 edit ... //depot/stg/opencl/drivers/opencl/runtime/build/Makefile.runtime#66 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#206 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#281 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/Makefile.oclrocm#11 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#26 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#31 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#11 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#50 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#18 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#11 edit ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.hpp#5 edit ... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#262 edit
This commit is contained in:
1 parent
99820356f1
commit
ff99f1f762
9 files changed
+26
-336
No files matched your search
@@ -195,20 +195,19 @@ HSAILProgram::compileImpl_LC(
|
||||
return false;
|
||||
}
|
||||
|
||||
driverOptions.append(" -Xclang -fno-validate-pch");
|
||||
|
||||
// save the options for caching before including the temporary header file for amdgcn
|
||||
std::string cacheOpts = driverOptions + std::to_string(clcStd);
|
||||
|
||||
driverOptions.append(" -include-pch " + pch->Name());
|
||||
driverOptions.append(" -Xclang -fno-validate-pch");
|
||||
|
||||
// Tokenize the options string into a vector of strings
|
||||
std::istringstream istrstr(driverOptions);
|
||||
std::istream_iterator<std::string> sit(istrstr), end;
|
||||
std::vector<std::string> params(sit, end);
|
||||
|
||||
if (!dev().cacheCompilation()->compileToLLVMBitcode(C.get(), inputs, output, params, cacheOpts)) {
|
||||
buildLog_ += dev().cacheCompilation()->buildLog();
|
||||
// Compile source to IR
|
||||
bool ret = C->CompileToLLVMBitcode(inputs, output, params);
|
||||
buildLog_ += C->Output();
|
||||
if (!ret) {
|
||||
buildLog_ += "Error: Failed to compile opencl source (from CL to LLVM IR).\n";
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user