From 7714e26cdd2eb901b4b29a4c9a20f5129e9e33a1 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 16 Jul 2015 08:30:58 -0400 Subject: [PATCH] P4 to Git Change 1170805 by nhaustov@nhaustov_hsa on 2015/07/15 10:59:34 ECR #333756 - Fix missing add of offset in ORCAHSALoaderContext::SegmentAddress. Testing: pre-checkin Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#195 edit [ROCm/clr commit: 7ab78d6db20e6e1c70658966c8671a85a4f81d10] --- projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp index 5780243b8b..2ab01aea93 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp @@ -2323,7 +2323,7 @@ void* ORCAHSALoaderContext::SegmentAddress(amdgpu_hsa_elf_segment_t segment, case AMDGPU_HSA_SEGMENT_GLOBAL_AGENT: case AMDGPU_HSA_SEGMENT_READONLY_AGENT: { gpu::Memory *gpuMem = reinterpret_cast(seg); - return reinterpret_cast(gpuMem->vmAddress()); + return reinterpret_cast(gpuMem->vmAddress() + offset); } case AMDGPU_HSA_SEGMENT_CODE_AGENT: return (char*) seg + offset; default: