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

@@ -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