P4 to Git Change 1139180 by wchau@wchau_WINDOWS7_OCL on 2015/04/09 15:42:22

ECR #399840 - OpenCL Runtime HW Debug support development - resolve the TDR issues on Kaveri.

	1. update the resource descriptors in the runtime trap handler to match those in the HSA HW debug implementation
	2. force to use SDMA for device memory map function, which is called when using clHwDbgSetGlobalMemoryAMD() and clEnqueueMapImage() functions, for HW debug

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#214 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gputrap.hpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#358 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.cpp#115 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLDevice.h#47 edit

rocclr/runtime/device/gpu/gpuresource.cpp

@@ -1445,7 +1445,8 @@ Resource::gslMap(void** ptr, size_t* pitch, gslMapAccessType flags, gslMemObject
 
     if (cal_.cardMemory_ || cal_.tiled_) {
         // @todo remove const cast
-        result = const_cast<Device&>(dev()).resMapLocal(*ptr, *pitch, resource, flags);
+        result = const_cast<Device&>(dev()).resMapLocal(*ptr, *pitch, resource, flags,
+                                                        dev().settings().enableHwDebug_);
     }
     else {
         result = dev().resMapRemote(*ptr, *pitch, resource, flags);
@@ -1461,7 +1462,8 @@ Resource::gslUnmap(gslMemObject resource) const
 
     if (cal_.cardMemory_) {
         // @todo remove const cast
-        result = const_cast<Device&>(dev()).resUnmapLocal(resource);
+        result = const_cast<Device&>(dev()).resUnmapLocal(resource,
+                                                          dev().settings().enableHwDebug_);
     }
     else {
         result = dev().resUnmapRemote(resource);