diff --git a/lib/spack/spack/build_systems/rocm.py b/lib/spack/spack/build_systems/rocm.py index 5ff569502aa..329633a6a91 100644 --- a/lib/spack/spack/build_systems/rocm.py +++ b/lib/spack/spack/build_systems/rocm.py @@ -77,7 +77,7 @@ import os import spack.variant -from spack.directives import conflicts, depends_on, variant +from spack.directives import conflicts, depends_on, requires, variant from spack.package_base import PackageBase from spack.util.environment import EnvironmentModifications @@ -140,9 +140,7 @@ class ROCmPackage(PackageBase): when="+rocm", ) - depends_on("llvm-amdgpu", type="build", when="+rocm") - depends_on("hsa-rocr-dev", when="+rocm") - depends_on("hip +rocm", when="+rocm") + depends_on("hip-lang", type="build", when="+rocm") # need amd gpu type for rocm builds conflicts("amdgpu_target=none", when="+rocm") @@ -183,14 +181,14 @@ def asan_on(self, env: EnvironmentModifications): # Add compiler minimum versions based on the first release where the # processor is included in llvm/lib/Support/TargetParser.cpp - depends_on("llvm-amdgpu@5.2.0:", when="amdgpu_target=gfx940") - depends_on("llvm-amdgpu@5.7.0:", when="amdgpu_target=gfx941") - depends_on("llvm-amdgpu@5.7.0:", when="amdgpu_target=gfx942") - depends_on("llvm-amdgpu@5.2.0:", when="amdgpu_target=gfx1036") - depends_on("llvm-amdgpu@5.3.0:", when="amdgpu_target=gfx1100") - depends_on("llvm-amdgpu@5.3.0:", when="amdgpu_target=gfx1101") - depends_on("llvm-amdgpu@5.3.0:", when="amdgpu_target=gfx1102") - depends_on("llvm-amdgpu@5.3.0:", when="amdgpu_target=gfx1103") + requires("%[virtuals=hip-lang] llvm-amdgpu@5.2.0:", when="amdgpu_target=gfx940") + requires("%[virtuals=hip-lang] llvm-amdgpu@5.7.0:", when="amdgpu_target=gfx941") + requires("%[virtuals=hip-lang] llvm-amdgpu@5.7.0:", when="amdgpu_target=gfx942") + requires("%[virtuals=hip-lang] llvm-amdgpu@5.2.0:", when="amdgpu_target=gfx1036") + requires("%[virtuals=hip-lang] llvm-amdgpu@5.3.0:", when="amdgpu_target=gfx1100") + requires("%[virtuals=hip-lang] llvm-amdgpu@5.3.0:", when="amdgpu_target=gfx1101") + requires("%[virtuals=hip-lang] llvm-amdgpu@5.3.0:", when="amdgpu_target=gfx1102") + requires("%[virtuals=hip-lang] llvm-amdgpu@5.3.0:", when="amdgpu_target=gfx1103") # Compiler conflicts