From 247ed4c2499fc1baa664f7d440551d81be7749c4 Mon Sep 17 00:00:00 2001 From: coleramos425 Date: Mon, 13 Feb 2023 10:46:28 -0600 Subject: [PATCH 1/3] Fix units in wavefront table #81 Signed-off-by: coleramos425 [ROCm/rocprofiler-compute commit: 273c1aad33e4d00fe6d9eb5958085fa4e091dd54] --- .../configs/gfx906/0700_wavefront-launch.yaml | 8 ++++---- .../configs/gfx908/0700_wavefront-launch.yaml | 8 ++++---- .../configs/gfx90a/0700_wavefront-launch.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx906/0700_wavefront-launch.yaml b/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx906/0700_wavefront-launch.yaml index 89e4ce7c14..c0592783e6 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx906/0700_wavefront-launch.yaml +++ b/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx906/0700_wavefront-launch.yaml @@ -107,25 +107,25 @@ Panel Config: avg: AVG(((4 * SQ_WAVE_CYCLES) / $denom)) min: MIN(((4 * SQ_WAVE_CYCLES) / $denom)) max: MAX(((4 * SQ_WAVE_CYCLES) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Dependency Wait Cycles: avg: AVG(((4 * SQ_WAIT_ANY) / $denom)) min: MIN(((4 * SQ_WAIT_ANY) / $denom)) max: MAX(((4 * SQ_WAIT_ANY) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Issue Wait Cycles: avg: AVG(((4 * SQ_WAIT_INST_ANY) / $denom)) min: MIN(((4 * SQ_WAIT_INST_ANY) / $denom)) max: MAX(((4 * SQ_WAIT_INST_ANY) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Active Cycles: avg: AVG(((4 * SQ_ACTIVE_INST_ANY) / $denom)) min: MIN(((4 * SQ_ACTIVE_INST_ANY) / $denom)) max: MAX(((4 * SQ_ACTIVE_INST_ANY) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Wavefront Occupancy: avg: AVG((SQ_ACCUM_PREV_HIRES / GRBM_GUI_ACTIVE)) diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx908/0700_wavefront-launch.yaml b/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx908/0700_wavefront-launch.yaml index 89e4ce7c14..c0592783e6 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx908/0700_wavefront-launch.yaml +++ b/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx908/0700_wavefront-launch.yaml @@ -107,25 +107,25 @@ Panel Config: avg: AVG(((4 * SQ_WAVE_CYCLES) / $denom)) min: MIN(((4 * SQ_WAVE_CYCLES) / $denom)) max: MAX(((4 * SQ_WAVE_CYCLES) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Dependency Wait Cycles: avg: AVG(((4 * SQ_WAIT_ANY) / $denom)) min: MIN(((4 * SQ_WAIT_ANY) / $denom)) max: MAX(((4 * SQ_WAIT_ANY) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Issue Wait Cycles: avg: AVG(((4 * SQ_WAIT_INST_ANY) / $denom)) min: MIN(((4 * SQ_WAIT_INST_ANY) / $denom)) max: MAX(((4 * SQ_WAIT_INST_ANY) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Active Cycles: avg: AVG(((4 * SQ_ACTIVE_INST_ANY) / $denom)) min: MIN(((4 * SQ_ACTIVE_INST_ANY) / $denom)) max: MAX(((4 * SQ_ACTIVE_INST_ANY) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Wavefront Occupancy: avg: AVG((SQ_ACCUM_PREV_HIRES / GRBM_GUI_ACTIVE)) diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx90a/0700_wavefront-launch.yaml b/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx90a/0700_wavefront-launch.yaml index b5a86adeed..fa53bbff74 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx90a/0700_wavefront-launch.yaml +++ b/projects/rocprofiler-compute/src/omniperf_analyze/configs/gfx90a/0700_wavefront-launch.yaml @@ -107,25 +107,25 @@ Panel Config: avg: AVG(((4 * SQ_WAVE_CYCLES) / $denom)) min: MIN(((4 * SQ_WAVE_CYCLES) / $denom)) max: MAX(((4 * SQ_WAVE_CYCLES) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Dependency Wait Cycles: avg: AVG(((4 * SQ_WAIT_ANY) / $denom)) min: MIN(((4 * SQ_WAIT_ANY) / $denom)) max: MAX(((4 * SQ_WAIT_ANY) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Issue Wait Cycles: avg: AVG(((4 * SQ_WAIT_INST_ANY) / $denom)) min: MIN(((4 * SQ_WAIT_INST_ANY) / $denom)) max: MAX(((4 * SQ_WAIT_INST_ANY) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Active Cycles: avg: AVG(((4 * SQ_ACTIVE_INST_ANY) / $denom)) min: MIN(((4 * SQ_ACTIVE_INST_ANY) / $denom)) max: MAX(((4 * SQ_ACTIVE_INST_ANY) / $denom)) - unit: Cycles/$normUnit + unit: (Cycles + $normUnit) tips: Wavefront Occupancy: avg: AVG((SQ_ACCUM_PREV_HIRES / GRBM_GUI_ACTIVE)) From 6bed39c32ae3681c82151eab9046f04fef9d9e1a Mon Sep 17 00:00:00 2001 From: "Karl W. Schulz" Date: Mon, 13 Feb 2023 15:30:10 -0600 Subject: [PATCH 2/3] remove unused file Signed-off-by: Karl W. Schulz [ROCm/rocprofiler-compute commit: 302373ba8971611b95d222ae2f1cbaa0593f40e1] --- .../rocprofiler-compute/cmake/miperf.sh.in | 36 ------------------- 1 file changed, 36 deletions(-) delete mode 100644 projects/rocprofiler-compute/cmake/miperf.sh.in diff --git a/projects/rocprofiler-compute/cmake/miperf.sh.in b/projects/rocprofiler-compute/cmake/miperf.sh.in deleted file mode 100644 index bf600808dc..0000000000 --- a/projects/rocprofiler-compute/cmake/miperf.sh.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash - -################################################################################ -# Copyright (c) 2021 - 2022 Advanced Micro Devices, Inc. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to deal -# in the Software without restriction, including without limitation the rights -# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -# copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -# THE SOFTWARE. -################################################################################ - -set -e - -SCRIPT_DIR=$(realpath $(dirname ${BASH_SOURCE[0]})) - -OMNIPERF_DIR=$(realpath ${SCRIPT_DIR}/@OMNIPERF_RELATIVE_PATH@) - -if [ ! -f ${OMNIPERF_DIR}/omniperf ]; then - echo -e "Error! Expected omniperf installation in ${OMNIPERF_DIR}" - exit 1 -fi - -eval ${OMNIPERF_DIR}/omniperf "${@}" From 17fc684237a50f94c335d27309e7baa4fe905d31 Mon Sep 17 00:00:00 2001 From: coleramos425 Date: Mon, 13 Feb 2023 16:44:43 -0600 Subject: [PATCH 3/3] Change CI tests to reflect renaming of analyze options Signed-off-by: coleramos425 [ROCm/rocprofiler-compute commit: 93b1b15291f51f46dd958dffd9766d43d2d356a1] --- .../tests/test_analyze_commands.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/rocprofiler-compute/tests/test_analyze_commands.py b/projects/rocprofiler-compute/tests/test_analyze_commands.py index 051365e60e..e79cdfef9b 100644 --- a/projects/rocprofiler-compute/tests/test_analyze_commands.py +++ b/projects/rocprofiler-compute/tests/test_analyze_commands.py @@ -145,7 +145,7 @@ def test_filter_dispatch_ids_mi100(): "analyze", "--path", "tests/workloads/mixbench/mi100", - "--filter-dispatch-ids", + "--dispatch", "0", ], ): @@ -162,7 +162,7 @@ def test_filter_dispatch_ids_inv_mi100(): "analyze", "--path", "tests/workloads/mixbench/mi100", - "--filter-dispatch-ids", + "--dispatch", "99", ], ): @@ -179,7 +179,7 @@ def test_filter_gpu_ids_mi100(): "analyze", "--path", "tests/workloads/mixbench/mi100", - "--filter-gpu-ids", + "--gpu-id", "0", ], ): @@ -196,7 +196,7 @@ def test_filter_gpu_ids_inv_mi100(): "analyze", "--path", "tests/workloads/mixbench/mi100", - "--filter-gpu-ids", + "--gpu-id", "99", ], ): @@ -490,7 +490,7 @@ def test_filter_dispatch_ids_mi200(): "analyze", "--path", "tests/workloads/mixbench/mi200", - "--filter-dispatch-ids", + "--dispatch", "0", ], ): @@ -507,7 +507,7 @@ def test_filter_dispatch_ids_inv_mi200(): "analyze", "--path", "tests/workloads/mixbench/mi200", - "--filter-dispatch-ids", + "--dispatch", "99", ], ): @@ -524,7 +524,7 @@ def test_filter_gpu_ids_mi200(): "analyze", "--path", "tests/workloads/mixbench/mi200", - "--filter-gpu-ids", + "--gpu-id", "0", ], ): @@ -541,7 +541,7 @@ def test_filter_gpu_ids_inv_mi200(): "analyze", "--path", "tests/workloads/mixbench/mi200", - "--filter-gpu-ids", + "--gpu-id", "99", ], ):