Added consistent 'Channel' headers to l2_per_chan, removed hardcoded 32 channels, and removed printed Nones (#276)

Signed-off-by: colramos-amd <colramos@amd.com>


[ROCm/rocprofiler-compute commit: 09f1455308]

projects/rocprofiler-compute/src/utils/parser.py

@@ -497,7 +497,7 @@ def build_dfs(archConfigs, filter_metrics, sys_info):
                         "cli_style" in data_config
                         and data_config["cli_style"] == "simple_box"
                     ):
-                        headers.append("Metric")
+                        headers.append(data_config["header"]["metric"])
                         for k in simple_box.keys():
                             headers.append(k)
 
@@ -855,29 +855,36 @@ def apply_filters(workload, dir, is_gui, debug):
     # We pick up kernel names from kerne ids first.
     # Then filter valid entries with kernel names.
     if workload.filter_kernel_ids:
-        # Verify valid kernel filter
-        kernels_df = pd.read_csv(os.path.join(dir, "pmc_kernel_top.csv"))
-        for kernel_id in workload.filter_kernel_ids:
-            if kernel_id >= len(kernels_df["Kernel_Name"]):
-                error(
-                    "{} is an invalid kernel id. Please enter an id between 0-{}".format(
-                        kernel_id, len(kernels_df["Kernel_Name"]) - 1
+        if type(workload.filter_kernel_ids) == int:
+            # Verify valid kernel filter
+            kernels_df = pd.read_csv(os.path.join(dir, "pmc_kernel_top.csv"))
+            for kernel_id in workload.filter_kernel_ids:
+                if kernel_id >= len(kernels_df["Kernel_Name"]):
+                    error(
+                        "{} is an invalid kernel id. Please enter an id between 0-{}".format(
+                            kernel_id, len(kernels_df["Kernel_Name"]) - 1
+                        )
                     )
-                )
-        kernels = []
-        # NB: mark selected kernels with "*"
-        #    Todo: fix it for unaligned comparison
-        kernel_top_df = workload.dfs[pmc_kernel_top_table_id]
-        kernel_top_df["S"] = ""
-        for kernel_id in workload.filter_kernel_ids:
-            # print("------- ", kernel_id)
-            kernels.append(kernel_top_df.loc[kernel_id, "Kernel_Name"])
-            kernel_top_df.loc[kernel_id, "S"] = "*"
+            kernels = []
+            # NB: mark selected kernels with "*"
+            #    Todo: fix it for unaligned comparison
+            kernel_top_df = workload.dfs[pmc_kernel_top_table_id]
+            kernel_top_df["S"] = ""
+            for kernel_id in workload.filter_kernel_ids:
+                # print("------- ", kernel_id)
+                kernels.append(kernel_top_df.loc[kernel_id, "Kernel_Name"])
+                kernel_top_df.loc[kernel_id, "S"] = "*"
 
-        if kernels:
-            # print("fitlered df:", len(df.index))
+            if kernels:
+                # print("fitlered df:", len(df.index))
+                ret_df = ret_df.loc[
+                    ret_df[schema.pmc_perf_file_prefix]["Kernel_Name"].isin(kernels)
+                ]
+        elif type(workload.filter_kernel_ids) == str:
             ret_df = ret_df.loc[
-                ret_df[schema.pmc_perf_file_prefix]["Kernel_Name"].isin(kernels)
+                ret_df[schema.pmc_perf_file_prefix]["Kernel_Name"].isin(
+                    workload.filter_kernel_ids
+                )
             ]
 
     if workload.filter_dispatch_ids:

projects/rocprofiler-compute/src/utils/schema.py

@@ -101,19 +101,19 @@ supported_field = [
     "L2 Read Req",
     "L2 Write Req",
     "L2 Atomic Req",
-    "L2 - Fabric Read Req",
-    "L2 - Fabric Write and Atomic Req",
-    "L2 - Fabric Atomic Req",
-    "L2 - Fabric Read Latency",
-    "L2 - Fabric Write Latency",
-    "L2 - Fabric Atomic Latency",
-    "L2 - Fabric Read Stall (PCIe)",
-    "L2 - Fabric Read Stall (Infinity Fabric™)",
-    "L2 - Fabric Read Stall (HBM)",
-    "L2 - Fabric Write Stall (PCIe)",
-    "L2 - Fabric Write Stall (Infinity Fabric™)",
-    "L2 - Fabric Write Stall (HBM)",
-    "L2 - Fabric Write Starve",
+    "L2-Fabric Read Req",
+    "L2-Fabric Write and Atomic Req",
+    "L2-Fabric Atomic Req",
+    "L2-Fabric Read Latency",
+    "L2-Fabric Write Latency",
+    "L2-Fabric Atomic Latency",
+    "L2-Fabric Read Stall (PCIe)",
+    "L2-Fabric Read Stall (Infinity Fabric™)",
+    "L2-Fabric Read Stall (HBM)",
+    "L2-Fabric Write Stall (PCIe)",
+    "L2-Fabric Write Stall (Infinity Fabric™)",
+    "L2-Fabric Write Stall (HBM)",
+    "L2-Fabric Write Starve",
 ]
 
 # The prefix of raw pmc_perf.csv

projects/rocprofiler-compute/src/utils/specs.py

@@ -255,16 +255,11 @@ def get_rocm_ver():
             error("Unable to detect a complete local ROCm installation.\nThe expected %s/.info/ versioning directory is missing. Please ensure you have valid ROCm installation." % _rocm_path)
     return rocm_ver
 
-<<<<<<< HEAD
-def run(cmd, exit_on_error=False):
-    p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-=======
 def run(cmd,exit_on_error=False):
     try:
         p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     except FileNotFoundError as e:
         error(f"Unable to parse specs. Can't find ROCm asset: {e.filename}\nTry passing a path to an existing workload results in 'analyze' mode.")
->>>>>>> 2d92bcf (Enhance correct_sys_info() func and err checking)
 
     if exit_on_error:
         if cmd[0] == "rocm-smi":