Skip to content

merge aomp-dev into amd-staging #2332

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

Closed
z1-cciauto wants to merge 4 commits into from
Closed

merge aomp-dev into amd-staging #2332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
61cc013
[CK] Check git validity instead of dir existence (#2321)
jplehr Jul 7, 2026
82e63e1
[SMOKE] turn on -fuse-emissary-print so printf n format works (#2322)
gregrodgers Jul 7, 2026
f7f17b4
[build] - Remove usage of aompi manifest (#2320)
estewart08 Jul 7, 2026
e18dee5
merge aomp-dev into amd-staging
z1-cciauto Jul 9, 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
25 changes: 7 additions & 18 deletions bin/clone_aomp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,26 +218,15 @@ if [[ "$AOMP_VERSION" == "13.1" ]] || [[ $AOMP_MAJOR_VERSION -gt 13 ]] ; then
# However, we gave up on using the repo command to clone the repos.
# That is all done here by parsing the manifest file.

# According to git documentation this ssh command should return 1 if authentication is successful
ssh -T $AOMP_GIT_INTERNAL_IP 2> /dev/null
if [ $? == 1 ] && [ "$AOMP_EXTERNAL_MANIFEST" != 1 ]; then
# AMD internal repo file
if [ "$AOMP_NEW" == "1" ]; then
manifest_file=$thisdir/../manifests/aompi_new_${AOMP_VERSION}.xml
else
manifest_file=$thisdir/../manifests/aompi_${AOMP_VERSION}.xml
fi
abranch=$(git branch | awk '/\*/ { print $2; }')
# Use release manifest if on release branch
if [ "$abranch" == "aomp-${AOMP_VERSION_STRING}" ]; then
manifest_file=$thisdir/../manifests/aomp_${AOMP_VERSION_STRING}.xml
else
abranch=$(git branch | awk '/\*/ { print $2; }')
# Use release manifest if on release branch
if [ "$abranch" == "aomp-${AOMP_VERSION_STRING}" ]; then
manifest_file=$thisdir/../manifests/aomp_${AOMP_VERSION_STRING}.xml
if [ "$AOMP_NEW" == "1" ]; then
manifest_file=$thisdir/../manifests/aomp_new_${AOMP_VERSION}.xml
else
if [ "$AOMP_NEW" == "1" ]; then
manifest_file=$thisdir/../manifests/aomp_new_${AOMP_VERSION}.xml
else
manifest_file=$thisdir/../manifests/aomp_${AOMP_VERSION}.xml
fi
manifest_file=$thisdir/../manifests/aomp_${AOMP_VERSION}.xml
fi
fi
echo "USED manifest file: $manifest_file"
Expand Down
9 changes: 8 additions & 1 deletion bin/run_composable-kernels.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,14 @@ if [ ! -d "${CK_TOP}" ]; then
mkdir -p "${CK_TOP}" || exit 1
fi

if [ ! -d "${CK_REPO}" ]; then
# Validate that CK_REPO is an actual git checkout, not just an existing
# directory. Alola periodically wipes the *contents* of old node-local dirs
# while leaving the directory shells behind, which yields a CK_REPO that
# exists but has no .git (and no CMakeLists.txt), breaking the build. A plain
# "-d" test would skip the clone and then fail. Re-clone when the tree is
# missing or not a valid repo; only pull when it is a healthy checkout.
if ! git -C "${CK_REPO}" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
rm -rf "${CK_REPO}"
git clone --single-branch --depth 1 ${CKRepoURL} "${CK_REPO}"
elif [ "${ShouldUpdateCKRepo}" == 'yes' ]; then
pushd "${CK_REPO}" || exit 1
Expand Down
28 changes: 9 additions & 19 deletions manifests/aomp_23.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +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 -->

<remote name="gerritgit" review="git.amd.com:8080" fetch="ssh://gerritgit/" />
<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 -->
<project remote="roc" path="llvm-project" name="llvm-project" revision="amd-staging" groups="unlocked" />
<project remote="roc" path="SPIRV-LLVM-Translator" name="SPIRV-LLVM-Translator" revision="amd-staging" groups="unlocked" />
<project remote="roc" path="hipify" name="hipify" revision="amd-staging" groups="unlocked" />
<!-- 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>
20 changes: 0 additions & 20 deletions manifests/aompi_23.0.xml
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions test/smoke/helloworld%n/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ TESTSRC_MAIN = helloworld.c
TESTSRC_AUX =
TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX)

# The %n printf format does not work with libc printf so force emissary printf
ifeq ($(shell echo 'int main() { return 0; }' | $(CC) -fuse-emissary-print -xc - 2>/dev/null && echo true), true)
EXTRA_CFLAGS=-fuse-emissary-print
endif

CLANG ?= clang
OMP_BIN = $(AOMP)/bin/$(CLANG)
CC = $(OMP_BIN) $(VERBOSE)
Expand Down
Loading