AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-467545 - Add rocprofiler support for gfx1150/gfx1151

Browse Source 
Change-Id: I2cddc36981f6d815c865d180a1daf1b8a7e0633f
Signed-off-by: Lang Yu <lang.yu@amd.com>


[ROCm/rocprofiler commit: 7313e52f35]
This commit is contained in:
Lang Yu
2024-07-09 22:39:43 -04:00
parent e4e1e4857e
commit 2230af4b1d
9 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocprofiler/build.sh
+1 -1
View File
@@ -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)
projects/rocprofiler/script/run-ci.py
+1 -1
View File
@@ -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="+",
)
projects/rocprofiler/src/core/counters/metrics/basic_counters.xml
+2
View File
@@ -736,6 +736,8 @@
<gfx1100 base="gfx11"></gfx1100>
<gfx1101 base="gfx11"></gfx1101>
<gfx1102 base="gfx11"></gfx1102>
<gfx1150 base="gfx11"></gfx1150>
<gfx1151 base="gfx11"></gfx1151>
<gfx12>
<metric name="GRBM_COUNT" block=GRBM event=0 descr="Tie High - Count Number of Clocks"></metric>
projects/rocprofiler/src/core/counters/metrics/derived_counters.xml
+4
View File
@@ -587,6 +587,8 @@
<gfx1100_expr base="gfx11_expr"></gfx1100_expr>
<gfx1101_expr base="gfx11_expr"></gfx1101_expr>
<gfx1102_expr base="gfx11_expr"></gfx1102_expr>
<gfx1150_expr base="gfx11_expr"></gfx1150_expr>
<gfx1151_expr base="gfx11_expr"></gfx1151_expr>
<gfx8 base="gfx8_expr"></gfx8>
<gfx9 base="gfx9_expr"></gfx9>
@@ -610,6 +612,8 @@
<gfx1100 base="gfx1100_expr"></gfx1100>
<gfx1101 base="gfx1101_expr"></gfx1101>
<gfx1102 base="gfx1102_expr"></gfx1102>
<gfx1150 base="gfx1150_expr"></gfx1150>
<gfx1151 base="gfx1151_expr"></gfx1151>
#Navi4x
<gfx1200 base="gfx1200_expr"></gfx1200>
<gfx1201 base="gfx1201_expr"></gfx1201>
projects/rocprofiler/src/core/counters/metrics/metrics.h
+1
View File
@@ -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()) {
projects/rocprofiler/src/core/metrics.h
+1
View File
@@ -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()) {
projects/rocprofiler/test/tool/gfx_metrics.xml
+2
View File
@@ -740,6 +740,8 @@
<gfx1100 base="gfx11"></gfx1100>
<gfx1101 base="gfx11"></gfx1101>
<gfx1102 base="gfx11"></gfx1102>
<gfx1150 base="gfx11"></gfx1150>
<gfx1151 base="gfx11"></gfx1151>
<gfx12>
<metric name="GRBM_COUNT" block=GRBM event=0 descr="Tie High - Count Number of Clocks"></metric>
projects/rocprofiler/test/tool/metrics.xml
+4
View File
@@ -455,6 +455,8 @@
<gfx1100_expr base="gfx11_expr"></gfx1100_expr>
<gfx1101_expr base="gfx11_expr"></gfx1101_expr>
<gfx1102_expr base="gfx11_expr"></gfx1102_expr>
<gfx1150_expr base="gfx11_expr"></gfx1150_expr>
<gfx1151_expr base="gfx11_expr"></gfx1151_expr>
<gfx1030_expr base="gfx10_expr">
</gfx1030_expr>
@@ -488,6 +490,8 @@
<gfx1100 base="gfx1100_expr"></gfx1100>
<gfx1101 base="gfx1101_expr"></gfx1101>
<gfx1102 base="gfx1102_expr"></gfx1102>
<gfx1150 base="gfx1150_expr"></gfx1150>
<gfx1151 base="gfx1151_expr"></gfx1151>
<gfx1200 base="gfx1200_expr"></gfx1200>
<gfx1201 base="gfx1201_expr"></gfx1201>
projects/rocprofiler/tests-v2/featuretests/profiler/CMakeLists.txt
+1 -1
View File
@@ -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