Remove uses of hipconfig: derive HIP version from find_package(hip)

projects/clr/CMakeLists.txt

@@ -69,53 +69,19 @@ if(NOT DEFINED ROCM_PATH)
 endif()
 message(STATUS "ROCM_PATH: ${ROCM_PATH}")
 
-# Attempt to auto-detect HIP_PLATFORM by interrogating hipconfig. This is kept
-# for compatibility: users are advised to pass HIP_PLATFORM explicitly.
-# Sets the HIP_PLATFORM variable in the parent scope.
-function(_hip_clr_auto_detect_hip_platform)
-    if (UNIX)
-      set(HIPCC_EXECUTABLE "hipcc")
-      set(HIPCONFIG_EXECUTABLE "hipconfig")
-    else()
-      set(HIPCC_EXECUTABLE "hipcc.exe")
-      set(HIPCONFIG_EXECUTABLE "hipconfig.exe")
-    endif()
-
-    # Set default HIPCC_BIN_DIR to ${ROCM_PATH}/bin
-    if(NOT DEFINED HIPCC_BIN_DIR AND UNIX)
-        set(HIPCC_BIN_DIR "${ROCM_PATH}/bin")
-    endif()
-    message(STATUS "Auto-detect HIP_PLATFORM from HIPCC Binary Directory: ${HIPCC_BIN_DIR}")
-
-    if(NOT EXISTS ${HIPCC_BIN_DIR}/${HIPCONFIG_EXECUTABLE})
-        message(FATAL_ERROR "Please pass hipcc/build or hipcc/bin using -DHIPCC_BIN_DIR.")
-    endif()
-
-    # Determine HIP_PLATFORM
-    if(NOT DEFINED HIP_PLATFORM)
-        if(NOT DEFINED ENV{HIP_PLATFORM})
-            execute_process(COMMAND ${HIPCC_BIN_DIR}/${HIPCONFIG_EXECUTABLE} --platform
-                OUTPUT_VARIABLE _detected_hip_platform
-                RESULT_VARIABLE result
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-	    if(result AND NOT result EQUAL 0)
-                message(FATAL_ERROR "Failure trying to auto-detect HIP_PLATFORM via command: ${HIPCC_BIN_DIR}/${HIPCONFIG_EXECUTABLE} --platform: ${result}")
-	    endif()
-
-            set(HIP_PLATFORM "${_detected_hip_platform}" PARENT_SCOPE)
-        else()
-            set(HIP_PLATFORM "$ENV{HIP_PLATFORM}" PARENT_SCOPE)
-        endif()
-    endif()
-endfunction()
 if(CLR_BUILD_HIP)
     message(STATUS "HIP Common Directory: ${HIP_COMMON_DIR}")
     if(NOT DEFINED HIP_COMMON_DIR)
         message(FATAL_ERROR "Please pass HIP using -DHIP_COMMON_DIR. HIP_COMMON_DIR is incorrect")
     endif()
+    # HIP_PLATFORM selects the HIP backend: "amd" (default) or "nvidia".
+    # Pass -DHIP_PLATFORM=nvidia explicitly for NVIDIA builds.
+    # Note: ENV{HIP_PLATFORM} (hipcc's env var) is intentionally not read here.
     if(NOT DEFINED HIP_PLATFORM)
-        _hip_clr_auto_detect_hip_platform()
+        set(HIP_PLATFORM "amd")
+        message(STATUS "HIP_PLATFORM defaulting to: ${HIP_PLATFORM}")
+    else()
+        message(STATUS "HIP_PLATFORM set to: ${HIP_PLATFORM}")
     endif()
 endif()
 
@@ -131,10 +97,11 @@ endif()
 # which selects the sanitizer runtime linkage.
 include("${CMAKE_CURRENT_LIST_DIR}/cmake/CLRSanitizers.cmake")
 
+# rocclr is only used for the AMD HIP path and OpenCL; the NVIDIA path does not use it.
 if((CLR_BUILD_HIP AND HIP_PLATFORM STREQUAL "amd") OR CLR_BUILD_OCL)
     add_subdirectory(rocclr)
-elseif(HIP_PLATFORM STREQUAL "amd")
-    message(FATAL_ERROR "Please enable building of one or more of the below runtimes:\n- HIP (-DCLR_BUILD_HIP=ON)\n- OpenCL (-DCLR_BUILD_OCL-ON)")
+elseif(NOT CLR_BUILD_HIP AND NOT CLR_BUILD_OCL)
+    message(FATAL_ERROR "Please enable building of one or more of the below runtimes:\n- HIP (-DCLR_BUILD_HIP=ON)\n- OpenCL (-DCLR_BUILD_OCL=ON)")
 endif()
 if(CLR_BUILD_HIP)
     add_subdirectory(hipamd)

projects/clr/hipamd/CMakeLists.txt

@@ -23,7 +23,6 @@ include(GNUInstallDirs)
 #  By default, CMake will search for a folder named opencl or ROCm-OpenCL-Runtime relative to the current path. Specify -DAMD_OPENCL_PATH=$OPENCL_DIR if opencl source is in obscure location.
 list(APPEND CMAKE_MODULE_PATH ${HIP_COMMON_DIR}/cmake)
 
-
 #############################
 # Options
 #############################
@@ -239,9 +238,7 @@ endif()
 # Determine HIP_PLATFORM
 if(NOT DEFINED HIP_PLATFORM)
     if(NOT DEFINED ENV{HIP_PLATFORM})
-        execute_process(COMMAND ${__HIPCONFIG_EXECUTABLE__} --platform
-            OUTPUT_VARIABLE HIP_PLATFORM
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
+        set(HIP_PLATFORM "amd")
     else()
         set(HIP_PLATFORM $ENV{HIP_PLATFORM} CACHE STRING "HIP Platform")
     endif()
@@ -366,7 +363,6 @@ execute_process(COMMAND test ${CMAKE_INSTALL_PREFIX} -ef ${CMAKE_CURRENT_SOURCE_
     RESULT_VARIABLE INSTALL_SOURCE)
 if(NOT ${INSTALL_SOURCE} EQUAL 0)
     if(WIN32)
-      install(DIRECTORY ${HIP_COMMON_BIN_DIR} DESTINATION . USE_SOURCE_PERMISSIONS)
       if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/" DESTINATION ${CMAKE_INSTALL_BINDIR}
                 FILES_MATCHING PATTERN "*.pdb"

projects/clr/hipamd/hip-config.cmake.in

@@ -96,38 +96,32 @@ endif()
 
 if(NOT DEFINED HIP_PLATFORM)
   if(NOT DEFINED ENV{HIP_PLATFORM})
-    # Try using hip_HIPCONFIG_EXECUTABLE first, if it is available.
-    if(DEFINED hip_HIPCONFIG_EXECUTABLE AND NOT hip_HIPCONFIG_EXECUTABLE STREQUAL "")
-      execute_process(
-        COMMAND ${hip_HIPCONFIG_EXECUTABLE} --platform
-        OUTPUT_VARIABLE HIP_PLATFORM
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        RESULT_VARIABLE _hipconfig_result
-        ERROR_VARIABLE _hipconfig_error
-      )
-      if(_hipconfig_result EQUAL 0 AND NOT HIP_PLATFORM STREQUAL "")
-        message(STATUS "HIP_PLATFORM using hip_HIPCONFIG_EXECUTABLE: ${HIP_PLATFORM}")
-      else()
-        message(WARNING "Failed to detect HIP_PLATFORM using hip_HIPCONFIG_EXECUTABLE (${hip_HIPCONFIG_EXECUTABLE}): ${_hipconfig_error}")
-        unset(HIP_PLATFORM)
+    # Prefer the platform this package was built for: @HIP_PLATFORM@ is
+    # substituted by configure_package_config_file at install time so the
+    # installed config reflects the actual build rather than the consuming host.
+    if(NOT "@HIP_PLATFORM@" STREQUAL "")
+      set(HIP_PLATFORM "@HIP_PLATFORM@")
+      message(STATUS "HIP_PLATFORM (from build): ${HIP_PLATFORM}")
+    else()
+      # Fallback for installs where the build-time value was not baked in:
+      # probe for amdclang++ (AMD) or nvcc (NVIDIA), default to amd.
+      find_program(_hip_amdclangxx_exec amdclang++ PATHS "${hip_BIN_INSTALL_DIR}/../llvm/bin" NO_DEFAULT_PATH)
+      if(NOT _hip_amdclangxx_exec)
+        find_program(_hip_amdclangxx_exec amdclang++)
       endif()
-    endif()
-
-    # Fallback to finding a hipconfig executable on PATH if needed.
-    if(NOT DEFINED HIP_PLATFORM OR HIP_PLATFORM STREQUAL "")
-      find_program(HIPCONFIG_EXEC hipconfig)
-      execute_process(
-        COMMAND ${HIPCONFIG_EXEC} --platform
-        OUTPUT_VARIABLE HIP_PLATFORM
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        RESULT_VARIABLE _hipconfig_fallback_result
-        ERROR_VARIABLE _hipconfig_fallback_error
-      )
-      if(_hipconfig_fallback_result EQUAL 0 AND NOT HIP_PLATFORM STREQUAL "")
-        message(STATUS "HIP_PLATFORM using HIPCONFIG_EXEC: ${HIP_PLATFORM}")
+      if(_hip_amdclangxx_exec)
+        set(HIP_PLATFORM "amd")
       else()
-        message(FATAL_ERROR "Failed to detect HIP_PLATFORM using HIPCONFIG_EXEC (${HIPCONFIG_EXEC}): ${_hipconfig_fallback_error}")
+        find_program(_hip_nvcc_exec nvcc)
+        if(_hip_nvcc_exec)
+          set(HIP_PLATFORM "nvidia")
+        else()
+          set(HIP_PLATFORM "amd")
+        endif()
+        unset(_hip_nvcc_exec CACHE)
       endif()
+      unset(_hip_amdclangxx_exec CACHE)
+      message(STATUS "HIP_PLATFORM auto-detected: ${HIP_PLATFORM}")
     endif()
   else()
     set(HIP_PLATFORM $ENV{HIP_PLATFORM} CACHE STRING "HIP Platform")

projects/hip-tests/catch/CMakeLists.txt

@@ -54,10 +54,21 @@ include_directories(${hip_INCLUDE_DIRS})
 find_package(hiprtc)
 find_package(Git)
 find_package(Python 3 COMPONENTS Interpreter REQUIRED)
-find_program(HIPCONFIG_EXEC hipconfig REQUIRED)
-
 # hip root dir is 3 levels down the hip-config.cmake file path
 set(HIP_PATH ${hip_DIR}/../../../)
+
+# Reconstruct MAJOR.MINOR.PATCH-GITHASH from find_package(hip) and
+# share/hip/version. hip_VERSION only carries MAJOR.MINOR.PATCH; the
+# git hash lives in share/hip/version as HIP_VERSION_GITHASH.
+set(HIP_VERSION ${hip_VERSION})
+file(STRINGS "${HIP_PATH}/share/hip/version" _hip_githash_line
+     REGEX "^HIP_VERSION_GITHASH=")
+if(_hip_githash_line)
+  string(REGEX REPLACE "^HIP_VERSION_GITHASH=" "" _hip_githash "${_hip_githash_line}")
+  set(HIP_VERSION "${HIP_VERSION}-${_hip_githash}")
+  unset(_hip_githash)
+endif()
+unset(_hip_githash_line)
 if(NOT DEFINED ROCM_PATH)
   # Derive ROCM_PATH from the HIP location instead of hardcoding to /opt/rocm
   set(ROCM_PATH ${HIP_PATH})
@@ -101,14 +112,6 @@ if(NOT HIP_PLATFORM STREQUAL "amd" AND NOT HIP_PLATFORM STREQUAL "nvidia")
   message(FATAL_ERROR "Unexpected HIP_PLATFORM: " ${HIP_PLATFORM})
 endif()
 
-execute_process(COMMAND ${HIPCONFIG_EXEC} --version
-                OUTPUT_VARIABLE HIP_VERSION
-                RESULT_VARIABLE result
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-if(result AND NOT result EQUAL 0)
-  message(FATAL_ERROR "Failure trying to obtain HIP version via command: ${HIPCONFIG_EXEC} --version: ${result}")
-endif()
 
 if(NOT WIN32)
   if(NOT BUILD_SHARED_LIBS)
@@ -132,12 +135,19 @@ list(GET VERSION_LIST 1 HIP_VERSION_MINOR)
 list(GET VERSION_LIST 2 HIP_VERSION_PATCH_GITHASH)
 string(REPLACE "-" ";" VERSION_LIST ${HIP_VERSION_PATCH_GITHASH})
 list(GET VERSION_LIST 0 HIP_VERSION_PATCH)
-list(GET VERSION_LIST 1 HIP_VERSION_GITHASH)
+list(LENGTH VERSION_LIST _version_list_len)
+if(_version_list_len GREATER 1)
+  list(GET VERSION_LIST 1 HIP_VERSION_GITHASH)
+else()
+  set(HIP_VERSION_GITHASH "")
+endif()
 
 if(DEFINED ENV{ROCM_LIBPATCH_VERSION})
   set(HIP_PACKAGING_VERSION_PATCH ${HIP_VERSION_PATCH}.$ENV{ROCM_LIBPATCH_VERSION})
-else()
+elseif(HIP_VERSION_GITHASH)
   set(HIP_PACKAGING_VERSION_PATCH ${HIP_VERSION_PATCH}-${HIP_VERSION_GITHASH})
+else()
+  set(HIP_PACKAGING_VERSION_PATCH ${HIP_VERSION_PATCH})
 endif()
 
 find_package(Catch2 3.8.1 QUIET)