From 04fb7e4fe774657f623fbc7ff0019acd5a903335 Mon Sep 17 00:00:00 2001 From: Sajina PK Date: Wed, 9 Apr 2025 16:20:02 -0400 Subject: [PATCH] RocJpeg cmake and document fixes (#157) - Fix for rocjpeg sample cmake due to changes in the rocJPEG project - Fix for rocprofiler-sdk version check - change the format - Edits to docs for jpeg and vcn activity support - mention that these values may not be supported on all ASICs. [ROCm/rocprofiler-systems commit: fad3a0d3416fc75fb538ef65d259751fc4d44cc8] --- projects/rocprofiler-systems/README.md | 2 ++ .../docs/conceptual/rocprof-sys-feature-set.rst | 1 + .../examples/jpegdecode/CMakeLists.txt | 5 +++-- .../source/lib/core/rocprofiler-sdk.cpp | 3 +-- .../source/lib/rocprof-sys/library/rocprofiler-sdk.cpp | 9 +++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/rocprofiler-systems/README.md b/projects/rocprofiler-systems/README.md index 551baece8e..ffaf579fea 100755 --- a/projects/rocprofiler-systems/README.md +++ b/projects/rocprofiler-systems/README.md @@ -71,6 +71,8 @@ The documentation source files reside in the [`/docs`](/docs) folder of this rep - Utilization - VCN Utilization - JPEG Utilization + + Note: The availability of VCN and JPEG engine utilization depends on device support for different ASICs. If unsupported, all values for VCN_ACTIVITY and JPEG_ACTIVITY will be reported as N/A in the output of `amd-smi metric --usage`. ### CPU Metrics diff --git a/projects/rocprofiler-systems/docs/conceptual/rocprof-sys-feature-set.rst b/projects/rocprofiler-systems/docs/conceptual/rocprof-sys-feature-set.rst index e6c3be3a16..8aac222869 100644 --- a/projects/rocprofiler-systems/docs/conceptual/rocprof-sys-feature-set.rst +++ b/projects/rocprofiler-systems/docs/conceptual/rocprof-sys-feature-set.rst @@ -62,6 +62,7 @@ GPU metrics * Utilization * VCN activity * JPEG activity + Note: The availability of VCN and JPEG engine activity depends on device support for different ASICs. If unsupported, all values for VCN_ACTIVITY and JPEG_ACTIVITY will be reported as N/A in the output of amd-smi metric--usage. CPU metrics ======================================== diff --git a/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt b/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt index d574ccac65..a76269d194 100644 --- a/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt +++ b/projects/rocprofiler-systems/examples/jpegdecode/CMakeLists.txt @@ -42,7 +42,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED On) list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../cmake) -list(APPEND CMAKE_PREFIX_PATH ${ROCmVersion_DIR}/hip ${ROCmVersion_DIR}) +list(APPEND CMAKE_PREFIX_PATH ${ROCmVersion_DIR}/lib/cmake ${ROCmVersion_DIR}) list(APPEND CMAKE_MODULE_PATH ${ROCmVersion_DIR}/share/rocjpeg/cmake) set(CMAKE_BUILD_TYPE "RelWithDebInfo") @@ -57,7 +57,7 @@ if(ROCPROFSYS_DISABLE_EXAMPLES) endif() endif() -find_package(rocJPEG QUIET) +find_package(ROCJPEG QUIET) find_package(rocprofiler-register QUIET) # Copy image files to build directory @@ -104,6 +104,7 @@ if(HIP_FOUND set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} rocprofiler-register::rocprofiler-register) # rocJPEG + message(STATUS "RocJPEG library found: ${ROCJPEG_LIBRARY}") include_directories(${ROCJPEG_INCLUDE_DIR}) set(LINK_LIBRARY_LIST ${LINK_LIBRARY_LIST} ${ROCJPEG_LIBRARY}) list(APPEND SOURCES ${PROJECT_SOURCE_DIR} jpegdecodeperf.cpp) diff --git a/projects/rocprofiler-systems/source/lib/core/rocprofiler-sdk.cpp b/projects/rocprofiler-systems/source/lib/core/rocprofiler-sdk.cpp index 00c488dd79..ce10c4a28e 100644 --- a/projects/rocprofiler-systems/source/lib/core/rocprofiler-sdk.cpp +++ b/projects/rocprofiler-systems/source/lib/core/rocprofiler-sdk.cpp @@ -360,8 +360,7 @@ get_callback_domains() ROCPROFILER_CALLBACK_TRACING_HIP_COMPILER_API, ROCPROFILER_CALLBACK_TRACING_MARKER_CORE_API, ROCPROFILER_CALLBACK_TRACING_CODE_OBJECT, -# if(ROCPROFILER_VERSION_MAJOR == 0 && ROCPROFILER_VERSION_MINOR >= 7) || \ - ROCPROFILER_VERSION_MAJOR >= 1 +# if(ROCPROFILER_VERSION >= 700) ROCPROFILER_CALLBACK_TRACING_ROCDECODE_API, ROCPROFILER_CALLBACK_TRACING_ROCJPEG_API, # endif diff --git a/projects/rocprofiler-systems/source/lib/rocprof-sys/library/rocprofiler-sdk.cpp b/projects/rocprofiler-systems/source/lib/rocprof-sys/library/rocprofiler-sdk.cpp index 1c2d96b3d0..0ea3b12d6b 100644 --- a/projects/rocprofiler-systems/source/lib/rocprof-sys/library/rocprofiler-sdk.cpp +++ b/projects/rocprofiler-systems/source/lib/rocprof-sys/library/rocprofiler-sdk.cpp @@ -508,8 +508,7 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, user_data, ts); break; } -#if(ROCPROFILER_VERSION_MAJOR == 0 && ROCPROFILER_VERSION_MINOR >= 7) || \ - ROCPROFILER_VERSION_MAJOR >= 1 +#if(ROCPROFILER_VERSION >= 700) case ROCPROFILER_CALLBACK_TRACING_ROCDECODE_API: { tool_tracing_callback_start(category::rocm_rocdecode_api{}, record, @@ -593,8 +592,7 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, ts, _bt_data); break; } -#if(ROCPROFILER_VERSION_MAJOR == 0 && ROCPROFILER_VERSION_MINOR >= 7) || \ - ROCPROFILER_VERSION_MAJOR >= 1 +#if(ROCPROFILER_VERSION >= 700) case ROCPROFILER_CALLBACK_TRACING_ROCDECODE_API: { tool_tracing_callback_stop(category::rocm_rocdecode_api{}, record, @@ -1039,8 +1037,7 @@ tool_init(rocprofiler_client_finalize_t fini_func, void* user_data) ROCPROFILER_CALLBACK_TRACING_HSA_FINALIZE_EXT_API, ROCPROFILER_CALLBACK_TRACING_HIP_RUNTIME_API, ROCPROFILER_CALLBACK_TRACING_HIP_COMPILER_API, -#if(ROCPROFILER_VERSION_MAJOR == 0 && ROCPROFILER_VERSION_MINOR >= 7) || \ - ROCPROFILER_VERSION_MAJOR >= 1 +#if(ROCPROFILER_VERSION >= 700) ROCPROFILER_CALLBACK_TRACING_ROCDECODE_API, ROCPROFILER_CALLBACK_TRACING_ROCJPEG_API, #endif