From d5ccaf288f2a8538081b22be19bf8124ecdbd3b3 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 17 Feb 2016 13:40:22 -0500 Subject: [PATCH] P4 to Git Change 1237953 by kzhuravl@win-kzhuravl-stg-sc on 2016/02/17 13:32:36 SWDEV-76911 - Remove HSART_NO_LARGE_BAR_SUPPORT define and do necessary updates (comes in 3 separate parts: stg sc, hsa, opencl changelists) [opencl part] ReviewBoardURL: http://ocltc.amd.com/reviews/r/9769/ Testing: http://ocltc:8111/viewModification.html?modId=66952&personal=true&init=1&tab=vcsModificationBuilds Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/ext/loader/executable.cpp#19 integrate ... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/ext/loader/loaders.cpp#9 integrate ... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/ext/loader/loaders.hpp#9 integrate ... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/amd_hsa_kernel_code.h#10 integrate ... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/amd_hsa_loader.hpp#8 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#64 edit [ROCm/clr commit: e5635ffbe4826044d2b62821745efad31de2d52b] --- projects/clr/rocclr/runtime/device/gpu/gpuprogram.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.hpp b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.hpp index d57b7d2313..e0acf0ab03 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.hpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.hpp @@ -403,6 +403,12 @@ public: void* SegmentAddress(amdgpu_hsa_elf_segment_t segment, hsa_agent_t agent, void* seg, size_t offset) override; + void* SegmentHostAddress(amdgpu_hsa_elf_segment_t segment, + hsa_agent_t agent, void* seg, size_t offset) override { + assert(false); + return nullptr; + } + bool SegmentFreeze(amdgpu_hsa_elf_segment_t segment, hsa_agent_t agent, void* seg, size_t size) override { return false; }