P4 to Git Change 1123271 by wchau@wchau_WINDOWS7_OCL on 2015/02/18 16:59:12

ECR #399840 - OpenCL Runtime HW Debug support development - add install_trap API to avoid the expose of runtime trap handler to the DBE.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#41 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_debugger_amd.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_debugger_amd.h#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugmanager.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hwdebug.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hwdebug.hpp#5 edit


[ROCm/clr commit: 7431a16712]

projects/clr/rocclr/runtime/device/gpu/gpudebugmanager.cpp

@@ -93,7 +93,6 @@ GpuDebugManager::executePreDispatchCallBack(void*  aqlPacket,
                                  oclEventHandle_,
                                  aqlPacket_,
                                  aclBinary_,
-                                 deviceTrapInfo_,
                                  preDispatchCallBackArgs_);
     }
 
@@ -107,7 +106,7 @@ GpuDebugManager::executePostDispatchCallBack()
     if (NULL != postDispatchCallBackFunc_) {
         cl_device_id clDeviceId = as_cl(device_);
         postDispatchCallBackFunc_(clDeviceId,
-                                  0,
+                                  aqlPacket_->completion_signal.handle,
                                   postDispatchCallBackArgs_);
     }
 }
@@ -202,10 +201,8 @@ GpuDebugManager::setupTrapInformation(DebugToolInfo* toolInfo)
 
     toolInfo->reservedCuNum_ = execMode_.reservedCuNum;
 
-    toolInfo->trapHandler_ =
-                as_amd(reinterpret_cast<cl_mem>(deviceTrapInfo_[kDebugTrapHandlerLocation]));
-    toolInfo->trapBuffer_ =
-                as_amd(reinterpret_cast<cl_mem>(deviceTrapInfo_[kDebugTrapBufferLocation]));
+    toolInfo->trapHandler_ = rtTrapInfo_[kDebugTrapHandlerLocation];
+    toolInfo->trapBuffer_ = rtTrapInfo_[kDebugTrapBufferLocation];
 }