From b9d9259c840a5518841890291690c21aea2e5522 Mon Sep 17 00:00:00 2001 From: Ethan Stewart Date: Thu, 16 Jul 2026 11:31:21 -0500 Subject: [PATCH] [build] - Bump version to 24.0-0 Bumped srock to 7.15. --- bin/aomp_common_vars | 4 +- bin/patches/patch-control-file_24.0.txt | 15 +++++++ manifests/aomp_24.0.xml | 20 ++++++++++ manifests/test_24.0.xml | 53 +++++++++++++++++++++++++ srock-bin/srock_common_vars | 2 +- trunk/README.md | 26 ++++++------ trunk/trunk_common_vars | 2 +- 7 files changed, 105 insertions(+), 17 deletions(-) create mode 100644 bin/patches/patch-control-file_24.0.txt create mode 100644 manifests/aomp_24.0.xml create mode 100644 manifests/test_24.0.xml diff --git a/bin/aomp_common_vars b/bin/aomp_common_vars index 38ecabe4d4..c025c38c3f 100644 --- a/bin/aomp_common_vars +++ b/bin/aomp_common_vars @@ -28,8 +28,8 @@ AOMP_COMPILER_NAME=${AOMP_COMPILER_NAME:-AOMP} ROCM_VERSION=${ROCM_VERSION:-6.4.0} # Set the AOMP VERSION STRING -AOMP_VERSION=${AOMP_VERSION:-"23.0"} -AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"1"} +AOMP_VERSION=${AOMP_VERSION:-"24.0"} +AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"0"} AOMP_VERSION_STRING=${AOMP_VERSION_STRING:-"$AOMP_VERSION-$AOMP_VERSION_MOD"} ROCM_EXPECTED_MODVERSION=${ROCM_EXPECTED_MODVERSION:-6.2.4} export AOMP_VERSION_STRING AOMP_VERSION AOMP_VERSION_MOD ROCM_VERSION ROCM_EXPECTED_MODVERSION diff --git a/bin/patches/patch-control-file_24.0.txt b/bin/patches/patch-control-file_24.0.txt new file mode 100644 index 0000000000..af86aeb4f0 --- /dev/null +++ b/bin/patches/patch-control-file_24.0.txt @@ -0,0 +1,15 @@ +openlibm: openlibm.patch +RAJA: raja.patch +RAJAPerf: rajaperf.patch +GenASis: genasis.patch +GenASiS_Basics: genasis_basics.patch +hipamd: +bolt: bolt.patch +rocr-runtime: rocr-runtime-numa.patch +clr: +rocprofiler: +rocprofiler-sdk: +babelstream: babelstream-usm.patch +llvm-project: ATD_ASO_full.patch +UMT: umt.patch +rocm-xio: xio.patch diff --git a/manifests/aomp_24.0.xml b/manifests/aomp_24.0.xml new file mode 100644 index 0000000000..fa4d06c572 --- /dev/null +++ b/manifests/aomp_24.0.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/manifests/test_24.0.xml b/manifests/test_24.0.xml new file mode 100644 index 0000000000..8cde6f0723 --- /dev/null +++ b/manifests/test_24.0.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/srock-bin/srock_common_vars b/srock-bin/srock_common_vars index b17f4048bb..d531955965 100644 --- a/srock-bin/srock_common_vars +++ b/srock-bin/srock_common_vars @@ -77,7 +77,7 @@ if [ ! -d "$SROCK_REPOS" ] ; then fi fi -SROCK_VERSION=${SROCK_VERSION:-"7.13"} +SROCK_VERSION=${SROCK_VERSION:-"7.15"} SROCK_VERSION_MOD=${SROCK_VERSION_MOD:-"0"} SROCK_VERSION_STRING=${SROCK_VERSION_STRING:-"$SROCK_VERSION-$SROCK_VERSION_MOD"} SROCK_MAJOR_VERSION=${SROCK_VERSION%.*} diff --git a/trunk/README.md b/trunk/README.md index f2c72d10f6..5538c2c1f2 100644 --- a/trunk/README.md +++ b/trunk/README.md @@ -1,9 +1,9 @@ -# How to Build the _trunk23_ Compiler +# How to Build the _trunk24_ Compiler Add the following to your environment in either `.bash_profile` or `.bashrc`: ``` bash -export TRUNK_REPOS=$HOME/git/trunk23.0 +export TRUNK_REPOS=$HOME/git/trunk24.0 ``` Or set `TRUNK_REPOS` to a location with a fast file system. Then log in again @@ -32,17 +32,17 @@ override. ## TRUNK_REPOS -See the discussion above for building _trunk23_ on the use of `TRUNK_REPOS`. +See the discussion above for building _trunk24_ on the use of `TRUNK_REPOS`. ## TRUNK_LINK The default value for `TRUNK_LINK` is `"$HOME/rocm/trunk"`. The `build_trunk.sh` -script will install into directory `${TRUNK_LINK}_23.0-0`. +script will install into directory `${TRUNK_LINK}_24.0-0`. Furthermore, it creates a symbolic link from `$TRUNK_LINK` to the install dir. So `$TRUNK_LINK` **MUST NOT** be a physical directory. This symbolic link makes -it easy to switch between future qualifed releases of _trunk23_. If you are on a +it easy to switch between future qualifed releases of _trunk24_. If you are on a system where `$HOME` is in a slow filesystem, set `TRUNK_LINK` to where you want the install directory to be. For example set the following in your `.bash_profile` or `.bashrc` then relogin: @@ -51,7 +51,7 @@ the install directory to be. For example set the following in your export TRUNK_LINK=/work/$USER/rocm/trunk ``` -Then the install scripts will install into `/work/$USER/rocm/trunk_23.0-0` and +Then the install scripts will install into `/work/$USER/rocm/trunk_24.0-0` and a symlink will be created from `$TRUNK_LINK`. @@ -160,16 +160,16 @@ The default for `BUILD_TYPE` is "Release". This sets the value for `CMAKE_BUILD_TYPE`. See CMake documentation for different possible values. -# Releases of _trunk23_ +# Releases of _trunk24_ -At various development check points we will qualify releases of _trunk23_ and +At various development check points we will qualify releases of _trunk24_ and increment the development version in `trunk_common_vars`. For example, after the -release of `trunk_23.0-0`, development will move to `trunk_23.0-1`. The build -scripts will then install into directory `$HOME/rocm/trunk_23.0-1`. The symbolic +release of `trunk_24.0-0`, development will move to `trunk_24.0-1`. The build +scripts will then install into directory `$HOME/rocm/trunk_24.0-1`. The symbolic link from `$HOME/rocm/trunk` will also change to the new install directory. -After a _trunk23_ release, a static release branch will be created. such as -`trunk_23.0-0`. This branch will be created by interactive rebasing all the +After a _trunk24_ release, a static release branch will be created. such as +`trunk_24.0-0`. This branch will be created by interactive rebasing all the local commits in `amd-trunk-dev`. Development will continue in the branch `amd-trunk-dev`. @@ -183,7 +183,7 @@ similar to the `clone_aomp.sh` script used for AOMP. For now, simply run merges from main. -# Testing _trunk23_ +# Testing _trunk24_ To use the various AOMP testing infrastructure in `$TRUNK_REPOS/aomp/test`: diff --git a/trunk/trunk_common_vars b/trunk/trunk_common_vars index 669e56fc4b..3145ebe803 100644 --- a/trunk/trunk_common_vars +++ b/trunk/trunk_common_vars @@ -8,7 +8,7 @@ # set environment variables defined in this file. # # Set the TRUNK VERSION STRING and TRUNK_PROJECT_REPO_BRANCH. -TRUNK_VERSION=${TRUNK_VERSION:-"23.0"} +TRUNK_VERSION=${TRUNK_VERSION:-"24.0"} TRUNK_VERSION_MOD=${TRUNK_VERSION_MOD:-"0"} TRUNK_VERSION_STRING=${TRUNK_VERSION_STRING:-"$TRUNK_VERSION-$TRUNK_VERSION_MOD"} export TRUNK_VERSION_STRING TRUNK_VERSION TRUNK_VERSION_MOD