From 0096cc552b7dcd0dfc18ca5f838bebce9b3d74b4 Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Tue, 21 Jan 2020 16:52:40 -0500
Subject: [PATCH] P4 to Git Change 2061101 by
 skudchad@skudchad_test2_win_opencl on 2020/01/21 16:47:25

	SWDEV-219917 - [VDI Cleanup] Remove some direct OpenCL references, introduce a common functionality.

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/18488/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/build/Makefile.hip#30 edit
... //depot/stg/opencl/drivers/opencl/api/hip/fixme.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_internal.hpp#51 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hiprtc_internal.hpp#3 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#190 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_common.hpp#25 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_context.cpp#61 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_device.cpp#75 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_execute.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_icd.cpp#36 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_platform_amd.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_program.cpp#54 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#610 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#180 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#150 edit
... //depot/stg/opencl/drivers/opencl/runtime/include/vdi_agent_amd.h#1 add
... //depot/stg/opencl/drivers/opencl/runtime/include/vdi_common.hpp#1 add
... //depot/stg/opencl/drivers/opencl/runtime/os/os.hpp#32 edit
... //depot/stg/opencl/drivers/opencl/runtime/os/os_posix.cpp#49 edit
... //depot/stg/opencl/drivers/opencl/runtime/os/os_win32.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/agent.cpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/agent.hpp#7 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/context.cpp#54 edit
... //depot/stg/opencl/drivers/opencl/runtime/runtimedefs#54 edit
---
 hipamd/api/hip/fixme.cpp           | 2 +-
 hipamd/api/hip/hip_internal.hpp    | 5 ++---
 hipamd/api/hip/hiprtc_internal.hpp | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hipamd/api/hip/fixme.cpp b/hipamd/api/hip/fixme.cpp
index 5d7f8144f7..95880cd630 100644
--- a/hipamd/api/hip/fixme.cpp
+++ b/hipamd/api/hip/fixme.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "cl_common.hpp"
+#include "vdi_common.hpp"
 #include <icd/loader/icd_dispatch.h>
 
 KHRicdVendorDispatch amd::ICDDispatchedObject::icdVendorDispatch_[] = {0};
diff --git a/hipamd/api/hip/hip_internal.hpp b/hipamd/api/hip/hip_internal.hpp
index 7e1b5e941c..dd6639488f 100644
--- a/hipamd/api/hip/hip_internal.hpp
+++ b/hipamd/api/hip/hip_internal.hpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef HIP_SRC_HIP_INTERNAL_H
 #define HIP_SRC_HIP_INTERNAL_H
 
-#include "cl_common.hpp"
+#include "vdi_common.hpp"
 #include "hip_prof_api.h"
 #include "trace_helper.h"
 #include "utils/debug.hpp"
@@ -34,7 +34,6 @@ THE SOFTWARE.
 #include <iterator>
 
 
-
 /*! IHIP IPC MEMORY Structure */
 #define IHIP_IPC_MEM_HANDLE_SIZE   32
 #define IHIP_IPC_MEM_RESERVED_SIZE LP64_SWITCH(28,24)
@@ -55,7 +54,7 @@ typedef struct ihipIpcMemHandle_st {
 #define HIP_INIT_API(cid, ...)                               \
   ClPrint(amd::LOG_INFO, amd::LOG_API, "[%zx] %s ( %s )", std::this_thread::get_id(), __func__, ToString( __VA_ARGS__ ).c_str()); \
   amd::Thread* thread = amd::Thread::current();              \
-  if (!CL_CHECK_THREAD(thread)) {                            \
+  if (!VDI_CHECK_THREAD(thread)) {                           \
     HIP_RETURN(hipErrorOutOfMemory);                         \
   }                                                          \
   HIP_INIT()                                                 \
diff --git a/hipamd/api/hip/hiprtc_internal.hpp b/hipamd/api/hip/hiprtc_internal.hpp
index e97ac9eb09..5f1838ffac 100644
--- a/hipamd/api/hip/hiprtc_internal.hpp
+++ b/hipamd/api/hip/hiprtc_internal.hpp
@@ -29,8 +29,8 @@ THE SOFTWARE.
 #define HIPRTC_INIT_API(...)                                 \
   ClPrint(amd::LOG_INFO, amd::LOG_API, "[%zx] %s ( %s )", std::this_thread::get_id(), __func__, ToString( __VA_ARGS__ ).c_str()); \
   amd::Thread* thread = amd::Thread::current();              \
-  if (!CL_CHECK_THREAD(thread)) {                            \
-    HIPRTC_RETURN(HIPRTC_ERROR_INTERNAL_ERROR);               \
+  if (!VDI_CHECK_THREAD(thread)) {                           \
+    HIPRTC_RETURN(HIPRTC_ERROR_INTERNAL_ERROR);              \
   }                                                          \
   HIP_INIT();