From 3f3e39c0be167f6c278b80b8db122f05dbfa14b9 Mon Sep 17 00:00:00 2001 From: colramos-amd Date: Wed, 31 Jan 2024 12:15:56 -0600 Subject: [PATCH] profiling: Fix issue in mismatch join detection Signed-off-by: colramos-amd [ROCm/rocprofiler-compute commit: 3ac0f8121be2e41d7b933b0d8832fbae1159241e] --- .../src/omniperf_profile/profiler_base.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py b/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py index 428f3ddb0b..5a6e577866 100644 --- a/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py +++ b/projects/rocprofiler-compute/src/omniperf_profile/profiler_base.py @@ -119,20 +119,20 @@ class OmniProfiler_Base(): # TODO: check for any mismatch in joins duplicate_cols = { - "GPU_ID": [col for col in df.columns if "GPU_ID" in col], - "Grid_Size": [col for col in df.columns if "Grid_Size" in col], - "Workgroup_Size": [col for col in df.columns if "Workgroup_Size" in col], - "LDS_Per_Workgroup": [col for col in df.columns if "LDS_Per_Workgroup" in col], - "Scratch_Per_Workitem": [col for col in df.columns if "Scratch_Per_Workitem" in col], - "SGPR": [col for col in df.columns if "SGPR" in col], + "GPU_ID": [col for col in df.columns if col.startswith("GPU_ID")], + "Grid_Size": [col for col in df.columns if col.startswith("Grid_Size")], + "Workgroup_Size": [col for col in df.columns if col.startswith("Workgroup_Size")], + "LDS_Per_Workgroup": [col for col in df.columns if col.startswith("LDS_Per_Workgroup")], + "Scratch_Per_Workitem": [col for col in df.columns if col.startswith("Scratch_Per_Workitem")], + "SGPR": [col for col in df.columns if col.startswith("SGPR")], } # Check for vgpr counter in ROCm < 5.3 if "vgpr" in df.columns: - duplicate_cols["vgpr"] = [col for col in df.columns if "vgpr" in col] + duplicate_cols["vgpr"] = [col for col in df.columns if col.startswith("vgpr")] # Check for vgpr counter in ROCm >= 5.3 else: - duplicate_cols["Arch_VGPR"] = [col for col in df.columns if "Arch_VGPR" in col] - duplicate_cols["Accum_VGPR"] = [col for col in df.columns if "Accum_VGPR" in col] + duplicate_cols["Arch_VGPR"] = [col for col in df.columns if col.startswith("Arch_VGPR")] + duplicate_cols["Accum_VGPR"] = [col for col in df.columns if col.startswith("Accum_VGPR")] for key, cols in duplicate_cols.items(): _df = df[cols] if not test_df_column_equality(_df):