diff --git a/.gitmodules b/.gitmodules index b5f3cf61836..ff097cfd0a0 100644 --- a/.gitmodules +++ b/.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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7110e1eb2ca..4c1b8b7f2c1 100644 --- a/CMakeLists.txt +++ b/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() diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index 0c474cceecb..cc7ed840202 100644 --- a/base/CMakeLists.txt +++ b/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 diff --git a/base/rocm-core b/base/rocm-core deleted file mode 160000 index 942821090f1..00000000000 --- a/base/rocm-core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 942821090f1a81d7ad55f910dffdba93c2cdca8a diff --git a/base/rocm_smi_lib b/base/rocm_smi_lib deleted file mode 160000 index b9b1c1f16c3..00000000000 --- a/base/rocm_smi_lib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b9b1c1f16c30fdf8a2133f25f4bfdb07d0e51a59 diff --git a/base/rocprofiler-register b/base/rocprofiler-register deleted file mode 160000 index 80fcffeb5aa..00000000000 --- a/base/rocprofiler-register +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 80fcffeb5aaa1033d250f1d8e14fa9e387fc783b diff --git a/build_tools/bump_submodules.py b/build_tools/bump_submodules.py index eebc7b2d82a..6c6c5482de9 100755 --- a/build_tools/bump_submodules.py +++ b/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 """, ) diff --git a/build_tools/fetch_sources.py b/build_tools/fetch_sources.py index 4a65221b30f..47fac2aa1aa 100755 --- a/build_tools/fetch_sources.py +++ b/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", ] + ( [ diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 7c9d72e3bb6..a7f332f594f 100644 --- a/core/CMakeLists.txt +++ b/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. diff --git a/core/HIP b/core/HIP deleted file mode 160000 index d1c55790088..00000000000 --- a/core/HIP +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d1c55790088f55d6e4a2b7060baf3a506bbca99d diff --git a/core/ROCR-Runtime b/core/ROCR-Runtime deleted file mode 160000 index 12430fe25a9..00000000000 --- a/core/ROCR-Runtime +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 12430fe25a91faff276c65ace2019d42927351a2 diff --git a/core/amdgpu-windows-interop b/core/amdgpu-windows-interop index 556191f4989..4a548681b78 160000 --- a/core/amdgpu-windows-interop +++ b/core/amdgpu-windows-interop @@ -1 +1 @@ -Subproject commit 556191f498918027cbdea668ebba475c878848c5 +Subproject commit 4a548681b78cf59ef80f46ea7668e1d412f66eb8 diff --git a/core/clr b/core/clr deleted file mode 160000 index 5229b26a377..00000000000 --- a/core/clr +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5229b26a3775fbb2eb6009220da376deea8fcac0 diff --git a/core/rocminfo b/core/rocminfo deleted file mode 160000 index aec5d6fa531..00000000000 --- a/core/rocminfo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit aec5d6fa53152668207d523ac481cc1ec9fb7298 diff --git a/patches/amd-mainline/clr/0003-SWDEV-460151-add-gfx1201-to-amd-staging-clr-183.patch b/patches/amd-mainline/clr/0003-SWDEV-460151-add-gfx1201-to-amd-staging-clr-183.patch deleted file mode 100644 index 2c37ac004da..00000000000 --- a/patches/amd-mainline/clr/0003-SWDEV-460151-add-gfx1201-to-amd-staging-clr-183.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 481d409f896326b19630f6975f9559f9b62f52b5 Mon Sep 17 00:00:00 2001 -From: "Xie, Jiabao(Jimbo)" -Date: Tue, 15 Jul 2025 22:32:58 +0000 -Subject: [PATCH 3/3] SWDEV-460151 - add gfx1201 to amd-staging clr (#183) - -* SWDEV-460151 - add gfx1201 to amd-staging clr - -* SWDEV-460151 - removed pal macro - ---------- - -Co-authored-by: Jimbo Xie ---- - rocclr/device/pal/paldevice.cpp | 1 + - rocclr/device/pal/palsettings.cpp | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/rocclr/device/pal/paldevice.cpp b/rocclr/device/pal/paldevice.cpp -index 03a087b0f..59edc1a23 100644 ---- a/rocclr/device/pal/paldevice.cpp -+++ b/rocclr/device/pal/paldevice.cpp -@@ -102,6 +102,7 @@ static constexpr PalDevice supportedPalDevices[] = { - {11, 0, 3, Pal::GfxIpLevel::GfxIp11_0, "gfx1103", Pal::AsicRevision::HawkPoint2}, - {11, 5, 0, Pal::GfxIpLevel::GfxIp11_5, "gfx1150", Pal::AsicRevision::Strix1}, - {11, 5, 1, Pal::GfxIpLevel::GfxIp11_5, "gfx1151", Pal::AsicRevision::StrixHalo}, -+ {12, 0, 1, Pal::GfxIpLevel::GfxIp12, "gfx1201", Pal::AsicRevision::Navi48}, - }; - - static std::tuple findIsa(uint32_t gfxipMajor, uint32_t gfxipMinor, -diff --git a/rocclr/device/pal/palsettings.cpp b/rocclr/device/pal/palsettings.cpp -index 8361a950c..0cd5ca70a 100644 ---- a/rocclr/device/pal/palsettings.cpp -+++ b/rocclr/device/pal/palsettings.cpp -@@ -161,6 +161,8 @@ bool Settings::create(const Pal::DeviceProperties& palProp, - amd::Os::getAppPathAndFileName(appName, appPathAndName); - - switch (palProp.revision) { -+ // Fall through for Navi4x ... -+ case Pal::AsicRevision::Navi48: - // Fall through for Navi3x ... - case Pal::AsicRevision::Navi33: - case Pal::AsicRevision::Navi32: --- -2.43.0 - diff --git a/patches/amd-mainline/clr/0005-Explicitly-load-libamdhip64.so.7.patch b/patches/amd-mainline/clr/0005-Explicitly-load-libamdhip64.so.7.patch deleted file mode 100644 index ccaaa413701..00000000000 --- a/patches/amd-mainline/clr/0005-Explicitly-load-libamdhip64.so.7.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 71a8f02f13d25632cc579d963c79d406d55f5066 Mon Sep 17 00:00:00 2001 -From: Marius Brehler -Date: Wed, 6 Aug 2025 20:53:01 +0000 -Subject: [PATCH 5/5] Explicitly load `libamdhip64.so.7` - ---- - hipamd/src/hip_comgr_helper.cpp | 2 +- - hipamd/src/hip_platform.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hipamd/src/hip_comgr_helper.cpp b/hipamd/src/hip_comgr_helper.cpp -index a8ee6ea9b..4b4908a93 100644 ---- a/hipamd/src/hip_comgr_helper.cpp -+++ b/hipamd/src/hip_comgr_helper.cpp -@@ -1151,7 +1151,7 @@ bool RTCProgram::findIsa() { - std::string dll_name = std::string("amdhip64_" + std::to_string(HIP_VERSION_MAJOR) + ".dll"); - libName = dll_name.c_str(); - #else -- libName = "libamdhip64.so"; -+ libName = "libamdhip64.so.7"; - #endif - - void* handle = amd::Os::loadLibrary(libName); -diff --git a/hipamd/src/hip_platform.cpp b/hipamd/src/hip_platform.cpp -index da290fd5e..e01667d69 100644 ---- a/hipamd/src/hip_platform.cpp -+++ b/hipamd/src/hip_platform.cpp -@@ -1014,7 +1014,7 @@ void* PlatformState::getDynamicLibraryHandle() { - #ifdef _WIN32 - const char* libName = "amdhip64.dll"; - #else -- const char* libName = "libamdhip64.so"; -+ const char* libName = "libamdhip64.so.7"; - #endif - - dynamicLibraryHandle_ = amd::Os::loadLibrary(libName); --- -2.43.0 - diff --git a/patches/amd-mainline/rocm-core/0001-Patch-version-and-getpath-files-for-Windows.patch b/patches/amd-mainline/rocm-systems/0001-Patch-version-and-getpath-files-for-Windows.patch similarity index 78% rename from patches/amd-mainline/rocm-core/0001-Patch-version-and-getpath-files-for-Windows.patch rename to patches/amd-mainline/rocm-systems/0001-Patch-version-and-getpath-files-for-Windows.patch index 36d036d9be5..f315aed60e3 100644 --- a/patches/amd-mainline/rocm-core/0001-Patch-version-and-getpath-files-for-Windows.patch +++ b/patches/amd-mainline/rocm-systems/0001-Patch-version-and-getpath-files-for-Windows.patch @@ -1,18 +1,18 @@ -From 0dd798f4768ecc971887fc53bb7c3e70a7f61d43 Mon Sep 17 00:00:00 2001 +From 0406f5b93e20f8b0567c212151a04511f5cef153 Mon Sep 17 00:00:00 2001 From: Scott Date: Fri, 31 Jan 2025 12:42:08 -0800 -Subject: [PATCH] Patch version and getpath files for Windows. +Subject: [PATCH 1/9] Patch version and getpath files for Windows. --- - rocm_getpath.cpp | 12 +++++++----- - rocm_getpath.h.in | 10 ++++++++-- - rocm_version.h.in | 10 ++++++++-- + projects/rocm-core/rocm_getpath.cpp | 12 +++++++----- + projects/rocm-core/rocm_getpath.h.in | 10 ++++++++-- + projects/rocm-core/rocm_version.h.in | 10 ++++++++-- 3 files changed, 23 insertions(+), 9 deletions(-) -diff --git a/rocm_getpath.cpp b/rocm_getpath.cpp -index 182b0ba..d02b3b5 100644 ---- a/rocm_getpath.cpp -+++ b/rocm_getpath.cpp +diff --git a/projects/rocm-core/rocm_getpath.cpp b/projects/rocm-core/rocm_getpath.cpp +index 182b0babea..4bdc8a16fe 100644 +--- a/projects/rocm-core/rocm_getpath.cpp ++++ b/projects/rocm-core/rocm_getpath.cpp @@ -25,10 +25,13 @@ #include @@ -60,10 +60,10 @@ index 182b0ba..d02b3b5 100644 return len; } - -diff --git a/rocm_getpath.h.in b/rocm_getpath.h.in -index c0eb448..7cf385d 100644 ---- a/rocm_getpath.h.in -+++ b/rocm_getpath.h.in +diff --git a/projects/rocm-core/rocm_getpath.h.in b/projects/rocm-core/rocm_getpath.h.in +index c0eb448f52..7cf385d96b 100644 +--- a/projects/rocm-core/rocm_getpath.h.in ++++ b/projects/rocm-core/rocm_getpath.h.in @@ -32,7 +32,13 @@ extern "C" { #endif /* __cplusplus */ @@ -88,10 +88,10 @@ index c0eb448..7cf385d 100644 #ifdef __cplusplus } // end extern "C" block -diff --git a/rocm_version.h.in b/rocm_version.h.in -index f9c11a9..6c239da 100644 ---- a/rocm_version.h.in -+++ b/rocm_version.h.in +diff --git a/projects/rocm-core/rocm_version.h.in b/projects/rocm-core/rocm_version.h.in +index f9c11a9c6f..6c239da9c9 100644 +--- a/projects/rocm-core/rocm_version.h.in ++++ b/projects/rocm-core/rocm_version.h.in @@ -33,7 +33,13 @@ extern "C" { #endif /* __cplusplus */ @@ -117,5 +117,5 @@ index f9c11a9..6c239da 100644 // int mj=0,mn=0,p=0,ret=0; // ret=getROCMVersion(&mj,&mn,&p); -- -2.34.1 +2.43.0 diff --git a/patches/amd-mainline/rocm-core/0002-Force-gzip-to-overwrite-an-existing-changelog.patch b/patches/amd-mainline/rocm-systems/0002-Force-gzip-to-overwrite-an-existing-changelog.patch similarity index 71% rename from patches/amd-mainline/rocm-core/0002-Force-gzip-to-overwrite-an-existing-changelog.patch rename to patches/amd-mainline/rocm-systems/0002-Force-gzip-to-overwrite-an-existing-changelog.patch index e3ca0059061..3d7a5d516b9 100644 --- a/patches/amd-mainline/rocm-core/0002-Force-gzip-to-overwrite-an-existing-changelog.patch +++ b/patches/amd-mainline/rocm-systems/0002-Force-gzip-to-overwrite-an-existing-changelog.patch @@ -1,7 +1,7 @@ -From 159e00067f58fdbe038a6a8d1adc37a3e32d8575 Mon Sep 17 00:00:00 2001 +From 3441f6a53eeaabb0d436099c6714d4d76f348d3e Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Wed, 18 Jun 2025 14:10:51 +0000 -Subject: [PATCH 2/2] Force gzip to overwrite an existing changelog +Subject: [PATCH 2/9] Force gzip to overwrite an existing changelog If a compressed changelog exists from a previous build, reconfiguring the project fails with @@ -14,14 +14,14 @@ the project fails with Add `-f` to force overwriting. --- - utils.cmake | 2 +- + projects/rocm-core/utils.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/utils.cmake b/utils.cmake -index 42c075b..0a4244b 100644 ---- a/utils.cmake -+++ b/utils.cmake -@@ -203,7 +203,7 @@ function( configure_debian_pkg PACKAGE_NAME_T COMPONENT_NAME_T PACKAGE_VERSION_T +diff --git a/projects/rocm-core/utils.cmake b/projects/rocm-core/utils.cmake +index 1200fb0655..0b31b49cf9 100644 +--- a/projects/rocm-core/utils.cmake ++++ b/projects/rocm-core/utils.cmake +@@ -229,7 +229,7 @@ function( configure_debian_pkg PACKAGE_NAME_T COMPONENT_NAME_T PACKAGE_VERSION_T find_program ( DEB_GZIP_EXEC gzip ) if(EXISTS "${CMAKE_BINARY_DIR}/DEBIAN/changelog.Debian" ) execute_process( diff --git a/patches/amd-mainline/clr/0001-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch b/patches/amd-mainline/rocm-systems/0003-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch similarity index 65% rename from patches/amd-mainline/clr/0001-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch rename to patches/amd-mainline/rocm-systems/0003-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch index c08dd13669a..4fc74623687 100644 --- a/patches/amd-mainline/clr/0001-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch +++ b/patches/amd-mainline/rocm-systems/0003-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch @@ -1,19 +1,19 @@ -From 8de0426f934c5d1587998e7958124021ef7358fa Mon Sep 17 00:00:00 2001 +From 546d8a36e57b1d0e4a739340918da26e50802744 Mon Sep 17 00:00:00 2001 From: Stella Laurenzo Date: Fri, 9 May 2025 19:21:34 -0700 -Subject: [PATCH 1/3] Use is_versioned = true consistently in both +Subject: [PATCH 3/9] Use is_versioned = true consistently in both Comgr::LoadLib paths. Prior to this, RTCProgram was using is_version = true and device initialization was using false. On Windows, this was causing us to attempt to load amd_comgr_3.dll at device load and amd_comgr0605.dll for RTC programs. Obviously, there is only one DLL and it must be used consistently. --- - rocclr/device/device.cpp | 2 +- + projects/clr/rocclr/device/device.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/rocclr/device/device.cpp b/rocclr/device/device.cpp -index a791aa46f..22abd16d2 100644 ---- a/rocclr/device/device.cpp -+++ b/rocclr/device/device.cpp -@@ -754,7 +754,7 @@ bool Device::ValidateComgr() { +diff --git a/projects/clr/rocclr/device/device.cpp b/projects/clr/rocclr/device/device.cpp +index 41d51bffec..ae9498f6c1 100644 +--- a/projects/clr/rocclr/device/device.cpp ++++ b/projects/clr/rocclr/device/device.cpp +@@ -826,7 +826,7 @@ bool Device::ValidateComgr() { #if defined(USE_COMGR_LIBRARY) // Check if Lightning compiler was requested if (settings_->useLightning_) { @@ -23,5 +23,5 @@ index a791aa46f..22abd16d2 100644 // Use Lightning only if it's available settings_->useLightning_ = amd::Comgr::IsReady(); -- -2.47.1.windows.2 +2.43.0 diff --git a/patches/amd-mainline/clr/0002-Fix-assembler-error-in-pal-trap-handler.patch b/patches/amd-mainline/rocm-systems/0004-Fix-assembler-error-in-pal-trap-handler.patch similarity index 76% rename from patches/amd-mainline/clr/0002-Fix-assembler-error-in-pal-trap-handler.patch rename to patches/amd-mainline/rocm-systems/0004-Fix-assembler-error-in-pal-trap-handler.patch index bb43f1573e3..710f93eb03a 100644 --- a/patches/amd-mainline/clr/0002-Fix-assembler-error-in-pal-trap-handler.patch +++ b/patches/amd-mainline/rocm-systems/0004-Fix-assembler-error-in-pal-trap-handler.patch @@ -1,7 +1,7 @@ -From 7f04a22c8b20e319056f6e28a0cc905a9a547c53 Mon Sep 17 00:00:00 2001 +From 8b9d41236fc6488dafae744f9bd0a2e10c4b12eb Mon Sep 17 00:00:00 2001 From: Stella Laurenzo Date: Sat, 10 May 2025 15:56:02 -0700 -Subject: [PATCH 2/3] Fix assembler error in pal trap handler. +Subject: [PATCH 4/9] Fix assembler error in pal trap handler. This has been showing up in real use as an error printed to the console complaining that the ".not_s_trap" label cannot be found on device initialization. @@ -11,13 +11,13 @@ In [the referenced original source](https://github.com/ROCm/ROCR-Runtime/tree/am Tested by running hipblaslt tests on Windows/gfx1151 in TheRock and verifying that the error was not printed and tests run correctly. --- - rocclr/device/pal/palblitcl.cpp | 2 +- + projects/clr/rocclr/device/pal/palblitcl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/rocclr/device/pal/palblitcl.cpp b/rocclr/device/pal/palblitcl.cpp -index 6616a7fed..9072073df 100644 ---- a/rocclr/device/pal/palblitcl.cpp -+++ b/rocclr/device/pal/palblitcl.cpp +diff --git a/projects/clr/rocclr/device/pal/palblitcl.cpp b/projects/clr/rocclr/device/pal/palblitcl.cpp +index 6616a7fed9..9072073df6 100644 +--- a/projects/clr/rocclr/device/pal/palblitcl.cpp ++++ b/projects/clr/rocclr/device/pal/palblitcl.cpp @@ -120,7 +120,7 @@ const char* TrapHandlerCode = RUNTIME_KERNEL( \ntrap_entry: \n // Extract trap_id from ttmp2 @@ -28,5 +28,5 @@ index 6616a7fed..9072073df 100644 \n // Check if the it was an host trap. \n s_bitcmp1_b32 ttmp1, SQ_WAVE_PC_HI_HT_SHIFT -- -2.47.1.windows.2 +2.43.0 diff --git a/patches/amd-mainline/clr/0004-Support-gfx1200-navi44.patch b/patches/amd-mainline/rocm-systems/0005-Support-gfx1200-navi44.patch similarity index 58% rename from patches/amd-mainline/clr/0004-Support-gfx1200-navi44.patch rename to patches/amd-mainline/rocm-systems/0005-Support-gfx1200-navi44.patch index d7d3c8f7319..f6e9b398d7b 100644 --- a/patches/amd-mainline/clr/0004-Support-gfx1200-navi44.patch +++ b/patches/amd-mainline/rocm-systems/0005-Support-gfx1200-navi44.patch @@ -1,17 +1,17 @@ -From 74b14b84aff8e075be7a9cdcebc5e5694455d29e Mon Sep 17 00:00:00 2001 +From e6622799d8cca17bdca35e310bbb856a41ce447f Mon Sep 17 00:00:00 2001 From: Aaryaman Vasishta Date: Thu, 31 Jul 2025 21:05:50 +0900 -Subject: [PATCH] Support gfx1200 (navi44) +Subject: [PATCH 5/9] Support gfx1200 (navi44) --- - rocclr/device/pal/paldevice.cpp | 1 + - rocclr/device/pal/palsettings.cpp | 1 + + projects/clr/rocclr/device/pal/paldevice.cpp | 1 + + projects/clr/rocclr/device/pal/palsettings.cpp | 1 + 2 files changed, 2 insertions(+) -diff --git a/rocclr/device/pal/paldevice.cpp b/rocclr/device/pal/paldevice.cpp -index 59edc1a23..3f92fb92b 100644 ---- a/rocclr/device/pal/paldevice.cpp -+++ b/rocclr/device/pal/paldevice.cpp +diff --git a/projects/clr/rocclr/device/pal/paldevice.cpp b/projects/clr/rocclr/device/pal/paldevice.cpp +index f7a6126dd7..dd23b6974a 100644 +--- a/projects/clr/rocclr/device/pal/paldevice.cpp ++++ b/projects/clr/rocclr/device/pal/paldevice.cpp @@ -102,6 +102,7 @@ static constexpr PalDevice supportedPalDevices[] = { {11, 0, 3, Pal::GfxIpLevel::GfxIp11_0, "gfx1103", Pal::AsicRevision::HawkPoint2}, {11, 5, 0, Pal::GfxIpLevel::GfxIp11_5, "gfx1150", Pal::AsicRevision::Strix1}, @@ -20,10 +20,10 @@ index 59edc1a23..3f92fb92b 100644 {12, 0, 1, Pal::GfxIpLevel::GfxIp12, "gfx1201", Pal::AsicRevision::Navi48}, }; -diff --git a/rocclr/device/pal/palsettings.cpp b/rocclr/device/pal/palsettings.cpp -index 0cd5ca70a..11fde4c09 100644 ---- a/rocclr/device/pal/palsettings.cpp -+++ b/rocclr/device/pal/palsettings.cpp +diff --git a/projects/clr/rocclr/device/pal/palsettings.cpp b/projects/clr/rocclr/device/pal/palsettings.cpp +index 0cd5ca70ae..11fde4c09b 100644 +--- a/projects/clr/rocclr/device/pal/palsettings.cpp ++++ b/projects/clr/rocclr/device/pal/palsettings.cpp @@ -163,6 +163,7 @@ bool Settings::create(const Pal::DeviceProperties& palProp, switch (palProp.revision) { // Fall through for Navi4x ... @@ -33,5 +33,5 @@ index 0cd5ca70a..11fde4c09 100644 case Pal::AsicRevision::Navi33: case Pal::AsicRevision::Navi32: -- -2.50.1.windows.1 +2.43.0 diff --git a/patches/amd-mainline/rocm-systems/0006-Explicitly-load-libamdhip64.so.7.patch b/patches/amd-mainline/rocm-systems/0006-Explicitly-load-libamdhip64.so.7.patch new file mode 100644 index 00000000000..7c1f1152798 --- /dev/null +++ b/patches/amd-mainline/rocm-systems/0006-Explicitly-load-libamdhip64.so.7.patch @@ -0,0 +1,39 @@ +From 2acb422421f1207803a9bbc2adb9a7a2b0e6aabb Mon Sep 17 00:00:00 2001 +From: Marius Brehler +Date: Wed, 6 Aug 2025 20:53:01 +0000 +Subject: [PATCH 6/9] Explicitly load `libamdhip64.so.7` + +--- + projects/clr/hipamd/src/hip_comgr_helper.cpp | 2 +- + projects/clr/hipamd/src/hip_platform.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/projects/clr/hipamd/src/hip_comgr_helper.cpp b/projects/clr/hipamd/src/hip_comgr_helper.cpp +index e48f1b18af..74b6a7ba9d 100644 +--- a/projects/clr/hipamd/src/hip_comgr_helper.cpp ++++ b/projects/clr/hipamd/src/hip_comgr_helper.cpp +@@ -907,7 +907,7 @@ bool RTCProgram::findIsa() { + std::string dll_name = std::string("amdhip64_" + std::to_string(HIP_VERSION_MAJOR) + ".dll"); + libName = dll_name.c_str(); + #else +- libName = "libamdhip64.so"; ++ libName = "libamdhip64.so.7"; + #endif + + void* handle = amd::Os::loadLibrary(libName); +diff --git a/projects/clr/hipamd/src/hip_platform.cpp b/projects/clr/hipamd/src/hip_platform.cpp +index 9b264d8663..f85a1d59b5 100644 +--- a/projects/clr/hipamd/src/hip_platform.cpp ++++ b/projects/clr/hipamd/src/hip_platform.cpp +@@ -1048,7 +1048,7 @@ void* PlatformState::getDynamicLibraryHandle() { + #ifdef _WIN32 + const char* libName = "amdhip64.dll"; + #else +- const char* libName = "libamdhip64.so"; ++ const char* libName = "libamdhip64.so.7"; + #endif + + dynamicLibraryHandle_ = amd::Os::loadLibrary(libName); +-- +2.43.0 + diff --git a/patches/amd-mainline/HIP/0001-Fix-FindHIP.cmake-search-for-hipconfig.patch b/patches/amd-mainline/rocm-systems/0007-Fix-FindHIP.cmake-search-for-hipconfig.patch similarity index 77% rename from patches/amd-mainline/HIP/0001-Fix-FindHIP.cmake-search-for-hipconfig.patch rename to patches/amd-mainline/rocm-systems/0007-Fix-FindHIP.cmake-search-for-hipconfig.patch index c8db7731733..3083816d7d6 100644 --- a/patches/amd-mainline/HIP/0001-Fix-FindHIP.cmake-search-for-hipconfig.patch +++ b/patches/amd-mainline/rocm-systems/0007-Fix-FindHIP.cmake-search-for-hipconfig.patch @@ -1,16 +1,16 @@ -From 027cb4a11e2b6c47606308b01e8180507496701d Mon Sep 17 00:00:00 2001 +From 42350ae31c7a156e921b3de34434ffb804c43dee Mon Sep 17 00:00:00 2001 From: Aaryaman Vasishta Date: Tue, 6 May 2025 15:07:26 +0530 -Subject: [PATCH] Fix FindHIP.cmake search for hipconfig. +Subject: [PATCH 7/9] Fix FindHIP.cmake search for hipconfig. --- - cmake/FindHIP.cmake | 11 ++--------- + projects/hip/cmake/FindHIP.cmake | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) -diff --git a/cmake/FindHIP.cmake b/cmake/FindHIP.cmake -index 422b7089..a93e839f 100644 ---- a/cmake/FindHIP.cmake -+++ b/cmake/FindHIP.cmake +diff --git a/projects/hip/cmake/FindHIP.cmake b/projects/hip/cmake/FindHIP.cmake +index 422b708917..a93e839f05 100644 +--- a/projects/hip/cmake/FindHIP.cmake ++++ b/projects/hip/cmake/FindHIP.cmake @@ -99,7 +99,7 @@ if(NOT APPLE) # Search in user specified path first find_path( @@ -45,5 +45,5 @@ index 422b7089..a93e839f 100644 # Find HIPCC_CMAKE_LINKER_HELPER executable find_program( -- -2.47.1.windows.2 +2.43.0 diff --git a/patches/amd-mainline/rocprofiler-sdk/0001-Rollup-of-build-changes-needed-for-compat-with-TheRo.patch b/patches/amd-mainline/rocm-systems/0008-Rollup-of-build-changes-needed-for-compat-with-TheRo.patch similarity index 80% rename from patches/amd-mainline/rocprofiler-sdk/0001-Rollup-of-build-changes-needed-for-compat-with-TheRo.patch rename to patches/amd-mainline/rocm-systems/0008-Rollup-of-build-changes-needed-for-compat-with-TheRo.patch index 92c734cdd25..1279b7e2962 100644 --- a/patches/amd-mainline/rocprofiler-sdk/0001-Rollup-of-build-changes-needed-for-compat-with-TheRo.patch +++ b/patches/amd-mainline/rocm-systems/0008-Rollup-of-build-changes-needed-for-compat-with-TheRo.patch @@ -1,22 +1,22 @@ -From ea8992b05f31d4fb523a0ea5ff7b7c1a98f4681d Mon Sep 17 00:00:00 2001 +From 643fae4bff51ba2d284218e9a9e7d6fbb09d0562 Mon Sep 17 00:00:00 2001 From: Stella Laurenzo Date: Mon, 23 Jun 2025 21:38:53 +0000 -Subject: [PATCH 1/2] Rollup of build changes needed for compat with TheRock. +Subject: [PATCH 8/9] Rollup of build changes needed for compat with TheRock. * When built for a non-default ROCM location, the HIP headers can't be found by a few targets. * Uses pkg_check for DRM libraries like ROCR-Runtime does (which avoids accidental fallback to system versions). Co-authored-by: Marius Brehler --- - cmake/rocprofiler_config_interfaces.cmake | 75 +++++++++++++--------- - source/lib/common/container/CMakeLists.txt | 1 + - source/lib/output/CMakeLists.txt | 3 +- + .../cmake/rocprofiler_config_interfaces.cmake | 75 +++++++++++-------- + .../lib/common/container/CMakeLists.txt | 1 + + .../source/lib/output/CMakeLists.txt | 3 +- 3 files changed, 48 insertions(+), 31 deletions(-) -diff --git a/cmake/rocprofiler_config_interfaces.cmake b/cmake/rocprofiler_config_interfaces.cmake -index 4d67246b..b41780f6 100644 ---- a/cmake/rocprofiler_config_interfaces.cmake -+++ b/cmake/rocprofiler_config_interfaces.cmake +diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_config_interfaces.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_config_interfaces.cmake +index 4d67246bda..b41780f63a 100644 +--- a/projects/rocprofiler-sdk/cmake/rocprofiler_config_interfaces.cmake ++++ b/projects/rocprofiler-sdk/cmake/rocprofiler_config_interfaces.cmake @@ -131,7 +131,13 @@ if(hip_VERSION VERSION_LESS "6.2") endif() @@ -106,19 +106,19 @@ index 4d67246b..b41780f6 100644 # ----------------------------------------------------------------------------------------# # -diff --git a/source/lib/common/container/CMakeLists.txt b/source/lib/common/container/CMakeLists.txt -index f1ab9577..b152ebd3 100644 ---- a/source/lib/common/container/CMakeLists.txt -+++ b/source/lib/common/container/CMakeLists.txt +diff --git a/projects/rocprofiler-sdk/source/lib/common/container/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/common/container/CMakeLists.txt +index f1ab95775f..b152ebd35f 100644 +--- a/projects/rocprofiler-sdk/source/lib/common/container/CMakeLists.txt ++++ b/projects/rocprofiler-sdk/source/lib/common/container/CMakeLists.txt @@ -9,3 +9,4 @@ set(containers_sources ring_buffer.cpp record_header_buffer.cpp ring_buffer.cpp target_sources(rocprofiler-sdk-common-library PRIVATE ${containers_sources} ${containers_headers}) +target_link_libraries(rocprofiler-sdk-common-library PRIVATE rocprofiler-sdk-hip-nolink) -diff --git a/source/lib/output/CMakeLists.txt b/source/lib/output/CMakeLists.txt -index 2a3505a5..cf72cf9c 100644 ---- a/source/lib/output/CMakeLists.txt -+++ b/source/lib/output/CMakeLists.txt +diff --git a/projects/rocprofiler-sdk/source/lib/output/CMakeLists.txt b/projects/rocprofiler-sdk/source/lib/output/CMakeLists.txt +index 2a3505a562..cf72cf9c3a 100644 +--- a/projects/rocprofiler-sdk/source/lib/output/CMakeLists.txt ++++ b/projects/rocprofiler-sdk/source/lib/output/CMakeLists.txt @@ -70,7 +70,8 @@ target_link_libraries( rocprofiler-sdk::rocprofiler-sdk-amd-comgr rocprofiler-sdk::rocprofiler-sdk-dw diff --git a/patches/amd-mainline/rocprofiler-sdk/0002-Find-bundled-libelf.patch b/patches/amd-mainline/rocm-systems/0009-Find-bundled-libelf.patch similarity index 55% rename from patches/amd-mainline/rocprofiler-sdk/0002-Find-bundled-libelf.patch rename to patches/amd-mainline/rocm-systems/0009-Find-bundled-libelf.patch index 2b11a3bb35a..7d642767c2e 100644 --- a/patches/amd-mainline/rocprofiler-sdk/0002-Find-bundled-libelf.patch +++ b/patches/amd-mainline/rocm-systems/0009-Find-bundled-libelf.patch @@ -1,16 +1,16 @@ -From 63edea5b7e5676698d66cb88af6233309abe4c91 Mon Sep 17 00:00:00 2001 +From 28d195faa8f568878801fb0f3fd663fa3e2ea46c Mon Sep 17 00:00:00 2001 From: Marius Brehler Date: Tue, 15 Jul 2025 09:48:47 +0000 -Subject: [PATCH 2/2] Find bundled libelf +Subject: [PATCH 9/9] Find bundled libelf --- - cmake/rocprofiler_config_interfaces.cmake | 4 ++-- + .../rocprofiler-sdk/cmake/rocprofiler_config_interfaces.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/cmake/rocprofiler_config_interfaces.cmake b/cmake/rocprofiler_config_interfaces.cmake -index b41780f6..6a548648 100644 ---- a/cmake/rocprofiler_config_interfaces.cmake -+++ b/cmake/rocprofiler_config_interfaces.cmake +diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_config_interfaces.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_config_interfaces.cmake +index b41780f63a..6a548648a1 100644 +--- a/projects/rocprofiler-sdk/cmake/rocprofiler_config_interfaces.cmake ++++ b/projects/rocprofiler-sdk/cmake/rocprofiler_config_interfaces.cmake @@ -204,8 +204,8 @@ target_link_libraries(rocprofiler-sdk-ptl INTERFACE PTL::ptl-static) # # ----------------------------------------------------------------------------------------# diff --git a/profiler/CMakeLists.txt b/profiler/CMakeLists.txt index 45439a014e2..29b9a4044e3 100644 --- a/profiler/CMakeLists.txt +++ b/profiler/CMakeLists.txt @@ -28,7 +28,8 @@ if(THEROCK_ENABLE_ROCPROFV3) # USE_DIST_AMDGPU_TARGETS once fixed. # See: https://github.com/ROCm/aqlprofile/issues/2 DISABLE_AMDGPU_TARGETS - EXTERNAL_SOURCE_DIR "aqlprofile" + EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/aqlprofile" + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/aqlprofile" BACKGROUND_BUILD INTERFACE_LINK_DIRS lib # So that dependents can find the aqlprofile library via find_library @@ -46,7 +47,8 @@ if(THEROCK_ENABLE_ROCPROFV3) ############################################################################## therock_cmake_subproject_declare(rocprofiler-sdk USE_DIST_AMDGPU_TARGETS - EXTERNAL_SOURCE_DIR "rocprofiler-sdk" + EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/rocprofiler-sdk" + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/rocprofiler-sdk" BACKGROUND_BUILD CMAKE_ARGS -DHIP_PLATFORM=amd @@ -79,7 +81,8 @@ if(THEROCK_ENABLE_ROCPROFV3) therock_cmake_subproject_declare(roctracer USE_DIST_AMDGPU_TARGETS - EXTERNAL_SOURCE_DIR "roctracer" + EXTERNAL_SOURCE_DIR "${THEROCK_ROCM_SYSTEMS_SOURCE_DIR}/projects/roctracer" + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/roctracer" BACKGROUND_BUILD COMPILER_TOOLCHAIN # Must build with the HIP compiler. diff --git a/profiler/aqlprofile b/profiler/aqlprofile deleted file mode 160000 index 5e990844250..00000000000 --- a/profiler/aqlprofile +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5e99084425053ad6c7a076842128fc926f48dccb diff --git a/profiler/rocprofiler-sdk b/profiler/rocprofiler-sdk deleted file mode 160000 index 30e239d1b7b..00000000000 --- a/profiler/rocprofiler-sdk +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 30e239d1b7bb74df8d255f01956e4631780723d8 diff --git a/profiler/roctracer b/profiler/roctracer deleted file mode 160000 index dd745ed9c73..00000000000 --- a/profiler/roctracer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dd745ed9c731cf1c67a182a4ce41ce30afbfb8ca diff --git a/rocm-systems b/rocm-systems new file mode 160000 index 00000000000..f4158ed3b79 --- /dev/null +++ b/rocm-systems @@ -0,0 +1 @@ +Subproject commit f4158ed3b798a6fe2dbdcff04a638a277e09b7d6