P4 to Git Change 1708308 by wchau@wchau_OCL_boltzmann on 2018/11/16 14:01:10

SWDEV-167383 - [OCL]: Switch to new object format
	- Disable code object v3 for blit programs
	- Porting the changes made by Konstantin (http://git.amd.com:8080/#/c/187605)

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#234 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#13 edit

rocclr/runtime/device/device.cpp

@@ -123,6 +123,9 @@ bool Device::BlitProgram::create(amd::Device* device, const char* extraKernels,
   if (!device->settings().useLightning_) {
     opt +=  "-Wf,--force_disable_spir -fno-lib-no-inline -fno-sc-keep-calls ";
   }
+  else {
+    opt +=  "-Wf,-mno-code-object-v3 ";
+  }
 
   if (extraOptions != nullptr) {
     opt += extraOptions;

rocclr/runtime/device/devprogram.cpp

@@ -1329,6 +1329,8 @@ bool Program::linkImplLC(amd::option::Options* options) {
 
   // 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");
 
   // NOTE: The params is also used to identy cached code object. This parameter
   //       should not contain any dyanamically generated filename.
@@ -1533,6 +1535,8 @@ bool Program::linkImplLC(amd::option::Options* options) {
 
   // 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");
 
   // Tokenize the options string into a vector of strings
   std::istringstream strstr(codegenOptions);