Skip to content

Commit

Permalink
Add support for 14.0-0 release manifest.
Browse files Browse the repository at this point in the history
- Change aomp_14.0.xml back to being a generic 14.0-x manifest.
- Add aomp_14.0-0.xml for release specific builds.
- Update clone_aomp.sh to support building using release manifests.
  The release manifest is used when the release branch is currently
  checkout out. For example the aomp-14.0-0 branch.
- Add AOMP_EXTERNAL_MANIFEST to avoid using internal version
  if ping succeeds.
  • Loading branch information
estewart08 committed Nov 16, 2021
1 parent abe825a commit 36f6ece
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 9 deletions.
13 changes: 10 additions & 3 deletions bin/clone_aomp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,20 @@ function get_monthnumber() {
if [[ "$AOMP_VERSION" == "13.1" ]] || [[ $AOMP_MAJOR_VERSION -gt 13 ]] ; then
# For 13.1 and beyond, we use a manifest file to specify the repos to clone.
# However, we gave up on using the repo command to clone the repos.
# That is all done here by parsing the manifest file.
# That is all done here by parsing the manifest file.
ping -c 1 $AOMP_GIT_INTERNAL_IP 2> /dev/null >/dev/null
if [ $? == 0 ] && [ "$EXTERNAL_MANIFEST" != 1 ]; then
if [ $? == 0 ] && [ "$AOMP_EXTERNAL_MANIFEST" != 1 ]; then
# AMD internal repo file
manifest_file=$thisdir/../manifests/aompi_${AOMP_VERSION}.xml
else
manifest_file=$thisdir/../manifests/aomp_${AOMP_VERSION}.xml
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
manifest_file=$thisdir/../manifests/aomp_${AOMP_VERSION}.xml
fi
fi
fi
if [ ! -f $manifest_file ] ; then
echo "ERROR manifest file missing: $manifest_file"
Expand Down
31 changes: 31 additions & 0 deletions manifests/aomp_14.0-0.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest>
<!-- Manifest for AOMP 14.0-x which uses ROCM 4.5 release branches of external reositories -->

<remote name="gerritgit" review="git.amd.com:8080" fetch="ssh://gerritgit/" />
<default revision="release/rocm-rel-4.5" remote="gerritgit" sync-j="4" sync-c="true" />
<remote name="roctools" fetch="https://github.com/ROCm-Developer-Tools/" />
<remote name="roc" fetch="https://github.com/RadeonOpenCompute/" />

<!-- These first 6 repos are NOT rocm4.5 because this build is for the ROCm 4.5 AFAR compiler -->
<project remote="roc" path="llvm-project" name="llvm-project" upstream="amd-stg-open" revision="aomp-14.0-0" groups="revlocked" />

<project remote="roc" path="rocm-compilersupport" name="ROCm-CompilerSupport" upstream="amd-stg-open" revision="ef72f4edb3dd9efb40dd38bd9778fa6e53f1adbd" groups="revlocked" />
<project remote="roc" path="rocm-device-libs" name="ROCm-Device-Libs" upstream="amd-stg-open" revision="2011841dfe9e7f93e57cf8939c02aa45bfaa4dca" groups="revlocked" />
<project remote="roctools" path="flang" name="flang" revision="aomp-14.0-0" groups="unlocked" />
<project remote="roctools" path="aomp-extras" name="aomp-extras" revision="aomp-14.0-0" groups="unlocked" />
<project remote="roctools" path="aomp" name="aomp" revision="aomp-14.0-0" groups="unlocked" />

<project remote="roctools" path="rocprofiler" name="rocprofiler" revision="rocm-4.5.x" groups="unlocked" />
<project remote="roctools" path="roctracer" name="roctracer" revision="rocm-4.5.x" groups="unlocked" />
<project remote="roctools" path="ROCdbgapi" name="ROCdbgapi" revision="rocm-4.5.x" groups="unlocked" />
<project remote="roctools" path="ROCgdb" name="ROCgdb" revision="rocm-4.5.x" groups="unlocked" />
<project remote="roctools" path="hipamd" name="hipamd" revision="rocm-4.5.x" groups="unlocked" />
<project remote="roctools" path="hip" name="hip" revision="rocm-4.5.x" groups="unlocked" />
<project remote="roctools" path="ROCclr" name="ROCclr" revision="rocm-4.5.x" groups="unlocked" />
<project remote="roc" path="ROCm-OpenCL-Runtime" name="ROCm-OpenCL-Runtime" revision="rocm-4.5.x" groups="unlocked" />
<project remote="roc" path="rocminfo" name="rocminfo" revision="roc-4.5.x" groups="unlocked" />
<project remote="roc" path="rocm-cmake" name="rocm-cmake" revision="release/rocm-rel-4.5" groups="unlocked" />
<project remote="roc" path="rocr-runtime" name="ROCR-Runtime" revision="rocm-4.5.x" groups="unlocked" />
<project remote="roc" path="roct-thunk-interface" name="ROCT-Thunk-Interface" revision="roc-4.5.x" groups="unlocked" />
</manifest>
12 changes: 6 additions & 6 deletions manifests/aomp_14.0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<remote name="roc" fetch="https://github.com/RadeonOpenCompute/" />

<!-- These first 6 repos are NOT rocm4.5 because this build is for the ROCm 4.5 AFAR compiler -->
<project remote="roc" path="llvm-project" name="llvm-project" upstream="amd-stg-open" revision="8a48924725f0c53217d108b1d4b95f6ba0038031" groups="revlocked" />
<project remote="roc" path="llvm-project" name="llvm-project" revision="amd-stg-open" groups="unlocked" />

<project remote="roc" path="rocm-compilersupport" name="ROCm-CompilerSupport" upstream="amd-stg-open" revision="ef72f4edb3dd9efb40dd38bd9778fa6e53f1adbd" groups="revlocked" />
<project remote="roc" path="rocm-device-libs" name="ROCm-Device-Libs" upstream="amd-stg-open" revision="2011841dfe9e7f93e57cf8939c02aa45bfaa4dca" groups="revlocked" />
<project remote="roctools" path="flang" name="flang" revision="aomp-14.0-0" groups="unlocked" />
<project remote="roctools" path="aomp-extras" name="aomp-extras" revision="aomp-14.0-0" groups="unlocked" />
<project remote="roctools" path="aomp" name="aomp" revision="aomp-14.0-0" groups="unlocked" />
<project remote="roc" path="rocm-compilersupport" name="ROCm-CompilerSupport" revision="amd-stg-open" groups="unlocked" />
<project remote="roc" path="rocm-device-libs" name="ROCm-Device-Libs" revision="amd-stg-open" groups="unlocked" />
<project remote="roctools" path="flang" name="flang" revision="aomp-dev" groups="unlocked" />
<project remote="roctools" path="aomp-extras" name="aomp-extras" revision="aomp-dev" groups="unlocked" />
<project remote="roctools" path="aomp" name="aomp" revision="aomp-dev" groups="unlocked" />

<project remote="roctools" path="rocprofiler" name="rocprofiler" revision="rocm-4.5.x" groups="unlocked" />
<project remote="roctools" path="roctracer" name="roctracer" revision="rocm-4.5.x" groups="unlocked" />
Expand Down

0 comments on commit 36f6ece

Please sign in to comment.