P4 to Git Change 1110331 by wchau@wchau_WINDOWS7_OCL on 2015/01/09 12:05:43

ECR #399840 - OpenCL Runtime HW Debug support development - Back out changelist 1109955 to avoid Cypass OpenCL Sanity timeout.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_debugger_amd.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_debugger_amd.h#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#237 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugger.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugmanager.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugmanager.hpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#489 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#136 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#274 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.hpp#105 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#199 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuscsi.cpp#29 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpusettings.cpp#296 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#345 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.hpp#123 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#68 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#41 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hwdebug.cpp#2 delete
... //depot/stg/opencl/drivers/opencl/runtime/device/hwdebug.hpp#3 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#222 edit

rocclr/runtime/device/gpu/gpusettings.cpp

@@ -134,7 +134,6 @@ Settings::Settings()
 
     // Use host queue for device enqueuing by default
     useDeviceQueue_ = GPU_USE_DEVICE_QUEUE;
-
 }
 
 bool
@@ -312,7 +311,7 @@ Settings::create(
                 calAttr.isWorkstation || hsail_) : GPU_FORCE_64BIT_PTR;
         }
         else {
-            if (GPU_FORCE_64BIT_PTR || LP64_SWITCH(false, (hsail_
+            if (GPU_FORCE_64BIT_PTR || LP64_SWITCH(false, (hsail_ 
                 || (oclVersion_ >= OpenCL20)))) {
                 use64BitPtr_    = true;
             }
@@ -441,11 +440,6 @@ Settings::create(
     if (oclVersion_ >= OpenCL20) {
         enableExtension(ClKhrSubGroups);
         enableExtension(ClKhrDepthImages);
-
-        // Enable HW debug
-        if (GPU_ENABLE_HW_DEBUG) {
-            enableHwDebug_ = true;
-        }
     }
 
     if (apuSystem_ &&