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

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<gpu::Memory*>(seg);
-        return reinterpret_cast<void*>(gpuMem->vmAddress());
+        return reinterpret_cast<void*>(gpuMem->vmAddress() + offset);
     }
     case AMDGPU_HSA_SEGMENT_CODE_AGENT: return (char*) seg + offset;
     default: