Remove remaining roctracer references (#82)

2025-02-07 23:27:58 -05:00
parent b3eee295dd
commit e437200e9e
25 changed files with 254 additions and 682 deletions
@@ -1,109 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying file
-# Copyright.txt or https://cmake.org/licensing for details.
-
-include(FindPackageHandleStandardArgs)
-
-# ----------------------------------------------------------------------------------------#
-
-if(NOT ROCM_PATH AND NOT "$ENV{ROCM_PATH}" STREQUAL "")
-    set(ROCM_PATH "$ENV{ROCM_PATH}")
-endif()
-
-foreach(_DIR ${ROCmVersion_DIR} ${ROCM_PATH} /opt/rocm /opt/rocm/rocprofiler)
-    if(EXISTS ${_DIR})
-        get_filename_component(_ABS_DIR "${_DIR}" REALPATH)
-        list(APPEND _ROCM_ROCPROFILER_PATHS ${_ABS_DIR})
-    endif()
-endforeach()
-
-# ----------------------------------------------------------------------------------------#
-
-find_path(
-    rocprofiler_ROOT_DIR
-    NAMES include/rocprofiler/rocprofiler.h include/rocprofiler.h
-    HINTS ${_ROCM_ROCPROFILER_PATHS}
-    PATHS ${_ROCM_ROCPROFILER_PATHS}
-    PATH_SUFFIXES rocprofiler)
-
-mark_as_advanced(rocprofiler_ROOT_DIR)
-
-# ----------------------------------------------------------------------------------------#
-
-find_path(
-    rocprofiler_INCLUDE_DIR
-    NAMES rocprofiler.h
-    HINTS ${rocprofiler_ROOT_DIR} ${_ROCM_ROCPROFILER_PATHS}
-    PATHS ${rocprofiler_ROOT_DIR} ${_ROCM_ROCPROFILER_PATHS}
-    PATH_SUFFIXES include include/rocprofiler rocprofiler/include)
-
-mark_as_advanced(rocprofiler_INCLUDE_DIR)
-
-find_path(
-    rocprofiler_hsa_INCLUDE_DIR
-    NAMES hsa.h
-    HINTS ${rocprofiler_ROOT_DIR} ${_ROCM_ROCPROFILER_PATHS}
-    PATHS ${rocprofiler_ROOT_DIR} ${_ROCM_ROCPROFILER_PATHS}
-    PATH_SUFFIXES include include/hsa)
-
-mark_as_advanced(rocprofiler_hsa_INCLUDE_DIR)
-
-# ----------------------------------------------------------------------------------------#
-
-find_library(
-    rocprofiler_LIBRARY
-    NAMES ${CMAKE_SHARED_LIBRARY_PREFIX}rocprofiler64${CMAKE_SHARED_LIBRARY_SUFFIX}.1
-          rocprofiler64 rocprofiler
-    HINTS ${rocprofiler_ROOT_DIR}/rocprofiler ${rocprofiler_ROOT_DIR}
-          ${_ROCM_ROCPROFILER_PATHS}
-    PATHS ${rocprofiler_ROOT_DIR}/rocprofiler ${rocprofiler_ROOT_DIR}
-          ${_ROCM_ROCPROFILER_PATHS}
-    PATH_SUFFIXES lib lib64
-    NO_DEFAULT_PATH)
-
-find_library(
-    rocprofiler_hsa-runtime_LIBRARY
-    NAMES hsa-runtime64 hsa-runtime
-    HINTS ${rocprofiler_ROOT_DIR} ${_ROCM_ROCPROFILER_PATHS}
-    PATHS ${rocprofiler_ROOT_DIR} ${_ROCM_ROCPROFILER_PATHS}
-    PATH_SUFFIXES lib lib64)
-
-if(rocprofiler_LIBRARY)
-    get_filename_component(rocprofiler_LIBRARY_DIR "${rocprofiler_LIBRARY}" PATH CACHE)
-endif()
-
-mark_as_advanced(rocprofiler_LIBRARY rocprofiler_hsa-runtime_LIBRARY)
-unset(_ROCM_ROCPROFILER_PATHS)
-
-if(ROCmVersion_NUMERIC_VERSION EQUAL 50500)
-    find_library(
-        rocprofiler_pciaccess_LIBRARY
-        NAMES pciaccess
-        PATH_SUFFIXES lib lib64)
-    mark_as_advanced(rocprofiler_pciaccess_LIBRARY)
-endif()
-
-# ----------------------------------------------------------------------------------------#
-
-find_package_handle_standard_args(
-    rocprofiler DEFAULT_MSG rocprofiler_ROOT_DIR rocprofiler_INCLUDE_DIR
-    rocprofiler_hsa_INCLUDE_DIR rocprofiler_LIBRARY rocprofiler_hsa-runtime_LIBRARY)
-
-# ----------------------------------------------------------------------------------------#
-
-if(rocprofiler_FOUND)
-    add_library(rocprofiler::rocprofiler INTERFACE IMPORTED)
-    add_library(rocprofiler::roctx INTERFACE IMPORTED)
-    set(rocprofiler_INCLUDE_DIRS ${rocprofiler_INCLUDE_DIR}
-                                 ${rocprofiler_hsa_INCLUDE_DIR})
-    set(rocprofiler_LIBRARY_DIRS ${rocprofiler_LIBRARY_DIR})
-    set(rocprofiler_LIBRARIES ${rocprofiler_LIBRARY} ${rocprofiler_hsa-runtime_LIBRARY})
-    if(rocprofiler_pciaccess_LIBRARY)
-        list(APPEND rocprofiler_LIBRARIES ${rocprofiler_pciaccess_LIBRARY})
-    endif()
-
-    target_include_directories(
-        rocprofiler::rocprofiler INTERFACE ${rocprofiler_INCLUDE_DIR}
-                                           ${rocprofiler_hsa_INCLUDE_DIR})
-
-    target_link_libraries(rocprofiler::rocprofiler INTERFACE ${rocprofiler_LIBRARIES})
-endif()
@@ -1,186 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying file
-# Copyright.txt or https://cmake.org/licensing for details.
-
-include(FindPackageHandleStandardArgs)
-
-# ----------------------------------------------------------------------------------------#
-
-if(NOT ROCM_PATH AND NOT "$ENV{ROCM_PATH}" STREQUAL "")
-    set(ROCM_PATH "$ENV{ROCM_PATH}")
-endif()
-
-foreach(_DIR ${ROCmVersion_DIR} ${ROCM_PATH} /opt/rocm /opt/rocm/roctracer)
-    if(EXISTS ${_DIR})
-        get_filename_component(_ABS_DIR "${_DIR}" REALPATH)
-        list(APPEND _ROCM_ROCTRACER_PATHS ${_ABS_DIR})
-    endif()
-endforeach()
-
-# ----------------------------------------------------------------------------------------#
-
-find_path(
-    roctracer_ROOT_DIR
-    NAMES include/roctracer/roctracer.h include/roctracer.h
-    HINTS ${_ROCM_ROCTRACER_PATHS}
-    PATHS ${_ROCM_ROCTRACER_PATHS}
-    PATH_SUFFIXES roctracer)
-
-mark_as_advanced(roctracer_ROOT_DIR)
-
-# ----------------------------------------------------------------------------------------#
-
-find_path(
-    roctracer_INCLUDE_DIR
-    NAMES roctracer.h
-    HINTS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATHS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATH_SUFFIXES include include/roctracer roctracer/include)
-
-mark_as_advanced(roctracer_INCLUDE_DIR)
-
-find_path(
-    roctracer_hsa_INCLUDE_DIR
-    NAMES hsa.h
-    HINTS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATHS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATH_SUFFIXES include include/hsa)
-
-mark_as_advanced(roctracer_hsa_INCLUDE_DIR)
-
-# ----------------------------------------------------------------------------------------#
-
-find_library(
-    roctracer_LIBRARY
-    NAMES roctracer64 roctracer
-    HINTS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATHS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATH_SUFFIXES lib lib64)
-
-find_library(
-    roctracer_roctx_LIBRARY
-    NAMES roctx64 roctx
-    HINTS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATHS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATH_SUFFIXES lib lib64)
-
-find_library(
-    roctracer_kfdwrapper_LIBRARY
-    NAMES kfdwrapper64 kfdwrapper
-    HINTS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATHS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATH_SUFFIXES lib lib64)
-
-find_library(
-    roctracer_hsa-runtime_LIBRARY
-    NAMES hsa-runtime64 hsa-runtime
-    HINTS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATHS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-    PATH_SUFFIXES lib lib64)
-
-# try not to directly use the hsakmt::hsakmt target because it hardcodes the
-# INTERFACE_LINK_LIBRARIES used when it was built
-find_package(hsakmt HINTS ${_ROCM_ROCTRACER_PATHS} PATHS ${_ROCM_ROCTRACER_PATHS})
-
-if(hsakmt_FOUND)
-    add_library(roctracer::hsakmt INTERFACE IMPORTED)
-    get_target_property(hsakmt_INCLUDE_DIR hsakmt::hsakmt INTERFACE_INCLUDE_DIRECTORIES)
-    target_include_directories(roctracer::hsakmt INTERFACE ${hsakmt_INCLUDE_DIR})
-    set(hsakmt_FOUND_LIBS ON)
-    foreach(_LIB drm drm_amdgpu rt c numa udev)
-        set(_LIB_NAMES ${_LIB})
-        foreach(_EXT 2 1)
-            list(
-                APPEND
-                _LIB_NAMES
-                ${CMAKE_SHARED_LIBRARY_PREFIX}${_LIB}${CMAKE_SHARED_LIBRARY_SUFFIX}.${_EXT}
-                )
-        endforeach()
-        find_library(
-            hsakmt_${_LIB}_LIBRARY
-            NAMES ${_LIB_NAMES}
-            HINTS ${_ROCM_ROCTRACER_PATHS} /opt/amdgpu
-            PATHS ${_ROCM_ROCTRACER_PATHS} /opt/amdgpu
-            PATH_SUFFIXES ${CMAKE_INSTALL_LIBDIR} lib lib64)
-        if(NOT hsakmt_${_LIB}_LIBRARY)
-            set(hsakmt_FOUND_LIBS OFF)
-        else()
-            target_link_libraries(roctracer::hsakmt INTERFACE ${hsakmt_${_LIB}_LIBRARY})
-        endif()
-    endforeach()
-    if(hsakmt_FOUND_LIBS)
-        find_package(Threads REQUIRED)
-        target_link_libraries(roctracer::hsakmt INTERFACE Threads::Threads)
-        set(roctracer_hsakmt_LIBRARY
-            roctracer::hsakmt
-            CACHE STRING "Generated hsakmt target for roctracer")
-    else()
-        set(roctracer_hsakmt_LIBRARY
-            hsakmt::hsakmt
-            CACHE STRING "Imported hsakmt target")
-    endif()
-else()
-    find_library(
-        roctracer_hsakmt_LIBRARY
-        NAMES hsakmt
-        HINTS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-        PATHS ${roctracer_ROOT_DIR} ${_ROCM_ROCTRACER_PATHS}
-        PATH_SUFFIXES lib lib64)
-endif()
-
-if(roctracer_LIBRARY)
-    get_filename_component(roctracer_LIBRARY_DIR "${roctracer_LIBRARY}" PATH CACHE)
-endif()
-
-mark_as_advanced(roctracer_LIBRARY roctracer_roctx_LIBRARY roctracer_hsakmt_LIBRARY
-                 roctracer_hsa-runtime_LIBRARY)
-
-# ----------------------------------------------------------------------------------------#
-
-find_package_handle_standard_args(
-    roctracer DEFAULT_MSG roctracer_ROOT_DIR roctracer_INCLUDE_DIR
-    roctracer_hsa_INCLUDE_DIR roctracer_LIBRARY roctracer_roctx_LIBRARY)
-
-# ------------------------------------------------------------------------------#
-
-if(roctracer_FOUND)
-    add_library(roctracer::roctracer INTERFACE IMPORTED)
-    add_library(roctracer::roctx INTERFACE IMPORTED)
-    set(roctracer_INCLUDE_DIRS ${roctracer_INCLUDE_DIR} ${roctracer_hsa_INCLUDE_DIR})
-    set(roctracer_LIBRARIES ${roctracer_LIBRARY} ${roctracer_roctx_LIBRARY})
-    set(roctracer_LIBRARY_DIRS ${roctracer_LIBRARY_DIR})
-
-    target_include_directories(
-        roctracer::roctracer INTERFACE ${roctracer_INCLUDE_DIR}
-                                       ${roctracer_hsa_INCLUDE_DIR})
-    target_include_directories(roctracer::roctx INTERFACE ${roctracer_INCLUDE_DIR}
-                                                          ${roctracer_hsa_INCLUDE_DIR})
-
-    target_link_libraries(roctracer::roctracer INTERFACE ${roctracer_LIBRARY})
-    target_link_libraries(roctracer::roctx INTERFACE ${roctracer_roctx_LIBRARY})
-
-    if(roctracer_kfdwrapper_LIBRARY)
-        list(APPEND roctracer_LIBRARIES ${roctracer_kfdwrapper_LIBRARY})
-        target_link_libraries(roctracer::roctracer
-                              INTERFACE ${roctracer_kfdwrapper_LIBRARY})
-        target_link_libraries(roctracer::roctx INTERFACE ${roctracer_kfdwrapper_LIBRARY})
-    endif()
-
-    if(roctracer_hsakmt_LIBRARY)
-        list(APPEND roctracer_LIBRARIES ${roctracer_hsakmt_LIBRARY})
-        target_link_libraries(roctracer::roctracer INTERFACE ${roctracer_hsakmt_LIBRARY})
-        target_link_libraries(roctracer::roctx INTERFACE ${roctracer_hsakmt_LIBRARY})
-    endif()
-
-    if(roctracer_hsa-runtime_LIBRARY)
-        list(APPEND roctracer_LIBRARIES ${roctracer_hsa-runtime_LIBRARY})
-        target_link_libraries(roctracer::roctracer
-                              INTERFACE ${roctracer_hsa-runtime_LIBRARY})
-    endif()
-
-endif()
-
-# ------------------------------------------------------------------------------#
-
-unset(_ROCM_ROCTRACER_PATHS)
-
-# ------------------------------------------------------------------------------#
@@ -17,10 +17,6 @@ rocprofiler_systems_add_interface_library(
    "Provides flags and libraries for Dyninst (dynamic instrumentation)")
 rocprofiler_systems_add_interface_library(rocprofiler-systems-rocm
                                          "Provides flags and libraries for ROCm")
-rocprofiler_systems_add_interface_library(rocprofiler-systems-roctracer
-                                          "Provides flags and libraries for roctracer")
-rocprofiler_systems_add_interface_library(rocprofiler-systems-rocprofiler
-                                          "Provides flags and libraries for rocprofiler")
 rocprofiler_systems_add_interface_library(
    rocprofiler-systems-rccl
    "Provides flags for ROCm Communication Collectives Library (RCCL)")
@@ -161,15 +157,6 @@ if(ROCPROFSYS_USE_ROCM)
    set(ROCPROFSYS_ROCM_VERSION_PATCH ${ROCmVersion_PATCH_VERSION})
    set(ROCPROFSYS_ROCM_VERSION ${ROCmVersion_TRIPLE_VERSION})

-    if(ROCPROFSYS_ROCM_VERSION_MAJOR GREATER_EQUAL 4 AND ROCPROFSYS_ROCM_VERSION_MINOR
-                                                         GREATER 3)
-        set(roctracer_kfdwrapper_LIBRARY)
-    endif()
-
-    if(NOT roctracer_kfdwrapper_LIBRARY)
-        set(roctracer_kfdwrapper_LIBRARY)
-    endif()
-
    rocprofiler_systems_add_feature(ROCPROFSYS_ROCM_VERSION
                                    "ROCm version used by rocprofiler-systems")
 else()