From b7d5d3b64bd86105de4440d77cea60eedafc33ed Mon Sep 17 00:00:00 2001 From: colramos-amd Date: Tue, 13 Feb 2024 19:56:46 -0600 Subject: [PATCH] Modify yaml configs to reflect new combined Top Stats Signed-off-by: colramos-amd --- src/omniperf_analyze/analysis_webui.py | 2 +- .../analysis_configs/gfx906/0000_top_stat.yaml | 8 -------- .../analysis_configs/gfx906/0000_top_stats.yaml | 14 ++++++++++++++ .../analysis_configs/gfx906/2000_kernels.yaml | 8 -------- .../analysis_configs/gfx908/0000_top_stat.yaml | 8 -------- .../analysis_configs/gfx908/0000_top_stats.yaml | 14 ++++++++++++++ .../analysis_configs/gfx908/2000_kernels.yaml | 8 -------- .../analysis_configs/gfx90a/0000_top_stat.yaml | 8 -------- .../analysis_configs/gfx90a/0000_top_stats.yaml | 14 ++++++++++++++ .../analysis_configs/gfx90a/2000_kernels.yaml | 8 -------- .../analysis_configs/gfx940/0000_top_stat.yaml | 8 -------- .../analysis_configs/gfx940/0000_top_stats.yaml | 14 ++++++++++++++ .../analysis_configs/gfx940/2000_kernels.yaml | 8 -------- .../analysis_configs/gfx941/0000_top_stat.yaml | 8 -------- .../analysis_configs/gfx941/0000_top_stats.yaml | 14 ++++++++++++++ .../analysis_configs/gfx941/2000_kernels.yaml | 8 -------- .../analysis_configs/gfx942/0000_top_stat.yaml | 8 -------- .../analysis_configs/gfx942/0000_top_stats.yaml | 14 ++++++++++++++ .../analysis_configs/gfx942/2000_kernels.yaml | 8 -------- src/utils/specs.py | 7 ++++--- 20 files changed, 89 insertions(+), 100 deletions(-) delete mode 100644 src/omniperf_soc/analysis_configs/gfx906/0000_top_stat.yaml create mode 100644 src/omniperf_soc/analysis_configs/gfx906/0000_top_stats.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx906/2000_kernels.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx908/0000_top_stat.yaml create mode 100644 src/omniperf_soc/analysis_configs/gfx908/0000_top_stats.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx908/2000_kernels.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx90a/0000_top_stat.yaml create mode 100644 src/omniperf_soc/analysis_configs/gfx90a/0000_top_stats.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx90a/2000_kernels.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx940/0000_top_stat.yaml create mode 100644 src/omniperf_soc/analysis_configs/gfx940/0000_top_stats.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx940/2000_kernels.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx941/0000_top_stat.yaml create mode 100644 src/omniperf_soc/analysis_configs/gfx941/0000_top_stats.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx941/2000_kernels.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx942/0000_top_stat.yaml create mode 100644 src/omniperf_soc/analysis_configs/gfx942/0000_top_stats.yaml delete mode 100644 src/omniperf_soc/analysis_configs/gfx942/2000_kernels.yaml diff --git a/src/omniperf_analyze/analysis_webui.py b/src/omniperf_analyze/analysis_webui.py index 8faf1a8b63..9f174ca948 100644 --- a/src/omniperf_analyze/analysis_webui.py +++ b/src/omniperf_analyze/analysis_webui.py @@ -159,7 +159,7 @@ class webui_analysis(OmniAnalyze_Base): # Append memory chart and roofline div_children.append( - get_memchart(panel_configs[400]["data source"], base_data[base_run]) + get_memchart(panel_configs[300]["data source"], base_data[base_run]) ) has_roofline = os.path.isfile(os.path.join(self.dest_dir, "roofline.csv")) if has_roofline and hasattr(self.get_socs()[self.arch], "roofline_obj"): diff --git a/src/omniperf_soc/analysis_configs/gfx906/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx906/0000_top_stat.yaml deleted file mode 100644 index 077004080f..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx906/0000_top_stat.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 000 - title: Top Stat - data source: - - raw_csv_table: - id: 001 - source: pmc_kernel_top.csv diff --git a/src/omniperf_soc/analysis_configs/gfx906/0000_top_stats.yaml b/src/omniperf_soc/analysis_configs/gfx906/0000_top_stats.yaml new file mode 100644 index 0000000000..ccf1309850 --- /dev/null +++ b/src/omniperf_soc/analysis_configs/gfx906/0000_top_stats.yaml @@ -0,0 +1,14 @@ +--- +Panel Config: + id: 000 + title: Top Stats + data source: + - raw_csv_table: + id: 001 + title: Top Kernels + source: pmc_kernel_top.csv + + - raw_csv_table: + id: 002 + title: Dispatch List + source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx906/2000_kernels.yaml b/src/omniperf_soc/analysis_configs/gfx906/2000_kernels.yaml deleted file mode 100644 index ed566f75a2..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx906/2000_kernels.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 2000 - title: Kernels - data source: - - raw_csv_table: - id: 2001 - source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx908/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx908/0000_top_stat.yaml deleted file mode 100644 index 077004080f..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx908/0000_top_stat.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 000 - title: Top Stat - data source: - - raw_csv_table: - id: 001 - source: pmc_kernel_top.csv diff --git a/src/omniperf_soc/analysis_configs/gfx908/0000_top_stats.yaml b/src/omniperf_soc/analysis_configs/gfx908/0000_top_stats.yaml new file mode 100644 index 0000000000..ccf1309850 --- /dev/null +++ b/src/omniperf_soc/analysis_configs/gfx908/0000_top_stats.yaml @@ -0,0 +1,14 @@ +--- +Panel Config: + id: 000 + title: Top Stats + data source: + - raw_csv_table: + id: 001 + title: Top Kernels + source: pmc_kernel_top.csv + + - raw_csv_table: + id: 002 + title: Dispatch List + source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx908/2000_kernels.yaml b/src/omniperf_soc/analysis_configs/gfx908/2000_kernels.yaml deleted file mode 100644 index ed566f75a2..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx908/2000_kernels.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 2000 - title: Kernels - data source: - - raw_csv_table: - id: 2001 - source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stat.yaml deleted file mode 100644 index 077004080f..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stat.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 000 - title: Top Stat - data source: - - raw_csv_table: - id: 001 - source: pmc_kernel_top.csv diff --git a/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stats.yaml b/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stats.yaml new file mode 100644 index 0000000000..ccf1309850 --- /dev/null +++ b/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stats.yaml @@ -0,0 +1,14 @@ +--- +Panel Config: + id: 000 + title: Top Stats + data source: + - raw_csv_table: + id: 001 + title: Top Kernels + source: pmc_kernel_top.csv + + - raw_csv_table: + id: 002 + title: Dispatch List + source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx90a/2000_kernels.yaml b/src/omniperf_soc/analysis_configs/gfx90a/2000_kernels.yaml deleted file mode 100644 index ed566f75a2..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx90a/2000_kernels.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 2000 - title: Kernels - data source: - - raw_csv_table: - id: 2001 - source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx940/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx940/0000_top_stat.yaml deleted file mode 100644 index 077004080f..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx940/0000_top_stat.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 000 - title: Top Stat - data source: - - raw_csv_table: - id: 001 - source: pmc_kernel_top.csv diff --git a/src/omniperf_soc/analysis_configs/gfx940/0000_top_stats.yaml b/src/omniperf_soc/analysis_configs/gfx940/0000_top_stats.yaml new file mode 100644 index 0000000000..ccf1309850 --- /dev/null +++ b/src/omniperf_soc/analysis_configs/gfx940/0000_top_stats.yaml @@ -0,0 +1,14 @@ +--- +Panel Config: + id: 000 + title: Top Stats + data source: + - raw_csv_table: + id: 001 + title: Top Kernels + source: pmc_kernel_top.csv + + - raw_csv_table: + id: 002 + title: Dispatch List + source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx940/2000_kernels.yaml b/src/omniperf_soc/analysis_configs/gfx940/2000_kernels.yaml deleted file mode 100644 index ed566f75a2..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx940/2000_kernels.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 2000 - title: Kernels - data source: - - raw_csv_table: - id: 2001 - source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx941/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx941/0000_top_stat.yaml deleted file mode 100644 index 077004080f..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx941/0000_top_stat.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 000 - title: Top Stat - data source: - - raw_csv_table: - id: 001 - source: pmc_kernel_top.csv diff --git a/src/omniperf_soc/analysis_configs/gfx941/0000_top_stats.yaml b/src/omniperf_soc/analysis_configs/gfx941/0000_top_stats.yaml new file mode 100644 index 0000000000..ccf1309850 --- /dev/null +++ b/src/omniperf_soc/analysis_configs/gfx941/0000_top_stats.yaml @@ -0,0 +1,14 @@ +--- +Panel Config: + id: 000 + title: Top Stats + data source: + - raw_csv_table: + id: 001 + title: Top Kernels + source: pmc_kernel_top.csv + + - raw_csv_table: + id: 002 + title: Dispatch List + source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx941/2000_kernels.yaml b/src/omniperf_soc/analysis_configs/gfx941/2000_kernels.yaml deleted file mode 100644 index ed566f75a2..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx941/2000_kernels.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 2000 - title: Kernels - data source: - - raw_csv_table: - id: 2001 - source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx942/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx942/0000_top_stat.yaml deleted file mode 100644 index 077004080f..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx942/0000_top_stat.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 000 - title: Top Stat - data source: - - raw_csv_table: - id: 001 - source: pmc_kernel_top.csv diff --git a/src/omniperf_soc/analysis_configs/gfx942/0000_top_stats.yaml b/src/omniperf_soc/analysis_configs/gfx942/0000_top_stats.yaml new file mode 100644 index 0000000000..ccf1309850 --- /dev/null +++ b/src/omniperf_soc/analysis_configs/gfx942/0000_top_stats.yaml @@ -0,0 +1,14 @@ +--- +Panel Config: + id: 000 + title: Top Stats + data source: + - raw_csv_table: + id: 001 + title: Top Kernels + source: pmc_kernel_top.csv + + - raw_csv_table: + id: 002 + title: Dispatch List + source: pmc_dispatch_info.csv diff --git a/src/omniperf_soc/analysis_configs/gfx942/2000_kernels.yaml b/src/omniperf_soc/analysis_configs/gfx942/2000_kernels.yaml deleted file mode 100644 index ed566f75a2..0000000000 --- a/src/omniperf_soc/analysis_configs/gfx942/2000_kernels.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Panel Config: - id: 2000 - title: Kernels - data source: - - raw_csv_table: - id: 2001 - source: pmc_dispatch_info.csv diff --git a/src/utils/specs.py b/src/utils/specs.py index a71b1c65d5..30d157e45c 100644 --- a/src/utils/specs.py +++ b/src/utils/specs.py @@ -230,9 +230,10 @@ def run(cmd,exit_on_error=False): p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) if exit_on_error: - if cmd[0] == "rocm-smi" and p.returncode != 0: - logging.error("ERROR: No GPU detected. Unable to load rocm-smi") - sys.exit(1) + if cmd[0] == "rocm-smi": + if p.returncode != 2 and p.returncode != 0: + logging.error("ERROR: No GPU detected. Unable to load rocm-smi") + sys.exit(1) elif p.returncode != 0: logging.error("ERROR: command [%s] failed with non-zero exit code" % cmd) sys.exit(1)