[CI] Miscellaneous Testing Updates (#305)

* Add rocprofiler-sdk-utilities.cmake - contains cmake function rocprofiler_sdk_get_gfx_architectures * Update perfetto_reader.py - fix hash collision * Update project names in tests folders - rocprofiler-tests -> rocprofiler-sdk-tests * Fix incorrect allocation-error handling * [CI] Disable openmp tests for navi2, navi3, and navi4 * Suppress leaks by omptarget and llvm --------- Co-authored-by: Jonathan R. Madsen <jonathanrmadsen@gmail.com>
2025-03-22 18:51:42 -05:00
parent b01465303b
commit 2d072f9217
69 changed files with 163 additions and 81 deletions
@@ -30,13 +30,13 @@ env:
  mi300a_EXCLUDE_TESTS_REGEX: "^(test-page-migration-(execute|validate))$"
  mi325_EXCLUDE_TESTS_REGEX: "^(test-page-migration-(execute|validate)|counter-collection-buffer)$"
  navi4_EXCLUDE_TESTS_REGEX: "^(test-page-migration-(execute|validate))$"
-  navi3_EXCLUDE_LABEL_REGEX: "^(pc-sampling|pc_sampling|openmp-target)$"
-  vega20_EXCLUDE_LABEL_REGEX: "^(pc-sampling|pc_sampling|openmp-target)$"
+  navi3_EXCLUDE_LABEL_REGEX: "^(pc-sampling)$"
+  vega20_EXCLUDE_LABEL_REGEX: "^(pc-sampling)$"
  mi200_EXCLUDE_LABEL_REGEX: "^(stochastic)$"
-  mi300_EXCLUDE_LABEL_REGEX: "^(pc-sampling|pc_sampling)$"
+  mi300_EXCLUDE_LABEL_REGEX: "^(pc-sampling)$"
  mi300a_EXCLUDE_LABEL_REGEX: ""
-  mi325_EXCLUDE_LABEL_REGEX: "^(pc-sampling|pc_sampling)$"
-  navi4_EXCLUDE_LABEL_REGEX: "^(pc-sampling|pc_sampling|openmp-target)$"
+  mi325_EXCLUDE_LABEL_REGEX: "^(pc-sampling)$"
+  navi4_EXCLUDE_LABEL_REGEX: "^(pc-sampling)$"

 jobs:
  core-deb:
@@ -0,0 +1,51 @@
+#
+# Miscellaneous cmake functions for rocprofiler-sdk
+#
+
+include_guard(GLOBAL)
+
+function(rocprofiler_sdk_get_gfx_architectures _VAR)
+    cmake_parse_arguments(ARG "ECHO" "PREFIX;DELIM" "" ${ARGN})
+
+    if(NOT DEFINED ARG_DELIM)
+        set(ARG_DELIM ", ")
+    endif()
+
+    if(NOT DEFINED ARG_PREFIX)
+        set(ARG_PREFIX "[${PROJECT_NAME}] ")
+    endif()
+
+    find_program(
+        rocminfo_EXECUTABLE
+        NAMES rocminfo
+        HINTS ${rocprofiler-sdk_ROOT_DIR} ${rocm_version_DIR} ${ROCM_PATH} /opt/rocm
+        PATHS ${rocprofiler-sdk_ROOT_DIR} ${rocm_version_DIR} ${ROCM_PATH} /opt/rocm
+        PATH_SUFFIXES bin)
+
+    if(rocminfo_EXECUTABLE)
+        execute_process(
+            COMMAND ${rocminfo_EXECUTABLE}
+            RESULT_VARIABLE rocminfo_RET
+            OUTPUT_VARIABLE rocminfo_OUT
+            ERROR_VARIABLE rocminfo_ERR
+            OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_STRIP_TRAILING_WHITESPACE)
+
+        if(rocminfo_RET EQUAL 0)
+            string(REGEX MATCHALL "gfx([0-9A-Fa-f]+)" rocminfo_GFXINFO "${rocminfo_OUT}")
+            list(REMOVE_DUPLICATES rocminfo_GFXINFO)
+            set(${_VAR}
+                "${rocminfo_GFXINFO}"
+                PARENT_SCOPE)
+
+            if(ARG_ECHO)
+                string(REPLACE ";" "${ARG_DELIM}" _GFXINFO_ECHO "${rocminfo_GFXINFO}")
+                message(STATUS "${ARG_PREFIX}System architectures: ${_GFXINFO_ECHO}")
+            endif()
+        else()
+            message(
+                AUTHOR_WARNING
+                    "${rocminfo_EXECUTABLE} failed with error code ${rocminfo_RET}\nstderr:\n${rocminfo_ERR}\nstdout:\n${rocminfo_OUT}"
+                )
+        endif()
+    endif()
+endfunction()
@@ -149,6 +149,7 @@ find_package_handle_standard_args(

 if(EXISTS ${@PACKAGE_NAME@_CMAKE_DIR}/Modules)
    list(APPEND CMAKE_MODULE_PATH ${@PACKAGE_NAME@_CMAKE_DIR}/Modules)
+    include(rocprofiler-sdk-utilities)
 endif()

 add_executable(@PACKAGE_NAME@::convert-counters-collection-format IMPORTED)
@@ -46,6 +46,7 @@ install(

 install(
    FILES ${PROJECT_SOURCE_DIR}/cmake/Modules/rocprofiler-sdk-custom-compilation.cmake
+    FILES ${PROJECT_SOURCE_DIR}/cmake/Modules/rocprofiler-sdk-utilities.cmake
    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}/Modules
    COMPONENT development)

@@ -93,10 +94,12 @@ configure_file(
    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}/${PACKAGE_NAME}-config-nolink-target.cmake
    COPYONLY)

-configure_file(
-    ${PROJECT_SOURCE_DIR}/cmake/Modules/rocprofiler-sdk-custom-compilation.cmake
-    ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}/Modules/rocprofiler-sdk-custom-compilation.cmake
-    COPYONLY)
+foreach(_FILE rocprofiler-sdk-custom-compilation.cmake rocprofiler-sdk-utilities.cmake)
+    configure_file(
+        ${PROJECT_SOURCE_DIR}/cmake/Modules/${_FILE}
+        ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}/Modules/${_FILE}
+        COPYONLY)
+endforeach()

 install(
    FILES
@@ -20,6 +20,12 @@ set(CMAKE_INSTALL_LIBDIR "lib")
 enable_testing()
 include(CTest)

+# generally needed
+find_package(rocprofiler-sdk REQUIRED)
+
+# get the gfx architectures that are present on the system
+rocprofiler_sdk_get_gfx_architectures(rocprofiler-sdk-samples-gfx-info ECHO)
+
 # common utilities for samples
 add_subdirectory(common)

@@ -40,14 +40,20 @@ set(ROCPROFILER_MEMCHECK_TYPES "ThreadSanitizer" "AddressSanitizer"
                               "UndefinedBehaviorSanitizer")

 if(ROCPROFILER_MEMCHECK AND ROCPROFILER_MEMCHECK IN_LIST ROCPROFILER_MEMCHECK_TYPES)
-    set(IS_SANITIZER ON)
+    set(IS_DISABLED ON)
 else()
-    set(IS_SANITIZER OFF)
+    set(IS_DISABLED OFF)
 endif()

 find_package(Threads REQUIRED)
 find_package(rocprofiler-sdk-roctx REQUIRED)

+# disable when GPU-0 is navi2, navi3, and navi4
+list(GET rocprofiler-sdk-samples-gfx-info 0 openmp-tools-gpu-0-gfx-info)
+if("${openmp-tools-gpu-0-gfx-info}" MATCHES "^gfx(10|11|12)[0-9][0-9]$")
+    set(IS_DISABLED ON)
+endif()
+
 add_executable(openmp-target-sample)
 target_sources(openmp-target-sample PRIVATE main.cpp)
 target_link_libraries(
@@ -86,4 +92,4 @@ set_tests_properties(
               FAIL_REGULAR_EXPRESSION
               "${ROCPROFILER_DEFAULT_FAIL_REGEX}"
               DISABLED
-               "${IS_SANITIZER}")
+               "${IS_DISABLED}")
@@ -99,9 +99,12 @@ get_output_stream(const output_config& cfg, std::string_view fname, std::string_
        return {&std::clog, [](auto*&) {}};

    auto  output_file = get_output_filename(cfg, fname, ext);
-    auto* _ofs        = new std::ofstream{output_file};
+    auto* _ofs        = new(std::nothrow) std::ofstream{output_file};
+
+    LOG_IF(FATAL, !_ofs) << fmt::format("Failed to allocate ofstream for output file '{}'",
+                                        output_file);
+    LOG_IF(FATAL, _ofs && !*_ofs) << fmt::format("Failed to open '{}' for output", output_file);

-    LOG_IF(FATAL, !_ofs && !*_ofs) << fmt::format("Failed to open {} for output", output_file);
    ROCP_ERROR << "Opened result file: " << output_file;

    return {_ofs, [](std::ostream*& v) {
@@ -1,7 +1,7 @@
 #
 #
 #
-project(rocprofiler-tests-buffering LANGUAGES C CXX)
+project(rocprofiler-sdk-tests-buffering LANGUAGES C CXX)

 include(GoogleTest)

@@ -1,7 +1,7 @@
 #
 #   Tests for the common library
 #
-project(rocprofiler-tests-common LANGUAGES C CXX)
+project(rocprofiler-sdk-tests-common LANGUAGES C CXX)

 include(GoogleTest)

@@ -8,3 +8,5 @@ leak:amdhip
 leak:python
 leak:hsa-amd-aqlprofile
 leak:__new_exitfn
+leak:omptarget
+leak:llvm
@@ -7,7 +7,7 @@ if(COMMAND rocprofiler_deactivate_clang_tidy)
    rocprofiler_deactivate_clang_tidy()
 endif()

-project(rocprofiler-tests LANGUAGES C CXX)
+project(rocprofiler-sdk-tests LANGUAGES C CXX)

 set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "tests")
 set(ROCPROFILER_SDK_TESTS_SOURCE_DIR "${PROJECT_SOURCE_DIR}")
@@ -42,6 +42,12 @@ endif()
 # needed for validation
 find_package(Python3 REQUIRED)

+# generally needed
+find_package(rocprofiler-sdk REQUIRED)
+
+# get the gfx architectures that are present on the system
+rocprofiler_sdk_get_gfx_architectures(rocprofiler-sdk-tests-gfx-info ECHO)
+
 # configure python module <BINARY_DIR>/rocprofiler_sdk/pytest_utils
 add_subdirectory(pytest-packages)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-async-copy-tracing
+    rocprofiler-sdk-tests-async-copy-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -3,7 +3,7 @@
 #
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

-project(rocprofiler-tests-bin LANGUAGES C CXX)
+project(rocprofiler-sdk-tests-bin LANGUAGES C CXX)

 set(CMAKE_BUILD_RPATH
    "\$ORIGIN:\$ORIGIN/../lib:$<TARGET_FILE_DIR:rocprofiler-sdk-roctx::rocprofiler-sdk-roctx-shared-library>"
@@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-bin-hip-graph LANGUAGES CXX HIP)
+project(rocprofiler-sdk-tests-bin-hip-graph LANGUAGES CXX HIP)

 foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
    if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "")
@@ -3,7 +3,7 @@
 #
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

-project(rocprofiler-tests-bin-hip-in-libraries LANGUAGES CXX)
+project(rocprofiler-sdk-tests-bin-hip-in-libraries LANGUAGES CXX)

 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -4,7 +4,7 @@

 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

-project(rocprofiler-tests-bin-hsa-code-object LANGUAGES CXX)
+project(rocprofiler-sdk-tests-bin-hsa-code-object LANGUAGES CXX)

 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -4,7 +4,7 @@

 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

-project(rocprofiler-tests-bin-hsa-multiqueue-dependency LANGUAGES CXX)
+project(rocprofiler-sdk-tests-bin-hsa-multiqueue-dependency LANGUAGES CXX)

 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_EXTENSIONS OFF)
@@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-bin-multistream LANGUAGES CXX HIP)
+project(rocprofiler-sdk-tests-bin-multistream LANGUAGES CXX HIP)

 foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
    if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "")
@@ -19,7 +19,7 @@ if(NOT OMP_TARGET_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-bin-openmp LANGUAGES CXX)
+project(rocprofiler-sdk-tests-bin-openmp LANGUAGES CXX)

 find_package(rocprofiler-sdk REQUIRED)

@@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-bin-page-migration LANGUAGES CXX HIP)
+project(rocprofiler-sdk-tests-bin-page-migration LANGUAGES CXX HIP)

 foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
    if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "")
@@ -3,7 +3,7 @@
 #
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

-project(rocprofiler-tests-bin LANGUAGES C CXX)
+project(rocprofiler-sdk-tests-bin-pc-sampling LANGUAGES C CXX)

 set(CMAKE_BUILD_RPATH "\$ORIGIN:\$ORIGIN/../lib")

@@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-bin-transpose LANGUAGES CXX HIP)
+project(rocprofiler-sdk-tests-bin-pc-sampling-exec-mask-manipulation LANGUAGES CXX HIP)

 foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
    if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "")
@@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-bin-reproducible-runtime LANGUAGES CXX HIP)
+project(rocprofiler-sdk-tests-bin-reproducible-runtime LANGUAGES CXX HIP)

 if(NOT CMAKE_BUILD_TYPE MATCHES "(Release|RelWithDebInfo)")
    set(CMAKE_BUILD_TYPE "RelWithDebInfo")
@@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-bin-transpose LANGUAGES CXX HIP)
+project(rocprofiler-sdk-tests-bin-simple-transpose LANGUAGES CXX HIP)

 foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
    if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "")
@@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-bin-transpose LANGUAGES CXX HIP)
+project(rocprofiler-sdk-tests-bin-transpose LANGUAGES CXX HIP)

 foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
    if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "")
@@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-bin-vector-operations LANGUAGES CXX HIP)
+project(rocprofiler-sdk-tests-bin-vector-operations LANGUAGES CXX HIP)

 foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
    if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "")
@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-c-tool
+    rocprofiler-sdk-tests-c-tool
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-conversion-script
+    rocprofiler-sdk-tests-conversion-script
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-counter-collection
+    rocprofiler-sdk-tests-counter-collection
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-hip-graph-tracing
+    rocprofiler-sdk-tests-hip-graph-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-memory-allocation-tracing
+    rocprofiler-sdk-tests-memory-allocation-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-kernel-tracing
+    rocprofiler-sdk-tests-kernel-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -3,7 +3,7 @@
 #
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

-project(rocprofiler-tests-lib LANGUAGES C CXX)
+project(rocprofiler-sdk-tests-lib LANGUAGES C CXX)

 set(CMAKE_BUILD_RPATH "\$ORIGIN:\$ORIGIN/../lib")

@@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-lib-transpose-shared-library LANGUAGES CXX HIP)
+project(rocprofiler-sdk-tests-lib-transpose-shared-library LANGUAGES CXX HIP)

 foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
    if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "")
@@ -17,7 +17,7 @@ if(NOT CMAKE_HIP_COMPILER)
    endif()
 endif()

-project(rocprofiler-tests-lib-vector-operations LANGUAGES CXX HIP)
+project(rocprofiler-sdk-tests-lib-vector-operations LANGUAGES CXX HIP)

 foreach(_TYPE DEBUG MINSIZEREL RELEASE RELWITHDEBINFO)
    if("${CMAKE_HIP_FLAGS_${_TYPE}}" STREQUAL "")
@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-openmp-tools
+    rocprofiler-sdk-tests-openmp-tools
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -26,9 +26,15 @@ set(ROCPROFILER_MEMCHECK_TYPES "ThreadSanitizer" "AddressSanitizer"
                               "UndefinedBehaviorSanitizer")

 if(ROCPROFILER_MEMCHECK AND ROCPROFILER_MEMCHECK IN_LIST ROCPROFILER_MEMCHECK_TYPES)
-    set(IS_SANITIZER ON)
+    set(IS_DISABLED ON)
 else()
-    set(IS_SANITIZER OFF)
+    set(IS_DISABLED OFF)
+endif()
+
+# disable when GPU-0 is navi2, navi3, and navi4
+list(GET rocprofiler-sdk-tests-gfx-info 0 openmp-tools-gpu-0-gfx-info)
+if("${openmp-tools-gpu-0-gfx-info}" MATCHES "^gfx(10|11|12)[0-9][0-9]$")
+    set(IS_DISABLED ON)
 endif()

 add_test(NAME test-openmp-tools-execute COMMAND $<TARGET_FILE:openmp-target>)
@@ -54,7 +60,7 @@ set_tests_properties(
               FAIL_REGULAR_EXPRESSION
               "${ROCPROFILER_DEFAULT_FAIL_REGEX}"
               DISABLED
-               "${IS_SANITIZER}")
+               "${IS_DISABLED}")

 # copy to binary directory
 rocprofiler_configure_pytest_files(COPY validate.py conftest.py CONFIG pytest.ini)
@@ -75,4 +81,4 @@ set_tests_properties(
               FAIL_REGULAR_EXPRESSION
               "${ROCPROFILER_DEFAULT_FAIL_REGEX}"
               DISABLED
-               "${IS_SANITIZER}")
+               "${IS_DISABLED}")
@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-page-migration
+    rocprofiler-sdk-tests-page-migration
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -780,7 +780,7 @@ class PerfettoReader:
            #         f"{_stack_id} already exists in track_id_dict[{_tp_index}][{_rank}][{_thread}]. failed to set:\n  {hnode.frame} (current)\n    {_existing.frame} (existing)"
            #     )

-            _hash = hash((_tp_index, _slice_id))
+            _hash = hash((_tp_index, _slice_id, _track_id))
            if _hash in callpath_to_node:
                raise ValueError(f"{_hash} already exists in callpath_to_node dict")

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocdecode-tracing
+    rocprofiler-sdk-tests-rocdecode-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocjpeg-tracing
+    rocprofiler-sdk-tests-rocjpeg-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-aborted-app
+    rocprofiler-sdk-tests-aborted-app
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-att
+    rocprofiler-sdk-tests-rocprofv3-att
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -18,8 +18,6 @@ find_package(rocprofiler-sdk REQUIRED)

 # hsa multiqueue dependency test

-message("Add  rocprofv3-test-hsa-multiqueue-att-cmd-env-ld-lib-path-execute")
-
 add_test(
    NAME rocprofv3-test-hsa-multiqueue-att-cmd-env-ld-lib-path-execute
    COMMAND
@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-agent-index
+    rocprofiler-sdk-tests-rocprofv3-agent-index
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-collection-period
+    rocprofiler-sdk-tests-rocprofv3-collection-period
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-counter-collection
+    rocprofiler-sdk-tests-counter-collection-list-metrics
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-counter-collection
+    rocprofiler-sdk-tests-counter-collection-input1
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-counter-collection
+    rocprofiler-sdk-tests-counter-collection-input2
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-counter-collection
+    rocprofiler-sdk-tests-counter-collection-input3
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-counter-collection
+    rocprofiler-sdk-tests-counter-collection-kernel-filtering
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-counter-collection
+    rocprofiler-sdk-tests-counter-collection-list-metrics
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-counter-collection
+    rocprofiler-sdk-tests-counter-collection-multiplex
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-counter-collection
+    rocprofiler-sdk-tests-counter-collection-range-filtering
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-hip-stream-display
+    rocprofiler-sdk-tests-rocprofv3-hip-stream-display
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-hsa-queue-tracing
+    rocprofiler-sdk-tests-rocprofv3-hsa-queue-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-kernel-rename
+    rocprofiler-sdk-tests-rocprofv3-kernel-rename
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-memory-allocation-tracing
+    rocprofiler-sdk-tests-rocprofv3-memory-allocation-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-pc-sampling
+    rocprofiler-sdk-tests-pc-sampling-host-trap-exec-mask-manipulation
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-pc-sampling
+    rocprofiler-sdk-tests-pc-sampling-host-trap-transpose-multiple-agents
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-rocdecode-tracing
+    rocprofiler-sdk-tests-rocprofv3-rocdecode-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-rocjpeg-tracing
+    rocprofiler-sdk-tests-rocprofv3-rocjpeg-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-roctracer-roctx-tracing
+    rocprofiler-sdk-tests-rocprofv3-roctracer-roctx-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-scratch-memory-tracing
+    rocprofiler-sdk-tests-rocprofv3-scratch-memory-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-summary
+    rocprofiler-sdk-tests-rocprofv3-summary
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-tracing-hip-in-libraries
+    rocprofiler-sdk-tests-rocprofv3-tracing-hip-in-libraries
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-counter-collection
+    rocprofiler-sdk-tests-rocprofv3-tracing-plus-counter-collection
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-rocprofv3-tracing
+    rocprofiler-sdk-tests-rocprofv3-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-scratch-memory-tracing
+    rocprofiler-sdk-tests-scratch-memory-tracing
    LANGUAGES CXX
    VERSION 0.0.0)

@@ -18,7 +18,7 @@ if(NOT CMAKE_HIP_COMPILER)
 endif()

 project(
-    rocprofiler-tests-thread-trace
+    rocprofiler-sdk-tests-thread-trace
    LANGUAGES CXX HIP
    VERSION 0.0.0)

@@ -4,7 +4,7 @@
 cmake_minimum_required(VERSION 3.21.0 FATAL_ERROR)

 project(
-    rocprofiler-tests-json-tool
+    rocprofiler-sdk-tests-tools
    LANGUAGES C CXX
    VERSION 0.0.0)