P4 to Git Change 1115252 by skudchad@skudchad_test_win_opencl2 on 2015/01/26 12:25:46

EPR #403782 - IOMMU2/SVM
	- Detect SVM Fine Grain system in IOL and OpenCL runtime
	- Changes to convey Allocation attribute to IOL

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/6685/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#203 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.hpp#78 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuscsi.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#299 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.hpp#89 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/include/cal/cal.h#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/include/cal/calcl.h#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#104 edit

rocclr/runtime/device/gpu/gpuresource.cpp

@@ -406,6 +406,7 @@ Resource::create(MemoryType memType, CreateParams* params, bool heap)
         // Fall through ...
     case RemoteUSWC:
     case Remote:
+    case Shader:
     case BusAddressable:
     case ExternalPhysical:
         // Fall through to process the memory allocation ...
@@ -437,6 +438,15 @@ Resource::create(MemoryType memType, CreateParams* params, bool heap)
             else if (memoryType() == RemoteUSWC) {
                 desc.type = GSL_MOA_MEMORY_AGP;
             }
+            else if (memoryType() == Shader){
+                if(dev().settings().svmFineGrainSystem_) {
+                    desc.isAllocExecute = true;
+                }
+                // 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;
+                cal_.type_ = memType;
+            }
             else if (memoryType() == BusAddressable){
                 desc.type = GSL_MOA_MEMORY_CARD_BUS_ADDRESSABLE;
             }