From e54f852217141053bf9b9c2c66d36aa5bbd2e6c0 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 2 Mar 2017 15:13:56 -0500 Subject: [PATCH] P4 to Git Change 1380455 by rili@rili-opencl-pal-stg on 2017/03/02 15:02:40 SWDEV-95925 - Fixed test_basic progvar_prog_scope_misc failure, caused by CL#1379762 for "Implement SVM fine grain system." Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palresource.cpp#26 edit --- rocclr/runtime/device/pal/palresource.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rocclr/runtime/device/pal/palresource.cpp b/rocclr/runtime/device/pal/palresource.cpp index cbdefc7502..b5f37bf140 100644 --- a/rocclr/runtime/device/pal/palresource.cpp +++ b/rocclr/runtime/device/pal/palresource.cpp @@ -437,14 +437,17 @@ Resource::create(MemoryType memType, CreateParams* params) amd::ScopedLock lk(dev().lockPAL()); if (memType == Shader) { - if(dev().settings().svmFineGrainSystem_) { + if (dev().settings().svmFineGrainSystem_) { desc_.isAllocExecute_ = true; desc_.SVMRes_ = true; + memType = RemoteUSWC; + } + else { + memType = Local; } // force to use remote memory for HW DEBUG or use // local memory once we determine if FGS is supported // memType = (!dev().settings().enableHwDebug_) ? Local : RemoteUSWC; - memType = RemoteUSWC; } // Get the element size