WIP: rocprofv3

Author: vchuravy

gen/rocprof/generator.jl

@@ -2,16 +2,17 @@ using Clang.Generators
 using JuliaFormatter
 
 include_dir = normpath("/opt/rocm/include")
-rocfft_dir  = joinpath(include_dir, "rocprofiler/v2")
+rocprof_dir  = joinpath(include_dir, "rocprofiler-sdk")
 options = load_options("rocprof/rocprof-generator.toml")
 
 args = get_default_args()
 push!(args, "-I$include_dir")
 
 headers = [
-    joinpath(rocfft_dir, header)
-    for header in readdir(rocfft_dir)
-    if endswith(header, ".h")
+    joinpath(rocprof_dir, header)
+    # for header in readdir(rocprof_dir)
+    # if endswith(header, ".h")
+    for header in ("rocprofiler.h",)
 ]
 
 ctx = create_context(headers, args, options)

gen/rocprof/rocprof-generator.toml

@@ -1,5 +1,5 @@
 [general]
-library_name = "librocprofiler64v2"
+library_name = "librocprofiler-sdk-tool"
 output_file_path = "./librocprof.jl"
 export_symbol_prefixes = []
 

src/discovery/discovery.jl

@@ -2,7 +2,7 @@ module ROCmDiscovery
 
 export lld_artifact, lld_path, libhsaruntime, libdevice_libs, libhip
 export librocblas, librocsparse, librocsolver
-export librocrand, librocfft, libMIOpen_path, librocprofiler64v2
+export librocrand, librocfft, libMIOpen_path, librocprofiler_sdk_tool
 
 using LLD_jll
 using ROCmDeviceLibs_jll
@@ -56,6 +56,7 @@ function __init__()
     global librocrand = ""
     global librocfft = ""
     global libMIOpen_path = ""
+    global librocprofiler_sdk_tool = ""
 
     if Sys.islinux() && isdir("/sys/class/kfd/kfd/topology/nodes/")
         for node_id in readdir("/sys/class/kfd/kfd/topology/nodes/")
@@ -103,7 +104,7 @@ function __init__()
         global librocrand = find_rocm_library(lib_prefix * "rocrand"; rocm_path)
         global librocfft = find_rocm_library(lib_prefix * "rocfft"; rocm_path)
         global libMIOpen_path = find_rocm_library(lib_prefix * "MIOpen"; rocm_path)
-        global librocprofiler64v2 = find_rocm_library(lib_prefix * "rocprofiler64v2"; rocm_path)
+        global librocprofiler_sdk_tool = find_rocm_library(lib_prefix * "rocprofiler-sdk-tool"; rocm_path)
     catch err
         @error """ROCm discovery failed!
         Discovered ROCm path: $rocm_path.

src/utils.jl

@@ -13,7 +13,7 @@ function versioninfo()
         _status(functional(:rocrand))     "rocRAND"          _ver(:rocrand, rocRAND.version)     _libpath(librocrand);
         _status(functional(:rocfft))      "rocFFT"           _ver(:rocfft, rocFFT.version)       _libpath(librocfft);
         _status(functional(:MIOpen))      "MIOpen"           _ver(:MIOpen, MIOpen.version)       _libpath(libMIOpen_path);
-        _status(functional(:rocprofv2))   "rocprofv2"        _ver(:rocprofv2, Profiler.version)  _libpath(librocprofiler64v2);
+        _status(functional(:rocprofv3))   "rocprof-sdk-tool"        _ver(:rocprofv3, Profiler.version)  _libpath(librocprofiler_sdk_tool);
     ]
 
     PrettyTables.pretty_table(data; header=[
@@ -89,12 +89,12 @@ function functional(component::Symbol)
         return !isempty(librocfft)
     elseif component == :MIOpen
         return !isempty(libMIOpen_path)
-    elseif component == :rocprofv2
-        return !isempty(librocprofiler64v2)
+    elseif component == :rocprofv3
+        return !isempty(librocprofiler_sdk_tool)
     elseif component == :all
         for component in (
             :hip, :lld, :device_libs, :rocblas, :rocsolver,
-            :rocsparse, :rocrand, :rocfft, :MIOpen, rocprofv2,
+            :rocsparse, :rocrand, :rocfft, :MIOpen, :rocprofv3,
         )
             functional(component) || return false
         end