zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch to add hsa prefix/include path (#44334)

Browse Source 
* Patch to add hsa prefix/include path:wq
* Style check error fix
* The patch need to be applied to 2024.01.stable. ROCm 6.0 requires hpctoolkit 2024.01.1 or later
* Fixing style chec error
This commit is contained in:
renjithravindrankannath 2024-05-29 18:02:34 -07:00 committed by GitHub
parent 6753605807
commit 11869ff872
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/hpctoolkit/correcting-hsa-include-path.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/configure.ac b/configure.ac
index 34b2613..8fa980d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4861,7 +4861,7 @@ case "$ROCM_HSA" in
found=yes
elif test -f "$ROCM_HSA/include/hsa/hsa.h" ; then
AC_MSG_NOTICE([found $ROCM_HSA/include/hsa/hsa.h])
- ROCM_HSA_IFLAGS="-I$ROCM_HSA/include/hsa"
+ ROCM_HSA_IFLAGS="-I$ROCM_HSA/include/hsa -I$ROCM_HSA/include"
ROCM_HSA_INC_MESG="$ROCM_HSA"
found=yes
fi

13
var/spack/repos/builtin/packages/hpctoolkit/define-hip-platform-as-amd.patch
View File

@ -1,13 +0,0 @@
t a/src/tool/hpcrun/Makefile.in b/src/tool/hpcrun/Makefile.in
index e273fe67d..380ba3ceb 100644
--- a/src/tool/hpcrun/Makefile.in
+++ b/src/tool/hpcrun/Makefile.in
@@ -1998,7 +1998,7 @@ UNW_MIPS_INCLUDE_DIRS = \
UNW_MIPS_LD_FLAGS =
MY_CPP_DEFINES = -D_GNU_SOURCE -DINLINE_FN=1 -DLOCAL_BUILD=1 \
- -D__HIP_PLATFORM_HCC__=1 $(am__append_11) $(am__append_16) \
+ -D__HIP_PLATFORM_HCC__=1 -D__HIP_PLATFORM_AMD__=1 $(am__append_11) $(am__append_16) \
$(am__append_22) $(am__append_106) $(am__append_110) \
$(am__append_112) $(am__append_114) $(am__append_118) \
$(am__append_135) $(am__append_139) $(am__append_143)

6
var/spack/repos/builtin/packages/hpctoolkit/package.py
View File

@ -220,6 +220,8 @@ class Hpctoolkit(AutotoolsPackage, MesonPackage):
"^hip@5.3:", when="@:2022.12", msg="rocm 5.3 requires hpctoolkit 2023.03.01 or later" "^hip@5.3:", when="@:2022.12", msg="rocm 5.3 requires hpctoolkit 2023.03.01 or later"
) )
conflicts("^hip@6:", when="@:2023", msg="rocm 6.0 requires hpctoolkit 2024.01.1 or later")
# Fix the build for old revs with gcc 10.x and 11.x. # Fix the build for old revs with gcc 10.x and 11.x.
patch("gcc10-enum.patch", when="@2020.01.01:2020.08 %gcc@10.0:") patch("gcc10-enum.patch", when="@2020.01.01:2020.08 %gcc@10.0:")
patch("511afd95b01d743edc5940c84e0079f462b2c23e.patch", when="@2019.08.01:2021.03 %gcc@11.0:") patch("511afd95b01d743edc5940c84e0079f462b2c23e.patch", when="@2019.08.01:2021.03 %gcc@11.0:")
@ -229,8 +231,8 @@ class Hpctoolkit(AutotoolsPackage, MesonPackage):
depends_on("python@3.4:", type="build", when="@2020.03:2020.08") depends_on("python@3.4:", type="build", when="@2020.03:2020.08")
patch("python3.patch", when="@2020.03:2020.08") patch("python3.patch", when="@2020.03:2020.08")
# HIP header files require HIP_PLATFORM_AMD to be set for AMD GPUs # hsa include path is hsa-rocr-dev-prefix-path/include
patch("define-hip-platform-as-amd.patch", when="^hip@6:") patch("correcting-hsa-include-path.patch", when="@2024.01 ^hip@6.0:")
# Fix a bug where make would mistakenly overwrite hpcrun-fmt.h. # Fix a bug where make would mistakenly overwrite hpcrun-fmt.h.
# https://gitlab.com/hpctoolkit/hpctoolkit/-/merge_requests/751 # https://gitlab.com/hpctoolkit/hpctoolkit/-/merge_requests/751