omnitrace: add versions 6.2.0 and 6.2.1 (#46848)

1 files changed, 69 insertions, 10 deletions

diff --git a/var/spack/repos/builtin/packages/omnitrace/package.py b/var/spack/repos/builtin/packages/omnitrace/package.py
index ba42a69c14..3b558925aa 100644
--- a/var/spack/repos/builtin/packages/omnitrace/package.py
+++ b/var/spack/repos/builtin/packages/omnitrace/package.py
@@ -11,24 +11,57 @@ from spack.package import *
 class Omnitrace(CMakePackage):
     """Application Profiling, Tracing, and Analysis"""
 
-    homepage = "https://amdresearch.github.io/omnitrace"
-    git = "https://github.com/AMDResearch/omnitrace.git"
-    maintainers("jrmadsen")
+    homepage = "https://rocm.docs.amd.com/projects/omnitrace/en/latest/index.html"
+    git = "https://github.com/ROCm/omnitrace.git"
+    url = "https://github.com/ROCm/omnitrace/archive/refs/tags/rocm-6.2.0.tar.gz"
+    maintainers("dgaliffiAMD", "afzpatel", "srekolam", "renjithravindrankannath", "jrmadsen")
 
     license("MIT")
 
-    version("main", branch="main", submodules=True)
+    version("amd-mainline", branch="amd-mainline", submodules=True)
+    version("amd-staging", branch="amd-staging", submodules=True)
+    version(
+        "1.12.0", tag="v1.12.0", commit="abff23ac4238da6d7891d9ac9f36a919e30bf759", submodules=True
+    )
+    version(
+        "rocm-6.2.1",
+        tag="rocm-6.2.1",
+        commit="df91a342370401c93b5278bf082e520d6a0e22e9",
+        submodules=True,
+    )
+    version(
+        "1.11.4", tag="v1.11.4", commit="6b0627f5b7d4b05c3b7b1da581e474d48ebe36cf", submodules=True
+    )
+    version(
+        "rocm-6.2.0",
+        tag="rocm-6.2.0",
+        commit="f0bd9126a5456eb9e511d13261af262d17d9b61b",
+        submodules=True,
+    )
+    version(
+        "1.11.0", tag="v1.11.0", commit="77d52814e9050004cfb11d7917e155b00ab861b1", submodules=True
+    )
+    version(
+        "1.10.0", tag="v1.10.0", commit="9de3a6b0b4243bf8ec10164babdd99f64dbc65f2", submodules=True
+    )
+    version(
+        "1.9.0", tag="v1.9.0", commit="9eafb2360296277103d2ee706fb5f90b12722668", submodules=True
+    )
+    version(
+        "1.8.0", tag="v1.8.0", commit="7c73d981258cc3a29477756a95c1f90c5f8897dd", submodules=True
+    )
     version("1.7.4", commit="12001d9633328f9f56210c7ebffce065bff06310", submodules=True)
     version("1.7.3", commit="2ebfe3fc30f977559142509edc4ea190c975992a", submodules=True)
     version("1.7.2", commit="a41a5c155e0d3780de4c83a76f28d7c8ffa6414f", submodules=True)
     version("1.7.1", commit="67f7471253b8e031e476d80d2bc00e569285c1bf", submodules=True)
     version("1.7.0", commit="2a387f909935d06c6a4874a5b11f38fb8521800e", submodules=True)
-    version("1.6.0", commit="15e6e6d979fcd5f549d952862400f292ec735b8c", submodules=True)
-    version("1.5.0", commit="2718596e5a6808a9278c3f6c8fddfaf977d3bcb6", submodules=True)
-    version("1.4.0", commit="23fb3946c7f4c0702b1b168e1d78b8b62597e3f1", submodules=True)
-    version("1.3.1", commit="641225f88304909fd2ca5407aec062d0fdf0ed8b", submodules=True)
-    version("1.3.0", commit="4dd144a32c8b83c44e132ef53f2b44fe4b4d5569", submodules=True)
-    version("1.2.0", commit="f82845388aab108ed1d1fc404f433a0def391bb3", submodules=True)
+    with default_args(deprecated=True):
+        version("1.6.0", commit="15e6e6d979fcd5f549d952862400f292ec735b8c", submodules=True)
+        version("1.5.0", commit="2718596e5a6808a9278c3f6c8fddfaf977d3bcb6", submodules=True)
+        version("1.4.0", commit="23fb3946c7f4c0702b1b168e1d78b8b62597e3f1", submodules=True)
+        version("1.3.1", commit="641225f88304909fd2ca5407aec062d0fdf0ed8b", submodules=True)
+        version("1.3.0", commit="4dd144a32c8b83c44e132ef53f2b44fe4b4d5569", submodules=True)
+        version("1.2.0", commit="f82845388aab108ed1d1fc404f433a0def391bb3", submodules=True)
 
     depends_on("c", type="build")  # generated
     depends_on("cxx", type="build")  # generated
@@ -89,11 +122,26 @@ class Omnitrace(CMakePackage):
     depends_on("rocm-smi-lib", when="+rocm")
     depends_on("roctracer-dev", when="+rocm")
     depends_on("rocprofiler-dev", when="@1.3.0: +rocm")
+    depends_on("hip@5", when="@1:1.10 +rocm")
+    depends_on("rocm-smi-lib@5", when="@1:1.10 +rocm")
+    depends_on("roctracer-dev@5", when="@1:1.10 +rocm")
+    depends_on("rocprofiler-dev@5", when="@1.3.0:1.10 +rocm")
+
+    for ver in ["6.2.0", "6.2.1"]:
+        depends_on(f"rocm-smi-lib@{ver}", when=f"@rocm-{ver} +rocm")
+        depends_on(f"hip@{ver}", when=f"@rocm-{ver} +rocm")
+        depends_on(f"roctracer-dev@{ver}", when=f"@rocm-{ver} +rocm")
+        depends_on(f"rocprofiler-dev@{ver}", when=f"@rocm-{ver} +rocm")
+
     depends_on("papi+shared", when="+papi")
     depends_on("mpi", when="+mpi")
     depends_on("tau", when="+tau")
     depends_on("caliper", when="+caliper")
     depends_on("python@3:", when="+python", type=("build", "run"))
+    depends_on("dyninst@12", when="@1.8:,rocm-6.2:0 +rocm")
+    depends_on("m4", when="@1.8:,rocm-6.2:0 +rocm")
+    depends_on("texinfo", when="@1.8:,rocm-6.2:0 +rocm")
+    depends_on("libunwind", when="@1.8:,rocm-6.2:0 +rocm")
 
     def cmake_args(self):
         spec = self.spec
@@ -134,8 +182,19 @@ class Omnitrace(CMakePackage):
             args.append(self.define("MPI_C_COMPILER", spec["mpi"].mpicc))
             args.append(self.define("MPI_CXX_COMPILER", spec["mpi"].mpicxx))
 
+        if spec.satisfies("@1.8:,rocm-6.2:0"):
+            args.append(self.define("dl_LIBRARY", "dl"))
+            args.append(
+                self.define("libunwind_INCLUDE_DIR", self.spec["libunwind"].prefix.include)
+            )
         return args
 
+    def flag_handler(self, name, flags):
+        if self.spec.satisfies("@1.8:,rocm-6.2:0"):
+            if name == "ldflags":
+                flags.append("-lintl")
+        return (flags, None, None)
+
     def setup_build_environment(self, env):
         if "+tau" in self.spec:
             import glob