Amd/dev/rlieberm/update mainline

.github/CODEOWNERS

@@ -1,3 +1,3 @@
-* @estewart08 @gregrodgers @ronlieb
+* @estewart08 @gregrodgers @ronlieb @zGoldthorpe @carlobertolli
 
 /bin/rocmlibs/ @saiislam

.github/workflows/aomp-shell.yml

@@ -0,0 +1,16 @@
+name: AOMP Lint
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  aomp-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Run shellcheck
+        run: |
+          find . -name "*.sh" -exec shellcheck -S info {} +

.shellcheckrc

@@ -0,0 +1 @@
+disable=SC2016,SC2002,SC2004

Makefile

@@ -7,6 +7,6 @@ AOMP ?= $(HOME)/rocm/aomp
 AOMP_REPOS = $(shell pwd)
 all: 
 	AOMP=$(AOMP) AOMP_REPOS=$(AOMP_REPOS) AOMP_APPLY_ROCM_PATCHES=0 TARBALL_INSTALL=1 $(AOMP_REPOS)/aomp/bin/build_prereq.sh
-	AOMP=$(AOMP) AOMP_REPOS=$(AOMP_REPOS) AOMP_APPLY_ROCM_PATCHES=0 TARBALL_INSTALL=1 DISABLE_LLVM_TESTS=1 $(AOMP_REPOS)/aomp/bin/build_aomp.sh
+	AOMP=$(AOMP) AOMP_REPOS=$(AOMP_REPOS) AOMP_APPLY_ROCM_PATCHES=0 TARBALL_INSTALL=1 DISABLE_LLVM_TESTS=1 LIBC_INCLUDE_BENCHMARKS=0 $(AOMP_REPOS)/aomp/bin/build_aomp.sh
 install:
 	@echo "Installation complete to $(AOMP)"

README.md

@@ -1,4 +1,4 @@
-AOMP - V 22.0-1
+AOMP - V 23.0-0
 ==============
 
 This is README.md for https://github.com/ROCm/aomp.
@@ -8,8 +8,8 @@ This is the base repository for AOMP. Use this github repository for
 documentation, and
 [examples](https://github.com/ROCm/aomp/tree/master/examples).
 
-The last [release is AOMP 22.0-1](https://github.com/ROCm/aomp/releases).
-Currently AOMP 22.0-2 is under development.
+The last [release is AOMP 23.0-0](https://github.com/ROCm/aomp/releases).
+Currently AOMP 23.0-1 is under development.
 
 Attention Users!  Please use this repository for [issues](https://github.com/ROCm/aomp/issues).
 Do not put issues in any of the source code repositories.

bin/README.md

@@ -13,33 +13,33 @@ The AOMP compiler supports OpenMP, clang-hip, clang-cuda, device OpenCL, and the
 
 <A NAME="Repositories"></A>
 The clone_aomp.sh script clones the necessary github repositories and the correct
-branches into subdirectories of $HOME/git/aomp22.0 (or $AOMP_REPOS if AOMP_REPOS is set).
+branches into subdirectories of $HOME/git/aomp23.0 (or $AOMP_REPOS if AOMP_REPOS is set).
 The repositories and components needed by AOMP are shown in the following table.
 The first column is the AOMP component name.  The build_aomp.sh script invokes
 each component build script with the name build_\<component name\>.sh .
 
 
 | COMPONENT | DEV BRANCH | DEFAULT DIRECTORY LOCATION           | REPOSITORY LINKS
 | --------- | ---------- | --------------------------           | ----------------
-| (aomp)    | aomp-dev   | $HOME/git/aomp22.0/aomp                | [aomp](https://github.com/ROCm/aomp) This repo!
-| project   | amd-staging | $HOME/git/aomp22.0/llvm-project      | [llvm-project](https://github.com/ROCm/llvm-project)
-| SPIRV-LLVM-Translator   | amd-staging | $HOME/git/aomp22.0/SPIRV-LLVM-Translator      | [SPIRV-LLVM-Translator](https://github.com/ROCm/SPIRV-LLVM-Translator)
-| hipify    |amd-staging| $HOME/git/aomp22.0/hipify              | [hipify](https://github.com/ROCm/hipify)
-| rocprofiler-register   | Latest ROCm | $HOME/git/aomp22.0/rocprofiler-register     | [rocprofiler-register](https://github.com/ROCm/rocprofiler-register)
-| openmp    | amd-staging | $HOME/git/aomp22.0/llvm-project/openmp | [llvm-project/openmp](https://github.com/ROCm/llvm-project)
+| (aomp)    | aomp-dev   | $HOME/git/aomp23.0/aomp                | [aomp](https://github.com/ROCm/aomp) This repo!
+| project   | amd-staging | $HOME/git/aomp23.0/llvm-project      | [llvm-project](https://github.com/ROCm/llvm-project)
+| SPIRV-LLVM-Translator   | amd-staging | $HOME/git/aomp23.0/SPIRV-LLVM-Translator      | [SPIRV-LLVM-Translator](https://github.com/ROCm/SPIRV-LLVM-Translator)
+| hipify    |amd-staging| $HOME/git/aomp23.0/hipify              | [hipify](https://github.com/ROCm/hipify)
+| rocprofiler-register   | Latest ROCm | $HOME/git/aomp23.0/rocprofiler-register     | [rocprofiler-register](https://github.com/ROCm/rocprofiler-register)
+| openmp    | amd-staging | $HOME/git/aomp23.0/llvm-project/openmp | [llvm-project/openmp](https://github.com/ROCm/llvm-project)
 ||           |                                        |
-| rocr       |Latest ROCm| $HOME/git/aomp22.0/rocr-runtime        | [rocr-runtime](https://github.com/ROCm/rocr-runtime)
-| hip        |Latest ROCm| $HOME/git/aomp22.0/hip              | [hipamd](https://github.com/ROCm/hip)
-|            |Latest ROCm| $HOME/git/aomp22.0/hipcc                 | [hip](https://github.com/ROCm/hipcc)
-|            |Latest ROCm| $HOME/git/aomp22.0/clr              | [ROCclr](https://github.com/ROCm/clr)
-|            |Latest ROCm| $HOME/git/aomp22.0/ROCm-OpenCL-Runtime | [ocl](https://github.com/ROCm/ROCm-OpenCL-Runtime)
-| comgr      |Latest ROCm| $HOME/git/aomp22.0/rocm-compilersupport| [comgr](https://github.com/ROCm/rocm-compilersupport)
-| rocminfo   |Latest ROCm| $HOME/git/aomp22.0/rocminfo            | [rocminfo](https://github.com/ROCm/rocminfo)
-| rocdbgapi  |Latest ROCm| $HOME/git/aomp22.0/ROCdbgapi           | [rocdbgapi](https://github.com/ROCm/ROCdbgapi)
-| rocgdb     |Latest ROCm| $HOME/git/aomp22.0/ROCgdb              | [rocgdb](https://github.com/ROCm/ROCgdb)
-| roctracer  |Latest ROCm| $HOME/git/aomp22.0/roctracer           | [roctracer](https://github.com/ROCm/roctracer)
-| rocprofiler  |Latest ROCm| $HOME/git/aomp22.0/rocprofiler           | [rocprofiler](https://github.com/ROCm/rocprofiler)
-| rocprofiler-sdk  |Latest ROCm| $HOME/git/aomp22.0/rocprofiler-sdk           | [rocprofiler-sdk](https://github.com/ROCm/rocprofiler-sdk)
+| rocr       |Latest ROCm| $HOME/git/aomp23.0/rocr-runtime        | [rocr-runtime](https://github.com/ROCm/rocr-runtime)
+| hip        |Latest ROCm| $HOME/git/aomp23.0/hip              | [hipamd](https://github.com/ROCm/hip)
+|            |Latest ROCm| $HOME/git/aomp23.0/hipcc                 | [hip](https://github.com/ROCm/hipcc)
+|            |Latest ROCm| $HOME/git/aomp23.0/clr              | [ROCclr](https://github.com/ROCm/clr)
+|            |Latest ROCm| $HOME/git/aomp23.0/ROCm-OpenCL-Runtime | [ocl](https://github.com/ROCm/ROCm-OpenCL-Runtime)
+| comgr      |Latest ROCm| $HOME/git/aomp23.0/rocm-compilersupport| [comgr](https://github.com/ROCm/rocm-compilersupport)
+| rocminfo   |Latest ROCm| $HOME/git/aomp23.0/rocminfo            | [rocminfo](https://github.com/ROCm/rocminfo)
+| rocdbgapi  |Latest ROCm| $HOME/git/aomp23.0/ROCdbgapi           | [rocdbgapi](https://github.com/ROCm/ROCdbgapi)
+| rocgdb     |Latest ROCm| $HOME/git/aomp23.0/ROCgdb              | [rocgdb](https://github.com/ROCm/ROCgdb)
+| roctracer  |Latest ROCm| $HOME/git/aomp23.0/roctracer           | [roctracer](https://github.com/ROCm/roctracer)
+| rocprofiler  |Latest ROCm| $HOME/git/aomp23.0/rocprofiler           | [rocprofiler](https://github.com/ROCm/rocprofiler)
+| rocprofiler-sdk  |Latest ROCm| $HOME/git/aomp23.0/rocprofiler-sdk           | [rocprofiler-sdk](https://github.com/ROCm/rocprofiler-sdk)
 
 Notice that some components are built with different parts of the same repository.
 
@@ -67,10 +67,10 @@ These are some important environment variables and their default values.
 | ENV VARIABLE | DEFAULT VALUE               | DESCRIPTION
 | ------------ | -------------               | -----------
 | AOMP                  | $HOME/rocm/aomp    | Directory symbolic link to where AOMP is installed and tested
-| AOMP_REPOS            | $HOME/git/aomp22.0   | The base directory for all AOMP build repositories
+| AOMP_REPOS            | $HOME/git/aomp23.0   | The base directory for all AOMP build repositories
 | AOMP_STANDALONE_BUILD | 1                  | Build all components, do NOT use installed ROCm
-| AOMP_VERSION          | 22.0               | Clang version.
-| AOMP_VERSION_MOD      | 2                  | This implies the next release will be AOMP_22.0-2.
+| AOMP_VERSION          | 23.0               | Clang version.
+| AOMP_VERSION_MOD      | 1                  | This implies the next release will be AOMP_23.0-1.
 | AOMP_VERSION_STRING   | $AOMP_VERSION-$AOMP_VERSION_MOD |
 | AOMP_USE_NINJA        | 0                  | Use ninja instead of make to build certain components
 | GFXLIST               | gfx700 gfx701 gfx801 gfx803     | List of AMDGPU gpus to build for
@@ -88,7 +88,7 @@ Here is a sample of commands you might want to put into your .bashrc or .bash_pr
 
 ```
 AOMP=/work/$USER/rocm/aomp
-AOMP_REPOS=/work/$USER/git/aomp22.0
+AOMP_REPOS=/work/$USER/git/aomp23.0
 NVPTXGPUS=30,35,70
 GFXLIST="gfx803 gfx906"
 AOMP_USE_NINJA=1
@@ -115,15 +115,15 @@ For testing purposes, you will often change the value of AOMP when not testing y
 AOMP build.  For example, to test the latest  packaged aomp release, set AOMP=/usr/lib/aomp.
 To test against the ROCM installed compiler, set AOMP=/opt/rocm/lib/llvm. To test one of your
 previous AOMP source builds, set AOMP to an older physical installation directory, such as
-AOMP=$HOME/rocm/aomp_22.0-1. BE CAREFUL! If you set AOMP for testing purposes,
+AOMP=$HOME/rocm/aomp_23.0-0. BE CAREFUL! If you set AOMP for testing purposes,
 remember to set it back before rebuilding aomp from source.
 
 ## Quick Start to AOMP Development
 To build and clone all components using the latest development sources, first clone aomp repo and checkout the aomp-dev branch as follows:
 
 ```
-   mkdir $HOME/git/aomp22.0
-   cd git/aomp22.0
+   mkdir $HOME/git/aomp23.0
+   cd git/aomp23.0
    git clone https://github.com/ROCm/aomp.git aomp
    cd aomp
    git checkout aomp-dev
@@ -138,7 +138,7 @@ WARNING: The script clone_aomp.sh does not pull updates for this aomp repository
 So please run "git pull" frequently to stay current with the aomp development team.
 
 ```
-cd $HOME/git/aomp22.0/aomp
+cd $HOME/git/aomp23.0/aomp
 git pull
 cd bin
 ./clone_aomp.sh
@@ -182,7 +182,7 @@ The only ROCm common component required by AOMP is the kernel kfd.
 
 
 ## Individual Component Builds
-This bin directory ($HOME/git/aomp22.0/aomp/bin) contains many component scripts to build and install AOMP from source. Here are some of the scripts contained in this direcotry
+This bin directory ($HOME/git/aomp23.0/aomp/bin) contains many component scripts to build and install AOMP from source. Here are some of the scripts contained in this direcotry
 ```
 clone_aomp.sh                 -  A script to make sure the necessary repos are up to date.
                                  See list source repositories above.
@@ -209,7 +209,7 @@ create_release_tarball.sh     - This builds an important release artifact
                                 containing all sources.
 ```
 To build aomp, run the master build script build_aomp.sh, or run the individual scripts in the order shown below.
-The build scripts with no arguments will build the component in the build directory $HOME/git/aomp22.0/build/\<component name\>
+The build scripts with no arguments will build the component in the build directory $HOME/git/aomp23.0/build/\<component name\>
 (or $AOMP_REPOS/build/\<component name\> if AOMP_REPOS is set).
 The component build scripts take a single positional argument with the value "install" or "nocmake".
 The master build script build_aomp.sh will call the component build scripts in the following order and stop if
@@ -262,24 +262,24 @@ WARNING: When the build scripts are run with NO arguments (that is, you do not s
 
 ## The AOMP Install Location
 The build scripts will build from the source directories identified by the environment variable AOMP_REPOS.
-The AOMP_REPOS default value is currently $HOME/git/aomp22.0.
+The AOMP_REPOS default value is currently $HOME/git/aomp23.0.
 The out-of-source build directory for each component is $AOMP_REPOS/build/\<component_name\>.
 
 The install location is defined by the $AOMP environment variable. The value of AOMP MUST be reserved as a symbolic link.
 That is, the physical installation will be in directory name formed by concatonating the version string to the value of $AOMP.
 The "build_project.sh install" script will make a symbolic link from the physical directory to the symbolic directory $AOMP.
 The default value for AOMP is $HOME/rocm/aomp.
-For example, when building AOMP version 22.0-2 the install scripts will put all files and directories
-in $HOME/rocm/aomp_22.0-2 and create a symbolic link as follows:
+For example, when building AOMP version 23.0-0 the install scripts will put all files and directories
+in $HOME/rocm/aomp_23.0-0 and create a symbolic link as follows:
 
 ```
-ln -sf ${AOMP}_22.0-2 ${AOMP}
+ln -sf ${AOMP}_23.0-0 ${AOMP}
 ```
 All testing for AOMP uses the environment variable AOMP to locate the installation. This makes it easy to switch between versions of AOMP for testing by simply changing the environment variable AOMP. You do NOT need to change the symbolic link.
-For example, if the aomp symbolic link currently points to aomp_22.0-2 and you want to test aomp_22.0-1, do this:
+For example, if the aomp symbolic link currently points to aomp_23.0-1 and you want to test aomp_22.0-2, do this:
 
 ```
-export AOMP=$HOME/rocm/aomp_22.0-1
+export AOMP=$HOME/rocm/aomp_23.0-0
 ```
 
 The aomp package installs in /usr/lib/aomp_\<version_string\> and symlinks /usr/lib/aomp to the versioned directory. To test the installed package, set AOMP to /usr/lib/aomp or /usr/lib/aomp_\<version_string\>.

bin/aomp-shellcheck

@@ -0,0 +1,146 @@
+#!/bin/bash
+#
+#  aomp-shell-format: Run shellcheck and shfmt to cleanup aomp shell script.
+#
+#  Process:
+#   1. RUn shellcheck --include $_fixByHand, fail if any found
+#   2. Run shellcheck --include $_patchable to generate patch
+#   3  Apply patch
+#   4. Run shellcheck --exclude $_alwaysExclude
+#      if any fails then 
+#        return 1
+#        proceed to update this aomp-shell-format utility by adding
+#        falled codes to either _fixByHand, _patchable, or _alwaysExclude
+#      else
+#         return 0
+#       
+
+# Join list of arguments using separator passed as first argument.
+#   join ',' a b c
+# -> a,b,c
+join() {
+  local IFS=$1
+  shift
+  printf "%s" "$*"
+}
+
+_fixByHand=(SC2050   # Forgotten $ on variable
+            SC2046   # Quote to prevent word splitting
+            SC2291   # Quote repeated spaces
+            SC2181   # Check exit code directly not with $?
+            SC2236   # Use -n instead of ! -z
+            SC2086   # Double quote to prevent globbing and word splitting
+            SC2034   # Ignore unused vars
+            SC1083   # Accidentally literal braces
+            SC2076   # Regex syntax check
+            SC2038   # find -print0
+            SC2068)  # Avoid re-splitting array expansion
+_fixByHandOpts=(--shell=bash --include="$(join ',' "${_fixByHand[@]}")")
+
+_patchable=(SC2164   # Use cd ... || exit
+            SC2006)  # Use $(...) instead of legacy backticks
+_patchableOpts=(--shell=bash --include="$(join ',' "${_patchable[@]}")")
+
+_alwaysExclude=(SC2016  # Use double quote instead of single
+                SC2002  # Useless cat
+                SC2004) # '$' on arithmetic vars
+_alwaysExcludeOpts=(--shell=bash --exclude="$(join ',' "${_alwaysExclude[@]}")")
+
+_check_only=false
+
+if [ $1 == "--check-only" ]; then
+  _check_only=true
+  shift
+fi
+
+declare -a _shellfiles=( "$@" )
+_missing=0
+for _shellfile in "${_shellfiles[@]}"; do
+  if [ ! -f "$_shellfile" ]; then
+    (( _missing++ ))
+  fi
+done
+unset _shellfile
+
+if [ "${#_shellfiles[@]}" -eq 0 ] || [ "$_missing" -gt 0 ] ; then
+   echo "ERROR: please specify an existing input file as 1st argument"
+   exit 1
+fi
+
+_shellcheck_bin=$(which shellcheck)
+if [ "$_shellcheck_bin" == "" ] ; then
+   echo "ERROR: please install shellcheck"
+   exit 1
+fi
+
+echo
+echo "---- STEP 1 ---- Check for fixByHand fails -----"
+echo "$_shellcheck_bin -x ${_fixByHandOpts[*]} ${_shellfiles[*]}"
+
+$_shellcheck_bin -x "${_fixByHandOpts[@]}" "${_shellfiles[@]}"
+_rc=$?
+if [[ $_rc != 0 ]]; then
+   echo
+   echo "ERROR: shellcheck found errors that must be fixed by hand. rc=$_rc"
+   exit 1
+fi
+
+if $_check_only; then
+   echo
+   echo "---- STEP 2 ---- Check patchable fails -----"
+   echo "$_shellcheck_bin -x ${_patchableOpts[@]} ${_shellfiles[@]}"
+   $_shellcheck_bin -x "${_patchableOpts[@]}" "${_shellfiles[@]}"
+
+   echo
+   echo "---- STEP 3 ---- (Skipping for --check-only)"
+else
+   echo
+   echo "---- STEP 2 ---- Check and repair patchable fails -----"
+
+   _patchfile=/tmp/patchfile$$
+
+   if ! touch "$_patchfile"; then
+      echo "ERROR: Could not create or update $_patchfile"
+      exit 1
+   fi
+
+   echo "$_shellcheck_bin -x ${_patchableOpts[*]} -f diff ${_shellfiles[*]} \>$_patchfile"
+   $_shellcheck_bin -x "${_patchableOpts[@]}" -f diff "${_shellfiles[@]}" >$_patchfile
+
+   if ! patch -p1 --dry-run <"$_patchfile"; then
+      echo "ERROR: Could not dryrun patch in $_patchfile to file ${_shellfiles[*]}"
+      exit 1
+   fi
+   echo
+   echo "---- STEP 3 ---- Applying patch $_patchfile to ${_shellfiles[*]}"
+   patch -p1 <"$_patchfile"
+   echo "rm $_patchfile"
+   rm "$_patchfile" # patch should work because of dryrun test above
+fi
+
+echo
+echo "---- STEP 4 ---- Test for codes not handled in $0"
+if $_check_only; then
+   # A non-check-only run would avoid triggering the patchable checks again
+   # in this invocation.  Mask them out for a check-only run.
+   _excludeOpts=(--shell=bash --exclude="$(join ',' "${_alwaysExclude[@]}" "${_patchable[@]}")")
+   echo "$_shellcheck_bin -x ${_excludeOpts[*]} ${_shellfiles[*]}"
+   $_shellcheck_bin -x "${_excludeOpts[@]}" "${_shellfiles[@]}"
+   _rc=$?
+else
+   echo "$_shellcheck_bin -x ${_alwaysExcludeOpts[*]} ${_shellfiles[*]}"
+   $_shellcheck_bin -x "${_alwaysExcludeOpts[@]}" "${_shellfiles[@]}"
+   _rc=$?
+fi
+if [ $_rc != 0 ] ; then
+   echo
+   echo "ERROR: shellcheck found codes not yet handled, must fix $0"
+   exit $_rc
+fi
+echo
+if [ "${#_shellfiles[@]}" -eq 1 ]; then
+  echo "DONE: script ${_shellfiles[*]} is clean"
+else
+  echo "DONE: scripts $(join ',' ${_shellfiles[@]}) are clean"
+fi
+exit 0

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:-"22.0"}
-AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"2"}
+AOMP_VERSION=${AOMP_VERSION:-"23.0"}
+AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"1"}
 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
@@ -40,13 +40,13 @@ AOMP=${AOMP:-$HOME/rocm/aomp}
 AOMP_INSTALL_DIR=${AOMP}_${AOMP_VERSION_STRING}
 
 GPURUN_BINDIR=${GPURUN_BINDIR:-$AOMP/bin}
-if [ ! -f "$GPURUN_BINDIR/gpurun" ] || [ ! -f "$GPURUN_BINDIR/rocminfo" ] ; then
+if [ ! -f "$GPURUN_BINDIR/gpurun" ] ; then
     # When using trunk, try to find gpurun and rocminfo in ROCm
     _SILENT=""
     GPURUN_BINDIR=/opt/rocm/llvm/bin
-    export ROCMINFO_BINARY=/opt/rocm/bin/rocminfo
-else
-    export ROCMINFO_BINARY=$GPURUN_BINDIR/rocminfo
+fi
+if [ ! -f "$AOMP/bin/rocminfo" ] ; then
+  export ROCMINFO_BINARY=/opt/rocm/bin/rocminfo
 fi
 
 # For example, if AOMP_REPOS=$HOME/git/aomp11, then the primary aomp repo

bin/build_aomp.sh

@@ -98,7 +98,7 @@ echo
 components="$AOMP_COMPONENT_LIST"
 
 if [ "$AOMP_STANDALONE_BUILD" == 1 ] ; then
-  components="$components rocprofiler-register rocr openmp offload extras comgr rocminfo rocm_smi_lib amdsmi"
+  components="$components rocprofiler-register rocr llvm_runtimes_standalone offload extras comgr rocminfo rocm_smi_lib amdsmi"
   _hostarch=$(uname -m)
   # The rocclr architecture is very x86 centric so it will not build on ppc64. Without
   # rocclr, we have no HIP or OpenCL for ppc64 :-( However, rocr works for ppc64 so AOMP works.
@@ -132,10 +132,7 @@ else
   # libdevice, project, comgr, rocminfo, hipamd, rocdbgapi, rocgdb,
   # roctracer, rocprofiler, rocm_smi_lib, and amdsmi should be found
   # in ROCM in /opt/rocm.  The ROCM build only needs these components:
-  components="extras openmp"
-  if [ -f "$AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/offload/CMakeLists.txt" ]; then
-    components="$components offload"
-  fi
+  components="llvm_runtimes_standalone offload"
   if [ "$AOMP_SKIP_FLANG" == 0 ] ; then
     if [ "$SANITIZER" == 1 ] && [ -f "$AOMP/bin/flang-classic" ] ; then
       components="$components pgmath flang flang_runtime"