P4 to Git Change 2016080 by gandryey@gera-win10 on 2019/10/18 13:08:03

SWDEV-204511 - [NV14 XTM] OpenCL Conformance Test Fails
	- Handle different ABI versions for LC and HSAIL if single context with multiple devices was used. LC changed the locaiton of hidden arguments and HSAIL path requires patching

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devkernel.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.cpp#83 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palkernel.hpp#30 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/kernel.hpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/program.cpp#105 edit

rocclr/runtime/device/devkernel.cpp

@@ -1557,7 +1557,7 @@ void Kernel::InitParameters(const amd_comgr_metadata_node_t kernelMD) {
   uint32_t numParams = params.size();
   // Append the hidden arguments to the OCL arguments
   params.insert(params.end(), hiddenParams.begin(), hiddenParams.end());
-  createSignature(params, numParams, amd::KernelSignature::ABIVersion_1);
+  createSignature(params, numParams, amd::KernelSignature::ABIVersion_2);
 }
 #else // not define USE_COMGR_LIBRARY
 void Kernel::InitParameters(const KernelMD& kernelMD, uint32_t argBufferSize) {
@@ -1632,7 +1632,7 @@ void Kernel::InitParameters(const KernelMD& kernelMD, uint32_t argBufferSize) {
   uint32_t numParams = params.size();
   // Append the hidden arguments to the OCL arguments
   params.insert(params.end(), hiddenParams.begin(), hiddenParams.end());
-  createSignature(params, numParams, amd::KernelSignature::ABIVersion_1);
+  createSignature(params, numParams, amd::KernelSignature::ABIVersion_2);
 }
 #endif  // defined(USE_COMGR_LIBRARY)
 #endif  // defined(WITH_LIGHTNING_COMPILER) || defined(USE_COMGR_LIBRARY)