From 8fb3cdb30b45b70447613657e7dc80b91b69d571 Mon Sep 17 00:00:00 2001
From: Laurent Morichetti <laurent.morichetti@amd.com>
Date: Thu, 15 Apr 2021 19:37:29 -0700
Subject: [PATCH] Make HIP_VDI the default

As this snippet shows, HCC is no longer supported by roctracer:

#if HIP_VDI
...
#else
#error HCC support dropped
#endif

Removed HIP_VDI from the CMakeLists.txt, and the source code.

Change-Id: Ib273da2a5af6d67fa1b021a7eca3ff785c8b9c73
---
 cmake_modules/env.cmake            | 13 ++-----------
 defaults.sh                        |  1 -
 src/core/loader.h                  | 10 ----------
 test/CMakeLists.txt                |  2 +-
 test/MatrixTranspose_test/Makefile |  2 +-
 test/tool/tracer_tool.cpp          |  8 --------
 6 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/cmake_modules/env.cmake b/cmake_modules/env.cmake
index ab6c7f8856..4f3fa2af1d 100644
--- a/cmake_modules/env.cmake
+++ b/cmake_modules/env.cmake
@@ -81,16 +81,8 @@ endif()
 add_definitions ( -DHIP_PROF_HIP_API_STRING=${HIP_API_STRING} )
 
 ## Enable HIP_VDI mode
-if ( NOT DEFINED HIP_VDI )
-  set ( HIP_VDI 0 )
-endif()
-add_definitions ( -DHIP_VDI=${HIP_VDI} )
-if ( "${HIP_VDI}" STREQUAL "1" )
-  add_definitions ( -D__HIP_ROCclr__=1 )
-  set ( HIP_DEFINES "-D__HIP_PLATFORM_HCC__=1 -D__HIP_ROCclr__=1" )
-else()
-  set ( HIP_DEFINES "-D__HIP_PLATFORM_HCC__=1")
-endif()
+add_definitions ( -D__HIP_ROCclr__=1 )
+set ( HIP_DEFINES "-D__HIP_PLATFORM_HCC__=1 -D__HIP_ROCclr__=1" )
 
 ## Enable HIP local build
 if ( DEFINED LOCAL_BUILD )
@@ -173,7 +165,6 @@ message ( "-------ROCM_ROOT_DIR: ${ROCM_ROOT_DIR}" )
 message ( "-------ROCM_INC_PATH: ${ROCM_INC_PATH}" )
 message ( "-------------KFD-Inc: ${HSA_KMT_INC_PATH}" )
 message ( "-------------HIP-Inc: ${HIP_INC_DIR}" )
-message ( "-------------HIP-VDI: ${HIP_VDI}" )
 message ( "-----CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}" )
 message ( "---CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}" )
 message ( "---------GPU_TARGETS: ${GPU_TARGETS}" )
diff --git a/defaults.sh b/defaults.sh
index 93361e72f0..d6d21b9506 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -1,3 +1,2 @@
 BUILD_DIR=build
 TO_CLEAN=yes
-HIP_VDI=1
diff --git a/src/core/loader.h b/src/core/loader.h
index 946521d130..9102dc13da 100644
--- a/src/core/loader.h
+++ b/src/core/loader.h
@@ -225,15 +225,9 @@ class HccApi {
 
   protected:
   void init(Loader* loader) {
-#if HIP_VDI
     InitActivityCallback = loader->GetFun<hipInitAsyncActivityCallback_t>("hipInitActivityCallback");
     EnableActivityCallback = loader->GetFun<hipEnableAsyncActivityCallback_t>("hipEnableActivityCallback");
     GetOpName = loader->GetFun<hipGetOpName_t>("hipGetCmdName");
-#else
-    InitActivityCallback = loader->GetFun<hipInitAsyncActivityCallback_t>("InitActivityCallbackImpl");
-    EnableActivityCallback = loader->GetFun<hipEnableAsyncActivityCallback_t>("EnableActivityCallbackImpl");
-    GetOpName = loader->GetFun<hipGetOpName_t>("GetCmdNameImpl");
-#endif
   }
 };
 
@@ -313,12 +307,8 @@ typedef HipLoaderShared HipLoader;
   template<> const char* roctracer::HipLoaderShared::lib_name_ = "libamdhip64.so";
 #endif
 
-#if HIP_VDI
 #define LOADER_INSTANTIATE() \
   LOADER_INSTANTIATE_2(); \
   LOADER_INSTANTIATE_HIP();
-#else
-#error HCC support dropped
-#endif
 
 #endif // SRC_CORE_LOADER_H_
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 748ee95a28..c2d6d1f44e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -52,7 +52,7 @@ set ( RUN_SCRIPT "${TEST_DIR}/run.sh" )
 ## build HIP tests
 set ( GEN_INC_DIR ${PROJECT_BINARY_DIR}/inc )
 set ( INC_PATH "${INC_PATH} ${GEN_INC_DIR}" )
-set ( TEST_ENV HIP_VDI=${HIP_VDI} ROCM_PATH=${ROCM_ROOT_DIR} HSA_PATH=${ROCM_ROOT_DIR}/hsa INC_PATH=${INC_PATH} LIB_PATH=${LIB_PATH} HIPCC_VERBOSE=3 )
+set ( TEST_ENV ROCM_PATH=${ROCM_ROOT_DIR} HSA_PATH=${ROCM_ROOT_DIR}/hsa INC_PATH=${INC_PATH} LIB_PATH=${LIB_PATH} HIPCC_VERBOSE=3 )
 add_custom_target( mytest
   COMMAND ${TEST_ENV} make -C "${TEST_DIR}/MatrixTranspose"
   COMMAND sh -xc "cp ${TEST_DIR}/MatrixTranspose/MatrixTranspose ${PROJECT_BINARY_DIR}/test"
diff --git a/test/MatrixTranspose_test/Makefile b/test/MatrixTranspose_test/Makefile
index 758f8d9431..8448e71228 100644
--- a/test/MatrixTranspose_test/Makefile
+++ b/test/MatrixTranspose_test/Makefile
@@ -17,7 +17,7 @@ TARGET=hcc
 
 EXECUTABLE=./MatrixTranspose
 OBJECTS = MatrixTranspose.o
-FLAGS =-g $(INC_PATH:%=-I%) -I$(ROCM_PATH)/hsa/include/hsa -I$(ROCM_PATH)/hsa/include -I$(ROCM_PATH)/hip/include -I$(ROCM_PATH)/include -DLOCAL_BUILD=1 -DHIP_VDI=${HIP_VDI} -DITERATIONS=$(ITERATIONS) -DAMD_INTERNAL_BUILD=1
+FLAGS =-g $(INC_PATH:%=-I%) -I$(ROCM_PATH)/hsa/include/hsa -I$(ROCM_PATH)/hsa/include -I$(ROCM_PATH)/hip/include -I$(ROCM_PATH)/include -DLOCAL_BUILD=1 -DITERATIONS=$(ITERATIONS) -DAMD_INTERNAL_BUILD=1
 
 ifeq ($(C_TEST), 1)
 	COMP=${CC}
diff --git a/test/tool/tracer_tool.cpp b/test/tool/tracer_tool.cpp
index 0b1721d5b1..42cb6ce465 100644
--- a/test/tool/tracer_tool.cpp
+++ b/test/tool/tracer_tool.cpp
@@ -567,14 +567,6 @@ void hip_api_flush_cb(hip_api_trace_entry_t* entry) {
           cxx_demangle(entry->name),
           data->args.hipExtModuleLaunchKernel.hStream);
         break;
-#if !HIP_VDI
-      case HIP_API_ID_hipHccModuleLaunchKernel:
-        fprintf(hip_api_file_handle, "%s(kernel(%s) stream(%p))\n",
-          oss.str().c_str(),
-          cxx_demangle(entry->name),
-          data->args.hipHccModuleLaunchKernel.hStream);
-        break;
-#endif
       default:
         fprintf(hip_api_file_handle, "%s()\n", oss.str().c_str());
     }