Switch to build from rocm-systems

.gitmodules

@@ -1,15 +1,7 @@
-[submodule "clr"]
-	path = core/clr
-	url = https://github.com/ROCm/clr
-	branch = amd-staging
 [submodule "half"]
 	path = base/half
 	url = https://github.com/ROCm/half.git
 	branch = rocm
-[submodule "HIP"]
-	path = core/HIP
-	url = https://github.com/ROCm/HIP.git
-	branch = amd-staging
 [submodule "HIPIFY"]
 	path = compiler/hipify
 	url = https://github.com/ROCm/HIPIFY.git
@@ -22,34 +14,10 @@
 	path = comm-libs/rccl
 	url = https://github.com/ROCm/rccl.git
 	branch = mainline
-[submodule "rocm_smi_lib"]
-	path = base/rocm_smi_lib
-	url = https://github.com/ROCm/rocm_smi_lib.git
-	branch = amd-mainline
 [submodule "rocm-cmake"]
 	path = base/rocm-cmake
 	url = https://github.com/ROCm/rocm-cmake.git
 	branch = mainline
-[submodule "rocm-core"]
-	path = base/rocm-core
-	url = https://github.com/ROCm/rocm-core.git
-	branch = master
-[submodule "rocminfo"]
-	path = core/rocminfo
-	url = https://github.com/ROCm/rocminfo.git
-	branch = amd-staging
-[submodule "rocprofiler-register"]
-	path = base/rocprofiler-register
-	url = https://github.com/ROCm/rocprofiler-register.git
-	branch = amd-staging
-[submodule "rocprofiler-sdk"]
-	path = profiler/rocprofiler-sdk
-	url = https://github.com/ROCm/rocprofiler-sdk.git
-	branch = amd-staging
-[submodule "ROCR-Runtime"]
-	path = core/ROCR-Runtime
-	url = https://github.com/ROCm/ROCR-Runtime.git
-	branch = amd-mainline
 [submodule "hipSOLVER"]
 	path = math-libs/BLAS/hipSOLVER
 	url = https://github.com/ROCm/hipSOLVER.git
@@ -62,12 +30,6 @@
 	path = comm-libs/rccl-tests
 	url = https://github.com/ROCm/rccl-tests.git
 	branch = develop
-[submodule "aqlprofile"]
-	path = profiler/aqlprofile
-	url = https://github.com/ROCm/aqlprofile.git
-[submodule "roctracer"]
-	path = profiler/roctracer
-	url = https://github.com/ROCm/roctracer.git
 [submodule "composable_kernel"]
 	path = ml-libs/composable_kernel
 	url = https://github.com/ROCm/composable_kernel.git
@@ -86,3 +48,7 @@
 	path = core/hip-tests
 	url = https://github.com/ROCm/hip-tests.git
 	branch = amd-staging
+[submodule "rocm-systems"]
+	path = rocm-systems
+	url = https://github.com/ROCm/rocm-systems.git
+	branch = develop

CMakeLists.txt

@@ -68,6 +68,10 @@ set(THEROCK_ROCM_LIBRARIES_SOURCE_DIR_DEFAULT "${THEROCK_SOURCE_DIR}/rocm-librar
 set(THEROCK_ROCM_LIBRARIES_SOURCE_DIR "${THEROCK_ROCM_LIBRARIES_SOURCE_DIR_DEFAULT}" CACHE STRING "Path to rocm-libraries superrepo")
 cmake_path(ABSOLUTE_PATH THEROCK_ROCM_LIBRARIES_SOURCE_DIR NORMALIZE)
 
+set(THEROCM_ROCM_SYSTEMS_SOURCE_DIR_DEFAULT "${THEROCK_SOURCE_DIR}/rocm-systems")
+set(THEROCK_ROCM_SYSTEMS_SOURCE_DIR "${THEROCM_ROCM_SYSTEMS_SOURCE_DIR_DEFAULT}" CACHE STRING "Path to rocm-systems superrepo")
+cmake_path(ABSOLUTE_PATH THEROCK_ROCM_SYSTEMS_SOURCE_DIR NORMALIZE)
+
 # Allow to specify alternative source locations instead of using
 # repositories tracked in TheRock's `.gitmodules`.
 therock_enable_external_source("rccl" "${THEROCK_SOURCE_DIR}/comm-libs/rccl" OFF)
@@ -103,7 +107,7 @@ endblock()
 # least from a major/minor perspective, the ROCM version is a "user" version, whereas
 # the HIP version is hardcoded into various places in the code.
 block(SCOPE_FOR VARIABLES PROPAGATE THEROCK_HIP_MAJOR_VERSION THEROCK_HIP_MINOR_VERSION)
-  set(VERSION_PATH "${CMAKE_CURRENT_SOURCE_DIR}/core/HIP/VERSION")
+  set(VERSION_PATH "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/hip/VERSION")
   if(NOT EXISTS "${VERSION_PATH}")
     message(FATAL_ERROR "Could not find HIP VERSION file: ${VERSION_PATH}")
   endif()

base/CMakeLists.txt

@@ -36,7 +36,8 @@ else()
 endif()
 
 therock_cmake_subproject_declare(rocm-core
-  EXTERNAL_SOURCE_DIR "rocm-core"
+  EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/rocm-core"
+  BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/rocm-core"
   USE_DIST_AMDGPU_TARGETS
   BACKGROUND_BUILD
   CMAKE_ARGS
@@ -57,7 +58,8 @@ therock_cmake_subproject_activate(rocm-core)
 if(NOT WIN32)  # TODO(#36): Enable on Windows and/or make subproject inclusion generally optional
 
 therock_cmake_subproject_declare(rocm_smi_lib
-  EXTERNAL_SOURCE_DIR "rocm_smi_lib"
+  EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/rocm-smi-lib"
+  BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/rocm_smi_lib"
   USE_DIST_AMDGPU_TARGETS
   BACKGROUND_BUILD
   CMAKE_ARGS
@@ -94,7 +96,8 @@ endif()
 if(NOT WIN32)  # TODO(#36): Enable on Windows?
 
 therock_cmake_subproject_declare(rocprofiler-register
-  EXTERNAL_SOURCE_DIR "rocprofiler-register"
+  EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/rocprofiler-register"
+  BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/rocprofiler-register"
   USE_DIST_AMDGPU_TARGETS
   BACKGROUND_BUILD
   INTERFACE_LINK_DIRS

build_tools/bump_submodules.py

@@ -81,9 +81,6 @@ def parse_components(components: list[str]) -> list[list]:
         system_projects += [
             "half",
             "rocm-cmake",
-            "rocm-core",
-            "rocm_smi_lib",
-            "rocprofiler-register",
         ]
 
     if "comm-libs" in components:
@@ -92,21 +89,15 @@ def parse_components(components: list[str]) -> list[list]:
             "rccl-tests",
         ]
 
-    if "core" in components:
-        # amdgpu-windows-interop is Windows only and is updated manually.
-        system_projects += [
-            "HIP",
-            "ROCR-Runtime",
-            "clr",
-            "rocminfo",
-        ]
+    # if "core" in components:
+    #     # amdgpu-windows-interop is Windows only and is updated manually.
+    #     # hip-tests is Windows only and is updated manually.
+    #     system_projects += [
+    #     ]
 
     if "profiler" in components:
         system_projects += [
-            "aqlprofile",
             "rocprof-trace-decoder",
-            "rocprofiler-sdk",
-            "roctracer",
         ]
 
     if "rocm-libraries" in components:
@@ -126,6 +117,11 @@ def parse_components(components: list[str]) -> list[list]:
         else:
             arguments.append("--no-include-ml-frameworks")
 
+    if "rocm-systems" in components:
+        arguments.append("--include-rocm-systems")
+    else:
+        arguments.append("--no-include-rocm-systems")
+
     if "compiler" in components:
         arguments.append("--include-compilers")
     else:
@@ -224,10 +220,10 @@ def main(argv):
                   base,
                   comm-libs,
                   compiler,
-                  core,
                   math-libs,
                   ml-libs,
                   rocm-libraries,
+                  rocm-systems,
                   profiler
              """,
     )

build_tools/fetch_sources.py

@@ -40,6 +40,8 @@ def get_enabled_projects(args) -> list[str]:
         projects.extend(args.compiler_projects)
     if args.include_rocm_libraries:
         projects.extend(["rocm-libraries"])
+    if args.include_rocm_systems:
+        projects.extend(["rocm-systems"])
     if args.include_math_libs:
         projects.extend(args.math_lib_projects)
     if args.include_ml_frameworks:
@@ -300,7 +302,13 @@ def main(argv):
         "--include-rocm-libraries",
         default=True,
         action=argparse.BooleanOptionalAction,
-        help="Include supported rocm-libraries projhects",
+        help="Include supported rocm-libraries projects",
+    )
+    parser.add_argument(
+        "--include-rocm-systems",
+        default=True,
+        action=argparse.BooleanOptionalAction,
+        help="Include supported rocm-systems projects",
     )
     parser.add_argument(
         "--include-math-libs",
@@ -319,26 +327,12 @@ def main(argv):
         nargs="+",
         type=str,
         default=[
-            "aqlprofile",
-            "clr",
             "half",
-            "HIP",
             "hip-tests",
             "rccl",
             "rccl-tests",
-            "rocm_smi_lib",
             "rocm-cmake",
-            "rocm-core",
-            "rocminfo",
-            "rocprofiler-register",
-            # TODO: Re-enable when used.
-            # "rocprofiler-compute",
-            "rocprofiler-sdk",
             "rocprof-trace-decoder",
-            # TODO: Re-enable when used.
-            # "rocprofiler-systems",
-            "roctracer",
-            "ROCR-Runtime",
         ]
         + (
             [

core/CMakeLists.txt

@@ -5,7 +5,8 @@ if(THEROCK_ENABLE_CORE_RUNTIME)
 
   therock_cmake_subproject_declare(ROCR-Runtime
     USE_DIST_AMDGPU_TARGETS
-    EXTERNAL_SOURCE_DIR "ROCR-Runtime"
+    EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/rocr-runtime"
+    BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/ROCR-Runtime"
     BACKGROUND_BUILD
     CMAKE_ARGS
       "-DBUILD_SHARED_LIBS=ON"
@@ -41,7 +42,8 @@ if(THEROCK_ENABLE_CORE_RUNTIME)
 
   therock_cmake_subproject_declare(rocminfo
     USE_DIST_AMDGPU_TARGETS
-    EXTERNAL_SOURCE_DIR "rocminfo"
+    EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/rocminfo"
+    BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/rocminfo"
     BACKGROUND_BUILD
     RUNTIME_DEPS
       ROCR-Runtime
@@ -77,7 +79,7 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
   set(HIP_CLR_RUNTIME_DEPS)
   if(WIN32)
     # Windows CLR options
-    set(_compute_pal_dir "${CMAKE_CURRENT_SOURCE_DIR}/amdgpu-windows-interop/20250722a")
+    set(_compute_pal_dir "${CMAKE_CURRENT_SOURCE_DIR}/amdgpu-windows-interop/20250820a")
     cmake_path(NORMAL_PATH _compute_pal_dir)
     list(APPEND HIP_CLR_CMAKE_ARGS
       "-DUSE_PROF_API=OFF"
@@ -97,13 +99,14 @@ if(THEROCK_ENABLE_HIP_RUNTIME)
 
   therock_cmake_subproject_declare(hip-clr
     USE_DIST_AMDGPU_TARGETS
-    EXTERNAL_SOURCE_DIR "clr"
+    EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/clr"
+    BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/clr"
     INTERFACE_PROGRAM_DIRS
       bin
     BACKGROUND_BUILD
     CMAKE_ARGS
       "-DHIP_PLATFORM=amd"
-      "-DHIP_COMMON_DIR=${CMAKE_CURRENT_SOURCE_DIR}/HIP"
+      "-DHIP_COMMON_DIR=${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/hip"
       "-DCLR_BUILD_HIP=ON"
       # Legacy: Disable various auto-detection logic that breaks out of jail
       # and can use local machine tools.