From 66c0fd4aa5a51eeb674a26d4efe1d43c4f115013 Mon Sep 17 00:00:00 2001
From: foreman <dl.constructicon@amd.com>
Date: Thu, 19 Feb 2015 19:40:35 -0500
Subject: [PATCH] P4 to Git Change 1123622 by wchau@wchau_WINDOWS7_OCL on
 2015/02/19 17:52:17

	ECR #399840 - OpenCL Runtime HW Debug support development

	- use device to control debugger registration and exception notification so that debug event will not be tied to any particular queue.
	- use aqlCodeInfo parameter for clHwDbgMapKernelCodeAMD() to be consistent with clHwDbgGetAqlPacketInfoAMD()

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_debugger_amd.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_debugger_amd.h#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugmanager.cpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudebugmanager.hpp#4 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#352 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.hpp#127 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.cpp#70 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gslbe/src/rt/GSLContext.h#43 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hwdebug.cpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hwdebug.hpp#6 edit
---
 opencl/api/opencl/amdocl/cl_debugger_amd.cpp | 9 +++------
 opencl/api/opencl/amdocl/cl_debugger_amd.h   | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/opencl/api/opencl/amdocl/cl_debugger_amd.cpp b/opencl/api/opencl/amdocl/cl_debugger_amd.cpp
index 90d884494e..7b1f12f852 100644
--- a/opencl/api/opencl/amdocl/cl_debugger_amd.cpp
+++ b/opencl/api/opencl/amdocl/cl_debugger_amd.cpp
@@ -690,9 +690,7 @@ RUNTIME_EXIT
  *
  *  \param device          specifies the device to be used
  *
- *  \param aqlCodeAddress  is the memory points to the returned host memory address for the kernel code
- *
- *  \param aqlCodeSize     returns the size of the kernel code
+ *  \param aqlCodeInfo   specifies the kernel code and its size
  *
  *  \return One of the following values:
  *  - CL_SUCCESS if the event occurs before the timeout
@@ -701,8 +699,7 @@ RUNTIME_EXIT
  */
 RUNTIME_ENTRY(cl_int, clHwDbgMapKernelCodeAMD, (
     cl_device_id                device,
-    cl_ulong *                  aqlCodeAddress,
-    cl_uint *                   aqlCodeSize))
+    void *                      aqlCodeInfo))
 {
     if (!is_valid(device)) {
         return CL_INVALID_DEVICE;
@@ -713,7 +710,7 @@ RUNTIME_ENTRY(cl_int, clHwDbgMapKernelCodeAMD, (
         return CL_HWDBG_MANAGER_NOT_AVAILABLE_AMD;
     }
 
-    debugManager->mapKernelCode(aqlCodeAddress, aqlCodeSize);
+    debugManager->mapKernelCode(aqlCodeInfo);
 
     return CL_SUCCESS;
 }
diff --git a/opencl/api/opencl/amdocl/cl_debugger_amd.h b/opencl/api/opencl/amdocl/cl_debugger_amd.h
index bd0ef2d487..cbbe743b04 100644
--- a/opencl/api/opencl/amdocl/cl_debugger_amd.h
+++ b/opencl/api/opencl/amdocl/cl_debugger_amd.h
@@ -666,8 +666,7 @@ extern CL_API_ENTRY cl_int CL_API_CALL clHwDbgGetDispatchDebugInfoAMD(
  */
 extern CL_API_ENTRY cl_int CL_API_CALL clHwDbgMapKernelCodeAMD(
     cl_device_id                        /* device */,
-    cl_ulong *                          /* aqlCodeAddress */,
-    cl_uint *                           /* aqlCodeSize */
+    void *                              /* aqlCodeInfo */
 ) CL_API_SUFFIX__VERSION_2_0;