From 478b6ed8ae00b64c1bb891ce8369f86b91c5a181 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 15 Jan 2016 17:23:45 -0500 Subject: [PATCH] P4 to Git Change 1228194 by skudchad@skudchad_test_win_opencl2 on 2016/01/15 17:13:28 SWDEV-77172 - Choose isa handle on CZ based on whether SVM is supported or not as SVM may need additional SC Options to be passed as default. ReviewBoardURL = http://ocltc.amd.com/reviews/r/9531/diff/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#220 edit [ROCm/clr commit: 3345a9726366cf0964e385caf39dd52fb0f7715a] --- projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp index 37fc985f45..0597be9d2f 100644 --- a/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp +++ b/projects/clr/rocclr/runtime/device/gpu/gpuprogram.cpp @@ -2373,8 +2373,14 @@ bool ORCAHSALoaderContext::IsaSupportedByAgent(hsa_agent_t agent, hsa_isa_t isa) case ED_ATI_CAL_MACHINE_ICELAND_ISA: case ED_ATI_CAL_MACHINE_TONGA_ISA: return isa.handle == gfx800; - case ED_ATI_CAL_MACHINE_CARRIZO_ISA: - return isa.handle == gfx801; + case ED_ATI_CAL_MACHINE_CARRIZO_ISA: { + if (program_->dev().settings().svmFineGrainSystem_) { + return isa.handle == gfx801; + } + else { + return isa.handle == gfx804; + } + } case ED_ATI_CAL_MACHINE_FIJI_ISA: case ED_ATI_CAL_MACHINE_ELLESMERE_ISA: case ED_ATI_CAL_MACHINE_BAFFIN_ISA: