From a59ceb60494efeb46813309523d1d122bb01afd7 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 11 Mar 2015 10:13:30 -0400 Subject: [PATCH] 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: 607c6fd80584c00d92ceb69e9498f49191b59818] --- projects/clr/rocclr/runtime/device/gpu/gpuscsi.cpp | 6 ++---- projects/clr/rocclr/runtime/utils/versions.hpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuscsi.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuscsi.cpp index 5de3a41013..5f5e548b84 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpuscsi.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpuscsi.cpp @@ -165,13 +165,11 @@ HSAILKernel::aqlCreateHWInfo(const void* shader, size_t shaderSize) char* headerBaseAddress = reinterpret_cast(siMetaData->common.hShaderMemHandle); - hsa_ext_code_descriptor_t* hcd = - reinterpret_cast(headerBaseAddress); amd_kernel_code_t* akc = reinterpret_cast( - headerBaseAddress + hcd->code.handle); + headerBaseAddress); address codeStartAddress = reinterpret_cast
(akc); - address codeEndAddress = reinterpret_cast
(hcd) + siMetaData->common.codeLenInByte; + address codeEndAddress = reinterpret_cast
(akc) + siMetaData->common.codeLenInByte; codeSize_ = codeEndAddress - codeStartAddress; code_ = new gpu::Memory(dev(), amd::alignUp(codeSize_, gpu::ConstBuffer::VectorSize)); diff --git a/projects/clr/rocclr/runtime/utils/versions.hpp b/projects/clr/rocclr/runtime/utils/versions.hpp index 5395169997..dec654c52f 100644 --- a/projects/clr/rocclr/runtime/utils/versions.hpp +++ b/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