P4 to Git Change 1109955 by wchau@wchau_WINDOWS7_OCL on 2015/01/08 14:00:03

ECR #399840 - OpenCL Runtime HW Debug support development - HW debeg core and runtime support

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_debugger_amd.cpp#2 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_debugger_amd.h#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#236 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugger.hpp#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugmanager.cpp#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugmanager.hpp#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#488 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#135 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#273 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#104 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#198 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuscsi.cpp#28 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#295 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#344 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.hpp#122 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#67 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#40 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hwdebug.cpp#1 add
... //depot/stg/opencl/drivers/opencl/runtime/device/hwdebug.hpp#2 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#221 edit

rocclr/runtime/device/gpu/gpuresource.cpp

@@ -363,7 +363,8 @@ Resource::create(MemoryType memType, CreateParams* params, bool heap)
     elementSize_ = static_cast<CALuint>(memoryFormatSize(cal()->format_).size_);
     cal_.type_ = memType;
     if (memType == Scratch) {
-        cal_.type_ = Local;
+        // use local memory for scratch buffer unless it is using HW DEBUG
+        cal_.type_ = (!dev().settings().enableHwDebug_) ? Local : RemoteUSWC;
         cal_.scratch_ = true;
     }
 
@@ -463,7 +464,7 @@ Resource::create(MemoryType memType, CreateParams* params, bool heap)
             else if ((gslRef_ != NULL) && (!dev().settings().use64BitPtr_)) {
                 // Make sure runtime didn't pick a resource with > 4GB address
                 if ((cal()->dimension_ == GSL_MOA_BUFFER) &&
-                    (static_cast<uint64_t>(gslRef_->gslResource()->getSurfaceAddress() + 
+                    (static_cast<uint64_t>(gslRef_->gslResource()->getSurfaceAddress() +
                      gslRef_->gslResource()->getSurfaceSize()) > (uint64_t(4) * Gi))) {
                     gslRef_->release();
                     gslRef_ = NULL;