diff options
| author | renjithravindrankannath <94420380+renjithravindrankannath@users.noreply.github.com> | 2024-05-29 18:02:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-29 18:02:34 -0700 |
| commit | 11869ff8722865cd83d8acbc0597fa80013c3734 (patch) | |
| tree | 9aa586bef743b3ba5505baddb79c5795bc9fae15 /var | |
| parent | 67536058077995cab1ed23b8ca62aaf75463ae04 (diff) | |
| download | spack-11869ff8722865cd83d8acbc0597fa80013c3734.tar.gz spack-11869ff8722865cd83d8acbc0597fa80013c3734.tar.bz2 spack-11869ff8722865cd83d8acbc0597fa80013c3734.tar.xz spack-11869ff8722865cd83d8acbc0597fa80013c3734.zip | |
Patch to add hsa prefix/include path (#44334)
* 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
Diffstat (limited to 'var')
3 files changed, 17 insertions, 15 deletions
diff --git a/var/spack/repos/builtin/packages/hpctoolkit/correcting-hsa-include-path.patch b/var/spack/repos/builtin/packages/hpctoolkit/correcting-hsa-include-path.patch new file mode 100644 index 0000000000..3d9a73db2f --- /dev/null +++ b/var/spack/repos/builtin/packages/hpctoolkit/correcting-hsa-include-path.patch @@ -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 diff --git a/var/spack/repos/builtin/packages/hpctoolkit/define-hip-platform-as-amd.patch b/var/spack/repos/builtin/packages/hpctoolkit/define-hip-platform-as-amd.patch deleted file mode 100644 index e5ca24136e..0000000000 --- a/var/spack/repos/builtin/packages/hpctoolkit/define-hip-platform-as-amd.patch +++ /dev/null @@ -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) diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 7f1c2d10ac..fb2810795f 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -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" ) + 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. 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:") @@ -229,8 +231,8 @@ class Hpctoolkit(AutotoolsPackage, MesonPackage): depends_on("python@3.4:", type="build", 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 - patch("define-hip-platform-as-amd.patch", when="^hip@6:") + # hsa include path is hsa-rocr-dev-prefix-path/include + patch("correcting-hsa-include-path.patch", when="@2024.01 ^hip@6.0:") # Fix a bug where make would mistakenly overwrite hpcrun-fmt.h. # https://gitlab.com/hpctoolkit/hpctoolkit/-/merge_requests/751 |