Fix conflicts.

ROCm · Oct 22, 2024 · b915b4a · b915b4a
2 parents a6b99bd + 6b53298
commit b915b4a
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 44 deletions.
diff --git a/.github/workflows/rhel-8.yml b/.github/workflows/rhel-8.yml
@@ -5,9 +5,9 @@ name: RHEL 8
 # Controls when the workflow will run
 on:
   push:
-    branches: [ amd-mainline, amd-staging ]
+    branches: [ amd-mainline, amd-staging, release/** ]
   pull_request:
-    branches: [ amd-mainline, amd-staging ]
+    branches: [ amd-mainline, amd-staging, release/** ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -330,8 +330,7 @@ install(
 install(
     DIRECTORY grafana
     DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}
-    COMPONENT main
-)
+    COMPONENT main)
 # samples
 install(
     DIRECTORY sample

diff --git a/src/utils/utils.py b/src/utils/utils.py
@@ -504,7 +504,7 @@ def mibench(args, mspec):
         "-d",
         str(args.device),
     ]
-    if(args.quiet):
+    if args.quiet:
         my_args += "--quiet"
     subprocess.run(
         my_args,

diff --git a/tests/test_analyze_commands.py b/tests/test_analyze_commands.py
@@ -14,8 +14,13 @@
 config = {}
 config["cleanup"] = True if "PYTEST_XDIST_WORKER_COUNT" in os.environ else False
 
-indir1 = "tests/workloads/vcopy/MI100"
-indir2 = "tests/workloads/vcopy/MI200"
+indirs = [
+    "tests/workloads/vcopy/MI100",
+    "tests/workloads/vcopy/MI200",
+    "tests/workloads/vcopy/MI300A_A1",
+    "tests/workloads/vcopy/MI300X_A1",
+    "tests/workloads/vcopy/MI300X_A1",
+]
 
 indirs = [
     "tests/workloads/vcopy/MI100",

diff --git a/tests/test_profile_general.py b/tests/test_profile_general.py
@@ -72,40 +72,54 @@ def check_arch_override():
         "pmc_perf_7.csv",
         "pmc_perf_8.csv",
         "pmc_perf_9.csv",
+        "pmc_perf_10.csv",
         "sysinfo.csv",
         "timestamps.csv",
     ]
 )
 ALL_CSVS_MI200 = sorted(
-    ALL_CSVS
-    + [
-        "pmc_perf_10.csv",
-        "pmc_perf_11.csv",
-        "pmc_perf_12.csv",
-        "pmc_perf_13.csv",
-        "pmc_perf_14.csv",
-        "pmc_perf_15.csv",
-        "pmc_perf_16.csv",
-        "pmc_perf_17.csv",
-        "pmc_perf_18.csv",
+    [
+        "SQ_IFETCH_LEVEL.csv",
+        "SQ_INST_LEVEL_LDS.csv",
+        "SQ_INST_LEVEL_SMEM.csv",
+        "SQ_INST_LEVEL_VMEM.csv",
+        "SQ_LEVEL_WAVES.csv",
+        "pmc_perf.csv",
+        "pmc_perf_0.csv",
+        "pmc_perf_1.csv",
+        "pmc_perf_2.csv",
+        "pmc_perf_3.csv",
+        "pmc_perf_4.csv",
+        "pmc_perf_5.csv",
+        "pmc_perf_6.csv",
+        "pmc_perf_7.csv",
+        "pmc_perf_8.csv",
+        "pmc_perf_9.csv",
         "roofline.csv",
         "sysinfo.csv",
         "timestamps.csv",
     ]
 )
 ALL_CSVS_MI300 = sorted(
-    ALL_CSVS
-    + [
-        "pmc_perf_10.csv",
-        "pmc_perf_11.csv",
-        "pmc_perf_12.csv",
-        "pmc_perf_13.csv",
-        "pmc_perf_14.csv",
-        "pmc_perf_15.csv",
-        "pmc_perf_16.csv",
-        "pmc_perf_17.csv",
+    [
+        "SQ_IFETCH_LEVEL.csv",
+        "SQ_INST_LEVEL_LDS.csv",
+        "SQ_INST_LEVEL_SMEM.csv",
+        "SQ_INST_LEVEL_VMEM.csv",
+        "SQ_LEVEL_WAVES.csv",
+        "pmc_perf.csv",
+        "pmc_perf_0.csv",
+        "pmc_perf_1.csv",
+        "pmc_perf_2.csv",
+        "pmc_perf_3.csv",
+        "pmc_perf_4.csv",
+        "pmc_perf_5.csv",
+        "pmc_perf_6.csv",
+        "pmc_perf_7.csv",
+        "pmc_perf_8.csv",
+        "sysinfo.csv",
+        "timestamps.csv",
     ]
-
 )
 
 ROOF_ONLY_FILES = sorted(
@@ -527,7 +541,6 @@ def test_no_roof():
     if soc == "MI100":
         assert sorted(list(file_dict.keys())) == ALL_CSVS
     elif soc == "MI200":
-        breakpoint()
         assert sorted(list(file_dict.keys())) == sorted(
             list(filter(lambda elm: elm != "roofline.csv", ALL_CSVS_MI200))
         )
@@ -705,7 +718,7 @@ def test_block_SQ():
             "SQ_INST_LEVEL_VMEM.csv",
             "sysinfo.csv",
         ]
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(
@@ -735,7 +748,7 @@ def test_block_SQC():
     ]
     if soc == "MI200":
         expected_csvs.append("roofline.csv")
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(
@@ -769,7 +782,7 @@ def test_block_TA():
     ]
     if soc == "MI200":
         expected_csvs.insert(9, "roofline.csv")
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(
@@ -817,7 +830,7 @@ def test_block_TD():
             "sysinfo.csv",
             "timestamps.csv",
         ]
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(
@@ -853,7 +866,7 @@ def test_block_TCP():
     ]
     if soc == "MI200":
         expected_csvs.insert(11, "roofline.csv")
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(
@@ -919,7 +932,7 @@ def test_block_TCC():
             "sysinfo.csv",
             "timestamps.csv",
         ]
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(
@@ -954,7 +967,7 @@ def test_block_SPI():
     ]
     if soc == "MI200":
         expected_csvs.insert(10, "roofline.csv")
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(
@@ -986,7 +999,7 @@ def test_block_CPC():
     ]
     if soc == "MI200":
         expected_csvs.insert(7, "roofline.csv")
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(inspect.stack()[0][3], workload_dir, file_dict)
@@ -1012,7 +1025,7 @@ def test_block_CPF():
     ]
     if soc == "MI200":
         expected_csvs.insert(5, "roofline.csv")
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(
@@ -1088,7 +1101,7 @@ def test_block_SQ_CPC():
             "SQ_INST_LEVEL_VMEM.csv",
             "sysinfo.csv",
         ]
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(
@@ -1164,7 +1177,7 @@ def test_block_SQ_TA():
             "SQ_INST_LEVEL_VMEM.csv",
             "sysinfo.csv",
         ]
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(inspect.stack()[0][3], workload_dir, file_dict)
@@ -1236,7 +1249,7 @@ def test_block_SQ_SPI():
             "SQ_INST_LEVEL_VMEM.csv",
             "sysinfo.csv",
         ]
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(
@@ -1311,7 +1324,7 @@ def test_block_SQ_SQC_TCP_CPC():
             "SQ_INST_LEVEL_VMEM.csv",
             "sysinfo.csv",
         ]
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(inspect.stack()[0][3], workload_dir, file_dict)
@@ -1383,7 +1396,7 @@ def test_block_SQ_SPI_TA_TCC_CPF():
             "SQ_INST_LEVEL_VMEM.csv",
             "sysinfo.csv",
         ]
-    print("Expected CSVs MI300A", "\n", sorted(list(file_dict.keys())))
+
     assert sorted(list(file_dict.keys())) == sorted(expected_csvs)
 
     validate(