HCC_HOME env cleanup

Change-Id: I2b00e5d310e6349fc52d5df60aae85f4c06adebe


[ROCm/roctracer commit: 8bdf282645]

projects/roctracer/README.md

@@ -57,9 +57,8 @@ rocTX API:
 
  - Set environment:
   export CMAKE_PREFIX_PATH=/opt/rocm
- - To use custom HIP/HCC versions:
+ - To use custom HIP version:
   export HIP_PATH=/opt/rocm/hip
-  export HCC_HOME=/opt/rocm/hcc
 
  - To build roctracer library:
   export CMAKE_BUILD_TYPE=<debug|release> # release by default

projects/roctracer/build.sh

@@ -17,7 +17,6 @@ if [ -e "$DEFAULTS" ] ; then source "$DEFAULTS"; fi
 if [ -z "$ROCTRACER_ROOT" ]; then ROCTRACER_ROOT=$SRC_DIR; fi
 if [ -z "$BUILD_DIR" ] ; then BUILD_DIR=$PWD; fi
 if [ -z "$HIP_PATH" ] ; then export HIP_PATH="$ROCM_PATH/hip"; fi
-if [ -z "$HCC_HOME" ] ; then export HCC_HOME="$ROCM_PATH/hcc"; fi
 if [ -z "$BUILD_TYPE" ] ; then BUILD_TYPE="release"; fi
 if [ -z "$PACKAGE_ROOT" ] ; then PACKAGE_ROOT=$ROCM_PATH; fi
 if [ -z "$PACKAGE_PREFIX" ] ; then PACKAGE_PREFIX="$ROCM_PATH/$COMPONENT"; fi

projects/roctracer/build_static.sh

@@ -17,7 +17,6 @@ if [ -e "$DEFAULTS" ] ; then source "$DEFAULTS"; fi
 if [ -z "$ROCTRACER_ROOT" ]; then ROCTRACER_ROOT=$SRC_DIR; fi
 if [ -z "$BUILD_DIR" ] ; then BUILD_DIR=$PWD; fi
 if [ -z "$HIP_PATH" ] ; then export HIP_PATH="$ROCM_PATH/hip"; fi
-if [ -z "$HCC_HOME" ] ; then export HCC_HOME="$ROCM_PATH/hcc"; fi
 if [ -z "$BUILD_TYPE" ] ; then BUILD_TYPE="release"; fi
 if [ -z "$PACKAGE_ROOT" ] ; then PACKAGE_ROOT=$ROCM_PATH; fi
 if [ -z "$PACKAGE_PREFIX" ] ; then PACKAGE_PREFIX="$ROCM_PATH/$COMPONENT"; fi

projects/roctracer/cmake_modules/env.cmake

@@ -89,7 +89,7 @@ else()
   set ( HIP_DEFINES "-D__HIP_PLATFORM_HCC__=1")
 endif()
 
-## Enable HIP/HCC local build
+## Enable HIP local build
 if ( DEFINED LOCAL_BUILD )
   add_definitions ( -DLOCAL_BUILD=${LOCAL_BUILD} )
 else()
@@ -114,15 +114,10 @@ if ( NOT DEFINED CMAKE_PREFIX_PATH AND DEFINED ENV{CMAKE_PREFIX_PATH} )
 endif()
 set ( ENV{CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH} )
 
-set ( HCC_HOME "/opt/rocm/hcc" )
 set ( HIP_PATH "/opt/rocm/hip" )
-if ( DEFINED ENV{HCC_HOME} )
-  set ( HCC_HOME $ENV{HCC_HOME} )
-endif()
 if ( DEFINED ENV{HIP_PATH} )
   set ( HIP_PATH $ENV{HIP_PATH} )
 endif()
-set ( HCC_INC_DIR "${HCC_HOME}/include" )
 set ( HIP_INC_DIR "${HIP_PATH}/include" )
 
 ## Extend Compiler flags based on build type
@@ -170,7 +165,6 @@ message ( "-----HSA-Runtime-Lib: ${HSA_RUNTIME_LIB_PATH}" )
 message ( "----HSA_KMT_LIB_PATH: ${HSA_KMT_LIB_PATH}" )
 message ( "-------ROCM_ROOT_DIR: ${ROCM_ROOT_DIR}" )
 message ( "-------------KFD-Inc: ${HSA_KMT_INC_PATH}" )
-message ( "-------------HCC-Inc: ${HCC_INC_DIR}" )
 message ( "-------------HIP-Inc: ${HIP_INC_DIR}" )
 message ( "-------------HIP-VDI: ${HIP_VDI}" )
 message ( "-----CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}" )

projects/roctracer/run_test.sh

@@ -7,7 +7,6 @@ fatal() {
 }
 
 if [ -z "$BUILD_DIR" ] ; then export BUILD_DIR=$PWD; fi
-if [ -z "$HCC_HOME" ] ; then export HCC_HOME="$ROCM_PATH/hcc"; fi
 
 cd $BUILD_DIR
 ./run.sh