sst: update core, elements, macro to 15.0.0 (#50473)

* Add tag for podio v01-03

* Update minimal root version for RNTuple support

* Make sure clang-format does not interfere with code generation

* Add edm4hep version 0.99.2 and new podio version dependency

* Keep root versions ordered for dependencies

Co-authored-by: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>

---------

Co-authored-by: Juan Miguel Carceller <22276694+jmcarcell@users.noreply.github.com>

lib/spack/external/_vendoring/archspec/cli.py

@@ -9,8 +9,8 @@
 import argparse
 import typing
 
-from . import __version__ as archspec_version
+import _vendoring.archspec
-from .cpu import host
+import _vendoring.archspec.cpu
 
 
 def _make_parser() -> argparse.ArgumentParser:
@@ -24,7 +24,7 @@ def _make_parser() -> argparse.ArgumentParser:
         "-V",
         help="Show the version and exit.",
         action="version",
-        version=f"archspec, version {archspec_version}",
+        version=f"archspec, version {_vendoring.archspec.__version__}",
     )
     parser.add_argument("--help", "-h", help="Show the help and exit.", action="help")
 
@@ -45,9 +45,9 @@ def _make_parser() -> argparse.ArgumentParser:
 
 
 def cpu() -> int:
-    """Run the `archspec cpu` subcommand."""
+    """Run the `_vendoring.archspec.cpu` subcommand."""
     try:
-        print(host())
+        print(_vendoring.archspec.cpu.host())
     except FileNotFoundError as exc:
         print(exc)
         return 1

lib/spack/external/_vendoring/archspec/cpu/microarchitecture.py

@@ -6,11 +6,12 @@
 import functools
 import platform
 import re
-import sys
 import warnings
-from typing import IO, List, Set, Tuple
 
-from . import schema
+import _vendoring.archspec
+import _vendoring.archspec.cpu.alias
+import _vendoring.archspec.cpu.schema
+
 from .alias import FEATURE_ALIASES
 from .schema import LazyDictionary
 
@@ -66,7 +67,7 @@ class Microarchitecture:
         cpu_part (str): cpu part of the architecture, if relevant.
     """
 
-    # pylint: disable=too-many-arguments,too-many-positional-arguments,too-many-instance-attributes
+    # pylint: disable=too-many-arguments,too-many-instance-attributes
     #: Aliases for micro-architecture's features
     feature_aliases = FEATURE_ALIASES
 
@@ -149,25 +150,17 @@ def __ge__(self, other):
         return (self == other) or (self > other)
 
     def __repr__(self):
-        return f"{self.__class__.__name__}({self.name!r})"
+        cls_name = self.__class__.__name__
+        fmt = (
+            cls_name + "({0.name!r}, {0.parents!r}, {0.vendor!r}, "
+            "{0.features!r}, {0.compilers!r}, generation={0.generation!r}, "
+            "cpu_part={0.cpu_part!r})"
+        )
+        return fmt.format(self)
 
     def __str__(self):
         return self.name
 
-    def tree(self, fp: IO[str] = sys.stdout, indent: int = 4) -> None:
-        """Format the partial order of ancestors of this microarchitecture as a tree."""
-        seen: Set[str] = set()
-        stack: List[Tuple[int, Microarchitecture]] = [(0, self)]
-        while stack:
-            level, current = stack.pop()
-            print(f"{'':>{level}}{current.name}", file=fp)
-
-            if current.name in seen:
-                continue
-
-            for parent in reversed(current.parents):
-                stack.append((level + indent, parent))
-
     def __contains__(self, feature):
         # Feature must be of a string type, so be defensive about that
         if not isinstance(feature, str):
@@ -391,7 +384,7 @@ def fill_target_from_dict(name, data, targets):
         )
 
     known_targets = {}
-    data = schema.TARGETS_JSON["microarchitectures"]
+    data = _vendoring.archspec.cpu.schema.TARGETS_JSON["microarchitectures"]
     for name in data:
         if name in known_targets:
             # name was already brought in as ancestor to a target

lib/spack/external/_vendoring/archspec/json/cpu/cpuid_schema.json

@@ -131,4 +131,4 @@
       }
     }
   }
-}
+}

lib/spack/external/_vendoring/archspec/json/cpu/microarchitectures_schema.json

@@ -110,4 +110,4 @@
       "additionalProperties": false
     }
   }
-}
+}

lib/spack/external/vendor.txt

@@ -9,4 +9,4 @@ macholib==1.16.2
   altgraph==0.17.3
 ruamel.yaml==0.17.21
 typing_extensions==4.1.1
-archspec @ git+https://github.com/archspec/archspec.git@77f3f81df3dd80b7e538e2e41bc4485fbec2dbaa
+archspec @ git+https://github.com/archspec/archspec.git@38ce485258ffc4fc6dd6688f8dc90cb269478c47

lib/spack/spack/cmd/repo.py

@@ -201,7 +201,19 @@ def repo_migrate(args: Any) -> int:
         repo_v2 = None
         exit_code = 0
 
-    if exit_code == 0 and isinstance(repo_v2, spack.repo.Repo):
+    if not args.fix:
+        tty.error(
+            f"No changes were made to the repository {repo.root} with namespace "
+            f"'{repo.namespace}'. Run with --fix to apply the above changes."
+        )
+
+    elif exit_code == 1:
+        tty.error(
+            f"Repository '{repo.namespace}' could not be migrated to the latest Package API. "
+            "Please check the error messages above."
+        )
+
+    elif isinstance(repo_v2, spack.repo.Repo):
         tty.info(
             f"Repository '{repo_v2.namespace}' was successfully migrated from "
             f"package API {repo.package_api_str} to {repo_v2.package_api_str}."
@@ -212,15 +224,9 @@ def repo_migrate(args: Any) -> int:
             f"    spack repo add {shlex.quote(repo_v2.root)}"
         )
 
-    elif exit_code == 0:
+    else:
         tty.info(f"Repository '{repo.namespace}' was successfully migrated")
 
-    elif not args.fix and exit_code == 1:
-        tty.error(
-            f"No changes were made to the repository {repo.root} with namespace "
-            f"'{repo.namespace}'. Run with --fix to apply the above changes."
-        )
-
     return exit_code
 
 

lib/spack/spack/variant.py

@@ -208,7 +208,7 @@ def variant_type(self) -> VariantType:
         else:
             return VariantType.SINGLE
 
-    def __str__(self):
+    def __str__(self) -> str:
         return (
             f"Variant('{self.name}', "
             f"default='{self.default}', "
@@ -491,14 +491,14 @@ class DisjointSetsOfValues(collections.abc.Sequence):
         *sets (list): mutually exclusive sets of values
     """
 
-    _empty_set = set(("none",))
+    _empty_set = {"none"}
 
-    def __init__(self, *sets):
+    def __init__(self, *sets: Tuple[str, ...]) -> None:
         self.sets = [set(_flatten(x)) for x in sets]
 
         # 'none' is a special value and can appear only in a set of
         # a single element
-        if any("none" in s and s != set(("none",)) for s in self.sets):
+        if any("none" in s and s != {"none"} for s in self.sets):
             raise spack.error.SpecError(
                 "The value 'none' represents the empty set,"
                 " and must appear alone in a set. Use the "

pyproject.toml

@@ -260,6 +260,9 @@ substitute = [
   { match = "from attr", replace = "from _vendoring.attr" },
   { match = "import jsonschema", replace = "import _vendoring.jsonschema" },
   { match = "from jsonschema", replace = "from _vendoring.jsonschema" },
+  { match = "archspec.cpu", replace = "_vendoring.archspec.cpu" },
+  { match = "archspec.__version__", replace = "_vendoring.archspec.__version__" },
+  { match = "import archspec", replace = "import _vendoring.archspec" },
 ]
 drop = [
   # contains unnecessary scripts

var/spack/repos/spack_repo/builtin/packages/additivefoam/assets/assets_1.0.0/Allwmake

@@ -1,4 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-applications/Allwmake $targetType $*
+wmake $targetType applications/solvers/additiveFoam/movingHeatSource
+wmake $targetType applications/solvers/additiveFoam

var/spack/repos/spack_repo/builtin/packages/additivefoam/assets/assets_1.0.0/applications/Allwmake

@@ -1,5 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-wmake libso solvers/additiveFoam/movingHeatSource
-wmake solvers/additiveFoam

var/spack/repos/spack_repo/builtin/packages/additivefoam/assets/assets_main/Allwmake

@@ -1,4 +1,4 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-applications/Allwmake $targetType $*
+./applications/solvers/additiveFoam/Allwmake $targetType $*

var/spack/repos/spack_repo/builtin/packages/additivefoam/assets/assets_main/applications/Allwmake

@@ -1,9 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Parse arguments for library compilation
-. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
-
-wmake $targetType solvers/additiveFoam/functionObjects/ExaCA
-wmake $targetType solvers/additiveFoam/movingHeatSource
-wmake $targetType solvers/additiveFoam

var/spack/repos/spack_repo/builtin/packages/additivefoam/package.py

@@ -15,9 +15,9 @@
 class Additivefoam(Package):
     """AdditiveFOAM is a heat and mass transfer software for Additive Manufacturing (AM)"""
 
-    homepage = "https://github.com/ORNL/AdditiveFOAM"
+    homepage = "https://ornl.github.io/AdditiveFOAM/"
     git = "https://github.com/ORNL/AdditiveFOAM.git"
-    url = "https://github.com/ORNL/AdditiveFOAM/archive/1.0.0.tar.gz"
+    url = "https://github.com/ORNL/AdditiveFOAM/archive/1.1.0.tar.gz"
 
     maintainers("streeve", "colemanjs", "gknapp1")
 
@@ -26,16 +26,17 @@ class Additivefoam(Package):
     license("GPL-3.0-only")
 
     version("main", branch="main")
+    version("1.1.0", sha256="a13770bd66fe10224705fb3a2bfb557e63e0aea98c917b0084cf8b91eaa53ee2")
     version("1.0.0", sha256="abbdf1b0230cd2f26f526be76e973f508978611f404fe8ec4ecdd7d5df88724c")
 
     depends_on("cxx", type="build")  # generated
 
     depends_on("openfoam-org@10")
 
-    common = ["spack-derived-Allwmake"]
+    common = []
-    assets = [join_path("applications", "Allwmake"), "Allwmake"]
+    assets = ["Allwmake"]
 
-    build_script = "./spack-derived-Allwmake"
+    build_script = "./Allwmake"
 
     phases = ["configure", "build", "install"]
 
@@ -56,15 +57,49 @@ def add_extra_files(self, common, local_prefix, local):
             openfoam.install(join_path(indir, f), join_path(outdir, f))
 
     def patch(self):
+        """Patches build by adding Allwmake from the asset directory based on
+        the spec version.
+
+        For all versions after 1.0.0 there is an Allwmake script in
+        the AdditiveFOAM repository that can be called by the spack assets_main/Allwmake
+        script, whereas the assets_1.0.0/Allwmake script contains the
+        build instructions."""
         spec = self.spec
-        asset_dir = ""
+        asset_dir = "assets_main"
-        if Version("main") in spec.versions:
+        if Version("1.0.0") in spec.versions:
-            asset_dir = "assets_main"
-        elif Version("1.0.0") in spec.versions:
             asset_dir = "assets_1.0.0"
         self.add_extra_files(self.common, asset_dir, self.assets)
 
+    def setup_build_environment(self, env):
+        """Set up the build environment variables."""
+
+        # Ensure that the directories exist
+        mkdirp(self.prefix.bin)
+        mkdirp(self.prefix.lib)
+
+        # Add to the environment
+        env.set("FOAM_USER_APPBIN", self.prefix.bin)
+        env.set("FOAM_USER_LIBBIN", self.prefix.lib)
+
+    def setup_run_environment(self, env):
+        """Set up the run environment variables."""
+
+        # Add to the environment
+        env.prepend_path("PATH", self.prefix.bin)
+        env.prepend_path("LD_LIBRARY_PATH", self.prefix.lib)
+
+    def activate(self, spec, prefix):
+        """Activate the package to modify the environment."""
+        self.setup_run_environment(self.spec.environment())
+
+    def deactivate(self, spec, prefix):
+        """Deactivate the package and clean up the environment."""
+        env = self.spec.environment()
+        env.pop("FOAM_USER_APPBIN", None)
+        env.pop("FOAM_USER_LIBBIN", None)
+
     def configure(self, spec, prefix):
+        """Configure the environment for building."""
         pass
 
     def build(self, spec, prefix):

var/spack/repos/spack_repo/builtin/packages/amdsmi/package.py

@@ -21,6 +21,7 @@ class Amdsmi(CMakePackage):
     libraries = ["libamd_smi"]
 
     license("MIT")
+    version("6.4.0", sha256="6f0200ba7305171e9dadbfcd41ff00c194b98d2b88e0555c57739ef01c767233")
     version("6.3.3", sha256="e23abc65a1cd75764d7da049b91cce2a095b287279efcd4f90b4b9b63b974dd5")
     version("6.3.2", sha256="1ed452eedfe51ac6e615d7bfe0bd7a0614f21113874ae3cbea7df72343cc2d13")
     version("6.3.1", sha256="a3a5a711052e813b9be9304d5e818351d3797f668ec2a455e61253a73429c355")
@@ -38,6 +39,7 @@ class Amdsmi(CMakePackage):
     version("5.5.1", sha256="b794c7fd562fd92f2c9f2bbdc2d5dded7486101fcd4598f2e8c3484c9a939281")
     version("5.5.0", sha256="dcfbd96e93afcf86b1261464e008e9ef7e521670871a1885e6eaffc7cdc8f555")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     depends_on("cmake@3.11:")

var/spack/repos/spack_repo/builtin/packages/aqlprofile/package.py

@@ -10,6 +10,20 @@
 from spack.package import *
 
 _versions = {
+    "6.4.0": {
+        "apt": (
+            "5ec56bc3c227ad37227072bd513c58c9501e1ceefb06692ad4812f337853dca4",
+            "https://repo.radeon.com/rocm/apt/6.4/pool/main/h/hsa-amd-aqlprofile/hsa-amd-aqlprofile_1.0.0.60400-47~22.04_amd64.deb",
+        ),
+        "yum": (
+            "22ed4c6a999ca6823e5e6bf9f4ab560cba68025f354346b1ac2ebb4757239c56",
+            "https://repo.radeon.com/rocm/rhel8/6.4/main/hsa-amd-aqlprofile-1.0.0.60400-47.el8.x86_64.rpm",
+        ),
+        "zyp": (
+            "7a4c9ca0e6ca178c65776f9b1d9d01ca7576eaa555fdcbf49a42def1ce6d6041",
+            "https://repo.radeon.com/rocm/zyp/6.4/main/hsa-amd-aqlprofile-1.0.0.60400-sles156.47.x86_64.rpm",
+        ),
+    },
     "6.3.3": {
         "apt": (
             "5fe2b18e75e8c0a66069af8446399796818f7340a9ef5f2b52adaa79ee8e2a37",
@@ -307,6 +321,7 @@ class Aqlprofile(Package):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/chafa/package.py

@@ -13,13 +13,14 @@ class Chafa(AutotoolsPackage):
     suitable for display in a terminal."""
 
     homepage = "https://hpjansson.org/chafa/"
-    url = "https://hpjansson.org/chafa/releases/chafa-1.16.0.tar.xz"
+    url = "https://hpjansson.org/chafa/releases/chafa-1.16.1.tar.xz"
     git = "https://github.com/hpjansson/chafa.git"
 
     license("LGPL-3.0-or-later", checked_by="Buldram")
     maintainers("Buldram")
 
     version("master", branch="master")
+    version("1.16.1", sha256="4a25debb71530baf0a748b15cfee6b8da6b513f696d9484987eaf410ecce1129")
     version("1.16.0", sha256="bf863e57b6200b696bde1742aa95d7feb8cd23b9df1e91e91859b2b1e54fd290")
     version("1.14.5", sha256="7b5b384d5fb76a641d00af0626ed2115fb255ea371d9bef11f8500286a7b09e5")
     version("1.14.4", sha256="d0708a63f05b79269dae862a42671e38aece47fbd4fc852904bca51a65954454")
@@ -82,7 +83,7 @@ def install_completions(self):
         install(
             "tools/completions/zsh-completion.zsh", zsh_completion_path(self.prefix) / "_chafa"
         )
-        if self.spec.satisfies("@master"):
+        if self.spec.satisfies("@1.16.1:"):
             mkdirp(fish_completion_path(self.prefix))
             install(
                 "tools/completions/fish-completion.fish",

var/spack/repos/spack_repo/builtin/packages/comgr/package.py

@@ -31,6 +31,7 @@ def url_for_version(self, version):
     license("NCSA")
 
     version("master", branch="amd-stg-open", deprecated=True)
+    version("6.4.0", sha256="dca1c145a23f05229d5d646241f9d1d3c5dbf1d745b338ae020eabe33beb965c")
     version("6.3.3", sha256="4df9aba24e574edf23844c0d2d9dda112811db5c2b08c9428604a21b819eb23d")
     version("6.3.2", sha256="1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827")
     version("6.3.1", sha256="e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c")
@@ -94,6 +95,7 @@ def url_for_version(self, version):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         # llvm libs are linked statically, so this *could* be a build dep
@@ -123,6 +125,7 @@ def url_for_version(self, version):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/composable_kernel/package.py

@@ -21,6 +21,7 @@ class ComposableKernel(CMakePackage):
     license("MIT")
 
     version("master", branch="develop", deprecated=True)
+    version("6.4.0", sha256="8dbfea0bdc4950ca60e8d1ea43edf1f515c4a34e47ead951415c49a0669a3baf")
     version("6.3.3", sha256="b7102efba044455416a6127af1951019fe8365a653ea7eb0b1d83bb4542c9309")
     version("6.3.2", sha256="875237fe493ff040f8f63b827cddf2ff30a8d3aa18864f87d0e35323c7d62a2d")
     version("6.3.1", sha256="3e8c8c832ca3f9ceb99ab90f654b93b7db876f08d90eda87a70bc629c854052a")
@@ -65,6 +66,7 @@ class ComposableKernel(CMakePackage):
 
     for ver in [
         "master",
+        "6.4.0",
         "6.3.3",
         "6.3.2",
         "6.3.1",

var/spack/repos/spack_repo/builtin/packages/edm4hep/package.py

@@ -22,6 +22,7 @@ class Edm4hep(CMakePackage):
     license("Apache-2.0")
 
     version("main", branch="main")
+    version("0.99.2", sha256="b3e7abb61fd969e4c9aef55dd6839a2186bf0b0d3801174fe6e0b9df8e0ebace")
     version("0.99.1", sha256="84d990f09dbd0ad2198596c0c51238a4b15391f51febfb15dd3d191dc7aae9f4")
     version("0.99", sha256="3636e8c14474237029bf1a8be11c53b57ad3ed438fd70a7e9b87c5d08f1f2ea6")
     version("0.10.5", sha256="003c8e0c8e1d1844592d43d41384f4320586fbfa51d4d728ae0870b9c4f78d81")
@@ -79,6 +80,7 @@ class Edm4hep(CMakePackage):
     depends_on("podio@1:", when="@0.99:")
     depends_on("podio@0.15:", when="@:0.10.5")
     depends_on("podio@:1.1", when="@:0.99.0")
+    depends_on("podio@1.3:", when="@0.99.2:")
     for _std in _cxxstd_values:
         for _v in _std:
             depends_on(f"podio cxxstd={_v.value}", when=f"cxxstd={_v.value}")
@@ -109,6 +111,8 @@ def cmake_args(self):
             self.define("BUILD_TESTING", self.run_tests),
             self.define_from_variant("EDM4HEP_WITH_JSON", "json"),
         ]
+        if self.spec.satisfies("@:0.99.1 ^podio@1.3:"):
+            args.append(self.define("PODIO_USE_CLANG_FORMAT", False))
         return args
 
     def setup_run_environment(self, env: EnvironmentModifications) -> None:

var/spack/repos/spack_repo/builtin/packages/geant4/package.py

@@ -5,16 +5,10 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 
 from spack.package import *
-from spack.variant import ConditionalVariantValues
 
 
 def _std_when(values):
-    for v in values:
+    return [(c.value, c.when) for v in values for c in v]
-        if isinstance(v, ConditionalVariantValues):
-            for c in v:
-                yield (c.value, c.when)
-        else:
-            yield (v, "")
 
 
 class Geant4(CMakePackage):

var/spack/repos/spack_repo/builtin/packages/gromacs/package.py

@@ -52,215 +52,82 @@ class Gromacs(CMakePackage, CudaPackage):
     # 2025 is supported.
     version("main", branch="main")
     version("master", branch="main", deprecated=True)
+    version("2025.2", sha256="0df09f9d45a99ef00e66b9baa9493a27e906813763a3b6c7672217c66b43ea11")
+    version("2025.1", sha256="0adf621a80fd8043f8defec84ce02811c0cdf42a052232890932d81f25c4d28a")
+    version("2025.0", sha256="a27ad35a646295bbec129abe684d9d03d1e2e0bd76b0d625e9055746aaefae82")
+    version("2024.5", sha256="fecf06b186cddb942cfb42ee8da5f3eb2b9993e6acc0a2f18d14ac0b014424f3")
     version("2024.4", sha256="ac618ece2e58afa86b536c5a2c4fcb937f0760318f12d18f10346b6bdebd86a8")
     version("2024.3", sha256="bbda056ee59390be7d58d84c13a9ec0d4e3635617adf2eb747034922cba1f029")
     version("2024.2", sha256="802a7e335f2e895770f57b159e4ec368ebb0ff2ce6daccf706c6e8025c36852b")
     version("2024.1", sha256="937d8f12a36fffbf2af7add71adbb5aa5c5537892d46c9a76afbecab1aa0aac7")
     version("2024", sha256="04d226d52066a8bc3a42e00d6213de737b4ec292e26703065924ff01956801e2")
-    version("2023.5", sha256="9cc491d3601a5fe0ec0de727e4432c34877f596fe8a463d4cf0f0f53fb34d08b")
-    version("2023.4", sha256="e5d6c4d9e7ccacfaccb0888619bd21b5ea8911f82b410e68d6db5d40f695f231")
-    version("2023.3", sha256="4ec8f8d0c7af76b13f8fd16db8e2c120e749de439ae9554d9f653f812d78d1cb")
-    version("2023.2", sha256="bce1480727e4b2bb900413b75d99a3266f3507877da4f5b2d491df798f9fcdae")
-    version("2023.1", sha256="eef2bb4a6cb6314cf9da47f26df2a0d27af4bf7b3099723d43601073ab0a42f4")
-    version("2023", sha256="ac92c6da72fbbcca414fd8a8d979e56ecf17c4c1cdabed2da5cfb4e7277b7ba8")
-    version("2022.6", sha256="75d277138475679dd3e334e384a71516570cde767310476687f2a5b72333ea41")
-    version("2022.5", sha256="083cc3c424bb93ffe86c12f952e3e5b4e6c9f6520de5338761f24b75e018c223")
-    version("2022.4", sha256="c511be602ff29402065b50906841def98752639b92a95f1b0a1060d9b5e27297")
-    version("2022.3", sha256="14cfb130ddaf8f759a3af643c04f5a0d0d32b09bc3448b16afa5b617f5e35dae")
-    version("2022.2", sha256="656404f884d2fa2244c97d2a5b92af148d0dbea94ad13004724b3fcbf45e01bf")
-    version("2022.1", sha256="85ddab5197d79524a702c4959c2c43be875e0fc471df3a35224939dce8512450")
-    version("2022", sha256="fad60d606c02e6164018692c6c9f2c159a9130c2bf32e8c5f4f1b6ba2dda2b68")
     version(
-        "2021.7",
+        "2023.5",
-        sha256="4db7bbbfe5424de48373686ec0e8c5bfa7175d5cd74290ef1c1e840e6df67f06",
+        sha256="9cc491d3601a5fe0ec0de727e4432c34877f596fe8a463d4cf0f0f53fb34d08b",
         deprecated=True,
     )
     version(
-        "2021.6",
+        "2023.4",
-        sha256="52df2c1d7586fd028d9397985c68bd6dd26e6e905ead382b7e6c473d087902c3",
+        sha256="e5d6c4d9e7ccacfaccb0888619bd21b5ea8911f82b410e68d6db5d40f695f231",
         deprecated=True,
     )
     version(
-        "2021.5",
+        "2023.3",
-        sha256="eba63fe6106812f72711ef7f76447b12dd1ee6c81b3d8d4d0e3098cd9ea009b6",
+        sha256="4ec8f8d0c7af76b13f8fd16db8e2c120e749de439ae9554d9f653f812d78d1cb",
         deprecated=True,
     )
     version(
-        "2021.4",
+        "2023.2",
-        sha256="cb708a3e3e83abef5ba475fdb62ef8d42ce8868d68f52dafdb6702dc9742ba1d",
+        sha256="bce1480727e4b2bb900413b75d99a3266f3507877da4f5b2d491df798f9fcdae",
         deprecated=True,
     )
     version(
-        "2021.3",
+        "2023.1",
-        sha256="e109856ec444768dfbde41f3059e3123abdb8fe56ca33b1a83f31ed4575a1cc6",
+        sha256="eef2bb4a6cb6314cf9da47f26df2a0d27af4bf7b3099723d43601073ab0a42f4",
         deprecated=True,
     )
     version(
-        "2021.2",
+        "2023",
-        sha256="d940d865ea91e78318043e71f229ce80d32b0dc578d64ee5aa2b1a4be801aadb",
+        sha256="ac92c6da72fbbcca414fd8a8d979e56ecf17c4c1cdabed2da5cfb4e7277b7ba8",
         deprecated=True,
     )
     version(
-        "2021.1",
+        "2022.6",
-        sha256="bc1d0a75c134e1fb003202262fe10d3d32c59bbb40d714bc3e5015c71effe1e5",
+        sha256="75d277138475679dd3e334e384a71516570cde767310476687f2a5b72333ea41",
         deprecated=True,
     )
     version(
-        "2021",
+        "2022.5",
-        sha256="efa78ab8409b0f5bf0fbca174fb8fbcf012815326b5c71a9d7c385cde9a8f87b",
+        sha256="083cc3c424bb93ffe86c12f952e3e5b4e6c9f6520de5338761f24b75e018c223",
         deprecated=True,
     )
     version(
-        "2020.7",
+        "2022.4",
-        sha256="744158d8f61b0d36ffe89ec934519b7e0981a7af438897740160da648d36c2f0",
+        sha256="c511be602ff29402065b50906841def98752639b92a95f1b0a1060d9b5e27297",
         deprecated=True,
     )
     version(
-        "2020.6",
+        "2022.3",
-        sha256="d8bbe57ed3c9925a8cb99ecfe39e217f930bed47d5268a9e42b33da544bdb2ee",
+        sha256="14cfb130ddaf8f759a3af643c04f5a0d0d32b09bc3448b16afa5b617f5e35dae",
         deprecated=True,
     )
     version(
-        "2020.5",
+        "2022.2",
-        sha256="7b6aff647f7c8ee1bf12204d02cef7c55f44402a73195bd5f42cf11850616478",
+        sha256="656404f884d2fa2244c97d2a5b92af148d0dbea94ad13004724b3fcbf45e01bf",
         deprecated=True,
     )
     version(
-        "2020.4",
+        "2022.1",
-        sha256="5519690321b5500c7951aaf53ff624042c3edd1a5f5d6dd1f2d802a3ecdbf4e6",
+        sha256="85ddab5197d79524a702c4959c2c43be875e0fc471df3a35224939dce8512450",
         deprecated=True,
     )
     version(
-        "2020.3",
+        "2022",
-        sha256="903183691132db14e55b011305db4b6f4901cc4912d2c56c131edfef18cc92a9",
+        sha256="fad60d606c02e6164018692c6c9f2c159a9130c2bf32e8c5f4f1b6ba2dda2b68",
-        deprecated=True,
-    )
-    version(
-        "2020.2",
-        sha256="7465e4cd616359d84489d919ec9e4b1aaf51f0a4296e693c249e83411b7bd2f3",
-        deprecated=True,
-    )
-    version(
-        "2020.1",
-        sha256="e1666558831a3951c02b81000842223698016922806a8ce152e8f616e29899cf",
-        deprecated=True,
-    )
-    version(
-        "2020",
-        sha256="477e56142b3dcd9cb61b8f67b24a55760b04d1655e8684f979a75a5eec40ba01",
         deprecated=True,
     )
+    # See exception documented above
     version("2019.6", sha256="bebe396dc0db11a9d4cc205abc13b50d88225617642508168a2195324f06a358")
-    version(
-        "2019.5",
-        sha256="438061a4a2d45bbb5cf5c3aadd6c6df32d2d77ce8c715f1c8ffe56156994083a",
-        deprecated=True,
-    )
-    version(
-        "2019.4",
-        sha256="ba4366eedfc8a1dbf6bddcef190be8cd75de53691133f305a7f9c296e5ca1867",
-        deprecated=True,
-    )
-    version(
-        "2019.3",
-        sha256="4211a598bf3b7aca2b14ad991448947da9032566f13239b1a05a2d4824357573",
-        deprecated=True,
-    )
-    version(
-        "2019.2",
-        sha256="bcbf5cc071926bc67baa5be6fb04f0986a2b107e1573e15fadcb7d7fc4fb9f7e",
-        deprecated=True,
-    )
-    version(
-        "2019.1",
-        sha256="b2c37ed2fcd0e64c4efcabdc8ee581143986527192e6e647a197c76d9c4583ec",
-        deprecated=True,
-    )
-    version(
-        "2019",
-        sha256="c5b281a5f0b5b4eeb1f4c7d4dc72f96985b566561ca28acc9c7c16f6ee110d0b",
-        deprecated=True,
-    )
-    version(
-        "2018.8",
-        sha256="776923415df4bc78869d7f387c834141fdcda930b2e75be979dc59ecfa6ebecf",
-        deprecated=True,
-    )
-    version(
-        "2018.5",
-        sha256="32261df6f7ec4149fc0508f9af416953d056e281590359838c1ed6644ba097b8",
-        deprecated=True,
-    )
-    version(
-        "2018.4",
-        sha256="6f2ee458c730994a8549d6b4f601ecfc9432731462f8bd4ffa35d330d9aaa891",
-        deprecated=True,
-    )
-    version(
-        "2018.3",
-        sha256="4423a49224972969c52af7b1f151579cea6ab52148d8d7cbae28c183520aa291",
-        deprecated=True,
-    )
-    version(
-        "2018.2",
-        sha256="4bdde8120c510b6543afb4b18f82551fddb11851f7edbd814aa24022c5d37857",
-        deprecated=True,
-    )
-    version(
-        "2018.1",
-        sha256="4d3533340499323fece83b4a2d4251fa856376f2426c541e00b8e6b4c0d705cd",
-        deprecated=True,
-    )
-    version(
-        "2018",
-        sha256="deb5d0b749a52a0c6083367b5f50a99e08003208d81954fb49e7009e1b1fd0e9",
-        deprecated=True,
-    )
-    version(
-        "2016.6",
-        sha256="bac0117d2cad21f9b94fe5b854fb9ae7435b098a6da4e732ee745f18e52473d7",
-        deprecated=True,
-    )
-    version(
-        "2016.5",
-        sha256="57db26c6d9af84710a1e0c47a1f5bf63a22641456448dcd2eeb556ebd14e0b7c",
-        deprecated=True,
-    )
-    version(
-        "2016.4",
-        sha256="4be9d3bfda0bdf3b5c53041e0b8344f7d22b75128759d9bfa9442fe65c289264",
-        deprecated=True,
-    )
-    version(
-        "2016.3",
-        sha256="7bf00e74a9d38b7cef9356141d20e4ba9387289cbbfd4d11be479ef932d77d27",
-        deprecated=True,
-    )
-    version(
-        "5.1.5",
-        sha256="c25266abf07690ecad16ed3996899b1d489cbb1ef733a1befb3b5c75c91a703e",
-        deprecated=True,
-    )
-    version(
-        "5.1.4",
-        sha256="0f3793d8f1f0be747cf9ebb0b588fb2b2b5dc5acc32c3046a7bee2d2c03437bc",
-        deprecated=True,
-    )
-    version(
-        "5.1.2",
-        sha256="39d6f1d7ae8ba38cea6089da40676bfa4049a49903d21551abc030992a58f304",
-        deprecated=True,
-    )
-    version(
-        "4.6.7",
-        sha256="6afb1837e363192043de34b188ca3cf83db6bd189601f2001a1fc5b0b2a214d9",
-        deprecated=True,
-    )
-    version(
-        "4.5.5",
-        sha256="e0605e4810b0d552a8761fef5540c545beeaf85893f4a6e21df9905a33f871ba",
-        deprecated=True,
-    )
 
     depends_on("c", type="build")
     depends_on("cxx", type="build")

var/spack/repos/spack_repo/builtin/packages/hip/package.py

@@ -27,6 +27,7 @@ class Hip(CMakePackage):
     license("MIT")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="bec899ba67df9aa7056297e5ad104b8e36938b1bab22f1f418f69a8e0043d07f")
     version("6.3.3", sha256="aa3a5466304d1dbee0d976b50fccb710dd12e2e1d5534793396447c0ff845e2c")
     version("6.3.2", sha256="66a4eba98bd74fc7126ce7cb4d59653b22075fe95a70412fe283dc806ae366e0")
     version("6.3.1", sha256="76f862493c4912a06e0e0b8da3917c2ba7481f1e05f2c23ffd5e05f8c44e3037")
@@ -123,6 +124,7 @@ class Hip(CMakePackage):
             "6.3.1",
             "6.3.2",
             "6.3.3",
+            "6.4.0",
         ]:
             depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
             depends_on(f"comgr@{ver}", when=f"@{ver}")
@@ -151,6 +153,7 @@ class Hip(CMakePackage):
             "6.3.1",
             "6.3.2",
             "6.3.3",
+            "6.4.0",
         ]:
             depends_on(f"hipify-clang@{ver}", when=f"@{ver}")
 
@@ -173,6 +176,7 @@ class Hip(CMakePackage):
             "6.3.1",
             "6.3.2",
             "6.3.3",
+            "6.4.0",
         ]:
             depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 
@@ -192,10 +196,11 @@ class Hip(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hipcc@{ver}", when=f"@{ver}")
 
-    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"rocprofiler-register@{ver}", when=f"@{ver}")
 
     # roc-obj-ls requirements
@@ -257,6 +262,7 @@ class Hip(CMakePackage):
         )
     # Add hip-clr sources thru the below
     for d_version, d_shasum in [
+        ("6.4.0", "76fd0ad83da0dabf7c91ca4cff6c51f2be8ab259e08ad9743af47d1b3473c2ff"),
         ("6.3.3", "8e5adca8f8c2d99d4a4e49605dd6b56b7881b762ee8ce15b4a7000e3cd982fec"),
         ("6.3.2", "ec13dc4ffe212beee22171cb2825d2b16cdce103c835adddb482b9238cf4f050"),
         ("6.3.1", "bfb8a4a59e7bd958e2cd4bf6f14c6cdea601d9827ebf6dc7af053a90e963770f"),
@@ -317,6 +323,7 @@ class Hip(CMakePackage):
         )
     # Add hipother sources thru the below
     for d_version, d_shasum in [
+        ("6.4.0", "53d5654d34e00f4bfa0846b291fe87ef6d43087349917159e663a842ea29a783"),
         ("6.3.3", "95cb2aab4bd996f0bd5f38427412cd768692a11fad70b97d20e402f32b1ef03e"),
         ("6.3.2", "1623d823de49471aae3ecb1fad0e9cdddf9301a4089f1fd44f78ac2ff0c20fb2"),
         ("6.3.1", "caa69147227bf72fa7b076867f84579456ef55af63efec29914265a80602df42"),
@@ -676,4 +683,6 @@ def cmake_args(self):
             args.append(self.define("HIPCC_BIN_DIR", self.stage.source_path + "/hipcc/bin"))
         if self.spec.satisfies("@6.0:"):
             args.append(self.define("HIPCC_BIN_DIR", self.spec["hipcc"].prefix.bin))
+        if self.spec.satisfies("@6.4.0:"):
+            args.append(self.define("clang", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang"))
         return args

var/spack/repos/spack_repo/builtin/packages/hip_tensor/package.py

@@ -19,6 +19,7 @@ class HipTensor(CMakePackage, ROCmPackage):
     maintainers("srekolam", "afzpatel")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="cc2a738defa72cd2b39f4d358c7967dc93b490160b6eb74f893c4626ad334310")
     version("6.3.3", sha256="2f4e34c5a96004e24fcdf70f9157f1079ab177a78f6dbf96ea8290f668257c23")
     version("6.3.2", sha256="094db6d759eb32e9d15c36fce7f5b5d46ba81416953a8d9435b2fb9c161d8c83")
     version("6.3.1", sha256="142401331526e6da3fa172cce283f1c053056cb59cf431264443da76cee2f168")
@@ -36,6 +37,7 @@ class HipTensor(CMakePackage, ROCmPackage):
 
     variant("asan", default=False, description="Build with address-sanitizer enabled or disabled")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     for ver in [
@@ -53,6 +55,7 @@ class HipTensor(CMakePackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"composable-kernel@{ver}", when=f"@{ver}")
@@ -69,6 +72,7 @@ class HipTensor(CMakePackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hipcc@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/hip_tests/package.py

@@ -20,6 +20,8 @@ class HipTests(CMakePackage):
 
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
 
+    version("6.4.0", sha256="bf609b7b4c7a567ed265d3cb305510321a47c5f311a80ae8d1beed1f4891c070")
+    version("6.3.3", sha256="7c8ccc78bdc7d684f2bc55ef1affa64e7ddad4b2bf28f12a5aede079002b8a12")
     version("6.3.2", sha256="5af72efd608962df5a73c8b66b479954dc432fe01828b671a91bce0451ac688b")
     version("6.3.1", sha256="0fc1cf4f46f2bbef377d65803d86c2489b01b598c468070c79c5114a661f07c6")
     version("6.3.0", sha256="8081d4ab1a43ffa1cebd646668d83008b799ab98c14daf7b455922355a439c8a")
@@ -34,7 +36,19 @@ class HipTests(CMakePackage):
     depends_on("cxx", type="build")  # generated
     depends_on("cmake", type="run")
 
-    for ver in ["6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2"]:
+    for ver in [
+        "6.1.0",
+        "6.1.1",
+        "6.1.2",
+        "6.2.0",
+        "6.2.1",
+        "6.2.4",
+        "6.3.0",
+        "6.3.1",
+        "6.3.2",
+        "6.3.3",
+        "6.4.0",
+    ]:
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/hipblas/package.py

@@ -8,7 +8,6 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
-import spack.variant
 from spack.package import *
 
 
@@ -28,6 +27,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
 
     version("develop", branch="develop", deprecated=True)
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="544a302bdc494af02147dc14c75d088031927e1c3a2f7a349d817497000b1c34")
     version("6.3.3", sha256="8f645a5c9298170e71354437188eeca8272ff2b98077e9f34d1ca0fd7f27b7f8")
     version("6.3.2", sha256="6e86d4f8657e13665e37fdf3174c3a30f4c7dff2c4e2431d1be110cd7d463971")
     version("6.3.1", sha256="77a1845254d738c43a48bc52fa3e94499ed83535b5771408ff476122bc4b7b7c")
@@ -57,7 +57,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
+        values=disjoint_sets(("auto",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"
@@ -100,6 +100,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-cmake@{ver}", when=f"+rocm @{ver}")
         depends_on(f"rocm-openmp-extras@{ver}", type="test", when=f"+rocm @{ver}")
@@ -129,6 +130,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
         "develop",
     ]:
@@ -137,7 +139,7 @@ class Hipblas(CMakePackage, CudaPackage, ROCmPackage):
     for tgt in ROCmPackage.amdgpu_targets:
         depends_on(f"rocblas amdgpu_target={tgt}", when=f"+rocm amdgpu_target={tgt}")
         depends_on(f"rocsolver amdgpu_target={tgt}", when=f"+rocm amdgpu_target={tgt}")
-    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"hipblas-common@{ver}", when=f"@{ver}")
 
     @classmethod

var/spack/repos/spack_repo/builtin/packages/hipblas_common/package.py

@@ -17,6 +17,7 @@ class HipblasCommon(CMakePackage):
 
     license("MIT")
 
+    version("6.4.0", sha256="8953bcf13ba1aa03cb29481bd90eaef373bf0e41cadff68e567ecd2ec0b07363")
     version("6.3.3", sha256="b2b77abb5c851674839b583dc313684b5f6aa676e8186ff0a5696b6962c2b4da")
     version("6.3.2", sha256="29aa1ac1a0f684a09fe2ea8a34ae8af3622c27708c7df403a7481e75174e1984")
     version("6.3.1", sha256="512e652483b5580713eca14db3fa633d0441cd7c02cdb0d26e631ea605b9231b")

var/spack/repos/spack_repo/builtin/packages/hipblaslt/002-link-roctracer.patch

@@ -0,0 +1,51 @@
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 24e25ab..1907108 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -72,6 +72,7 @@ include(src/CMakeLists.txt)
+ # Create hipBLASLt library
+ add_library(hipblaslt ${hipblaslt_source} ${hipblaslt_headers_public})
+ add_library(roc::hipblaslt ALIAS hipblaslt)
++target_include_directories( hipblaslt PRIVATE ${MSGPACK_DIR}/include )
+ 
+ # Target compile definitions
+ if(NOT BUILD_CUDA)
+@@ -159,7 +160,9 @@ if(NOT BUILD_CUDA)
+ endif()
+ 
+ if(HIPBLASLT_ENABLE_MARKER)
+-  target_link_libraries(hipblaslt PRIVATE -lroctx64)
++  find_path(ROCTRACER_INCLUDE_DIR "roctracer/roctx.h")
++  target_include_directories(hipblaslt PRIVATE ${ROCTRACER_INCLUDE_DIR})
++  target_link_libraries(hipblaslt PRIVATE ${rocTracer})
+ endif()
+ 
+ if( NOT BUILD_CUDA AND NOT LEGACY_HIPBLAS_DIRECT )
+diff --git a/tensilelite/Tensile/Source/client/CMakeLists.txt b/tensilelite/Tensile/Source/client/CMakeLists.txt
+index 8dc7401..e6d0ba9 100644
+--- a/tensilelite/Tensile/Source/client/CMakeLists.txt
++++ b/tensilelite/Tensile/Source/client/CMakeLists.txt
+@@ -64,7 +64,9 @@ target_include_directories(TensileClient PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc
+ target_link_libraries(TensileClient PRIVATE TensileHost Boost::program_options Boost::filesystem rocm_smi)
+ 
+ if(Tensile_ENABLE_MARKER)
+-    target_link_libraries(TensileClient PRIVATE -lroctx64)
++    find_path(ROCTRACER_INCLUDE_DIR "roctracer/roctx.h")
++    target_include_directories(TensileClient PRIVATE ${ROCTRACER_INCLUDE_DIR})
++    target_link_libraries(TensileClient PRIVATE ${rocTracer})
+ endif()
+ 
+ if(TENSILE_USE_OPENMP)
+diff --git a/tensilelite/Tensile/cmake/TensileConfig.cmake b/tensilelite/Tensile/cmake/TensileConfig.cmake
+index 7627780..ac3560a 100644
+--- a/tensilelite/Tensile/cmake/TensileConfig.cmake
++++ b/tensilelite/Tensile/cmake/TensileConfig.cmake
+@@ -234,6 +234,8 @@ function(TensileCreateLibraryFiles
+     set(Options ${Options} "--build-id=${Tensile_BUILD_ID}")
+   endif()
+ 
++  set(Options ${Options} "--offload-bundler=$ENV{TENSILE_ROCM_OFFLOAD_BUNDLER_PATH}")
++
+   set(CommandLine ${VIRTUALENV_BIN_DIR}/${VIRTUALENV_PYTHON_EXENAME} ${Script} ${Options} ${Tensile_LOGIC_PATH} ${Tensile_OUTPUT_PATH} HIP)
+   message(STATUS "Tensile_CREATE_COMMAND: ${CommandLine}")
+ 

var/spack/repos/spack_repo/builtin/packages/hipblaslt/003-use-rocm-smi-config.patch

@@ -0,0 +1,15 @@
+diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
+index 02ae47d..6b66209 100755
+--- a/clients/CMakeLists.txt
++++ b/clients/CMakeLists.txt
+@@ -97,8 +97,8 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
+ 
+   # Find the package ROCmSMI
+   if(NOT WIN32)
+-      find_package(ROCmSMI REQUIRED)
+-      list( APPEND COMMON_LINK_LIBS rocm_smi )
++      find_package(rocm_smi CONFIG REQUIRED)
++      list( APPEND COMMON_LINK_LIBS rocm_smi64 )
+   endif()
+ 
+   # common source files used in subdirectories benchmarks and gtest thus ../common

var/spack/repos/spack_repo/builtin/packages/hipblaslt/package.py

@@ -19,6 +19,7 @@ class Hipblaslt(CMakePackage):
     maintainers("srekolam", "afzpatel", "renjithravindrankannath")
 
     license("MIT")
+    version("6.4.0", sha256="a4baa0c7336db9d46a0884c8ccfd0fb7e00a502b478aed9f588aa26fa8773353")
     version("6.3.3", sha256="f32d666b37bdbecbf924cc98653fa3d30a0de629039d4dad44d35a2082e39e5a")
     version("6.3.2", sha256="cc4875b1a5cf1708a7576c42aff6b4cb790cb7337f5dc2df33119a4aadcef027")
     version("6.3.1", sha256="9a18a2e44264a21cfe58ed102fd3e34b336f23d6c191ca2da726e8e0883ed663")
@@ -45,6 +46,8 @@ class Hipblaslt(CMakePackage):
     depends_on("c", type="build")
     depends_on("cxx", type="build")
     depends_on("cmake@3.25.2:", type="build", when="@6.2.0:")
+    depends_on("python@3.7:")
+    depends_on("python@3.8:", when="@6.4:")
 
     for ver in [
         "6.0.0",
@@ -59,6 +62,7 @@ class Hipblaslt(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
@@ -67,15 +71,19 @@ class Hipblaslt(CMakePackage):
     for ver in ["6.0.0", "6.0.2", "6.1.0", "6.1.1", "6.1.2", "6.2.0", "6.2.1", "6.2.4"]:
         depends_on(f"hipblas@{ver}", when=f"@{ver}")
 
-    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"hipblas-common@{ver}", when=f"@{ver}")
         depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
 
+    for ver in ["6.4.0"]:
+        depends_on(f"roctracer-dev@{ver}", when=f"@{ver}")
+
     depends_on("msgpack-c")
     depends_on("py-joblib", type=("build", "link"))
     depends_on("googletest@1.10.0:", type="test")
     depends_on("netlib-lapack@3.7.1:", type="test")
     depends_on("py-pyyaml", type="test")
+    depends_on("python-venv", when="@6.4:")
 
     # Sets the proper for clang++ and clang-offload-blunder.
     # Also adds hipblas and msgpack include directories
@@ -83,7 +91,9 @@ class Hipblaslt(CMakePackage):
     # Below patch sets the proper path for clang++ and clang-offload-blunder.
     # Also adds hipblas and msgpack include directories for 6.1.0 release.
     patch("0001-Set-LLVM_Path-Add-Hiblas-Include-to-CmakeLists-6.1.Patch", when="@6.1:6.2")
-    patch("0001-Set-LLVM-Path-6.3.Patch", when="@6.3:")
+    patch("0001-Set-LLVM-Path-6.3.Patch", when="@6.3")
+    patch("002-link-roctracer.patch", when="@6.4")
+    patch("003-use-rocm-smi-config.patch", when="@6.4")
 
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         env.set("CXX", self.spec["hip"].hipcc)
@@ -115,6 +125,13 @@ def patch(self):
                 "library/src/amd_detail/rocblaslt/src/kernels/compile_code_object.sh",
                 string=True,
             )
+        if self.spec.satisfies("@6.3:"):
+            filter_file(
+                "${rocm_path}/bin/amdclang++",
+                f'{self.spec["llvm-amdgpu"].prefix}/bin/amdclang++',
+                "tensilelite/Tensile/Ops/gen_assembly.sh",
+                string=True,
+            )
 
     def cmake_args(self):
         args = [
@@ -129,4 +146,6 @@ def cmake_args(self):
             args.append(
                 self.define("ROCM_OPENMP_EXTRAS_DIR", self.spec["rocm-openmp-extras"].prefix)
             )
+        if self.spec.satisfies("@6.4:"):
+            args.append(self.define("Python_ROOT", self.spec["python"].prefix.bin))
         return args

var/spack/repos/spack_repo/builtin/packages/hipcc/package.py

@@ -25,6 +25,7 @@ def url_for_version(self, version):
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
 
     license("MIT")
+    version("6.4.0", sha256="dca1c145a23f05229d5d646241f9d1d3c5dbf1d745b338ae020eabe33beb965c")
     version("6.3.3", sha256="4df9aba24e574edf23844c0d2d9dda112811db5c2b08c9428604a21b819eb23d")
     version("6.3.2", sha256="1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827")
     version("6.3.1", sha256="e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c")

var/spack/repos/spack_repo/builtin/packages/hipcub/package.py

@@ -6,7 +6,6 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
-import spack.variant
 from spack.package import *
 
 
@@ -21,6 +20,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
     license("BSD-3-Clause")
 
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
+    version("6.4.0", sha256="2c044ed9bf53b9410ef6de4ca578384569b0a89cac4e8604dfdde390b2918481")
     version("6.3.3", sha256="4ce22aba007c6c8a8b2231adefa7785b1869e5fdd4af29b0371a499a523c2dc6")
     version("6.3.2", sha256="4a1443c2ea12c3aa05fb65703eb309ccf8b893f9e6cbebec4ccf5502ba54b940")
     version("6.3.1", sha256="e5d100c7b8f95fe6243ad9f22170c136aa34db4e588136bec54ede7cb2e7f12f")
@@ -50,7 +50,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
+        values=disjoint_sets(("auto",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"
@@ -92,6 +92,7 @@ class Hipcub(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocprim@{ver}", when=f"+rocm @{ver}")
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/hipfft/package.py

@@ -7,7 +7,6 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
-import spack.variant
 from spack.package import *
 
 
@@ -28,6 +27,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
     license("MIT")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="f16859ba3823f8b29f2aac120cef3395109babf93a0a5069c3b4c7c67ef35e96")
     version("6.3.3", sha256="c032d59a45b0eb4441539498bd4c22d8442fbc554cb08d6cb452a1d27be6c57c")
     version("6.3.2", sha256="5d9e662c7d67f4c814cad70476b57651df5ae6b65f371ca6dbb5aa51d9eeb6f5")
     version("6.3.1", sha256="b709df2d0115748ed004d0cddce829cb0f9ec3761eb855e61f0097cab04e4806")
@@ -57,7 +57,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
+        values=disjoint_sets(("auto",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"
@@ -99,6 +99,7 @@ class Hipfft(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/hipfort/package.py

@@ -18,6 +18,7 @@ class Hipfort(CMakePackage):
     license("MIT")
 
     maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
+    version("6.4.0", sha256="a2e4c10f1c6561789208ba5a41a00b562c8048ec503339cb4eed236ee3cf6131")
     version("6.3.3", sha256="dacb7d5a30689e6a8f81ec251daaa4a74b40f1d28145953c7d42ccd29cecee7c")
     version("6.3.2", sha256="d2438971199637eb2e09519c1f2300cdd7a84b4d948034a7cd1ce3e441faf5de")
     version("6.3.1", sha256="8141bf3d05ab4f91c561815134707123e3d06486bf775224b9a3a4cc8ee8f56f")
@@ -42,6 +43,7 @@ class Hipfort(CMakePackage):
         version("5.3.3", sha256="593be86502578b68215ffe767c26849fd27d4dbd92c8e76762275805f99e64f5")
         version("5.3.0", sha256="9e2aa142de45b2d2c29449d6f82293fb62844d511fbf51fa597845ba05c700fa")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
     depends_on("fortran", type="build")  # generated
 
@@ -74,6 +76,7 @@ class Hipfort(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", type="build", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/hipify_clang/package.py

@@ -21,6 +21,7 @@ class HipifyClang(CMakePackage):
     license("MIT")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="874e3ee9801f795aaae30d6ea86e5edc991d5f71a5dee0a8e8eb7ce6379a51eb")
     version("6.3.3", sha256="94d32b0e02c0c34debb9a8034cb5fcd6c2ee35b67350c64690034cf94cd38ddd")
     version("6.3.2", sha256="c0da5118be8207fab6d19803417c0b8d2db5bc766279038527cbd6fa92b25c67")
     version("6.3.1", sha256="5f9d9a65545f97b18c6a0d4394dca1bcdee10737a5635b79378ea505081f9315")
@@ -82,6 +83,7 @@ class HipifyClang(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
@@ -105,6 +107,7 @@ class HipifyClang(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/hiprand/package.py

@@ -8,7 +8,6 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
-import spack.variant
 from spack.package import *
 
 
@@ -28,6 +27,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
 
     version("develop", branch="develop", deprecated=True)
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="60e9153edf617e984361696aa60af3ad44c5ae01ed75ad610c617a387b0559a4")
     version("6.3.3", sha256="ea0d7638a463c06d30692205f8c591d3fe025b58a772226ca1c972e723118a2f")
     version("6.3.2", sha256="0a08ed7554c161b095c866cd5e6f0d63cdf063e5b3c1183afa6ac18bad94a575")
     version("6.3.1", sha256="ec43bf64eda348cf53c2767e553fd9561540dc50ae3ce95ca916404aa9a3eafb")
@@ -57,7 +57,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
+        values=disjoint_sets(("auto",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"
@@ -111,6 +111,7 @@ class Hiprand(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
         "develop",
     ]:

var/spack/repos/spack_repo/builtin/packages/hipsolver/package.py

@@ -9,7 +9,6 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
-import spack.variant
 from spack.package import *
 
 
@@ -33,6 +32,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
 
     version("develop", branch="develop", deprecated=True)
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="d6cf798c5f2d1d00a442f7a3f07c6f3a9e4ce5b3be36608aac7c97175dac9eb0")
     version("6.3.3", sha256="529263f9abe5b7485bbabedc3993630abaa0d5fd547c4add0993d1cb0d71e226")
     version("6.3.2", sha256="885c999da8e4aa0b4cb9584bc0fc0d6a8c8d56f5e7ee6d211c608003eff22aa7")
     version("6.3.1", sha256="793074ebaa4a3b16dc6e4d2a54ecbb259f1e0ec7fdcd7f885da622a1d1478b76")
@@ -62,7 +62,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
+        values=disjoint_sets(("auto",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"
@@ -117,6 +117,7 @@ class Hipsolver(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
         "develop",
     ]:

var/spack/repos/spack_repo/builtin/packages/hipsparse/package.py

@@ -8,7 +8,6 @@
 from spack_repo.builtin.build_systems.cuda import CudaPackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
-import spack.variant
 from spack.package import *
 
 
@@ -25,6 +24,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
     libraries = ["libhipsparse"]
 
     license("MIT")
+    version("6.4.0", sha256="aaab3e9a905f5c5f470634ed7a0929ef93e28d2c5fe4f6f89338b39a937f1825")
     version("6.3.3", sha256="61c26eb93e857c942a03ea4350a403e20191be465041e542ad7da00058e89ead")
     version("6.3.2", sha256="9fbc3468632fdc828d7bae386c2737eb371d78811f53da7348b417fb00d62808")
     version("6.3.1", sha256="d64bc48e0aa5ec2f48853272a9c554b37ec98cb0724135e45f21b1340df7bccb")
@@ -54,7 +54,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
+        values=disjoint_sets(("auto",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"
@@ -67,6 +67,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
     conflicts("+cuda +rocm", msg="CUDA and ROCm support are mutually exclusive")
     conflicts("~cuda ~rocm", msg="CUDA or ROCm support is required")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
     depends_on("fortran", type="build")  # generated
 
@@ -99,6 +100,7 @@ class Hipsparse(CMakePackage, CudaPackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
         depends_on(f"rocsparse@{ver}", when=f"+rocm @{ver}")

var/spack/repos/spack_repo/builtin/packages/hipsparselt/0002-add-hipsparse-include.patch

@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5904f78..a0b0c92 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -204,7 +204,7 @@ else()
+         set( tensile_fork "ROCmSoftwarePlatform" CACHE STRING "Tensile fork to use" )
+         file (STRINGS "tensilelite_tag.txt" read_tensile_tag)
+         set( tensile_tag ${read_tensile_tag} CACHE STRING "Tensile tag to download" )
+-        virtualenv_install("git+https://github.com/${tensile_fork}/hipBLASLt.git@${tensile_tag}#subdirectory=tensilelite")
++        virtualenv_install("git+https://github.com/ROCm/hipBLASLt.git@modify-tensilelite-spack-6.4#subdirectory=tensilelite")
+ 
+         message (STATUS "using GIT Tensile fork=${tensile_fork} from branch=${tensile_tag}")
+       endif()
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index aac8506..345147f 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -123,6 +123,7 @@ target_include_directories(hipsparselt
+                            PUBLIC  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/library/include>
+                                    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+                                    $<BUILD_INTERFACE:${HIP_INCLUDE_DIRS}>
++                                   $<BUILD_INTERFACE:${HIPSPARSE_INCLUDE_DIRS}>
+                                    $<INSTALL_INTERFACE:include>
+ )
+ 

var/spack/repos/spack_repo/builtin/packages/hipsparselt/package.py

@@ -6,7 +6,6 @@
 from spack_repo.builtin.build_systems.cmake import CMakePackage
 from spack_repo.builtin.build_systems.rocm import ROCmPackage
 
-import spack.variant
 from spack.package import *
 
 
@@ -24,6 +23,7 @@ class Hipsparselt(CMakePackage, ROCmPackage):
     maintainers("srekolam", "afzpatel", "renjithravindrankannath")
 
     license("MIT")
+    version("6.4.0", sha256="3950f424c5623bdf764e23c263f3a63de62e3690f491251b88054e27560dc604")
     version("6.3.3", sha256="6b756e20fddb37b8c1237ef8e124452c9bdd46acad8a40699d10b609d0d2ebfc")
     version("6.3.2", sha256="a0b30b478eff822dd7fa1c116ad99dcdf14ece1c33aae04ac71b594efd4d9866")
     version("6.3.1", sha256="403d4c0ef47f89510452a20be6cce72962f21761081fc19a7e0e27e7f0c4ccfd")
@@ -41,7 +41,7 @@ class Hipsparselt(CMakePackage, ROCmPackage):
     variant(
         "amdgpu_target",
         description="AMD GPU architecture",
-        values=spack.variant.DisjointSetsOfValues(("auto",), ("none",), amdgpu_targets)
+        values=disjoint_sets(("auto",), amdgpu_targets)
         .with_default("auto")
         .with_error(
             "the values 'auto' and 'none' are mutually exclusive with any of the other values"
@@ -51,6 +51,7 @@ class Hipsparselt(CMakePackage, ROCmPackage):
     )
     variant("asan", default=False, description="Build with address-sanitizer enabled or disabled")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     for ver in [
@@ -66,13 +67,14 @@ class Hipsparselt(CMakePackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"hipsparse@{ver}", when=f"@{ver}")
         depends_on(f"rocm-openmp-extras@{ver}", when=f"@{ver}", type="test")
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
 
-    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
 
     depends_on("cmake@3.5:", type="build")
@@ -93,6 +95,7 @@ class Hipsparselt(CMakePackage, ROCmPackage):
     patch("0001-update-llvm-path-add-hipsparse-include-dir-for-spack-6.1.patch", when="@6.1")
     patch("0001-update-llvm-path-add-hipsparse-include-dir-for-spack-6.2.patch", when="@6.2")
     patch("0001-update-llvm-path-add-hipsparse-include-dir-for-spack-6.3.patch", when="@6.3")
+    patch("0002-add-hipsparse-include.patch", when="@6.4")
 
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         env.set("CXX", self.spec["hip"].hipcc)
@@ -107,7 +110,8 @@ def setup_build_environment(self, env: EnvironmentModifications) -> None:
             "ROCM_AGENT_ENUMERATOR_PATH",
             f"{self.spec['rocminfo'].prefix}/bin/rocm_agent_enumerator",
         )
-        env.set("ROCM_SMI_PATH", f"{self.spec['rocm-smi-lib'].prefix}/bin/rocm-smi")
+        if self.spec.satisfies("@6.3:"):
+            env.set("ROCM_SMI_PATH", f"{self.spec['rocm-smi-lib'].prefix}/bin/rocm-smi")
 
     def cmake_args(self):
         args = [

var/spack/repos/spack_repo/builtin/packages/hsa_rocr_dev/package.py

@@ -25,6 +25,7 @@ class HsaRocrDev(CMakePackage):
     libraries = ["libhsa-runtime64"]
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="ff740e8c8f2229c6dc47577363f707b1a44ea4254f8ad74f8f0a669998829535")
     version("6.3.3", sha256="aa2e30d3d68707d6df4840e954bb08cc13cd312cec1a98a64d97adbe07262f50")
     version("6.3.2", sha256="aaecaa7206b6fa1d5d7b8f7c1f7c5057a944327ba4779448980d7e7c7122b074")
     version("6.3.1", sha256="547ceeeda9a41cdffa21e57809dc5834f94938a0a2809c283aebcbcf01901df0")
@@ -112,6 +113,7 @@ class HsaRocrDev(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
@@ -137,9 +139,13 @@ class HsaRocrDev(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
+        depends_on(f"rocprofiler-register@{ver}", when=f"@{ver}")
+
     patch("0002-Remove-explicit-RPATH-again.patch", when="@3.7.0:5.6")
 
     @property
@@ -206,5 +212,7 @@ def cmake_args(self):
             args.append(self.define("ROCM_PATCH_VERSION", "60300"))
         if self.spec.satisfies("@5.7.0:"):
             args.append(self.define_from_variant("ADDRESS_SANITIZER", "asan"))
-
+        if self.spec.satisfies("@6.3.2:"):
+            args.append(self.define("SHARED_LIBS", "ON"))
+            args.append(self.define("BUILD_SHARED_LIBS", "ON"))
         return args

var/spack/repos/spack_repo/builtin/packages/llvm_amdgpu/package.py

@@ -38,6 +38,7 @@ class LlvmAmdgpu(CMakePackage, LlvmDetection, CompilerPackage):
     license("Apache-2.0")
 
     version("master", branch="amd-stg-open", deprecated=True)
+    version("6.4.0", sha256="dca1c145a23f05229d5d646241f9d1d3c5dbf1d745b338ae020eabe33beb965c")
     version("6.3.3", sha256="4df9aba24e574edf23844c0d2d9dda112811db5c2b08c9428604a21b819eb23d")
     version("6.3.2", sha256="1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827")
     version("6.3.1", sha256="e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c")
@@ -88,7 +89,8 @@ class LlvmAmdgpu(CMakePackage, LlvmDetection, CompilerPackage):
     provides("libllvm@15", when="@5.3:5.4")
     provides("libllvm@16", when="@5.5:5.6")
     provides("libllvm@17", when="@5.7:6.1")
-    provides("libllvm@18", when="@6.2:")
+    provides("libllvm@18", when="@6.2:6.3")
+    provides("libllvm@19", when="@6.4:")
 
     depends_on("c", type="build")  # generated
     depends_on("cxx", type="build")  # generated
@@ -179,6 +181,7 @@ class LlvmAmdgpu(CMakePackage, LlvmDetection, CompilerPackage):
         when="@master +rocm-device-libs",
     )
     for d_version, d_shasum in [
+        ("6.4.0", "ff740e8c8f2229c6dc47577363f707b1a44ea4254f8ad74f8f0a669998829535"),
         ("6.3.3", "aa2e30d3d68707d6df4840e954bb08cc13cd312cec1a98a64d97adbe07262f50"),
         ("6.3.2", "aaecaa7206b6fa1d5d7b8f7c1f7c5057a944327ba4779448980d7e7c7122b074"),
         ("6.3.1", "547ceeeda9a41cdffa21e57809dc5834f94938a0a2809c283aebcbcf01901df0"),
@@ -288,7 +291,7 @@ def cmake_args(self):
             args.append(self.define("CLANG_LINK_CLANG_DYLIB", True))
 
         # Get the GCC prefix for LLVM.
-        if self.compiler.name == "gcc":
+        if self.compiler.name == "gcc" and self.spec.satisfies("@:6.3"):
             args.append(self.define("GCC_INSTALL_PREFIX", self.compiler.prefix))
         if self.spec.satisfies("@5.4.3:"):
             args.append("-DCMAKE_INSTALL_LIBDIR=lib")

var/spack/repos/spack_repo/builtin/packages/mesa/package.py

@@ -6,7 +6,6 @@
 from spack_repo.builtin.build_systems import meson
 from spack_repo.builtin.build_systems.meson import MesonPackage
 
-import spack.variant
 from spack.package import *
 
 
@@ -85,9 +84,7 @@ class Mesa(MesonPackage):
     #   @:21  - swr was removed in 22.0
     variant(
         "swr",
-        values=spack.variant.DisjointSetsOfValues(
+        values=disjoint_sets(("none",), ("auto",), ("avx", "avx2", "knl", "skx"))
-            ("none",), ("auto",), ("avx", "avx2", "knl", "skx")
-        )
         .with_non_feature_values("auto")
         .with_non_feature_values("none")
         .with_default("auto"),

var/spack/repos/spack_repo/builtin/packages/migraphx/package.py

@@ -21,6 +21,7 @@ class Migraphx(CMakePackage):
     libraries = ["libmigraphx"]
 
     license("MIT")
+    version("6.4.0", sha256="9041ea3c0ea0a22884e049f2a12559b6221eac897d31b3ebe0cf3e7a5b7d0268")
     version("6.3.3", sha256="a268baa99b145a32fe282e407cf923b1c1022f2ddab36d7178537b860fdfcf8d")
     version("6.3.2", sha256="4e6b9800919e99070c0289616657592c23ff66a55230409f38e5c7e099c0d89b")
     version("6.3.1", sha256="c60df20b3c890c469265ae6f273fb5d43cc13c8c514f76dd7b4d195d9e44ba85")
@@ -111,6 +112,7 @@ class Migraphx(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
         depends_on(f"hip@{ver}", when=f"@{ver}")
@@ -130,6 +132,7 @@ class Migraphx(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocmlir@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/miopen_hip/0003-link-with-hipblas-roctracer-rocrand-6.3.0.patch

@@ -1,45 +0,0 @@
-diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
-index 60d6fe6..bba3ad6 100644
---- a/driver/CMakeLists.txt
-+++ b/driver/CMakeLists.txt
-@@ -71,7 +71,11 @@ if(WIN32)
- endif()
- add_dependencies(MIOpenDriver generate_kernels)
- target_include_directories(MIOpenDriver PRIVATE ../src/kernels)
--target_link_libraries(MIOpenDriver MIOpen Threads::Threads roc::rocrand)
-+target_link_libraries(MIOpenDriver MIOpen Threads::Threads roc::rocrand roc::hipblas roc::hipblaslt)
-+if(MIOPEN_USE_ROCTRACER)
-+    target_include_directories(MIOpenDriver PRIVATE ${ROCTRACER_INCLUDE_DIR})
-+    target_link_libraries(MIOpenDriver ${rocTracer})
-+endif()
- if(NOT MIOPEN_EMBED_DB STREQUAL "")
- target_link_libraries(MIOpenDriver $<BUILD_INTERFACE:miopen_data> )
- endif()
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 92e4f42..7e169a1 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -940,6 +940,13 @@ if(hipblaslt_FOUND)
-     target_link_libraries( MIOpen PRIVATE roc::hipblaslt )
- endif()
- 
-+if(hipblas_FOUND)
-+    target_link_libraries( MIOpen PRIVATE roc::hipblas )
-+endif()
-+if(rocrand_FOUND)
-+    target_link_libraries( MIOpen PRIVATE roc::rocrand )
-+endif()
-+
- # For backward compatibility with ROCm 5.3
- # Build with library libMLIRMIOpen
- if(LIBMLIRMIOPEN)
-@@ -994,7 +1001,8 @@ if(NOT WIN32 AND NOT APPLE)
- endif()
- 
- if(MIOPEN_USE_ROCTRACER)
--    target_link_libraries(MIOpen PRIVATE roctx64)
-+    target_include_directories(MIOpen PRIVATE ${ROCTRACER_INCLUDE_DIR})
-+    target_link_libraries(MIOpen PRIVATE ${rocTracer})
- endif()
- 
- ############################################################

var/spack/repos/spack_repo/builtin/packages/miopen_hip/package.py

@@ -23,6 +23,7 @@ class MiopenHip(CMakePackage):
     libraries = ["libMIOpen"]
 
     license("MIT")
+    version("6.4.0", sha256="5b101f9177d49654968a3f3c01c9eede561a8fe5178f2ae4d8e5acb16b0b17e6")
     version("6.3.3", sha256="755beaec2e97aa4fafcdb07e4becbcddcb0c3cef6af256a04716d46e90c2f520")
     version("6.3.2", sha256="7abda3b437e396a1611a6f63e73ab1656d45d5405194504136c0ccbb75b81fea")
     version("6.3.1", sha256="edb82a74086fb96f8d7ee9e50a180302f716332cd0dff96bf7244bdc6fab5895")
@@ -78,12 +79,16 @@ class MiopenHip(CMakePackage):
     patch("0002-add-include-dir-miopen-hip-6.0.0.patch", when="@6.0")
     patch("0001-link-with-roctracer-when-building-miopendriver-6.1.0.patch", when="@6.1")
     patch("0001-link-with-roctracer-when-building-miopendriver-6.2.0.patch", when="@6.2")
-    patch("0003-link-with-hipblas-roctracer-rocrand-6.3.0.patch", when="@6.3")
     patch(
         "https://github.com/ROCm/MIOpen/commit/f60aa1ff89f8fb596b4a6a4c70aa7d557803db87.patch?full_index=1",
         sha256="7f382c872d89f22da1ad499e85ffe9881cc7404c8465e42877a210a09382e2ea",
         when="@5.7",
     )
+    patch(
+        "https://github.com/ROCm/MIOpen/commit/d1a25ad0f4fc90dffea7a5dbb9cc7a9983a004c2.patch?full_index=1",
+        sha256="3001a90202b572a5cd86a51905064903bcee74d8fa0d9649ee9732274c207801",
+        when="@6.3:",
+    )
 
     for ver in [
         "5.3.0",
@@ -108,6 +113,7 @@ class MiopenHip(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
         depends_on(f"hip@{ver}", when=f"@{ver}")
@@ -153,6 +159,7 @@ class MiopenHip(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"composable-kernel@{ver}", when=f"@{ver} +ck")
     for ver in ["5.4.0", "5.4.3", "5.5.0"]:
@@ -170,11 +177,12 @@ class MiopenHip(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"roctracer-dev@{ver}", when=f"@{ver}")
-    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"rocrand@{ver}", when=f"@{ver}")
-    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"hipblas@{ver}", when=f"@{ver}")
         depends_on(f"hipblaslt@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/mivisionx/package.py

@@ -12,9 +12,9 @@ class Mivisionx(CMakePackage):
     vision and machine intelligence libraries, utilities, and
     applications bundled into a single toolkit."""
 
-    homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX"
+    homepage = "https://github.com/ROCm/MIVisionX"
-    git = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git"
+    git = "https://github.com/ROCm/MIVisionX.git"
-    url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-6.1.2.tar.gz"
+    url = "https://github.com/ROCm/MIVisionX/archive/rocm-6.4.0.tar.gz"
 
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
     tags = ["rocm"]
@@ -27,6 +27,7 @@ def url_for_version(self, version):
         return url.format(version)
 
     license("MIT")
+    version("6.4.0", sha256="de3902ad2402bf29e4f53617ec10d34188b0c67547fc290390ff0c8ac4ad505a")
     version("6.3.3", sha256="6ab255305b786c6152ffe12211f329d2bc56823bb2192a945b9aa5efe6731b82")
     version("6.3.2", sha256="2e7984e4ef2e6195aa9afa11030b8418aee885bec9befa220b9b53b5229b7fae")
     version("6.3.1", sha256="1f7bd1f6b61401bc642b50e96411344b092b09189534c5d6ba2f4c661d1af0ce")
@@ -244,6 +245,7 @@ def patch(self):
             "6.3.1",
             "6.3.2",
             "6.3.3",
+            "6.4.0",
         ]:
             depends_on(f"miopen-hip@{ver}", when=f"@{ver}")
         for ver in [
@@ -268,6 +270,7 @@ def patch(self):
             "6.3.1",
             "6.3.2",
             "6.3.3",
+            "6.4.0",
         ]:
             depends_on(f"migraphx@{ver}", when=f"@{ver}")
             depends_on(f"hip@{ver}", when=f"@{ver}")
@@ -291,6 +294,7 @@ def patch(self):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
         depends_on("python@3.5:", type="build")
@@ -310,6 +314,7 @@ def patch(self):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rpp@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/neovim/package.py

@@ -19,7 +19,11 @@ class Neovim(CMakePackage):
     license("Apache-2.0 AND Vim")
 
     version("master", branch="master")
-    version("stable", tag="stable", commit="d772f697a281ce9c58bf933997b87c7f27428a60")
+    version("stable", tag="stable")
+    version("0.11.1", sha256="ffe7f9a7633ed895ff6adb1039af7516cd6453715c8889ad844b6fa39c3df443")
+    version("0.11.0", sha256="6826c4812e96995d29a98586d44fbee7c9b2045485d50d174becd6d5242b3319")
+    version("0.10.4", sha256="10413265a915133f8a853dc757571334ada6e4f0aa15f4c4cc8cc48341186ca2")
+    version("0.10.3", sha256="39fab47d241da7b9418823cc563c689d522c1c4b2def04036393834f3f1ca94c")
     version("0.10.2", sha256="546cb2da9fffbb7e913261344bbf4cf1622721f6c5a67aa77609e976e78b8e89")
     version("0.10.0", sha256="372ea2584b0ea2a5a765844d95206bda9e4a57eaa1a2412a9a0726bab750f828")
     version("0.9.5", sha256="fe74369fc30a32ec7a086b1013acd0eacd674e7570eb1acc520a66180c9e9719")
@@ -107,11 +111,11 @@ class Neovim(CMakePackage):
     depends_on("lua-lpeg")
     depends_on("lua-mpack")
     depends_on("iconv", type="link")
-    depends_on("libtermkey", type="link")
+    depends_on("libtermkey", type="link", when="@:0.9")
     depends_on("libuv", type="link")
-    depends_on("libluv", type="link")
+    depends_on("libluv", type="link", when="@:0.9")
-    depends_on("libvterm", type="link")
+    depends_on("libvterm", type="link", when="@:0.10")
-    depends_on("msgpack-c", type="link")
+    depends_on("msgpack-c", type="link", when="@:0.10")
     depends_on("unibilium", type="link")
     depends_on("unibilium@:1.2.0", type="link", when="@0.2.0")
 
@@ -146,8 +150,15 @@ class Neovim(CMakePackage):
         depends_on("cmake@3.13:", type="build")
         depends_on("libvterm@0.3.3:")
         depends_on("tree-sitter@0.20.9:")
-    with when("@master"):
+    with when("@0.11:"):
+        depends_on("cmake@3.16:", type="build")
         depends_on("utf8proc", type="link")
+        depends_on("tree-sitter@0.25:", type="link")
+
+        # https://github.com/neovim/neovim/issues/33506#issuecomment-2812141484
+        conflicts("platform=darwin target=aarch64:")
+    with when("@master"):
+        pass
 
     # Support for `libvterm@0.2:` has been added in neovim@0.8.0
     # term: Add support for libvterm >= 0.2 (https://github.com/neovim/neovim/releases/tag/v0.8.0)

var/spack/repos/spack_repo/builtin/packages/opencv/package.py

@@ -241,6 +241,9 @@ class Opencv(CMakePackage, CudaPackage):
         depends_on("java")
         depends_on("ant")
 
+    with when("+ffmpeg"):
+        depends_on("pkgconfig", type="build")
+
     with when("+objc"):
         conflicts("~imgproc")
         conflicts("~objc_bindings_generator")

var/spack/repos/spack_repo/builtin/packages/podio/package.py

@@ -21,6 +21,7 @@ class Podio(CMakePackage):
     tags = ["hep", "key4hep"]
 
     version("master", branch="master")
+    version("1.3", sha256="7efdf049822f171f4da5e83a7101096c066679904e59e741f3c2833ccda5e363")
     version("1.2", sha256="bc97ba09ce908e55d4c5faa78d9739dde7daefd9337ae98351813b13708d0685")
     version("1.1", sha256="2cb5040761f3da4383e1f126da25d68e99ecd8398e0ff12e7475a3745a7030a6")
     version("1.0.1", sha256="915531a2bcf638011bb6cc19715bbc46d846ec8b985555a1afdcd6abc017e21b")
@@ -105,6 +106,7 @@ class Podio(CMakePackage):
     depends_on("root@6.14:", when="+datasource")
     depends_on("root@6.28.04: +root7", when="+rntuple")
     depends_on("root@6.28:", when="@0.17:")
+    depends_on("root@6.32: +root7", when="@1.3: +rntuple")
     for cxxstd in ("17", "20"):
         depends_on("root cxxstd={}".format(cxxstd), when="cxxstd={}".format(cxxstd))
 

var/spack/repos/spack_repo/builtin/packages/py_matplotlib/package.py

@@ -27,6 +27,7 @@ class PyMatplotlib(PythonPackage):
     license("Apache-2.0")
     maintainers("adamjstewart", "rgommers")
 
+    version("3.10.3", sha256="2f82d2c5bb7ae93aaaa4cd42aca65d76ce6376f83304fa3a630b569aca274df0")
     version("3.10.1", sha256="e8d2d0e3881b129268585bf4765ad3ee73a4591d77b9a18c214ac7e3a79fb2ba")
     version("3.10.0", sha256="b886d02a581b96704c9d1ffe55709e49b4d2d52709ccebc4be42db856e511278")
     version("3.9.4", sha256="1e00e8be7393cbdc6fedfa8a6fba02cf3e83814b285db1c60b906a023ba41bc3")

var/spack/repos/spack_repo/builtin/packages/py_scipy/package.py

@@ -19,6 +19,7 @@ class PyScipy(PythonPackage):
     license("BSD-3-Clause")
 
     version("main", branch="main")
+    version("1.15.3", sha256="eae3cf522bc7df64b42cad3925c876e1b0b6c35c1337c93e12c0f366f55b0eaf")
     version("1.15.2", sha256="cd58a314d92838f7e6f755c8a2167ead4f27e1fd5c1251fd54289569ef3495ec")
     version("1.15.1", sha256="033a75ddad1463970c96a88063a1df87ccfddd526437136b6ee81ff0312ebdf6")
     version("1.15.0", sha256="300742e2cc94e36a2880ebe464a1c8b4352a7b0f3e36ec3d2ac006cdbe0219ac")

var/spack/repos/spack_repo/builtin/packages/py_tensorflow/package.py

@@ -408,6 +408,7 @@ class PyTensorflow(Package, CudaPackage, ROCmPackage, PythonExtension):
     with when("+rocm"):
         for pkg_dep in rocm_dependencies:
             depends_on(f"{pkg_dep}@6.0:", when="@2.14:")
+            depends_on(f"{pkg_dep}@:6.3", when="@:2.18")
             depends_on(pkg_dep)
 
     # Check configure and configure.py to see when these variants are supported

var/spack/repos/spack_repo/builtin/packages/rccl/0004-Set-rocm-core-path-for-version-file-6.4.patch

@@ -0,0 +1,44 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 45ba954f..4fbf5116 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -173,7 +173,7 @@ message(STATUS "${COMPILER_EXE_NAME} HIP version:    ${hip_version_string}")
+ 
+ ## Check for ROCm version
+ execute_process(
+-  COMMAND         bash "-c" "cat ${ROCM_PATH}/.info/version"
++  COMMAND         bash "-c" "cat $ENV{ROCMCORE_PATH}/.info/version"
+   OUTPUT_VARIABLE rocm_version_string
+ )
+ string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" rocm_version_matches ${rocm_version_string})
+@@ -324,6 +324,7 @@ endif()
+ # Check for ROCTX
+ if(ROCTX)
+   find_library(ROCTX_LIB NAMES roctx64)
++  find_path(ROCTRACER_INCLUDE_DIR "roctracer/roctx.h")
+   if(ROCTX_LIB)
+     set(ROCTX_ENABLE ON)
+     message(STATUS "ROCTX library found: ${ROCTX_LIB}")
+@@ -687,9 +688,13 @@ target_include_directories(rccl PRIVATE ${HIPIFY_DIR}/src/device/network/unpack)
+ target_include_directories(rccl PRIVATE ${HIPIFY_DIR}/gensrc)
+ target_include_directories(rccl PRIVATE ${HSA_INCLUDE_PATH})
+ target_include_directories(rccl PRIVATE ${ROCM_SMI_INCLUDE_DIR})
++target_include_directories(rccl PRIVATE $ENV{ROCMCORE_PATH}/include)
+ if(DEMANGLE_DIR)
+   target_include_directories(rccl PRIVATE ${DEMANGLE_DIR})
+ endif()
++if(ROCTX_ENABLE)
++  target_include_directories(rccl PRIVATE ${ROCTRACER_INCLUDE_DIR})
++endif()
+ 
+ ## Set RCCL compile definitions
+ if(COLLTRACE)
+@@ -816,7 +821,7 @@ if (HAVE_BFD)
+   endif()
+ endif()
+ if (ROCTX_ENABLE)
+-  target_link_libraries(rccl PRIVATE -lroctx64)
++  target_link_libraries(rccl PRIVATE ${ROCTX_LIB})
+ endif()
+ target_link_libraries(rccl PRIVATE   -fgpu-rdc)             # Required when linking relocatable device code
+ target_link_libraries(rccl PRIVATE   Threads::Threads)

var/spack/repos/spack_repo/builtin/packages/rccl/package.py

@@ -23,6 +23,12 @@ class Rccl(CMakePackage):
 
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
     libraries = ["librccl"]
+    version(
+        "6.4.0",
+        tag="rocm-6.4.0",
+        commit="7b86f83d8468a577ed59d9b2a34a8d7639d36072",
+        submodules=True,
+    )
     version(
         "6.3.3",
         tag="rocm-6.3.3",
@@ -80,6 +86,7 @@ class Rccl(CMakePackage):
     patch("0003-Fix-numactl-rocm-smi-path-issue.patch", when="@5.2.3:5.6")
     patch("0004-Set-rocm-core-path-for-version-file.patch", when="@6.0:6.2")
     patch("0004-Set-rocm-core-path-for-version-file-6.3.patch", when="@6.3")
+    patch("0004-Set-rocm-core-path-for-version-file-6.4.patch", when="@6.4")
 
     depends_on("c", type="build")  # generated
     depends_on("cxx", type="build")  # generated
@@ -111,6 +118,7 @@ class Rccl(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")
         depends_on(f"hip@{ver}", when=f"@{ver}")
@@ -136,9 +144,14 @@ class Rccl(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 
+    for ver in ["6.4.0"]:
+        depends_on(f"roctracer-dev@{ver}", when=f"@{ver}")
+        depends_on(f"rocprofiler-register@{ver}", when=f"@{ver}")
+
     depends_on("googletest@1.11.0:", type="test", when="@5.3:")
 
     @classmethod

var/spack/repos/spack_repo/builtin/packages/rdc/package.py

@@ -28,6 +28,7 @@ def url_for_version(self, version):
         return url.format(version)
 
     license("MIT")
+    version("6.4.0", sha256="2ee3def1e90784923f2043220974d30fe9581ec0d54c93628911ed8292fc56c4")
     version("6.3.3", sha256="9be314ea8d7e7af58ac4a24f5720f54d51ba553d3e1751bc9cfc4bff98494fab")
     version("6.3.2", sha256="e0780b8ef46d7b9885eb06a0b9eb56924fdf090ade71a66360a0bee1d9d7295d")
     version("6.3.1", sha256="88a96f13c0010a7f9e63f7a5a5531ae1d57ef1a722bac232c8544cde6245e120")
@@ -52,6 +53,7 @@ def url_for_version(self, version):
         version("5.3.3", sha256="1bf1a02f305e3a629801e62584116a34eafbd1b26627837a2a8c10550fcf611b")
         version("5.3.0", sha256="ce9c85dad8e0c0b21e8e5938bf16f86a62dc5f6ded5f453c61acd43666634d6b")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     depends_on("cmake@3.15:", type="build")
@@ -63,6 +65,25 @@ def url_for_version(self, version):
     depends_on("protobuf")
     depends_on("libcap")
 
+    for ver in [
+        "5.3.0",
+        "5.3.3",
+        "5.4.0",
+        "5.4.3",
+        "5.5.0",
+        "5.5.1",
+        "5.6.0",
+        "5.6.1",
+        "5.7.0",
+        "5.7.1",
+        "6.0.0",
+        "6.0.2",
+        "6.1.0",
+        "6.1.1",
+        "6.1.2",
+    ]:
+        depends_on(f"rocm-smi-lib@{ver}", type=("build", "link"), when=f"@{ver}")
+
     for ver in [
         "5.3.0",
         "5.3.3",
@@ -86,8 +107,8 @@ def url_for_version(self, version):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
-        depends_on(f"rocm-smi-lib@{ver}", type=("build", "link"), when=f"@{ver}")
         depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
 
     for ver in [
@@ -109,11 +130,15 @@ def url_for_version(self, version):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
-    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"amdsmi@{ver}", when=f"@{ver}")
 
+    for ver in ["6.4.0"]:
+        depends_on(f"rocm-validation-suite@{ver}", when=f"@{ver}")
+
     def patch(self):
         filter_file(r"\${ROCM_DIR}/rocm_smi", "${ROCM_SMI_DIR}", "CMakeLists.txt")
         filter_file(

var/spack/repos/spack_repo/builtin/packages/rocal/package.py

@@ -17,6 +17,7 @@ class Rocal(CMakePackage):
     maintainers("afzpatel", "srekolam", "renjithravindrankannath")
 
     license("MIT")
+    version("6.4.0", sha256="6239caa398c2779c1c7ecff3cebe7d206cd2fa591c1800f6f2ae16329876dd4a")
     version("6.3.3", sha256="aaccd951f176356561d8ab8210696d80a94553fd48ace72993a7cfac4b98d6cf")
     version("6.3.2", sha256="ceae8a86770c1f5d8cb56f4c38d6b354e16bda6b877cf93417d6a3e4e33354c6")
     version("6.3.1", sha256="e332c9c2b2eb4081d7dd8a66a141f95fe8c7fccbbfdd0fea7572a62a28a62bbb")
@@ -27,15 +28,22 @@ class Rocal(CMakePackage):
 
     depends_on("libjpeg-turbo@2.0.6+partial_decoder", when="@6.2.0")
     depends_on("libjpeg-turbo@3.0.2:", when="@6.2.1:")
+    depends_on("python@3")
     depends_on("rapidjson")
     depends_on("ffmpeg@4.4:")
     depends_on("abseil-cpp", when="@6.3:")
 
-    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"mivisionx@{ver}", when=f"@{ver}")
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
         depends_on(f"rpp@{ver}", when=f"@{ver}")
 
+    patch(
+        "https://github.com/ROCm/rocAL/commit/357dfcb25b9ff959615efa45736d4368cf7b51fd.patch?full_index=1",
+        sha256="5df45c3a0e870d6e6310a23071e05f1795a450eef5fde6445cb37caf2653a86f",
+        when="@6.4:",
+    )
+
     def patch(self):
         filter_file(
             r"${ROCM_PATH}/llvm/bin/clang++",
@@ -113,6 +121,18 @@ def cmake_args(self):
             args.append(
                 self.define("CMAKE_CXX_FLAGS", "-I{0} -I{1}".format(abspath, rapidjsonpath))
             )
+        if self.spec.satisfies("@6.4.0:"):
+            args.append(
+                self.define("CMAKE_C_COMPILER", f"{self.spec['llvm-amdgpu'].prefix}/bin/amdclang")
+            )
+            args.append(
+                self.define(
+                    "CMAKE_CXX_COMPILER", f"{self.spec['llvm-amdgpu'].prefix}/bin/amdclang++"
+                )
+            )
+            # force rocAL to use Spack installed python
+            args.append(self.define("PYTHON_VERSION_SUGGESTED", self.spec["python"].version))
+            args.append(self.define("Python3_ROOT_DIR", self.spec["python"].prefix))
         return args
 
     def check(self):

var/spack/repos/spack_repo/builtin/packages/rocalution/package.py

@@ -28,6 +28,7 @@ class Rocalution(CMakePackage):
     libraries = ["librocalution_hip"]
 
     license("MIT")
+    version("6.4.0", sha256="dcd6cccb55136362bedb4681f10eb9c9fe7f958f63802f85573732c2cd7a5185")
     version("6.3.3", sha256="bec6388e74b74922c2dc3af0d73ff0e4cafdabad9e8473181079df09de81c11a")
     version("6.3.2", sha256="b13118a5c0af08a666d80af78d52bdfba12ed134f6745ab36d8de75ed3bc7584")
     version("6.3.1", sha256="94b78b34ac750c09831aa70a3d7f8cd220c540a75e4f91c391ba435de420c536")
@@ -93,6 +94,7 @@ class Rocalution(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"rocprim@{ver}", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/rocblas/0008-link-roctracer.patch

@@ -0,0 +1,16 @@
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 762580d..1692578 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -81,7 +81,10 @@ function( rocblas_library_settings lib_target_ )
+   else()
+     target_link_libraries( ${lib_target_} PRIVATE hip::device -lstdc++fs --rtlib=compiler-rt --unwindlib=libgcc)
+     if (BUILD_SHARED_LIBS)
+-      target_link_libraries(${lib_target_} PRIVATE -lroctx64)
++      find_path(ROCTRACER_INCLUDE_DIR "roctracer/roctx.h")
++      target_include_directories(${lib_target_} PUBLIC ${ROCTRACER_INCLUDE_DIR})
++      find_library(ROCTX_LIB NAMES roctx64)
++      target_link_libraries(${lib_target_} PRIVATE ${ROCTX_LIB})
+     endif()
+   endif()
+     target_link_libraries( ${lib_target_} PRIVATE Threads::Threads )

var/spack/repos/spack_repo/builtin/packages/rocblas/0009-use-rocm-smi-config.patch

@@ -0,0 +1,15 @@
+diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
+index 6194286..292bd8d 100644
+--- a/clients/CMakeLists.txt
++++ b/clients/CMakeLists.txt
+@@ -178,8 +178,8 @@ if( BUILD_CLIENTS_BENCHMARKS OR BUILD_CLIENTS_TESTS)
+ 
+   # Find the package ROCmSMI
+   if(NOT WIN32)
+-      find_package(ROCmSMI REQUIRED)
+-      list( APPEND COMMON_LINK_LIBS rocm_smi )
++      find_package(rocm_smi CONFIG REQUIRED)
++      list( APPEND COMMON_LINK_LIBS rocm_smi64 )
+   endif()
+ 
+   find_package( GTest REQUIRED )

var/spack/repos/spack_repo/builtin/packages/rocblas/package.py

@@ -25,6 +25,7 @@ class Rocblas(CMakePackage):
 
     version("develop", branch="develop", deprecated=True)
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="ab8e75c9f98d17817a650aa4f06ff1e6c6af92cd143079e361cb6a0c96676aaa")
     version("6.3.3", sha256="73e91bd50c920b818742fa5bf9990c0676be5bfbafe321d5781607dc2ce27060")
     version("6.3.2", sha256="455cad760d926c21101594197c4456f617e5873a8f17bb3e14bd762018545a9e")
     version("6.3.1", sha256="88d2de6ce6b23a157eea8be63408350848935e4dfc3e27e5f2add78834c6d6ba")
@@ -95,10 +96,11 @@ class Rocblas(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-openmp-extras@{ver}", type="test", when=f"@{ver}")
 
-    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"rocm-smi-lib@{ver}", type="test", when=f"@{ver}")
 
     depends_on("rocm-cmake@master", type="build", when="@master:")
@@ -126,14 +128,18 @@ class Rocblas(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"llvm-amdgpu@{ver}", type="build", when=f"@{ver}")
         depends_on(f"rocminfo@{ver}", type="build", when=f"@{ver}")
         depends_on(f"rocm-cmake@{ver}", type="build", when=f"@{ver}")
 
-    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"hipblaslt@{ver}", when=f"@{ver}")
+    for ver in ["6.4.0"]:
+        depends_on(f"roctracer-dev@{ver}", when=f"@{ver}")
+
     depends_on("python@3.6:", type="build")
 
     with when("+tensile"):
@@ -171,6 +177,7 @@ class Rocblas(CMakePackage):
         ("@6.3.1", "aca95d1743c243dd0dd0c8b924608bc915ce1ae7"),
         ("@6.3.2", "aca95d1743c243dd0dd0c8b924608bc915ce1ae7"),
         ("@6.3.3", "aca95d1743c243dd0dd0c8b924608bc915ce1ae7"),
+        ("@6.4.0", "be49885fce2a61b600ae4593f1c2d00c8b4fa11e"),
     ]:
         resource(
             name="Tensile",
@@ -191,6 +198,8 @@ class Rocblas(CMakePackage):
     patch("0004-Find-python.patch", when="@5.2.0:5.4")
     patch("0006-Guard-use-of-OpenMP-to-make-it-optional-5.4.patch", when="@5.4")
     patch("0007-add-rocm-openmp-extras-include-dir.patch", when="@5.6:5.7")
+    patch("0008-link-roctracer.patch", when="@6.4")
+    patch("0009-use-rocm-smi-config.patch", when="@6.4")
 
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         env.set("CXX", self.spec["hip"].hipcc)

var/spack/repos/spack_repo/builtin/packages/rocdecode/0001-add-amdgpu-drm-include.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 817b0fc..c5815c7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -134,6 +134,8 @@ if(HIP_FOUND AND Libva_FOUND)
+ 
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
+   target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARY_LIST})
++  
++  target_include_directories(${PROJECT_NAME} PRIVATE ${AMDGPU_DRM_INCLUDE_DIRS})
+ 
+   set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+   set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)

var/spack/repos/spack_repo/builtin/packages/rocdecode/package.py

@@ -20,6 +20,7 @@ class Rocdecode(CMakePackage):
     maintainers("afzpatel", "srekolam", "renjithravindrankannath")
 
     license("MIT")
+    version("6.4.0", sha256="d82c17687cc8ccac67fe2d401edd25c9825b38777b7a7b4100f84658838a1e50")
     version("6.3.3", sha256="e72f53674527b7a6c3cba3b7555fee32117f0875107fd9e632a2ec1d5ce03489")
     version("6.3.2", sha256="39ff3c21c81a73910dcfe6a147edaddecc21575a3077f0f99971c8d2f6d0e7d5")
     version("6.3.1", sha256="94da1a61167abaf3f983ae5d62bffb22bb8ba3eb1c9d9fc7c68ed9a066aa4e52")
@@ -41,6 +42,7 @@ class Rocdecode(CMakePackage):
     )
 
     depends_on("libva", type="build", when="@6.2:")
+    depends_on("libdrm", type="build", when="@6.4:")
 
     for ver in [
         "6.1.0",
@@ -53,9 +55,12 @@ class Rocdecode(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
 
+    patch("0001-add-amdgpu-drm-include.patch", when="@6.4")
+
     def patch(self):
         filter_file(
             r"${ROCM_PATH}/llvm/bin/clang++",
@@ -76,4 +81,14 @@ def cmake_args(self):
             args.append(self.define_from_variant("AMDGPU_TARGETS", "amdgpu_target"))
         if self.spec.satisfies("@6.3.0:"):
             args.append(self.define("LIBVA_INCLUDE_DIR", self.spec["libva"].prefix.include))
+        if self.spec.satisfies("@6.4.0:"):
+            args.append(
+                self.define("CMAKE_C_COMPILER", f"{self.spec['llvm-amdgpu'].prefix}/bin/amdclang")
+            )
+            args.append(
+                self.define(
+                    "CMAKE_CXX_COMPILER", f"{self.spec['llvm-amdgpu'].prefix}/bin/amdclang++"
+                )
+            )
+            args.append(self.define("AMDGPU_DRM_INCLUDE_DIRS", self.spec["libdrm"].prefix.include))
         return args

var/spack/repos/spack_repo/builtin/packages/rocfft/package.py

@@ -23,6 +23,7 @@ class Rocfft(CMakePackage):
 
     license("MIT")
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="0e9f3f23d8facee65e32baaec7941119b56eb17313b8b514e1c3994c9777c320")
     version("6.3.3", sha256="b2edb5c39215b98e0abc485d2b277a0b8c6f87f06e9b0770a60f5568ef52e62e")
     version("6.3.2", sha256="0511d04d2367dcac6b35bc6b449337ba37bb623b8382fb11178fc608b5435437")
     version("6.3.1", sha256="f8aa0e68d8e303725d0be8ae1d7c0113b6ca019a3b9f08572abf8a02db690662")
@@ -104,6 +105,7 @@ class Rocfft(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/rocjpeg/0001-add-amdgpu-drm-include.patch

@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8233cf..939b221 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -161,6 +161,8 @@ if(HIP_FOUND AND Libva_FOUND)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
+   target_link_libraries(${PROJECT_NAME} ${LINK_LIBRARY_LIST})
+ 
++  target_include_directories(${PROJECT_NAME} PRIVATE ${AMDGPU_DRM_INCLUDE_DIRS})
++
+   set_target_properties(${PROJECT_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
+   set_target_properties(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
+   set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
+@@ -375,4 +377,4 @@ else()
+   if(NOT Libva_FOUND)
+     message(FATAL_ERROR "-- ERROR!: libva Not Found - please install libva-amdgpu-dev(DEBIAN)/libva-amdgpu-devel(RPM) package!")
+   endif()
+-endif()
+\ No newline at end of file
++endif()

var/spack/repos/spack_repo/builtin/packages/rocjpeg/package.py

@@ -20,6 +20,7 @@ class Rocjpeg(CMakePackage):
 
     license("MIT")
 
+    version("6.4.0", sha256="5488f5ab9c475566716d99ad32fb4c20686ac1bcc00c9242221abdbde2b94ffe")
     version("6.3.3", sha256="65081b20ab3df82337fdcaf3d4e614c75f946656a4ea7bc00ac0d1bbd81e3e83")
     version("6.3.2", sha256="4e1ec9604152e818afa85360f1e0ef9e98bfb8a97ca0989980063e2ece015c16")
     version("6.3.1", sha256="f4913cbc63e11b9b418d33b0f9ba0fec0aa00b23285090acfd435e1ba1c21e42")
@@ -27,11 +28,13 @@ class Rocjpeg(CMakePackage):
 
     depends_on("cxx", type="build")
 
-    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")
         depends_on(f"hip@{ver}", when=f"@{ver}")
 
     depends_on("libva", type="build", when="@6.2:")
+    depends_on("libdrm", type="build", when="@6.4:")
+    patch("0001-add-amdgpu-drm-include.patch", when="@6.4")
 
     def patch(self):
         filter_file(
@@ -43,4 +46,14 @@ def patch(self):
 
     def cmake_args(self):
         args = [self.define("LIBVA_INCLUDE_DIR", self.spec["libva"].prefix.include)]
+        if self.spec.satisfies("@6.4.0:"):
+            args.append(
+                self.define("CMAKE_C_COMPILER", f"{self.spec['llvm-amdgpu'].prefix}/bin/amdclang")
+            )
+            args.append(
+                self.define(
+                    "CMAKE_CXX_COMPILER", f"{self.spec['llvm-amdgpu'].prefix}/bin/amdclang++"
+                )
+            )
+            args.append(self.define("AMDGPU_DRM_INCLUDE_DIRS", self.spec["libdrm"].prefix.include))
         return args

var/spack/repos/spack_repo/builtin/packages/rocm_bandwidth_test/package.py

@@ -19,6 +19,7 @@ class RocmBandwidthTest(CMakePackage):
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="0a4c8aa32e041f0344eda448927d677b4a65835dda9736a7f2ab72b8e7f14d1c")
     version("6.3.3", sha256="d33f656eb6ba7db78b41c4bcf6d830b511dc97c6d645760e6d05edd07fcaefba")
     version("6.3.2", sha256="3754831244d7c4f6314fc25b3e929adf9abe44c9cb60621dd8ae5d1aa930ae55")
     version("6.3.1", sha256="98002e4104929a62a308114ed82fba530880359a17f90ebd62a2ca49c2baac78")
@@ -43,6 +44,7 @@ class RocmBandwidthTest(CMakePackage):
         version("5.3.3", sha256="2bc079297e639d45d57c8017f6f47bc44d4ed34613ec76c80574bb703d79b498")
         version("5.3.0", sha256="a97365c04d79663db7c85027c63a12d56356abc0a351697f49c2d82bf9ef8999")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     depends_on("cmake@3:", type="build")
@@ -92,6 +94,7 @@ class RocmBandwidthTest(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
@@ -115,6 +118,7 @@ class RocmBandwidthTest(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/rocm_cmake/package.py

@@ -22,6 +22,7 @@ class RocmCmake(CMakePackage):
     license("MIT")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="be8109c52e9309d1ae9553e067346ecdf1a25f653cc21974ddc542f31ce54615")
     version("6.3.3", sha256="4238cccc22226ba9487185fc2faa66b11c0cb8e7982240332e1b919cec8d909e")
     version("6.3.2", sha256="f5104c2289da99a70d8c4c1befbca4f8efa7c89711eaac7b6b63592cd4bd99a8")
     version("6.3.1", sha256="6994a5bdeea55cd41ec01ab4142785ea02bbdcb83e70f6911095c7cea766ebe8")
@@ -69,6 +70,7 @@ class RocmCmake(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 
@@ -85,6 +87,7 @@ def test_cmake(self):
         test_dir = join_path(self.test_suite.current_test_cache_dir, self.test_src_dir)
         with working_dir(test_dir, create=True):
             cc_options = [f"-DCMAKE_PREFIX_PATH={self.prefix}", "."]
+            make = self.spec["gmake"].command
             cmake = self.spec["cmake"].command
             cmake(*cc_options)
             make()

var/spack/repos/spack_repo/builtin/packages/rocm_core/package.py

@@ -21,6 +21,7 @@ class RocmCore(CMakePackage):
     libraries = ["librocm-core"]
 
     license("MIT")
+    version("6.4.0", sha256="058739404c91105c1b34117803f6b48917a23191291ce67020e6b983b45450c1")
     version("6.3.3", sha256="d2a3900424dea1dcc0e303c288d2c07e1345c2d5348398449998e8007fe7fd44")
     version("6.3.2", sha256="3243f661e5e995341e81127a6096ac80169b8481826ebadc02e24020f1ff985d")
     version("6.3.1", sha256="f8196f3aafe03bd93ae2947162f34098fd08ddbad4eb3deaf92acd434b480304")
@@ -59,6 +60,7 @@ class RocmCore(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on("llvm-amdgpu", when=f"@{ver}+asan")
 

var/spack/repos/spack_repo/builtin/packages/rocm_dbgapi/package.py

@@ -26,6 +26,7 @@ class RocmDbgapi(CMakePackage):
     license("MIT")
 
     version("master", branch="amd-master", deprecated=True)
+    version("6.4.0", sha256="5dcf627245cc9511c7ff22f46410c5e5777187fab97b7cfcd95e03e61069f72c")
     version("6.3.3", sha256="25c8e9f4a22f23004f2fc1998c284095b193591eb6143b47380455754948ab98")
     version("6.3.2", sha256="0e7cea6ae2eb737ad378787d2ef5f6cbaf9dfb483bb5e61e716601a145677adf")
     version("6.3.1", sha256="1843423c91a22cf83bef5f14cb50f55ba333047e03e75296b9f9522facde5822")
@@ -57,6 +58,8 @@ class RocmDbgapi(CMakePackage):
     conflicts("+asan", when="os=centos8")
 
     depends_on("cxx", type="build")  # generated
+    depends_on("c", type="build")
+
     depends_on("cmake@3:", type="build")
     depends_on("hwdata", when="@5.5.0:")
     depends_on("pciutils", when="@5.5.0:")
@@ -84,6 +87,7 @@ class RocmDbgapi(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"hsa-rocr-dev@{ver}", type="build", when=f"@{ver}")
@@ -108,6 +112,7 @@ class RocmDbgapi(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/rocm_debug_agent/package.py

@@ -19,6 +19,7 @@ class RocmDebugAgent(CMakePackage):
 
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
     libraries = ["librocm-debug-agent"]
+    version("6.4.0", sha256="699af72a1ff7edf3cff6ef293469345538da06aaedefb3540dd61f55ea862330")
     version("6.3.3", sha256="27407c5cabec3d9757ffe5eb729639ccb3ad3b086f57f101854b73479a6f0f51")
     version("6.3.2", sha256="578aa08b10a456eebd2b548afd86339bd5a5df807611ffd20cc3006eaae74836")
     version("6.3.1", sha256="0e28a9febf3b95cc6bbf8eae91091bf22a8f49fe9558171251f8f9afe666f9d7")
@@ -50,9 +51,10 @@ class RocmDebugAgent(CMakePackage):
     conflicts("+asan", when="os=centos8")
 
     depends_on("cxx", type="build")  # generated
+    depends_on("c", type="build")
 
     depends_on("cmake@3:", type="build")
-    depends_on("elfutils@:0.168", type="link")
+    depends_on("elfutils@0.188:", type="link")
 
     for ver in [
         "5.3.0",
@@ -99,6 +101,7 @@ class RocmDebugAgent(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
         depends_on(f"rocm-dbgapi@{ver}", when=f"@{ver}")
@@ -122,12 +125,13 @@ class RocmDebugAgent(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 
     # https://github.com/ROCm/rocr_debug_agent/pull/4
     patch("0001-Drop-overly-strict-Werror-flag.patch")
-    patch("0002-add-hip-architecture.patch")
+    patch("0002-add-hip-architecture.patch", when="@:6.3")
 
     @classmethod
     def determine_version(cls, lib):
@@ -139,9 +143,9 @@ def determine_version(cls, lib):
         return None
 
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
+        env.set("CC", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang")
+        env.set("CXX", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang++")
         if self.spec.satisfies("+asan"):
-            env.set("CC", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang")
-            env.set("CXX", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang++")
             env.set("ASAN_OPTIONS", "detect_leaks=0")
             env.set("CFLAGS", "-fsanitize=address -shared-libasan")
             env.set("CXXFLAGS", "-fsanitize=address -shared-libasan")

var/spack/repos/spack_repo/builtin/packages/rocm_device_libs/package.py

@@ -26,6 +26,7 @@ def url_for_version(self, version):
     maintainers("srekolam", "renjithravindrankannath", "haampie", "afzpatel")
 
     version("master", branch="amd-stg-open", deprecated=True)
+    version("6.4.0", sha256="dca1c145a23f05229d5d646241f9d1d3c5dbf1d745b338ae020eabe33beb965c")
     version("6.3.3", sha256="4df9aba24e574edf23844c0d2d9dda112811db5c2b08c9428604a21b819eb23d")
     version("6.3.2", sha256="1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827")
     version("6.3.1", sha256="e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c")

var/spack/repos/spack_repo/builtin/packages/rocm_examples/package.py

@@ -20,6 +20,7 @@ class RocmExamples(CMakePackage):
 
     license("MIT")
 
+    version("6.4.0", sha256="af2be5806982a72c726cf052c512493cc004bfa98d0136fbf8fed2754a4f4b80")
     version("6.3.3", sha256="5e5bdffb4bf56d30c5f8dd8fda95d162362d17e446396e6b6a3afe8d293039f3")
     version("6.3.2", sha256="7a71dcfec782338af1d838f86b692974368e362de8ad85d5ec26c23b0afbab9e")
     version("6.3.1", sha256="c5093cd6641de478b940d2e36d6723f7ef1ccad3f4f96caf0394def2e6c7e325")
@@ -28,11 +29,12 @@ class RocmExamples(CMakePackage):
     version("6.2.1", sha256="2e426572aa5f5b44c7893ea256945c8733b79db39cca84754380f40c8b44a563")
     version("6.2.0", sha256="6fb1f954ed32b5c4085c7f071058d278c2e1e8b7b71118ee5e85cf9bbc024df0")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")
 
     depends_on("glfw", type="build")
 
-    for ver in ["6.3.3", "6.3.2", "6.3.1", "6.3.0", "6.2.4", "6.2.1", "6.2.0"]:
+    for ver in ["6.4.0", "6.3.3", "6.3.2", "6.3.1", "6.3.0", "6.2.4", "6.2.1", "6.2.0"]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"hipify-clang@{ver}", when=f"@{ver}")
         depends_on(f"hipcub@{ver}", when=f"@{ver}")
@@ -44,6 +46,10 @@ class RocmExamples(CMakePackage):
         depends_on(f"rocsparse@{ver}", when=f"@{ver}")
         depends_on(f"rocsolver@{ver}", when=f"@{ver}")
 
+    for ver in ["6.4.0", "6.3.3", "6.3.2", "6.3.1", "6.3.0"]:
+        depends_on(f"hipfft@{ver}", when=f"@{ver}")
+        depends_on(f"rocfft@{ver}", when=f"@{ver}")
+
     def patch(self):
         filter_file(
             r"${ROCM_ROOT}/bin/hipify-perl",

var/spack/repos/spack_repo/builtin/packages/rocm_gdb/package.py

@@ -19,6 +19,7 @@ class RocmGdb(AutotoolsPackage):
     license("LGPL-2.0-or-later")
 
     maintainers("srekolam", "renjithravindrankannath")
+    version("6.4.0", sha256="ef32529b2e3799dd8ab15647701063fcdcadd6d043a0d376a98c3ca10813817a")
     version("6.3.3", sha256="51678b588f65f92f50c2336707322cf4973fa96d03e268ec5956ac1a9f2ebaa3")
     version("6.3.2", sha256="85b03c1fb99f55272f4732dff58e8ba0a1add454a79d2b9d471df200366d0c7e")
     version("6.3.1", sha256="954236518491ba547f849be7c86e71ff95ef24535f66acabfd45040e11c25d7b")
@@ -83,6 +84,7 @@ class RocmGdb(AutotoolsPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-dbgapi@{ver}", type="link", when=f"@{ver}")
         depends_on(f"comgr@{ver}", type="link", when=f"@{ver}")
@@ -106,6 +108,7 @@ class RocmGdb(AutotoolsPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/rocm_opencl/package.py

@@ -37,6 +37,7 @@ def url_for_version(self, version):
     license("MIT")
 
     version("master", branch="main", deprecated=True)
+    version("6.4.0", sha256="76fd0ad83da0dabf7c91ca4cff6c51f2be8ab259e08ad9743af47d1b3473c2ff")
     version("6.3.3", sha256="8e5adca8f8c2d99d4a4e49605dd6b56b7881b762ee8ce15b4a7000e3cd982fec")
     version("6.3.2", sha256="ec13dc4ffe212beee22171cb2825d2b16cdce103c835adddb482b9238cf4f050")
     version("6.3.1", sha256="bfb8a4a59e7bd958e2cd4bf6f14c6cdea601d9827ebf6dc7af053a90e963770f")
@@ -135,6 +136,7 @@ def url_for_version(self, version):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"comgr@{ver}", type="build", when=f"@{ver}")
@@ -153,6 +155,7 @@ def url_for_version(self, version):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"aqlprofile@{ver}", type="link", when=f"@{ver}")
 
@@ -175,6 +178,7 @@ def url_for_version(self, version):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/rocm_openmp_extras/0001-Avoid-duplicate-registration-on-cuda-env-6.4.patch

@@ -0,0 +1,13 @@
+diff --git a/rocm-openmp-extras/llvm-project/offload/plugins-nextgen/cuda/CMakeLists.txt b/rocm-openmp-extras/llvm-project/offload/plugins-nextgen/cuda/CMakeLists.txt
+ index 5fdfb8f..7e13320 100644
+ --- a/rocm-openmp-extras/llvm-project/offload/plugins-nextgen/cuda/CMakeLists.txt
+ +++ b/rocm-openmp-extras/llvm-project/offload/plugins-nextgen/cuda/CMakeLists.txt
+ @@ -18,8 +18,6 @@ endif()
+  option(LIBOMPTARGET_FORCE_NVIDIA_TESTS "Build NVIDIA libomptarget tests" OFF)
+  if (LIBOMPTARGET_FOUND_NVIDIA_GPU OR LIBOMPTARGET_FORCE_NVIDIA_TESTS)
+    message(STATUS "Enable tests using CUDA plugin")
+ -  set(LIBOMPTARGET_SYSTEM_TARGETS
+ -      "${LIBOMPTARGET_SYSTEM_TARGETS} nvptx64-nvidia-cuda nvptx64-nvidia-cuda-LTO" PARENT_SCOPE)
+    list(APPEND LIBOMPTARGET_TESTED_PLUGINS "omptarget.rtl.cuda")
+    set(LIBOMPTARGET_TESTED_PLUGINS "${LIBOMPTARGET_TESTED_PLUGINS}" PARENT_SCOPE)
+  else()

var/spack/repos/spack_repo/builtin/packages/rocm_openmp_extras/package.py

@@ -39,6 +39,7 @@
     "8fefdd0d9eecd11866ddecbe039347560469eb69d974934005d480eac4432b81",
     "eeda81dafd17df7e1d2b9dbf91a23924c6dd8de29f0792725fc25a6cd1d9c5fa",
     "b43b889b5778572d6d348c6a6614dc02258212004d1f1f64f0cdc74dc3249e86",
+    "b9b1537fcbb7226d99145a1c01e8c5961ab83a5834286397943ff86676d545ed",
 ]
 
 devlib = [
@@ -64,6 +65,7 @@
     "e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c",
     "1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827",
     "4df9aba24e574edf23844c0d2d9dda112811db5c2b08c9428604a21b819eb23d",
+    "dca1c145a23f05229d5d646241f9d1d3c5dbf1d745b338ae020eabe33beb965c",
 ]
 
 llvm = [
@@ -89,6 +91,7 @@
     "e9c2481cccacdea72c1f8d3970956c447cec47e18dfb9712cbbba76a2820552c",
     "1f52e45660ea508d3fe717a9903fe27020cee96de95a3541434838e0193a4827",
     "4df9aba24e574edf23844c0d2d9dda112811db5c2b08c9428604a21b819eb23d",
+    "dca1c145a23f05229d5d646241f9d1d3c5dbf1d745b338ae020eabe33beb965c",
 ]
 
 flang = [
@@ -114,6 +117,7 @@
     "2e38ba138312d18b2677347839a960802bb04090bb92b5e6a15ac06ed789dbc0",
     "4b4d8025a215c52e62dd6317cafce224d95f91040e90942c9a93ade568a8dd48",
     "e0f650fc633ab4a8eab30b0c1ba0efb46ec596b540c3a4c13ca24d92c512d255",
+    "a51fbdda9d5d968fe6d23eaeabbe04a0db810a88a7a609ae924e3caaed4539f1",
 ]
 
 extras = [
@@ -139,6 +143,7 @@
     "4050c60cbbf582122cc0a30b4a99200341c426f2fa3d81ac8dc61f5a0890ed15",
     "70b49c1198bf176498ec4a94584b8ed8a07f623ebfa567e4fcf1a6545b635185",
     "9615235b4d5ae78e43ca4854f316b83e75f7d9ed3fc187ed1869b7d8d7e26341",
+    "105dd0ccae2864275de5a6370010d923d25307e6a8c35af3befdd0064ea743bc",
 ]
 
 versions = [
@@ -164,6 +169,7 @@
     "6.3.1",
     "6.3.2",
     "6.3.3",
+    "6.4.0",
 ]
 versions_dict = dict()  # type: Dict[str,Dict[str,str]]
 components = ["aomp", "devlib", "llvm", "flang", "extras"]
@@ -187,6 +193,7 @@ class RocmOpenmpExtras(Package):
     license("Apache-2.0")
 
     maintainers("srekolam", "renjithravindrankannath", "estewart08", "afzpatel")
+    version("6.4.0", sha256=versions_dict["6.4.0"]["aomp"])
     version("6.3.3", sha256=versions_dict["6.3.3"]["aomp"])
     version("6.3.2", sha256=versions_dict["6.3.2"]["aomp"])
     version("6.3.1", sha256=versions_dict["6.3.1"]["aomp"])
@@ -247,6 +254,7 @@ class RocmOpenmpExtras(Package):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 
@@ -321,6 +329,7 @@ class RocmOpenmpExtras(Package):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"comgr@{ver}", when=f"@{ver}")
         depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
@@ -362,12 +371,20 @@ class RocmOpenmpExtras(Package):
         when="@6.1",
     )
     patch("0001-Avoid-duplicate-registration-on-cuda-env.patch", when="@6.1")
-    patch("0001-Avoid-duplicate-registration-on-cuda-env-6.2.patch", when="@6.2:")
+    patch("0001-Avoid-duplicate-registration-on-cuda-env-6.2.patch", when="@6.2:6.3")
+    patch("0001-Avoid-duplicate-registration-on-cuda-env-6.4.patch", when="@6.4:")
 
     def setup_run_environment(self, env: EnvironmentModifications) -> None:
-        devlibs_prefix = self.spec["llvm-amdgpu"].prefix
+        if self.spec.external:
-        llvm_prefix = self.spec["llvm-amdgpu"].prefix
+            devlibs_prefix = self.prefix
-        hsa_prefix = self.spec["hsa-rocr-dev"].prefix
+            llvm_prefix = self.prefix
+            # prefix is set to either <rocm_path>/llvm or <rocm_path>/lib/llvm
+            path_parts = self.prefix.rstrip("llvm").rstrip("lib/")
+            hsa_prefix = os.path.dirname(path_parts)
+        else:
+            devlibs_prefix = self.spec["llvm-amdgpu"].prefix
+            llvm_prefix = self.spec["llvm-amdgpu"].prefix
+            hsa_prefix = self.spec["hsa-rocr-dev"].prefix
         env.set("AOMP", f"{llvm_prefix}")
         env.set("HIP_DEVICE_LIB_PATH", f"{devlibs_prefix}/amdgcn/bitcode")
         env.prepend_path("CPATH", f"{self.prefix}/include")
@@ -391,7 +408,10 @@ def setup_build_environment(self, env: EnvironmentModifications) -> None:
 
     def patch(self):
         src = self.stage.source_path
-        libomptarget = "{0}/rocm-openmp-extras/llvm-project/openmp/libomptarget"
+        if self.spec.satisfies("@6.4:"):
+            libomptarget = "{0}/rocm-openmp-extras/llvm-project/offload"
+        else:
+            libomptarget = "{0}/rocm-openmp-extras/llvm-project/openmp/libomptarget"
         flang = "{0}/rocm-openmp-extras/flang/"
 
         plugin = "/plugins/amdgpu/CMakeLists.txt"

var/spack/repos/spack_repo/builtin/packages/rocm_smi_lib/0001-add-libdrm-include-dir.patch

@@ -0,0 +1,31 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 289cca0..d05a779 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,6 +41,8 @@ set(SHARE_INSTALL_PREFIX
+ # provide git to utilities
+ find_program (GIT NAMES git)
+ 
++pkg_check_modules(DRM REQUIRED libdrm)
++pkg_check_modules(AMDGPU_DRM REQUIRED libdrm_amdgpu)
+ 
+ ## Setup the package version based on git tags.
+ set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver")
+diff --git a/rocm_smi/CMakeLists.txt b/rocm_smi/CMakeLists.txt
+index 257309b..a3d7357 100755
+--- a/rocm_smi/CMakeLists.txt
++++ b/rocm_smi/CMakeLists.txt
+@@ -98,6 +98,13 @@ if(FILE_REORG_BACKWARD_COMPATIBILITY)
+                            "$<INSTALL_INTERFACE:${ROCM_SMI}/include>")
+ endif()
+ 
++
++target_include_directories(${ROCM_SMI_TARGET}
++	                   INTERFACE
++			   ${DRM_INCLUDE_DIRS}
++			   ${AMDGPU_DRM_INCLUDE_DIRS}
++)
++
+ ## Set the VERSION and SOVERSION values
+ set_property(TARGET ${ROCM_SMI_TARGET} PROPERTY
+              SOVERSION "${VERSION_MAJOR}")

var/spack/repos/spack_repo/builtin/packages/rocm_smi_lib/package.py

@@ -25,6 +25,7 @@ class RocmSmiLib(CMakePackage):
     libraries = ["librocm_smi64"]
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="0c462520b4fa0cf9b49515b207b0ead32a5f96ddba487c5d4fa07a403690c05a")
     version("6.3.3", sha256="679dfd0cbd213d27660e546584ab013afea286eff95928d748d168503305c9c4")
     version("6.3.2", sha256="29a9190143dfcbafeac93d8064b00c9320dbca57a3344adb009ec17d9b09d036")
     version("6.3.1", sha256="0f45e4823e361a1c6ac560eabf6000c3b59e08bcd96e87150149149e861c6a63")
@@ -77,6 +78,7 @@ class RocmSmiLib(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 
@@ -91,9 +93,13 @@ class RocmSmiLib(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on("llvm-amdgpu", when=f"@{ver}+asan")
 
+    depends_on("pkg-config", when="@6.4:")
+    depends_on("libdrm", when="@6.4:")
+
     patch(
         "https://github.com/ROCm/rocm_smi_lib/commit/11f12b86517d0e9868f4d16d74d4e8504c3ba7da.patch?full_index=1",
         sha256="62be7262f6e1e71bf82a03f500a424a536638f04e913d0f4b477f60e8e1190fd",
@@ -101,6 +107,12 @@ class RocmSmiLib(CMakePackage):
     )
 
     patch("disable_pdf_generation_with_doxygen_and_latex.patch", when="@:5.6")
+    patch(
+        "https://github.com/ROCm/rocm_smi_lib/commit/ce405476cabf66a884a351cb2e3253bd5c29e06b.patch?full_index=1",
+        sha256="54094b5dbd05b79341e38e95f785dcbb0ba4a5aef4bad19e075ea77470164138",
+        when="@6.4",
+    )
+    patch("0001-add-libdrm-include-dir.patch", when="@6.4")
 
     def cmake_args(self):
         args = [

var/spack/repos/spack_repo/builtin/packages/rocm_tensile/0004-replace_rocm_smi.patch

@@ -0,0 +1,24 @@
+diff --git a/Tensile/Source/client/CMakeLists.txt b/Tensile/Source/client/CMakeLists.txt
+index a9ac80a..087e0c5 100644
+--- a/Tensile/Source/client/CMakeLists.txt
++++ b/Tensile/Source/client/CMakeLists.txt
+@@ -58,8 +58,8 @@ set_target_properties(TensileClient
+ find_package(Boost COMPONENTS program_options REQUIRED)
+ 
+ if (NOT WIN32)
+-    find_package(ROCmSMI QUIET)
+-    if(NOT ROCmSMI_FOUND)
++    find_package(rocm_smi CONFIG QUIET)
++    if(NOT rocm_smi_FOUND)
+         set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${Tensile_DIR}" "${Tensile_DIR}/../Source/cmake" "${CMAKE_HOME_DIRECTORY}/cmake")
+         find_package(ROCmSMI REQUIRED)
+     endif()
+@@ -72,7 +72,7 @@ target_include_directories(TensileClient PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/inc
+ target_link_libraries(TensileClient PRIVATE TensileHost ${Boost_LIBRARIES})
+ 
+ if(NOT WIN32)
+-    target_link_libraries(TensileClient PRIVATE TensileHost rocm_smi)
++    target_link_libraries(TensileClient PRIVATE TensileHost ${ROCM_SMI_LIBRARY})
+ endif()
+ 
+ if(TENSILE_USE_OPENMP)

var/spack/repos/spack_repo/builtin/packages/rocm_tensile/package.py

@@ -21,6 +21,7 @@ class RocmTensile(CMakePackage):
     license("MIT")
 
     maintainers("srekolam", "renjithravindrankannath", "haampie", "afzpatel")
+    version("6.4.0", sha256="cfe32aa31aa0dd79018d0cdd36e09df3a548159cb7b8e18d0ef6513d0febce90")
     version("6.3.3", sha256="5849fc3898e9cea05569c0ee102c13043c4df67079119572687bc42f274ae496")
     version("6.3.2", sha256="700e43a22d7e6309bf74624b18a42bb0132ef35716fccec897d3045a97759e6a")
     version("6.3.1", sha256="9882e8f949e1eb1d4b7dbd215370ecce643852dd2ce6e021d59cd49d32ba9dea")
@@ -65,6 +66,7 @@ class RocmTensile(CMakePackage):
     )
     variant("openmp", default=True, description="Enable OpenMP")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     depends_on("cmake@3:", type="build")
@@ -95,6 +97,7 @@ class RocmTensile(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-cmake@{ver}", type="build", when=f"@{ver}")
         depends_on(f"hip@{ver}", when=f"@{ver}")
@@ -106,6 +109,7 @@ class RocmTensile(CMakePackage):
     root_cmakelists_dir = "Tensile/Source"
 
     patch("0003-require-openmp-extras-when-tensile-use-openmp.patch", when="@5.1.0:")
+    patch("0004-replace_rocm_smi.patch", when="@6.4")
 
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         env.set("CXX", self.spec["hip"].hipcc)

var/spack/repos/spack_repo/builtin/packages/rocm_validation_suite/010-add-drm-include-path.patch

@@ -0,0 +1,16 @@
+diff --git a/rvslib/CMakeLists.txt b/rvslib/CMakeLists.txt
+index d3ea8af..55b26c3 100644
+--- a/rvslib/CMakeLists.txt
++++ b/rvslib/CMakeLists.txt
+@@ -114,9 +114,10 @@ else()
+   set(ASAN_LIB_PATH "$ENV{LD_LIBRARY_PATH}")
+ endif()
+ 
++find_path(DRM_INCLUDE_DIR libdrm/drm.h PATHS /usr/include /usr/local/include)
+ ## define include directories
+ include_directories(./ ../ ../rvs
+-  ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${HIPBLASLT_INC_DIR} ${YAML_CPP_INCLUDE_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIR})
++  ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR} ${HIPBLASLT_INC_DIR} ${YAML_CPP_INCLUDE_DIR} ${HIPRAND_INC_DIR} ${ROCRAND_INC_DIR} ${HIPBLAS-COMMON_INCLUDE_DIR} ${DRM_INCLUDE_DIR})
+ 
+ link_directories(${ASAN_LIB_PATH} ${ROCM_SMI_LIB_DIR})
+ 

var/spack/repos/spack_repo/builtin/packages/rocm_validation_suite/package.py

@@ -23,6 +23,7 @@ class RocmValidationSuite(CMakePackage):
     license("MIT")
 
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
+    version("6.4.0", sha256="1963aa0ec6f6b7e957a5521dbfba615c2047ef7f432048b4a14c979c90a6f995")
     version("6.3.3", sha256="3d1afc47f6bd491991f6deb80f84d00041497e7fd564fd0129622263b5b87cc1")
     version("6.3.2", sha256="c13d1efc21358901074f73c48f9cc8531cd5c6d28b7702d022f3efbbaf4b4286")
     version("6.3.1", sha256="5a5ec682729292d57838191e217a3475d662c5c25a7bd79c4996fdf4b5e36a5a")
@@ -47,6 +48,7 @@ class RocmValidationSuite(CMakePackage):
         version("5.3.3", sha256="9acbc8de9b2e18659f51bd49f6e92ab6c93742e2ed0046322025f017fc12497f")
         version("5.3.0", sha256="d6afb8a5f4eaf860fd510bcfe65e735cbf96d4b8817c758ea7aee84d4c994382")
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     patch(
@@ -69,13 +71,15 @@ class RocmValidationSuite(CMakePackage):
     patch(
         "https://github.com/ROCm/ROCmValidationSuite/commit/bd63256d43d11ae09a2c203e05cb002c7a730c59.patch?full_index=1",
         sha256="bd63baeb4dea00ac4104ef7e9fab907bc04a1eccb93036478c005d0ac11034de",
-        when="@6.3.0:",
+        when="@6.3",
     )
+    patch("010-add-drm-include-path.patch", when="@6.4")
     depends_on("cmake@3.5:", type="build")
     depends_on("zlib-api", type="link")
     depends_on("yaml-cpp~shared")
     depends_on("googletest")
     depends_on("doxygen", type="build")
+    depends_on("libdrm", when="@6.4:")
 
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         spec = self.spec
@@ -126,17 +130,18 @@ def setup_build_environment(self, env: EnvironmentModifications) -> None:
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"rocminfo@{ver}", when=f"@{ver}")
         depends_on(f"rocblas@{ver}", when=f"@{ver}")
         depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
         depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
-    for ver in ["6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"hiprand@{ver}", when=f"@{ver}")
         depends_on(f"rocrand@{ver}", when=f"@{ver}")
 
-    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"hipblaslt@{ver}", when=f"@{ver}")
 
     def patch(self):

var/spack/repos/spack_repo/builtin/packages/rocminfo/package.py

@@ -19,6 +19,7 @@ class Rocminfo(CMakePackage):
     maintainers("srekolam", "renjithravindrankannath", "haampie")
 
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="060184e70755cb267017553ec37cc5b36af2c94e6b0643cad4b9fed270199a79")
     version("6.3.3", sha256="08390b2babe6dc832887098c5d3a5253d655430a18751f3446a56c7422b26dd2")
     version("6.3.2", sha256="a98a32bae0e118397b5559b4a584c9363191bb2d1f45fe13b09f502016745e8f")
     version("6.3.1", sha256="30cf7ed537c066e325a8731d0fbe62be2f0f66c8700a06f334e787e9f0f87437")
@@ -94,6 +95,7 @@ class Rocminfo(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
         "master",
     ]:
         depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
@@ -117,6 +119,7 @@ class Rocminfo(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 

var/spack/repos/spack_repo/builtin/packages/rocmlir/package.py

@@ -19,6 +19,7 @@ class Rocmlir(CMakePackage):
 
     maintainers("srekolam", "afzpatel", "renjithravindrankannath")
 
+    version("6.4.0", sha256="e377ad70fd5a5723427edf9464dde8e7892dabd1f783123d39a2fa2faf87079f")
     version("6.3.3", sha256="87242b811536132a02ce79fe430c70485f9b1477de22d8376e7e923a9c9ad98b")
     version("6.3.2", sha256="5911e880a66faecb08d242efa3e5eb6f8ce32cb21ea09dec36f4aef111c395fb")
     version("6.3.1", sha256="b9e0ea8cfb83c20553b1ec1556752958afaa421a8d7326b1da748395ba7b75ac")
@@ -84,6 +85,7 @@ def patch(self):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"llvm-amdgpu@{ver}", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/rocprim/package.py

@@ -19,6 +19,7 @@ class Rocprim(CMakePackage):
     license("MIT")
 
     maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
+    version("6.4.0", sha256="c35c568b83f8894fc3b9b722343b0ea75c3bd961be24075fb3527d5230788e26")
     version("6.3.3", sha256="15e4f8dfc71175c568f8afa87e3e0e3c7ad0680c8bca0d9db3a39936ec185813")
     version("6.3.2", sha256="fbb4839992eaba838f798408636da30f0d61b669513dae185ab790c5fa5595c4")
     version("6.3.1", sha256="37690d9f326d68379d52a21fe9184061d38b15263a566f1f182d539e4b3277d5")
@@ -86,6 +87,7 @@ class Rocprim(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"comgr@{ver}", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/rocprofiler_compute/package.py

@@ -19,6 +19,8 @@ class RocprofilerCompute(CMakePackage):
     maintainers("afzpatel", "srekolam", "renjithravindrankannath")
 
     license("MIT")
+
+    version("6.4.0", sha256="484a8974ebf973fa00241bf3665eac790b3c317aa36b794cc2998f892b3036fc")
     version("6.3.3", sha256="0f563874f71b593cbdcdf0eea58b08c7437f1abf807f0886a3a30afa9e7f4953")
     version("6.3.2", sha256="317f19acfa6e6780923e6c8144c3c223b523c382588df528b6df001fae38d13d")
 

var/spack/repos/spack_repo/builtin/packages/rocprofiler_dev/package.py

@@ -20,6 +20,7 @@ class RocprofilerDev(CMakePackage):
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
     libraries = ["librocprofiler64"]
     license("MIT")
+    version("6.4.0", sha256="c605bdbf5245f46267d4a422746fc941213beae494cd3f902b67fc5423979a57")
     version("6.3.3", sha256="7ca6900b4a81f9dc0d7cdfe3be39372b3bf25f3c8304256705003294772890bd")
     version("6.3.2", sha256="c440ac79fa9f3e8c1decbfd83557d5cbbc4bb720927880b33dc36e682f37ec26")
     version("6.3.1", sha256="c4666c1167e551cfafc343b092506834477556ba6f7b0739552d660fd69c30fb")
@@ -114,6 +115,7 @@ class RocprofilerDev(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"rocm-smi-lib@{ver}", when=f"@{ver}")
@@ -137,6 +139,7 @@ class RocprofilerDev(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"aqlprofile@{ver}", when=f"@{ver}")
         depends_on(f"comgr@{ver}", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/rocprofiler_register/package.py

@@ -21,6 +21,7 @@ class RocprofilerRegister(CMakePackage):
     maintainers("afzpatel", "srekolam", "renjithravindrankannath")
 
     license("MIT")
+    version("6.4.0", sha256="7439d789f722971b2dd2f8e7b5c5cbdb1522e47a6fbb428fd9bcb24234c6fd48")
     version("6.3.3", sha256="afe4b1017ca604259de8cf7d06f98680bae63180214b914fcd7bd5da116b58c3")
     version("6.3.2", sha256="2e973dd10af220cd37838c13f3c7d52671f5cf846a3f06311b138770b62f51f4")
     version("6.3.1", sha256="82e2fbd2da058503398848c3e662f518e99f9bccb7b98880aa321c1f6511fca9")

var/spack/repos/spack_repo/builtin/packages/rocprofiler_sdk/package.py

@@ -23,6 +23,12 @@ class RocprofilerSdk(CMakePackage):
 
     license("MIT")
 
+    version(
+        "6.4.0",
+        tag="rocm-6.4.0",
+        commit="e8e49fe76971000a42a5a177d9a727d16dd0ebcf",
+        submodules=True,
+    )
     version(
         "6.3.3",
         tag="rocm-6.3.3",
@@ -56,9 +62,15 @@ class RocprofilerSdk(CMakePackage):
     depends_on("c", type="build")
     depends_on("cxx", type="build")
 
-    for ver in ["6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"rocm-cmake@{ver}", when=f"@{ver}")
         depends_on(f"aqlprofile@{ver}", when=f"@{ver}")
         depends_on(f"rccl@{ver}", when=f"@{ver}")
         depends_on(f"rocprofiler-register@{ver}", when=f"@{ver}")
+
+    for ver in ["6.4.0"]:
+        depends_on(f"rocdecode@{ver}", when=f"@{ver}")
+
+    def setup_run_environment(self, env):
+        env.prepend_path("LD_LIBRARY_PATH", self.spec["aqlprofile"].prefix.lib)

var/spack/repos/spack_repo/builtin/packages/rocpydecode/package.py

@@ -15,6 +15,7 @@ class Rocpydecode(CMakePackage):
     url = "https://github.com/ROCm/rocPyDecode/archive/refs/tags/rocm-6.2.0.tar.gz"
 
     maintainers("afzpatel", "srekolam", "renjithravindrankannath")
+    version("6.4.0", sha256="c7fd47f98dc0ef005a0fda0dc73e71e1d5318901d038489ba69f51473b7aca6a")
     version("6.3.3", sha256="df45b4a64ed3e550229fd91bcf7896d1a8fe377dd1ff88d2e6a71897b981180d")
     version("6.3.2", sha256="c1b4dba9f8a28299279ad4e4aeb0c857c3a9772d016fcc0f164940f22faa6dee")
     version("6.3.1", sha256="77ed22ee23409b004676fb1a11b963324b878e786dae0a56fdef58375716c9eb")
@@ -27,7 +28,7 @@ class Rocpydecode(CMakePackage):
     depends_on("ffmpeg@4.4:6")
     depends_on("dlpack")
 
-    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3"]:
+    for ver in ["6.2.0", "6.2.1", "6.2.4", "6.3.0", "6.3.1", "6.3.2", "6.3.3", "6.4.0"]:
         depends_on(f"rocdecode@{ver}", when=f"@{ver}")
 
     def patch(self):
@@ -55,7 +56,6 @@ def cmake_args(self):
             self.define("rocDecode_PATH", self.spec["rocdecode"].prefix),
             self.define("FFMPEG_INCLUDE_DIR", self.spec["ffmpeg"].prefix.include),
             self.define("CMAKE_INSTALL_PREFIX_PYTHON", self.spec.prefix),
-            self.define("CMAKE_CXX_FLAGS", "-I{0}".format(self.spec["dlpack"].prefix.include)),
             self.define(
                 "CMAKE_CXX_FLAGS",
                 "-DUSE_AVCODEC_GREATER_THAN_58_134 -I{0}".format(
@@ -63,4 +63,13 @@ def cmake_args(self):
                 ),
             ),
         ]
+        if self.spec.satisfies("@6.4.0:"):
+            args.append(
+                self.define("CMAKE_C_COMPILER", f"{self.spec['llvm-amdgpu'].prefix}/bin/amdclang")
+            )
+            args.append(
+                self.define(
+                    "CMAKE_CXX_COMPILER", f"{self.spec['llvm-amdgpu'].prefix}/bin/amdclang++"
+                )
+            )
         return args

var/spack/repos/spack_repo/builtin/packages/rocrand/package.py

@@ -27,6 +27,7 @@ class Rocrand(CMakePackage):
 
     version("develop", branch="develop", deprecated=True)
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="689bc7de81741a0b3feb9f4415a55c2cf1ae58a378fbd9b1a33769caf62bbf95")
     version("6.3.3", sha256="d55be9d367af28d87d983d649329b7ef04641e74d39064b98aeee4b9980af4eb")
     version("6.3.2", sha256="57f364806369ddb80761ce44187920075cf446de527dd1fbc6adbb4b4b3e9bb8")
     version("6.3.1", sha256="80d86c31ec9cb40f5c5532281b42cf99fbc8a81e3ffd3bc8b3bbe4a7e509bf5f")
@@ -136,6 +137,7 @@ class Rocrand(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"rocm-cmake@{ver}:", type="build", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/rocsolver/package.py

@@ -48,6 +48,7 @@ class Rocsolver(CMakePackage):
 
     version("develop", branch="develop", deprecated=True)
     version("master", branch="master", deprecated=True)
+    version("6.4.0", sha256="48930842ac441a6a5d7e25d6c5c6ac6b5fe26549a1add49a102b374e02f5b60e")
     version("6.3.3", sha256="0e8bb906513555d349b6a20cb17976402f5ea6702668efcdda595a2e2d516b46")
     version("6.3.2", sha256="834f532c54bdf0e4900e73ffb0544068071976175559c8bf3c50d7a3b7230a3a")
     version("6.3.1", sha256="ffa70c4dedeb20a33cf79d4ae3e95ade2ae5202f819459b19a0ebf62c380bba0")
@@ -118,6 +119,7 @@ class Rocsolver(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"rocblas@{ver}", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/rocsparse/package.py

@@ -41,6 +41,7 @@ class Rocsparse(CMakePackage):
     conflicts("+asan", when="os=centos8")
 
     license("MIT")
+    version("6.4.0", sha256="a0fb423b80da72f072a6d80b9837c80c671b5fae719f57c0e83d7e4e27d3d187")
     version("6.3.3", sha256="e316d46b40e99976f4acaa097d6ebf5c2caf1ff2bd3c5b1de04c93c1dac90516")
     version("6.3.2", sha256="665a85517d50e5ef37b1f953ccb17108d6a5cb30db21c5364bd50a41d44c61f2")
     version("6.3.1", sha256="95c9dcc8421711f2f203a34c2830c5ac504e127922e0a83dbc68bccd5509c72f")
@@ -94,6 +95,7 @@ class Rocsparse(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"rocprim@{ver}", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/rocthrust/package.py

@@ -20,6 +20,7 @@ class Rocthrust(CMakePackage):
     tags = ["rocm"]
 
     maintainers("cgmb", "srekolam", "renjithravindrankannath", "afzpatel")
+    version("6.4.0", sha256="b590b69cfecf30b66202e426ad1adcb577651d72ed9dd7425281b5668e6262fe")
     version("6.3.3", sha256="564f5b2621bc707c0dda0d09702642876fc4d1b8cd9a83d1324539b768653e8b")
     version("6.3.2", sha256="c3991bbd9f8b0e3ecbc18a7d014446608bfe2a3660a8d9e3dcc136d784883935")
     version("6.3.1", sha256="a63dd161f4b30be7fcc4ad4184b948646233d59b5ca13c239f723ab59c607a1a")
@@ -85,6 +86,7 @@ class Rocthrust(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hip@{ver}", when=f"@{ver}")
         depends_on(f"rocprim@{ver}", when=f"@{ver}")

var/spack/repos/spack_repo/builtin/packages/roctracer_dev/package.py

@@ -24,6 +24,7 @@ class RoctracerDev(CMakePackage, ROCmPackage):
     libraries = ["libroctracer64"]
 
     license("MIT")
+    version("6.4.0", sha256="e5c6e3b20ed3c0d2dca61ad472f9878107c9ce09a2108ff6583ae32031298022")
     version("6.3.3", sha256="0d03ebd058291d584be6bf8b114292c666a799b0fd23c697e1c6cb2b6d43f990")
     version("6.3.2", sha256="ca8e93fc37f4671db28df5cb7a24b48f3d4879a188e4780e45961bba3725bb8a")
     version("6.3.1", sha256="89e4ab249f527131f684714c9135c69eaad1a63b7e74bae718b1617543b94426")
@@ -102,6 +103,7 @@ class RoctracerDev(CMakePackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"hsa-rocr-dev@{ver}", when=f"@{ver}")
         depends_on(f"rocminfo@{ver}", when=f"@{ver}")
@@ -129,6 +131,7 @@ class RoctracerDev(CMakePackage, ROCmPackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on(f"rocm-core@{ver}", when=f"@{ver}")
 
@@ -169,6 +172,7 @@ def cmake_args(self):
             self.define("CMAKE_MODULE_PATH", f"{self.stage.source_path}/cmake_modules"),
             self.define("HSA_RUNTIME_HSA_INC_PATH", self.spec["hsa-rocr-dev"].prefix.include),
             self.define("CMAKE_POSITION_INDEPENDENT_CODE", True),
+            self.define("HIP_CXX_COMPILER", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang++"),
         ]
         if self.spec.satisfies("@:5.4.0"):
             args.append(self.define("ROCPROFILER_PATH", self.spec["rocprofiler-dev"].prefix))

var/spack/repos/spack_repo/builtin/packages/roctracer_dev_api/package.py

@@ -20,6 +20,7 @@ class RoctracerDevApi(Package):
     license("MIT")
 
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
+    version("6.4.0", sha256="e5c6e3b20ed3c0d2dca61ad472f9878107c9ce09a2108ff6583ae32031298022")
     version("6.3.3", sha256="0d03ebd058291d584be6bf8b114292c666a799b0fd23c697e1c6cb2b6d43f990")
     version("6.3.2", sha256="ca8e93fc37f4671db28df5cb7a24b48f3d4879a188e4780e45961bba3725bb8a")
     version("6.3.1", sha256="89e4ab249f527131f684714c9135c69eaad1a63b7e74bae718b1617543b94426")

var/spack/repos/spack_repo/builtin/packages/rocwmma/0002-use-find-package-rocm-smi.patch

@@ -0,0 +1,28 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eced8d8..c017349 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -132,13 +132,16 @@ find_package( hip REQUIRED )
+ find_package( hiprtc REQUIRED )
+ find_package( OpenMP REQUIRED )
+ 
+-find_path(ROCM_SMI_ROOT "include/rocm_smi/rocm_smi.h"
+-    PATHS "${ROCM_ROOT}"
+-    PATH_SUFFIXES "rocm_smi"
+-    )
+-
+-find_library(ROCM_SMI_LIBRARY rocm_smi64
+-    PATHS "${ROCM_SMI_ROOT}/lib")
++## Check for ROCM-smi
++find_package(rocm_smi PATHS ${ROCM_PATH}/lib/cmake/rocm_smi)
++if (rocm_smi_FOUND)
++  message(STATUS "Found rocm_smi at ${ROCM_SMI_INCLUDE_DIR}")
++else()
++  message(STATUS "Checking old include directory structure for rocm_smi")
++  set(ROCM_SMI_INCLUDE_DIR "${ROCM_PATH}/rocm_smi/include")
++  set(ROCM_SMI_LIB_DIR     "${ROCM_PATH}/rocm_smi/lib")
++  set(ROCM_SMI_LIBRARIES   rocm_smi64)
++endif()
+ 
+ add_library(rocwmma INTERFACE)
+ target_link_libraries(rocwmma INTERFACE hip::device hip::host OpenMP::OpenMP_CXX ${ROCM_SMI_LIBRARY})

var/spack/repos/spack_repo/builtin/packages/rocwmma/package.py

@@ -28,6 +28,7 @@ class Rocwmma(CMakePackage):
     license("MIT")
 
     maintainers("srekolam", "renjithravindrankannath", "afzpatel")
+    version("6.4.0", sha256="d95d53f70b4a2adc565bf4490515626cb7109f1d2e8a9978626610d3f178cf42")
     version("6.3.3", sha256="5bfd2909cc9b4601bb83ddd79da6cfa4075afa6d6e9396d9bbe1df844163fbd2")
     version("6.3.2", sha256="f9dc5e837ac30efe4600775fb309e46ed8ef112a673435663d2ef7fdf28f8f12")
     version("6.3.1", sha256="9afd06c58b405dd86535ea1ca479fd6f9d717fa8665710bb64fc8027a26e6ac7")
@@ -70,6 +71,7 @@ class Rocwmma(CMakePackage):
         description="CMake build type",
     )
 
+    depends_on("c", type="build")
     depends_on("cxx", type="build")  # generated
 
     depends_on("cmake@3.16:", type="build", when="@5.2.0:")
@@ -100,6 +102,7 @@ class Rocwmma(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver)
         depends_on("llvm-amdgpu@" + ver, type="build", when="@" + ver)
@@ -124,13 +127,15 @@ class Rocwmma(CMakePackage):
         "6.3.1",
         "6.3.2",
         "6.3.3",
+        "6.4.0",
     ]:
         depends_on("rocm-smi-lib@" + ver, when="@" + ver)
 
     for tgt in itertools.chain(["auto"], amdgpu_targets):
         depends_on("rocblas amdgpu_target={0}".format(tgt), when="amdgpu_target={0}".format(tgt))
 
-    patch("0001-add-rocm-smi-lib-path-for-building-tests.patch", when="@5.6:")
+    patch("0001-add-rocm-smi-lib-path-for-building-tests.patch", when="@5.6:6.3")
+    patch("0002-use-find-package-rocm-smi.patch", when="@6.4:")
 
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         env.set("CXX", self.spec["hip"].hipcc)

var/spack/repos/spack_repo/builtin/packages/rpp/package.py

@@ -15,13 +15,13 @@ class Rpp(CMakePackage):
     performance computer vision library for AMD (CPU and GPU) with HIP
     and OPENCL back-ends"""
 
-    homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp"
+    homepage = "https://github.com/ROCm/rpp"
-    git = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp.git"
+    git = "https://github.com/ROCm/rpp.git"
-    url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/archive/refs/tags/rocm-6.1.2.tar.gz"
+    url = "https://github.com/ROCm/rpp/archive/refs/tags/rocm-6.4.0.tar.gz"
 
     def url_for_version(self, version):
         if version >= Version("5.7.0"):
-            url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/archive/refs/tags/rocm-{0}.tar.gz"
+            url = "https://github.com/ROCm/rpp/archive/refs/tags/rocm-{0}.tar.gz"
         else:
             url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/rpp/archive/{0}.tar.gz"
         return url.format(version)
@@ -30,6 +30,7 @@ def url_for_version(self, version):
 
     maintainers("srekolam", "afzpatel")
     license("MIT")
+    version("6.4.0", sha256="e59e5aa6b140de062430cab03c9c2b88a3b444c53ae17c6b885898e16aefd39b")
     version("6.3.3", sha256="e6b586679a3705bf6b7bb3c5852541d329bd967e110999ac59dc052b49a92cbc")
     version("6.3.2", sha256="05f0e063c61f5039661a4d5a80113ebb7b9782d0958c29375a8e1e2e759b88bc")
     version("6.3.1", sha256="6e7da82bf7b6d642d605370329e4e719af10bb5c6af30079b5d0b60cdcb91a48")
@@ -76,7 +77,7 @@ def url_for_version(self, version):
 
     patch("0001-include-half-openmp-through-spack-package.patch", when="@:5.7")
     patch("0002-declare-handle-in-header.patch")
-    patch("0003-include-half-through-spack-package.patch", when="@6.0:")
+    patch("0003-include-half-through-spack-package.patch", when="@6.0:6.3")
 
     # adds half.hpp include directory and modifies how the libjpegturbo
     # library is linked for the rpp unit test
@@ -177,6 +178,7 @@ def patch(self):
                 "6.3.1",
                 "6.3.2",
                 "6.3.3",
+                "6.4.0",
             ]:
                 depends_on("hip@" + ver, when="@" + ver)
         with when("@:1.2"):
@@ -193,7 +195,7 @@ def setup_run_environment(self, env: EnvironmentModifications) -> None:
     def setup_build_environment(self, env: EnvironmentModifications) -> None:
         if self.spec.satisfies("+asan"):
             env.set("CC", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang")
-            env.set("CXX", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang")
+            env.set("CXX", f"{self.spec['llvm-amdgpu'].prefix}/bin/clang++")
             env.set("ASAN_OPTIONS", "detect_leaks=0")
             env.set("CFLAGS", "-fsanitize=address -shared-libasan")
             env.set("CXXFLAGS", "-fsanitize=address -shared-libasan")
@@ -215,4 +217,10 @@ def cmake_args(self):
                     "COMPILER_FOR_HIP", "{0}/bin/clang++".format(spec["llvm-amdgpu"].prefix)
                 )
             )
+            if self.spec.satisfies("@6.4:"):
+                args.append(
+                    self.define(
+                        "CMAKE_CXX_COMPILER", f"{self.spec['llvm-amdgpu'].prefix}/bin/amdclang++"
+                    )
+                )
         return args