From 3f6cc5b851fed6c42d4f4c4f76845c0d7bdaa685 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 21 Mar 2016 17:40:05 -0400 Subject: [PATCH] P4 to Git Change 1249484 by kzhuravl@kzhuravl-kaveri-sc on 2016/03/21 17:26:34 SWDEV-76911 - Fix base/full profile loader issues on SoftCP path [integration of CL 1249449] 1) Introduce internal API that provides kernel host address given kernel device address 2) Remove base/full profile loader hacks we have today + runtime changes: 1) Remove asserts when querying host address of a host address in hsart's loader context ReviewBoardURL: http://ocltc.amd.com/reviews/r/10054/ Testing: precheckin (http://ocltc.amd.com:8111/viewModification.html?modId=68651&personal=true&tab=vcsModificationBuilds) Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/ext/loader/executable.cpp#22 integrate ... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/ext/loader/executable.hpp#11 integrate ... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/amd_hsa_kernel_code.h#12 integrate ... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/amd_hsa_loader.hpp#10 integrate ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.hpp#65 edit --- rocclr/runtime/device/gpu/gpuprogram.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/rocclr/runtime/device/gpu/gpuprogram.hpp b/rocclr/runtime/device/gpu/gpuprogram.hpp index e0acf0ab03..70fcd07ad0 100644 --- a/rocclr/runtime/device/gpu/gpuprogram.hpp +++ b/rocclr/runtime/device/gpu/gpuprogram.hpp @@ -405,7 +405,6 @@ public: void* SegmentHostAddress(amdgpu_hsa_elf_segment_t segment, hsa_agent_t agent, void* seg, size_t offset) override { - assert(false); return nullptr; }