From 2230af4b1dda200c31c812ef80a94398bbd85d89 Mon Sep 17 00:00:00 2001 From: Lang Yu Date: Tue, 9 Jul 2024 22:39:43 -0400 Subject: [PATCH] SWDEV-467545 - Add rocprofiler support for gfx1150/gfx1151 Change-Id: I2cddc36981f6d815c865d180a1daf1b8a7e0633f Signed-off-by: Lang Yu [ROCm/rocprofiler commit: 7313e52f35a6edace31becdb73fdd3b81b3483f6] --- projects/rocprofiler/build.sh | 2 +- projects/rocprofiler/script/run-ci.py | 2 +- .../rocprofiler/src/core/counters/metrics/basic_counters.xml | 2 ++ .../src/core/counters/metrics/derived_counters.xml | 4 ++++ projects/rocprofiler/src/core/counters/metrics/metrics.h | 1 + projects/rocprofiler/src/core/metrics.h | 1 + projects/rocprofiler/test/tool/gfx_metrics.xml | 2 ++ projects/rocprofiler/test/tool/metrics.xml | 4 ++++ .../rocprofiler/tests-v2/featuretests/profiler/CMakeLists.txt | 2 +- 9 files changed, 17 insertions(+), 3 deletions(-) diff --git a/projects/rocprofiler/build.sh b/projects/rocprofiler/build.sh index 0ce2e8320e..64c776a362 100755 --- a/projects/rocprofiler/build.sh +++ b/projects/rocprofiler/build.sh @@ -75,7 +75,7 @@ if [ -n "$ROCM_RPATH" ] ; then LD_RUNPATH_FLAG=" -Wl,--enable-new-dtags -Wl,--rp if [ -z "$TO_CLEAN" ] ; then TO_CLEAN=yes; fi if [ -z "$RUN_TEST" ] ; then RUN_TEST=no; fi if [ -z "$ASAN" ] ; then ASAN=False; fi -if [ -z "$GPU_LIST" ] ; then GPU_LIST="gfx900 gfx906 gfx908 gfx90a gfx940 gfx941 gfx942 gfx1030 gfx1100 gfx1101 gfx1102 gfx1031 gfx1200 gfx1201"; fi +if [ -z "$GPU_LIST" ] ; then GPU_LIST="gfx900 gfx906 gfx908 gfx90a gfx940 gfx941 gfx942 gfx1030 gfx1100 gfx1101 gfx1102 gfx1031 gfx1150 gfx1151 gfx1200 gfx1201"; fi ROCPROFILER_ROOT=$(cd $ROCPROFILER_ROOT && echo $PWD) diff --git a/projects/rocprofiler/script/run-ci.py b/projects/rocprofiler/script/run-ci.py index 122a94b4c6..5e8156aab2 100755 --- a/projects/rocprofiler/script/run-ci.py +++ b/projects/rocprofiler/script/run-ci.py @@ -298,7 +298,7 @@ def parse_cdash_args(args): parser.add_argument( "--gpu-targets", help="GPU build architectures", - default="gfx900 gfx906 gfx908 gfx90a gfx942 gfx1030 gfx1031 gfx1032 gfx1100 gfx1101 gfx1102".split(), + default="gfx900 gfx906 gfx908 gfx90a gfx942 gfx1030 gfx1031 gfx1032 gfx1100 gfx1101 gfx1102 gfx1150 gfx1151".split(), type=str, nargs="+", ) diff --git a/projects/rocprofiler/src/core/counters/metrics/basic_counters.xml b/projects/rocprofiler/src/core/counters/metrics/basic_counters.xml index 22c8680087..4e4eec5ad8 100755 --- a/projects/rocprofiler/src/core/counters/metrics/basic_counters.xml +++ b/projects/rocprofiler/src/core/counters/metrics/basic_counters.xml @@ -736,6 +736,8 @@ + + diff --git a/projects/rocprofiler/src/core/counters/metrics/derived_counters.xml b/projects/rocprofiler/src/core/counters/metrics/derived_counters.xml index 2a873cf2dd..935eee1bba 100755 --- a/projects/rocprofiler/src/core/counters/metrics/derived_counters.xml +++ b/projects/rocprofiler/src/core/counters/metrics/derived_counters.xml @@ -587,6 +587,8 @@ + + @@ -610,6 +612,8 @@ + + #Navi4x diff --git a/projects/rocprofiler/src/core/counters/metrics/metrics.h b/projects/rocprofiler/src/core/counters/metrics/metrics.h index 78a92d2294..612f65d70e 100644 --- a/projects/rocprofiler/src/core/counters/metrics/metrics.h +++ b/projects/rocprofiler/src/core/counters/metrics/metrics.h @@ -229,6 +229,7 @@ class MetricsDict { "gfx940", "gfx941", "gfx942", // Mi300 "gfx1030", "gfx1031", "gfx1032", // Navi2x "gfx1100", "gfx1101", "gfx1102", // Navi3x + "gfx1150", "gfx1151", "gfx1200", "gfx1201", // Navi4x }; if (supported_agent_names.find(agent_name_) != supported_agent_names.end()) { diff --git a/projects/rocprofiler/src/core/metrics.h b/projects/rocprofiler/src/core/metrics.h index 2b8f4286d8..4594cf4a73 100644 --- a/projects/rocprofiler/src/core/metrics.h +++ b/projects/rocprofiler/src/core/metrics.h @@ -212,6 +212,7 @@ class MetricsDict { "gfx940", "gfx941", "gfx942", // Mi300 "gfx1030", "gfx1031", "gfx1032", // Navi2x "gfx1100", "gfx1101", "gfx1102", // Navi3x + "gfx1150", "gfx1151", "gfx1200", "gfx1201", // Navi4x }; if (supported_agent_names.find(agent_name_) != supported_agent_names.end()) { diff --git a/projects/rocprofiler/test/tool/gfx_metrics.xml b/projects/rocprofiler/test/tool/gfx_metrics.xml index f915b653a0..819afff1e8 100755 --- a/projects/rocprofiler/test/tool/gfx_metrics.xml +++ b/projects/rocprofiler/test/tool/gfx_metrics.xml @@ -740,6 +740,8 @@ + + diff --git a/projects/rocprofiler/test/tool/metrics.xml b/projects/rocprofiler/test/tool/metrics.xml index 8b63912e1c..c5ad7239d4 100755 --- a/projects/rocprofiler/test/tool/metrics.xml +++ b/projects/rocprofiler/test/tool/metrics.xml @@ -455,6 +455,8 @@ + + @@ -488,6 +490,8 @@ + + diff --git a/projects/rocprofiler/tests-v2/featuretests/profiler/CMakeLists.txt b/projects/rocprofiler/tests-v2/featuretests/profiler/CMakeLists.txt index 0cff7269fa..de3457d483 100644 --- a/projects/rocprofiler/tests-v2/featuretests/profiler/CMakeLists.txt +++ b/projects/rocprofiler/tests-v2/featuretests/profiler/CMakeLists.txt @@ -308,7 +308,7 @@ function(generate_hsaco TARGET_ID INPUT_FILE OUTPUT_FILE) PARENT_SCOPE) endfunction(generate_hsaco) -set(GPU_LIST "gfx900" "gfx906" "gfx908" "gfx90a" "gfx942" "gfx1030" "gfx1031" "gfx1032" "gfx1100" "gfx1101" "gfx1102" "gfx1200" "gfx1201") +set(GPU_LIST "gfx900" "gfx906" "gfx908" "gfx90a" "gfx942" "gfx1030" "gfx1031" "gfx1032" "gfx1100" "gfx1101" "gfx1102" "gfx1150" "gfx1151" "gfx1200" "gfx1201") foreach(target_id ${GPU_LIST}) # generate kernel bitcodes generate_hsaco(${target_id} ${CMAKE_CURRENT_SOURCE_DIR}/apps/copy.cl