Modify yaml configs to reflect new combined Top Stats

Signed-off-by: colramos-amd <colramos@amd.com>
ROCm · Feb 14, 2024 · b7d5d3b · b7d5d3b
1 parent bd83f68
commit b7d5d3b
Show file tree

Hide file tree

Showing 20 changed files with 89 additions and 100 deletions.
diff --git a/src/omniperf_analyze/analysis_webui.py b/src/omniperf_analyze/analysis_webui.py
@@ -159,7 +159,7 @@ def generate_from_filter(
 
             # 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
diff --git a/src/omniperf_soc/analysis_configs/gfx906/0000_top_stats.yaml 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
diff --git a/src/omniperf_soc/analysis_configs/gfx908/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx908/0000_top_stat.yaml
diff --git a/src/omniperf_soc/analysis_configs/gfx908/0000_top_stats.yaml 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
diff --git a/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stat.yaml
diff --git a/src/omniperf_soc/analysis_configs/gfx90a/0000_top_stats.yaml 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
diff --git a/src/omniperf_soc/analysis_configs/gfx940/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx940/0000_top_stat.yaml
diff --git a/src/omniperf_soc/analysis_configs/gfx940/0000_top_stats.yaml 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
diff --git a/src/omniperf_soc/analysis_configs/gfx941/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx941/0000_top_stat.yaml
diff --git a/src/omniperf_soc/analysis_configs/gfx941/0000_top_stats.yaml 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
diff --git a/src/omniperf_soc/analysis_configs/gfx942/0000_top_stat.yaml b/src/omniperf_soc/analysis_configs/gfx942/0000_top_stat.yaml
diff --git a/src/omniperf_soc/analysis_configs/gfx942/0000_top_stats.yaml 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
diff --git 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)