diff --git a/CMakeLists.txt b/CMakeLists.txt index 43d605d289..98b59131a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,13 +255,9 @@ add_test( WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) set_tests_properties( - test_profile_kernel_execution - test_profile_dispatch - test_profile_mem - test_profile_join - test_profile_sort - test_profile_misc - PROPERTIES LABELS "profile" RESOURCE_GROUPS gpus:1) + test_profile_kernel_execution test_profile_dispatch test_profile_mem test_profile_join + test_profile_sort test_profile_misc PROPERTIES LABELS "profile" RESOURCE_GROUPS + gpus:1) # --------------------------- # analysis command tests diff --git a/src/rocprof_compute_soc/soc_base.py b/src/rocprof_compute_soc/soc_base.py index efd36ef2ea..334dd89f5f 100644 --- a/src/rocprof_compute_soc/soc_base.py +++ b/src/rocprof_compute_soc/soc_base.py @@ -433,6 +433,16 @@ class OmniSoC_Base: def get_rocprof_supported_counters(self): rocprof_cmd = detect_rocprof(self.get_args()) + + if rocprof_cmd != "rocprofiler-sdk": + console_warning( + "rocprof v1 / v2 / v3 interfaces will be removed in favor of " + "rocprofiler-sdk interface in a future release. To use rocprofiler-sdk " + "interface, please set the environment variable ROCPROF to 'rocprofiler-sdk' " + "and optionally provide the path to librocprofiler-sdk.so library via the " + "--rocprofiler-sdk-library-path option." + ) + rocprof_counters = set() if str(rocprof_cmd).endswith("rocprof"): @@ -482,7 +492,7 @@ class OmniSoC_Base: f"Failed to list rocprof supported counters using command: {command}" ) for line in output.splitlines(): - if "Name:" in line: + if "counter_name" in line: counters, _ = self.parse_counters_text(line.split(":")[1].strip()) rocprof_counters.update(counters) # Custom counter support for mi100 for rocprofv3 diff --git a/src/utils/utils.py b/src/utils/utils.py index cf1c1c5f5e..2952108e52 100644 --- a/src/utils/utils.py +++ b/src/utils/utils.py @@ -245,14 +245,6 @@ def detect_rocprof(args): ) return rocprof_cmd - console_warning( - "rocprof v1 / v2 / v3 interfaces will be deprecated in favor of " - "rocprofiler-sdk interface in a future release. To use rocprofiler-sdk " - "interface, please set the environment variable ROCPROF to 'rocprofiler-sdk' " - "and optionally provide the path to librocprofiler-sdk.so library via the " - "--rocprofiler-sdk-library-path option." - ) - # detect rocprof if not "ROCPROF" in os.environ.keys(): # default rocprof