From f1c9c686ffcc7464d7a5c86e7ca76674142f6bcb Mon Sep 17 00:00:00 2001 From: "fei.zheng" Date: Mon, 4 Nov 2024 14:31:52 -0700 Subject: [PATCH] fix PoP of VALU Active Threads with wave_size Signed-off-by: fei.zheng [ROCm/rocprofiler-compute commit: 1b37572b4a180cce611e58fe636ec0ba6729be9a] --- .../analysis_configs/gfx906/0200_system-speed-of-light.yaml | 5 ++--- .../analysis_configs/gfx908/0200_system-speed-of-light.yaml | 5 ++--- .../analysis_configs/gfx940/0200_system-speed-of-light.yaml | 5 ++--- .../analysis_configs/gfx941/0200_system-speed-of-light.yaml | 5 ++--- .../analysis_configs/gfx942/0200_system-speed-of-light.yaml | 5 ++--- projects/rocprofiler-compute/src/utils/parser.py | 1 + 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx906/0200_system-speed-of-light.yaml b/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx906/0200_system-speed-of-light.yaml index 1e7b7f2875..aafb938fa4 100644 --- a/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx906/0200_system-speed-of-light.yaml +++ b/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx906/0200_system-speed-of-light.yaml @@ -102,9 +102,8 @@ Panel Config: value: AVG(((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU) if (SQ_ACTIVE_INST_VALU != 0) else None)) unit: Threads - peak: 64 - pop: (AVG(((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU) if (SQ_ACTIVE_INST_VALU - != 0) else None)) * 1.5625) + peak: $wave_size + pop: (100 * AVG((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU / $wave_size) if (SQ_ACTIVE_INST_VALU != 0) else None)) tips: IPC: value: AVG((SQ_INSTS / SQ_BUSY_CU_CYCLES)) diff --git a/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx908/0200_system-speed-of-light.yaml b/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx908/0200_system-speed-of-light.yaml index 1bd4979de9..00da40724d 100644 --- a/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx908/0200_system-speed-of-light.yaml +++ b/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx908/0200_system-speed-of-light.yaml @@ -102,9 +102,8 @@ Panel Config: value: AVG(((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU) if (SQ_ACTIVE_INST_VALU != 0) else None)) unit: Threads - peak: 64 - pop: (AVG(((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU) if (SQ_ACTIVE_INST_VALU - != 0) else None)) * 1.5625) + peak: $wave_size + pop: (100 * AVG((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU / $wave_size) if (SQ_ACTIVE_INST_VALU != 0) else None)) tips: IPC: value: AVG((SQ_INSTS / SQ_BUSY_CU_CYCLES)) diff --git a/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx940/0200_system-speed-of-light.yaml b/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx940/0200_system-speed-of-light.yaml index 7752ee879e..eec30fe8fc 100644 --- a/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx940/0200_system-speed-of-light.yaml +++ b/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx940/0200_system-speed-of-light.yaml @@ -119,9 +119,8 @@ Panel Config: value: AVG(((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU) if (SQ_ACTIVE_INST_VALU != 0) else None)) unit: Threads - peak: 64 - pop: (AVG(((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU) if (SQ_ACTIVE_INST_VALU - != 0) else None)) * 1.5625) + peak: $wave_size + pop: (100 * AVG((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU / $wave_size) if (SQ_ACTIVE_INST_VALU != 0) else None)) tips: IPC: value: AVG((SQ_INSTS / SQ_BUSY_CU_CYCLES)) diff --git a/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx941/0200_system-speed-of-light.yaml b/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx941/0200_system-speed-of-light.yaml index 7752ee879e..eec30fe8fc 100644 --- a/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx941/0200_system-speed-of-light.yaml +++ b/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx941/0200_system-speed-of-light.yaml @@ -119,9 +119,8 @@ Panel Config: value: AVG(((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU) if (SQ_ACTIVE_INST_VALU != 0) else None)) unit: Threads - peak: 64 - pop: (AVG(((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU) if (SQ_ACTIVE_INST_VALU - != 0) else None)) * 1.5625) + peak: $wave_size + pop: (100 * AVG((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU / $wave_size) if (SQ_ACTIVE_INST_VALU != 0) else None)) tips: IPC: value: AVG((SQ_INSTS / SQ_BUSY_CU_CYCLES)) diff --git a/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx942/0200_system-speed-of-light.yaml b/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx942/0200_system-speed-of-light.yaml index 9909e68a71..9e6cba483e 100644 --- a/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx942/0200_system-speed-of-light.yaml +++ b/projects/rocprofiler-compute/src/rocprof_compute_soc/analysis_configs/gfx942/0200_system-speed-of-light.yaml @@ -119,9 +119,8 @@ Panel Config: value: AVG(((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU) if (SQ_ACTIVE_INST_VALU != 0) else None)) unit: Threads - peak: 64 - pop: (AVG(((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU) if (SQ_ACTIVE_INST_VALU - != 0) else None)) * 1.5625) + peak: $wave_size + pop: (100 * AVG((SQ_THREAD_CYCLES_VALU / SQ_ACTIVE_INST_VALU / $wave_size) if (SQ_ACTIVE_INST_VALU != 0) else None)) tips: IPC: value: AVG((SQ_INSTS / SQ_BUSY_CU_CYCLES)) diff --git a/projects/rocprofiler-compute/src/utils/parser.py b/projects/rocprofiler-compute/src/utils/parser.py index 654057b400..8e2f84319f 100644 --- a/projects/rocprofiler-compute/src/utils/parser.py +++ b/projects/rocprofiler-compute/src/utils/parser.py @@ -698,6 +698,7 @@ def eval_metric(dfs, dfs_type, sys_info, raw_pmc_df, debug): ammolite__hbm_bw = sys_info.hbm_bw ammolite__total_l2_chan = calc_builtin_var("$total_l2_chan", sys_info) ammolite__num_xcd = sys_info.num_xcd + ammolite__wave_size = sys_info.wave_size # TODO: fix all $normUnit in Unit column or title