Fix clocks (#246)

Signed-off-by: Nicholas Curtis <nicurtis@amd.com>
Co-authored-by: Nicholas Curtis <nicurtis@amd.com>

[ROCm/rocprofiler-compute commit: 852cc13f2a]

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

@@ -993,7 +993,7 @@ def correct_sys_info(df, specs_correction):
         "max_waves_per_cu": "maxWavesPerCU",
         "max_waves_per_cu": "maxWorkgroupSize",
         "max_sclk": "sclk",
-        "mclk": "mclk",
+        "max_mclk": "mclk",
         "cur_sclk": "cur_sclk",
         "cur_mclk": "cur_mclk",
         "L2Banks": "L2Banks",

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

@@ -337,14 +337,10 @@ def get_machine_specs(devicenum):
 
     rocm_version = rocm_ver.strip()
 
-    freq = search(device, rocm_smi).split()
-    cur_sclk = search(r"([0-9]+)", freq[2])
-    if cur_sclk is None:
-        cur_sclk = ""
-
-    cur_mclk = search(r"([0-9]+)", freq[3])
-    if cur_mclk is None:
-        cur_mclk = 0
+    # these are just max's now, because the parsing was broken and this was inconsistent
+    # with how we use the clocks elsewhere (all max, all the time)
+    cur_sclk = gpu_info['max_sclk']
+    cur_mclk = gpu_info['max_mclk']
 
     # FIXME with device
     vbios = search(r"VBIOS version: (.*?)$", run(["rocm-smi", "-v"], exit_on_error=True))

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

@@ -337,8 +337,8 @@ def gen_sysinfo(workload_name, workload_dir, ip_blocks, app_cmd, skip_roof, roof
     param += [
         mspec.L1,
         mspec.L2,
-        mspec.cur_mclk,
-        mspec.cur_mclk,
+        mspec.max_sclk,
+        mspec.max_mclk,
         mspec.cur_sclk,
         mspec.cur_mclk,
         mspec.L2Banks,