From 3aafb37eaa445c6f5cbfd81506228b5d731de260 Mon Sep 17 00:00:00 2001 From: Abhinab Paul Choudhury Date: Thu, 12 Feb 2026 02:36:27 -0600 Subject: [PATCH 1/2] Fixed list blocks output --- .../src/rocprof_compute_analyze/analysis_base.py | 4 ++-- projects/rocprofiler-compute/src/rocprof_compute_base.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/projects/rocprofiler-compute/src/rocprof_compute_analyze/analysis_base.py b/projects/rocprofiler-compute/src/rocprof_compute_analyze/analysis_base.py index b4edad07fde..d5f2b6403c4 100644 --- a/projects/rocprofiler-compute/src/rocprof_compute_analyze/analysis_base.py +++ b/projects/rocprofiler-compute/src/rocprof_compute_analyze/analysis_base.py @@ -205,11 +205,11 @@ def list_blocks(self) -> None: ) print(f"{'INDEX':<8} {'BLOCK ALIAS':<16} {'BLOCK NAME'}") + panel_alias_dict = {value: key for key, value in get_panel_alias().items()} for key, value in self._arch_configs[arch].metric_list.items(): - panel_alias_dict = get_panel_alias() if key.count(".") > 0: continue - print(f"{key:<8} {panel_alias_dict[value]:<16} {value}") + print(f"{key:<8} {panel_alias_dict[key]:<16} {value}") sys.exit(0) diff --git a/projects/rocprofiler-compute/src/rocprof_compute_base.py b/projects/rocprofiler-compute/src/rocprof_compute_base.py index c7ae26cf985..80460f8c746 100644 --- a/projects/rocprofiler-compute/src/rocprof_compute_base.py +++ b/projects/rocprofiler-compute/src/rocprof_compute_base.py @@ -376,10 +376,11 @@ def list_blocks(self) -> None: parser.build_dfs(arch_configs=ac, filter_metrics=[], sys_info=sys_info) print(f"{'INDEX':<8} {'BLOCK ALIAS':<16} {'BLOCK NAME'}") + panel_alias_dict = {value: key for key, value in get_panel_alias().items()} for key, value in ac.metric_list.items(): if key.count(".") > 0: continue - print(f"{key:<8} {get_panel_alias()[value]:<16} {value}") + print(f"{key:<8} {panel_alias_dict[key]:<16} {value}") sys.exit(0) else: console_error("Unsupported arch") From d46c3013789cb6ddb2050bd5ae7c9be380474115 Mon Sep 17 00:00:00 2001 From: Abhinab Paul Choudhury Date: Thu, 12 Feb 2026 02:43:57 -0600 Subject: [PATCH 2/2] Updated test --- .../rocprofiler-compute/tests/test_utils.py | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/projects/rocprofiler-compute/tests/test_utils.py b/projects/rocprofiler-compute/tests/test_utils.py index 7e2886bfed8..024df5521f9 100644 --- a/projects/rocprofiler-compute/tests/test_utils.py +++ b/projects/rocprofiler-compute/tests/test_utils.py @@ -7556,6 +7556,32 @@ def test_list_metrics(binary_handler_analyze_rocprof_compute, capsys): assert "5.2 -> Command processor packet processor (CPC)" in output +def test_list_blocks(binary_handler_analyze_rocprof_compute, capsys): + return_code = binary_handler_analyze_rocprof_compute(["--list-blocks", "gfx90a"]) + assert return_code == 0 + + # Test output + output = capsys.readouterr().out + assert "INDEX" in output + assert "BLOCK ALIAS" in output + assert "BLOCK NAME" in output + + # Verify specific block id, alias, and name mappings + lines = output.strip().splitlines() + block_entries = {} + for line in lines[1:]: # skip header + parts = line.split() + if len(parts) >= 3: + block_id = parts[0] + block_alias = parts[1] + block_name = " ".join(parts[2:]) + block_entries[block_id] = (block_alias, block_name) + + assert block_entries["0"] == ("topstats", "Top Stats") + assert block_entries["1"] == ("sysinfo", "System Info") + assert block_entries["6"] == ("spi", "Workgroup Manager (SPI)") + + # ============================================================================= # TESTS FOR AMDSMI INTERFACE # =============================================================================