ROCm package llvm-amdgpu requires additionally setting prefix

config-hlrs/config.yaml

@@ -17,6 +17,10 @@ config:
   # Directory where licenses should be located
   license_dir: $spack/../licenses
 
+  # Cache directory for already downloaded source tarballs and archived
+  # repositories. This can be purged with `spack clean --downloads`.
+  source_cache: $user_cache_path/cache
+
 
   # Directory where spack managed environments are created and stored
   environments_root: $spack/../environments

config-hlrs/packages.yaml

@@ -144,120 +144,127 @@ packages:
       - cray-parallel-netcdf/1.12.3.13
     buildable: false
 # Rocm/hip packages
-# `module load rocm` defaults to v5.5.1 in CPE 24.03
+# `module load rocm` defaults to v5.5.1 in CPE 24.03, but MI300/gfx942 requires rocm/6+
   rocsparse:
     externals:
-    - spec: rocsparse@5.5.1
+    - spec: rocsparse@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   hipsparse:
     externals:
-    - spec: hipsparse@5.5.1
+    - spec: hipsparse@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   hipsolver:
     externals:
-    - spec: hipsolver@5.5.1
+    - spec: hipsolver@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   hip:
     externals:
-    - spec: hip@5.5.1
+    - spec: hip@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   hipblas:
     externals:
-    - spec: hipblas@5.5.1
+    - spec: hipblas@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   rocprofiler-dev:
     externals:
-    - spec: rocprofiler-dev@5.5.1
+    - spec: rocprofiler-dev@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   hiprand:
     externals:
-    - spec: hiprand@5.5.1
+    - spec: hiprand@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   rocblas:
     externals:
-    - spec: rocblas@5.5.1
+    - spec: rocblas@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   hsa-rocr-dev:
     externals:
-    - spec: hsa-rocr@5.5.1
+    - spec: hsa-rocr-dev@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
+    buildable: false
+  llvm-amdgpu:
+    externals:
+    - spec: llvm-amdgpu@6.1.1
+      modules:
+      - rocm/6.1.1
+      prefix: /opt/rocm-6.1.1/llvm/
     buildable: false
   rccl:
     externals:
-    - spec: rccl@5.5.1
+    - spec: rccl@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   rocfft:
     externals:
-    - spec: rocfft@5.5.1
+    - spec: rocfft@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   comgr:
     externals:
-    - spec: comgr@5.5.1
+    - spec: comgr@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   miopen-hip:
     externals:
-    - spec: miopen-hip@5.5.1
+    - spec: miopen-hip@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   migraphx:
     externals:
-    - spec: migraphx@5.5.1
+    - spec: migraphx@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   rocsolver:
     externals:
-    - spec: rocsolver@5.5.1
+    - spec: rocsolver@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   rocrand:
     externals:
-    - spec: rocrand@5.5.1
+    - spec: rocrand@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   roctracer-dev:
     externals:
-    - spec: roctracer-dev@5.5.1
+    - spec: roctracer-dev@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   rocm-smi-lib:
     externals:
-    - spec: rocm-smi-lib@5.5.1
+    - spec: rocm-smi-lib@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
   miopen-opencl:
     externals:
-    - spec: miopen-opencl@5.5.1
+    - spec: miopen-opencl@6.1.1
       modules:
-      - rocm/5.5.1
+      - rocm/6.1.1
     buildable: false
 # Packages which have not been discovered by spack external find 
 # and packages which are not in the OS image but low-level.