AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1711343 by gandryey@gera-ocl-lc on 2018/11/23 15:00:30

Browse Source 
SWDEV-79445 - OCL generic changes and code clean-up
	- Fix kernel compilation with COMgr. CodeobjectV3 has to be disabled during the kernel compilation also, not just linking.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#235 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#16 edit


[ROCm/clr commit: 0a284d5913]
This commit is contained in:
foreman
2018-11-23 15:11:58 -05:00
parent 64e30609d4
commit df097687e1
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/rocclr/runtime/device/devprogram.cpp
+6 -4
View File
@@ -541,6 +541,8 @@ bool Program::compileImplLC(const std::string& sourceCode,
driverOptions.append(options->llvmOptions);
driverOptions.append(ProcessOptions(options));
// Force object code v2.
driverOptions.append(" -mno-code-object-v3");
// Set whole program mode
driverOptions.append(" -mllvm -amdgpu-early-inline-all -mllvm -amdgpu-prelink");
@@ -1329,10 +1331,10 @@ bool Program::linkImplLC(amd::option::Options* options) {
std::ostream_iterator<std::string>(ostrstr, " "));
codegenOptions.append(" ").append(ostrstr.str());
// Set whole program mode
codegenOptions.append(" -mllvm -amdgpu-internalize-symbols -mllvm -amdgpu-early-inline-all");
// Force object code v2.
codegenOptions.append(" -mno-code-object-v3");
// Set whole program mode
codegenOptions.append(" -mllvm -amdgpu-internalize-symbols -mllvm -amdgpu-early-inline-all");
// NOTE: The params is also used to identy cached code object. This parameter
// should not contain any dyanamically generated filename.
@@ -1539,10 +1541,10 @@ bool Program::linkImplLC(amd::option::Options* options) {
std::ostream_iterator<std::string>(ostrstr, " "));
codegenOptions.append(" ").append(ostrstr.str());
// Set whole program mode
codegenOptions.append(" -mllvm -amdgpu-internalize-symbols -mllvm -amdgpu-early-inline-all");
// Force object code v2.
codegenOptions.append(" -mno-code-object-v3");
// Set whole program mode
codegenOptions.append(" -mllvm -amdgpu-internalize-symbols -mllvm -amdgpu-early-inline-all");
// Tokenize the options string into a vector of strings
std::istringstream strstr(codegenOptions);