Skip to content

Update sources to 7 13 #2295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
estewart08 merged 3 commits into from
Jun 29, 2026
Merged

Update sources to 7 13 #2295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e72149
[build] - Update manifest and clone_aomp.sh to support 7.13 sources
estewart08 Jun 25, 2026
fbd3414
[build] - Update patch control file for move to rocm-systems monorepo
estewart08 Jun 26, 2026
c86015d
[build] - Update build scripts/aomp_common_vars for 7.13 sources
estewart08 Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions bin/aomp_common_vars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,24 +436,25 @@ fi
AOMP_REPO_NAME=${AOMP_REPO_NAME:-aomp}

# These extra repositories are needed but we cannot update them
AOMP_ROCM_SYSTEMS_NAME=${AOMP_ROCM_SYSTEMS_NAME:-rocm-systems/projects}
AOMP_ROCT_REPO_NAME=${AOMP_ROCT_REPO_NAME:-roct-thunk-interface}
AOMP_ROCT_COMPONENT_NAME=${AOMP_ROCT_COMPONENT_NAME:-roct}
AOMP_ROCR_REPO_NAME=${AOMP_ROCR_REPO_NAME:-rocr-runtime}
AOMP_ROCR_REPO_NAME=${AOMP_ROCR_REPO_NAME:-${AOMP_ROCM_SYSTEMS_NAME}/rocr-runtime}
AOMP_ROCR_COMPONENT_NAME=${AOMP_ROCR_COMPONENT_NAME:-rocr}
AOMP_LIBDEVICE_REPO_NAME=${AOMP_LIBDEVICE_REPO_NAME:-device-libs}
AOMP_LIBDEVICE_COMPONENT_NAME=${AOMP_LIBDEVICE_COMPONENT_NAME:-rocdl}
DEVICELIBS_ROOT=${DEVICELIBS_ROOT:-$AOMP_REPOS/$AOMP_LIBDEVICE_REPO_NAME}
AOMP_COMGR_REPO_NAME=${AOMP_COMGR_REPO_NAME:-comgr}
AOMP_RINFO_REPO_NAME=${AOMP_RINFO_REPO_NAME:-rocminfo}
AOMP_RINFO_REPO_NAME=${AOMP_RINFO_REPO_NAME:-${AOMP_ROCM_SYSTEMS_NAME}/rocminfo}

AOMP_ROCMCMAKE_REPO_NAME=${AOMP_ROCMCMAKE_REPO_NAME:-rocm-cmake}

# These are needed when AOMP_BUILD_DEBUG=1
AOMP_GDB_REPO_NAME=${AOMP_GDB_REPO_NAME:-ROCgdb}
AOMP_DBGAPI_REPO_NAME=${AOMP_DBGAPI_REPO_NAME:-ROCdbgapi}
AOMP_PROF_REPO_NAME=${AOMP_PROF_REPO_NAME:-rocprofiler}
AOMP_PROF_SDK_REPO_NAME=${AOMP_PROF_SDK_REPO_NAME:-rocprofiler-sdk}
AOMP_PROF_REGISTER_REPO_NAME=${AOMP_PROF_REGISTER_REPO_NAME:-rocprofiler-register}
AOMP_DBGAPI_REPO_NAME=${AOMP_DBGAPI_REPO_NAME:-${AOMP_ROCM_SYSTEMS_NAME}/rocdbgapi}
AOMP_PROF_REPO_NAME=${AOMP_PROF_REPO_NAME:-${AOMP_ROCM_SYSTEMS_NAME}/rocprofiler}
AOMP_PROF_SDK_REPO_NAME=${AOMP_PROF_SDK_REPO_NAME:-${AOMP_ROCM_SYSTEMS_NAME}/rocprofiler-sdk}
AOMP_PROF_REGISTER_REPO_NAME=${AOMP_PROF_REGISTER_REPO_NAME:-${AOMP_ROCM_SYSTEMS_NAME}/rocprofiler-register}
AOMP_TRACE_REPO_NAME=${AOMP_TRACE_REPO_NAME:-roctracer}

# These are test repositories
Expand Down
2 changes: 1 addition & 1 deletion bin/build_amdsmi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ thisdir=$(dirname "$realpath")
. "$thisdir/aomp_common_vars"
# --- end standard header ----

RSMILIB_REPO_DIR=$AOMP_REPOS/amdsmi
RSMILIB_REPO_DIR=$AOMP_REPOS/${AOMP_ROCM_SYSTEMS_NAME}/amdsmi

BUILD_DIR=${BUILD_AOMP}

Expand Down
8 changes: 4 additions & 4 deletions bin/build_hipamd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ thisdir=$(dirname "$realpath")
. "$thisdir/aomp_common_vars"
# --- end standard header ----

export HIPAMD_DIR=$AOMP_REPOS/clr
export HIP_DIR=$AOMP_REPOS/hip
export ROCclr_DIR=$AOMP_REPOS/clr/rocclr
export OPENCL_DIR=$AOMP_REPOS/clr/opencl
export HIPAMD_DIR=$AOMP_REPOS/${AOMP_ROCM_SYSTEMS_NAME}/clr
export HIP_DIR=$AOMP_REPOS/${AOMP_ROCM_SYSTEMS_NAME}/hip
export ROCclr_DIR=$AOMP_REPOS/${AOMP_ROCM_SYSTEMS_NAME}/clr/rocclr
export OPENCL_DIR=$AOMP_REPOS/${AOMP_ROCM_SYSTEMS_NAME}/clr/opencl
[[ ! -d $HIPAMD_DIR ]] && echo "ERROR: Missing $HIPAMD_DIR" && exit 1
[[ ! -d $HIP_DIR ]] && echo "ERROR: Missing $HIP_DIR" && exit 1
[[ ! -d $ROCclr_DIR ]] && echo "ERROR: Missing $ROCclr_DIR" && exit 1
Expand Down
8 changes: 0 additions & 8 deletions bin/build_project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ INSTALL_PROJECT=${INSTALL_PROJECT:-$LLVM_INSTALL_LOC}

WEBSITE="http\:\/\/github.com\/ROCm\/aomp"

# Check-openmp prep
# Patch rocr
ROCR_REPO_DIR=$AOMP_REPOS/$AOMP_ROCR_REPO_NAME
patchrepo "$ROCR_REPO_DIR"

# Patch llvm-project with ATD patch customized for amd-staging.
# WARNING: This patch (ATD_ASO_full.patch) rarely applies cleanly
# because of its size and constant trunk merges to amd-staging.
Expand Down Expand Up @@ -129,8 +124,6 @@ MYCMAKEOPTS=(-DCMAKE_BUILD_TYPE="$BUILD_TYPE"
-DLLVM_BUILD_LLVM_DYLIB=ON
-DLLVM_LINK_LLVM_DYLIB=ON
-DCLANG_LINK_CLANG_DYLIB=ON
-DLIBOMPTARGET_EXTERNAL_PROJECT_HSA_PATH="$AOMP_REPOS/$AOMP_ROCR_REPO_NAME"
-DOFFLOAD_EXTERNAL_PROJECT_UNIFIED_ROCR=On
-DLIBOMPTARGET_EXTERNAL_PROJECT_ROCM_DEVICE_LIBS_PATH="$AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/amd/device-libs"
-DLLVM_EXTERNAL_PROJECTS=SPIRV_TRANSLATOR
-DLLVM_EXTERNAL_SPIRV_TRANSLATOR_SOURCE_DIR="$AOMP_REPOS/SPIRV-LLVM-Translator"
Expand Down Expand Up @@ -323,7 +316,6 @@ if [ "$1" == "install" ] ; then
if [ "$AOMP_APPLY_ATD_AMD_STAGING_PATCH" == 1 ] ; then
removepatch "$REPO_DIR"
fi
removepatch "$ROCR_REPO_DIR"
amd_compiler_symlinks=("amdclang" "amdclang++" "amdclang-cl" "amdclang-cpp" "amdflang" "amdlld")
amd_compiler_cfg=("clang" "clang++" "clang-cpp" "clang-${AOMP_MAJOR_VERSION}" "clang-cl" "flang")

Expand Down
2 changes: 1 addition & 1 deletion bin/build_rocm_smi_lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ thisdir=$(dirname "$realpath")
. "$thisdir/aomp_common_vars"
# --- end standard header ----

RSMILIB_REPO_DIR=$AOMP_REPOS/rocm_smi_lib
RSMILIB_REPO_DIR=$AOMP_REPOS/${AOMP_ROCM_SYSTEMS_NAME}/rocm-smi-lib

BUILD_DIR=${BUILD_AOMP}

Expand Down
15 changes: 11 additions & 4 deletions bin/clone_aomp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ if [ -d "$repodirname" ] ; then
if [ "$STASH_BEFORE_PULL" == "YES" ] ; then
git stash -u
fi
echo "git pull "
if ! git pull && [ "$IGNORE_GIT_ERROR" != 1 ] ; then
echo "git pull failed for: $repodirname"
exit 1
if [ "$sha_key_used" -eq 0 ] && [ "$tag_used" -eq 0 ]; then
echo "git pull "
if ! git pull && [ "$IGNORE_GIT_ERROR" != 1 ] ; then
echo "git pull failed for: $repodirname"
exit 1
fi
fi
echo "cd $repodirname ; git checkout $COBRANCH"
if ! git checkout "$COBRANCH" && [ "$IGNORE_GIT_ERROR" != 1 ] ; then
Expand Down Expand Up @@ -256,6 +258,7 @@ if [[ "$AOMP_VERSION" == "13.1" ]] || [[ $AOMP_MAJOR_VERSION -gt 13 ]] ; then
line_is_good=1
remote=$(echo "$line" | grep remote | cut -d"=" -f2)
sha_key_used=0
tag_used=0
COSHAKEY=""
for field in $line; do
if [[ "$field" =~ remote=\"([^\"]*)\" ]]; then
Expand All @@ -276,6 +279,10 @@ if [[ "$AOMP_VERSION" == "13.1" ]] || [[ $AOMP_MAJOR_VERSION -gt 13 ]] ; then
elif [[ "$field" =~ revision=\"([^\"]*)\" ]]; then
COBRANCH=${BASH_REMATCH[1]}
fi
if [[ "$field" =~ tag=\"true\" ]]; then
tag_used=1
sha_key_used=0
fi
done
reponame=$path
repogitname=$name
Expand Down
8 changes: 4 additions & 4 deletions bin/patches/patch-control-file_23.0.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ RAJA: raja.patch
RAJAPerf: rajaperf.patch
GenASis: genasis.patch
GenASiS_Basics: genasis_basics.patch
hipamd: hipamd-rpath.patch
hipamd:
bolt: bolt.patch
rocr-runtime: rocr-runtime-numa.patch
clr: clr-findamd-icd.patch clr-amd-comgr-find-package.patch
rocprofiler: rocprofiler-combined-no-aql-ok-fix-cov6.patch
rocprofiler-sdk: rocprofiler-sdk-otf2-url-fix.patch
clr:
rocprofiler:
rocprofiler-sdk:
babelstream: babelstream-usm.patch
llvm-project: ATD_ASO_full.patch
UMT: umt.patch
Expand Down
21 changes: 6 additions & 15 deletions manifests/aompi_23.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<!-- Manifest for AOMP 23.0-x which uses ROCM 7.2 release branches of external repositories -->
<!-- Manifest for AOMP 23.0-x which uses ROCM 7.13 release branches of external repositories -->

<default revision="release/rocm-rel-7.2" remote="gerritgit" sync-j="4" sync-c="true" />
<remote name="roc" fetch="https://github.com/ROCm" />
<remote name="simde" fetch="https://github.com/simd-everywhere" />

<!-- These first 4 repos are NOT rocm 7.2. They are compiler developer branches -->
<!-- These first 4 repos are NOT rocm 7.13. They are compiler developer branches -->
<project remote="roc" path="llvm-project" name="llvm-project.git" revision="amd-staging" groups="unlocked" />
<project remote="roc" path="SPIRV-LLVM-Translator" name="spirv-llvm-translator.git" revision="amd-staging" groups="unlocked" />
<project remote="roc" path="hipify" name="hipify.git" revision="amd-staging" groups="unlocked" />
<project remote="simde" path="simde" name="simde" revision="master" groups="unlocked" />

<project remote="roc" path="aomp" name="aomp" revision="aomp-dev" groups="unlocked" />

<project remote="roc" path="rocprofiler-sdk" name="rocprofiler-sdk" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="ROCdbgapi" name="ROCdbgapi" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="ROCgdb" name="ROCgdb" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="hip" name="hip" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="clr" name="clr" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="rocminfo" name="rocminfo" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="rocm_smi_lib" name="rocm_smi_lib" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="amdsmi" name="amdsmi" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="rocm-cmake" name="rocm-cmake" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="rocr-runtime" name="ROCR-Runtime" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="rocprofiler-register" name="rocprofiler-register" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="hipfort" name="hipfort" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="ROCgdb" name="ROCgdb" upstream="amd-staging" revision="therock-7.13" tag="true" groups="revlocked" />
<project remote="roc" path="rocm-cmake" name="rocm-cmake" upstream="develop" revision="therock-7.13" tag="true" groups="revlocked" />
<project remote="roc" path="hipfort" name="hipfort" revision="release/rocm-rel-7.2" groups="unlocked" />
<project remote="roc" path="rocm-systems" name="rocm-systems" upstream="develop" revision="therock-7.13" tag="true" groups="revlocked" />
</manifest>
Loading