P4 to Git Change 1129467 by kzhuravl@lin-kzhuravl-stg-oclhsa on 2015/03/11 03:27:33

EPR #415589 - Prepend default module name if a kernel has module linkage

	Testing: p4precheckin (http://ocltc:8111/viewModification.html?modId=48280&personal=true&init=1&tab=vcsModificationBuilds)

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsaprogram.cpp#13 edit


[ROCm/clr commit: 607c6fd805]

projects/clr/rocclr/runtime/device/gpu/gpuscsi.cpp

@@ -165,13 +165,11 @@ HSAILKernel::aqlCreateHWInfo(const void* shader, size_t shaderSize)
 
     char* headerBaseAddress =
         reinterpret_cast<char*>(siMetaData->common.hShaderMemHandle);
-    hsa_ext_code_descriptor_t* hcd =
-        reinterpret_cast<hsa_ext_code_descriptor_t*>(headerBaseAddress);
     amd_kernel_code_t* akc = reinterpret_cast<amd_kernel_code_t*>(
-        headerBaseAddress + hcd->code.handle);
+        headerBaseAddress);
 
     address codeStartAddress = reinterpret_cast<address>(akc);
-    address codeEndAddress = reinterpret_cast<address>(hcd) + siMetaData->common.codeLenInByte;
+    address codeEndAddress = reinterpret_cast<address>(akc) + siMetaData->common.codeLenInByte;
     codeSize_ = codeEndAddress - codeStartAddress;
     code_ = new gpu::Memory(dev(), amd::alignUp(codeSize_, gpu::ConstBuffer::VectorSize));
 

projects/clr/rocclr/runtime/utils/versions.hpp

@@ -12,7 +12,7 @@
 #endif // AMD_PLATFORM_NAME
 
 #ifndef AMD_PLATFORM_BUILD_NUMBER
-# define AMD_PLATFORM_BUILD_NUMBER 1752
+# define AMD_PLATFORM_BUILD_NUMBER 1753
 #endif // AMD_PLATFORM_BUILD_NUMBER
 
 #ifndef AMD_PLATFORM_REVISION_NUMBER