Update docs/aomp_common_vars for 11.5-0 release.

README.md

@@ -1,4 +1,4 @@
-AOMP - V 11.0-1
+AOMP - V 11.5-0
 ==============
 
 This is README.md for https://github.com/ROCM-Developer-Tools/aomp.
@@ -8,8 +8,8 @@ This is the base repository for AOMP. Use this github repository for
 documentation, and
 [examples](https://github.com/ROCm-Developer-Tools/aomp/tree/master/examples).
 
-The last [release is AOMP 11.0-1](https://github.com/ROCm-Developer-Tools/aomp/releases).
-Currently AOMP 11.5-0 is under development.
+The last [release is AOMP 11.5-0](https://github.com/ROCm-Developer-Tools/aomp/releases).
+Currently AOMP 11.5-1 is under development.
 
 
 Attention Users!  Please use this repository for [issues](https://github.com/ROCm-Developer-Tools/aomp/issues).

bin/README.md

@@ -22,7 +22,6 @@ build_rocminfo.sh        -  Builds the rocminfo utilities to support hip.
 build_vdi.sh             -  Builds the hip interoperability layer ROCclr.
 build_hipvdi.sh          -  Builds the hip host runtime using ROCclr.
 build_extras.sh          -  Builds hostcall, libm, and utils all in aomp-extras repo.
-build_atmi.sh            -  Builds ATMI for aomp.
 build_openmp.sh          -  Builds the OpenMP libraries and device RTL.
 build_pgmath.sh          -  Builds the pgmath support for flang.
 build_flang.sh           -  Builds flang for aomp.
@@ -48,7 +47,6 @@ The first column is the AOMP component that uses the repositories.
 | comgr     | $HOME/git/aomp11/rocm-compilersupport  | [comgr](https://github.com/radeonopencompute/rocm-compilersupport)
 | hipvdi    | $HOME/git/aomp11/hip-on-vdi            | [hipvdi](https://github.com/ROCm-Developer-Tools/hip)
 | ocl       | $HOME/git/aomp11/opencl-on-vdi         | [ocl](https://github.com/radeonopencompute/ROCm-OpenCL-Runtime)
-| atmi      | $HOME/git/aomp11/atmi                  | [atmi](https://github.com/radeonopencompute/atmi)
 | openmp    | $HOME/git/aomp11/llvm-project/openmp   | [llvm-project/openmp](https://github.com/ROCm-Developer-Tools/llvm-project)
 | libdevice | $HOME/git/aomp11/rocm-device-libs      | [rocm-device-libs](https://github.com/radeonopencompute/rocm-device-libs)
 | flang     | $HOME/git/aomp11/flang                 | [flang](https://github.com/ROCm-Developer-Tools/flang)
@@ -134,9 +132,6 @@ Developers may update a component and then run these scripts in the following or
    ./build_hipvdi.sh
    ./build_hipvdi.sh install
 
-   ./build_atmi.sh
-   ./build_atmi.sh install
-
    ./build_extras.sh
    ./build_extras.sh install
 
@@ -164,10 +159,10 @@ WARNING: When the build scripts are run with NO arguments (that is, you do not s
 The install location is defined by the $AOMP environment variable. The value of AOMP needs to be reserved as a symbolic link.
 That is, the physical installation will be in directory $AOMP concatonated with the version string.
 The install script will make a symbolic link from the physical directory to the symbolic directory $AOMP.
-For example, when building AOMP version 11.0-1 with the default value for AOMP=$HOME/rocm/aomp,
-the install scripts will put all files and directories in $HOME/rocm/aomp_11.0-1 and create a symbolic link as follows.
+For example, when building AOMP version 11.5-0 with the default value for AOMP=$HOME/rocm/aomp,
+the install scripts will put all files and directories in $HOME/rocm/aomp_11.5-0 and create a symbolic link as follows.
 
 ```
-ln -sf ${AOMP}_11.0-1 ${AOMP}
+ln -sf ${AOMP}_11.5-0 ${AOMP}
 ```
 This symbolic link makes it easy to switch between versions of AOMP for testing.

bin/aomp_common_vars

@@ -15,14 +15,22 @@
 AOMP_COMPILER_NAME=${AOMP_COMPILER_NAME:-AOMP}
 
 # ROCM_VERSION may be set by Jenkins, if not guess a good number
-ROCM_VERSION=${ROCM_VERSION:-3.4.0}
+ROCM_VERSION=${ROCM_VERSION:-3.5.0}
 
 # Set the AOMP VERSION STRING and AOMP_PROJECT_REPO_BRANCH.
 AOMP_VERSION=${AOMP_VERSION:-"11.5"}
 AOMP_VERSION_MOD=${AOMP_VERSION_MOD:-"0"}
 AOMP_VERSION_STRING=${AOMP_VERSION_STRING:-"$AOMP_VERSION-$AOMP_VERSION_MOD"}
 export AOMP_VERSION_STRING AOMP_VERSION AOMP_VERSION_MOD ROCM_VERSION
 
+# Hash values for repos on dev branches. To recreate build of 11.5-0, verify these repos are on the correct commit.
+# rocm-device-libs     dc34b35
+# rocm-compilersupport 3ebf0a
+# rocminfo             1a81ee3
+# ROCclr (vdi)         928f8b06
+# hip (hip-on-vdi)     ffcbd7e6
+# ROCm-OpenCL-Runtime  a66edda
+
 # Set install directory and the link directory.
 # AOMP will be a symbolic link AOMP_INSTALL_DIR is the versioned dir name
 AOMP=${AOMP:-$HOME/rocm/aomp}
@@ -139,13 +147,13 @@ GITKHRONOS="https://github.com/KhronosGroup"
 
 #  These aomp development repositories
 AOMP_REPO_NAME=${AOMP_REPO_NAME:-aomp}
-AOMP_REPO_BRANCH=${AOMP_REPO_BRANCH:-amd-stg-openmp}
+AOMP_REPO_BRANCH=${AOMP_REPO_BRANCH:-rel_11.5-0}
 AOMP_PROJECT_REPO_NAME=${AOMP_PROJECT_REPO_NAME:-amd-llvm-project}
-AOMP_PROJECT_REPO_BRANCH=${AOMP_PROJECT_REPO_BRANCH:-amd-stg-openmp}
+AOMP_PROJECT_REPO_BRANCH=${AOMP_PROJECT_REPO_BRANCH:-aomp-11.5-0}
 AOMP_EXTRAS_REPO_NAME=${AOMP_EXTRAS_REPO_NAME:-aomp-extras}
-AOMP_EXTRAS_REPO_BRANCH=${AOMP_EXTRAS_REPO_BRANCH:-amd-stg-openmp}
+AOMP_EXTRAS_REPO_BRANCH=${AOMP_EXTRAS_REPO_BRANCH:-aomp-11.5-0}
 AOMP_FLANG_REPO_NAME=${AOMP_FLANG_REPO_NAME:-flang}
-AOMP_FLANG_REPO_BRANCH=${AOMP_FLANG_REPO_BRANCH:-amd-stg-openmp}
+AOMP_FLANG_REPO_BRANCH=${AOMP_FLANG_REPO_BRANCH:-aomp-11.5-0}
 
 #  These extra repositories are needed but we cannot update them
 AOMP_ROCT_REPO_NAME=${AOMP_ROCT_REPO_NAME:-roct-thunk-interface}
@@ -161,8 +169,6 @@ AOMP_COMGR_REPO_NAME=${AOMP_COMGR_REPO_NAME:-rocm-compilersupport}
 AOMP_COMGR_REPO_BRANCH=${AOMP_COMGR_REPO_BRANCH:-amd-stg-open}
 AOMP_RINFO_REPO_NAME=${AOMP_RINFO_REPO_NAME:-rocminfo}
 AOMP_RINFO_REPO_BRANCH=${AOMP_RINFO_REPO_BRANCH:-master}
-AOMP_ATMI_REPO_NAME=${AOMP_ATMI_REPO_NAME:-atmi}
-AOMP_ATMI_REPO_BRANCH=${AOMP_ATMI_REPO_BRANCH:-aomp-0.7-7}
 AOMP_HCC_REPO_NAME=${AOMP_HCC_REPO_NAME:-hcc}
 AOMP_HCC_REPO_BRANCH=${AOMP_HCC_REPO_BRANCH:-roc-3.1.x}
 AOMP_HIP_REPO_NAME=${AOMP_HIP_REPO_NAME:-hip}

docs/NOROOTINSTALL.md

@@ -7,13 +7,13 @@ Once installed go to [TESTINSTALL](TESTINSTALL.md) for instructions on getting s
 To install the debian package without root access into your home directory, you can run these commands.<br>
 On Ubuntu 18.04 LTS (bionic beaver):
 ```
-   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_Ubuntu1804_11.0-1_amd64.deb
-   dpkg -x aomp_Ubuntu1804_11.0-1_amd64.deb /tmp/temproot
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_Ubuntu1804_11.5-0_amd64.deb
+   dpkg -x aomp_Ubuntu1804_11.5-0_amd64.deb /tmp/temproot
 ```
 On Ubuntu 16.04:
 ```
-   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_Ubuntu1604_11.0-1_amd64.deb
-   dpkg -x aomp_Ubuntu1604_11.0-1_amd64.deb /tmp/temproot
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_Ubuntu1604_11.5-0_amd64.deb
+   dpkg -x aomp_Ubuntu1604_11.5-0_amd64.deb /tmp/temproot
 ```
 Move to $HOME and set variables:
 ```
@@ -30,13 +30,13 @@ To install the rpm package without root access into your home directory, you can
 ```
 For Red Hat:
 ```
-   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_REDHAT_7-11.0-1.x86_64.rpm
-   rpm2cpio aomp_REDHAT_7-11.0-1.x86_64.rpm | cpio -idmv
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_REDHAT_7-11.5-0.x86_64.rpm
+   rpm2cpio aomp_REDHAT_7-11.5-0.x86_64.rpm | cpio -idmv
 ```
 For SLES15-SP1:
 ```
-   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_SLES15_SP1-11.0-1.x86_64.rpm
-   rpm2cpio aomp_SLES15_SP1-11.0-1.x86_64.rpm | cpio -idmv
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_SLES15_SP1-11.5-0.x86_64.rpm
+   rpm2cpio aomp_SLES15_SP1-11.5-0.x86_64.rpm | cpio -idmv
 ```
 Move to $HOME and set variables:
 ```

docs/RELEASESOURCEINSTALL.md

@@ -101,8 +101,8 @@ Remember,the aomp spack configuration file is currently missing dependencies, so
 To build and install aomp from the release source tarball run these commands:
 
 ```
-   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp-11.0-1.tar.gz
-   tar -xzf aomp-11.0-1.tar.gz
+   wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp-11.5-0.tar.gz
+   tar -xzf aomp-11.5-0.tar.gz
    cd aomp
    nohup make &
 ```
@@ -117,9 +117,9 @@ If you set the environment variable AOMP, the Makefile will install to that dire
 Otherwise, the Makefile will install into /usr/local.
 So you must have authorization to write into /usr/local if you do not set the environment variable AOMP.
 Let's assume you set the environment variable AOMP to "$HOME/rocm/aomp" in .bash_profile.
-The build_aomp.sh script will install into $HOME/rocm/aomp_11.0-1 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_11.0-1.
+The build_aomp.sh script will install into $HOME/rocm/aomp_11.5-0 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_11.5-0.
 This feature allows multiple versions of AOMP to be installed concurrently.
-To enable a backlevel version of AOMP, simply set AOMP to $HOME/rocm/aomp_0.7-7.
+To enable a backlevel version of AOMP, simply set AOMP to $HOME/rocm/aomp_11.0-1.
 
 ## Build AOMP with spack
 
@@ -128,7 +128,7 @@ Currently the aomp configuration is not yet in the spack git hub so you must cre
 
 ```
    wget https://github.com/ROCm-Developer-Tools/aomp/blob/master/bin/package.py
-   spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp-11.0-1.tar.gz
+   spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp-11.5-0.tar.gz
    spack edit aomp
    spack install aomp
 ```

docs/RHELINSTALL.md

@@ -8,12 +8,12 @@ sudo yum install perl-Digest-MD5
 ```
 ### Download and Install
 ```
-wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_REDHAT_7-11.0-1.x86_64.rpm
-sudo rpm -i aomp_REDHAT_7-11.0-1.x86_64.rpm
+wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_REDHAT_7-11.5-0.x86_64.rpm
+sudo rpm -i aomp_REDHAT_7-11.5-0.x86_64.rpm
 ```
 If CUDA is not installed the installation may cancel, to bypass this:
 ```
-sudo rpm -i --nodeps aomp_REDHAT_7-11.0-1.x86_64.rpm
+sudo rpm -i --nodeps aomp_REDHAT_7-11.5-0.x86_64.rpm
 ```
 Confirm AOMP environment variable is set:
 ```

docs/SLES15INSTALL.md

@@ -1,9 +1,9 @@
 # AOMP SUSE SLES-15-SP1 Install 
-<b>The SLES package for AOMP 11.0-1, is pending due to limited office access.</b>
+<b>The SLES package for AOMP 11.5-0, is pending due to limited office access.</b>
 AOMP will install to /usr/lib/aomp. The AOMP environment variable will automatically be set to the install location. This may require a new terminal to be launched to see the change.
 ```
-wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_SLES15_SP1-11.0-1.x86_64.rpm
-sudo rpm -i aomp_SLES15_SP1-11.0-1.x86_64.rpm
+wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_SLES15_SP1-11.5-0.x86_64.rpm
+sudo rpm -i aomp_SLES15_SP1-11.5-0.x86_64.rpm
 ```
 Confirm AOMP environment variable is set:
 ```

docs/SOURCEINSTALL.md

@@ -1,4 +1,4 @@
-# Source Install V 11.5-0 (DEV)
+# Source Install V 11.5-1 (DEV)
 
 Build and install from sources is possible.  However, the source build for AOMP is complex for several reasons.
 - Many repos are required.  The clone_aomp.sh script ensures you have all repos and the correct branch.
@@ -99,7 +99,7 @@ Create a /etc/yum.repos.d/rocm.repo file with the following contents:
 ```
 
 <b>Choose a Build Version (Development or Release)</b>
-The development version is the next version to be released.  It is possible that the development version is broken due to regressions that often occur during development.  If instead, you want to build from the sources of a previous release such as 11.0-1 that is possible as well.
+The development version is the next version to be released.  It is possible that the development version is broken due to regressions that often occur during development.  If instead, you want to build from the sources of a previous release such as 11.5-0 that is possible as well.
 
 <b>For the Development Branch:</b>
 ```
@@ -109,7 +109,7 @@ The development version is the next version to be released.  It is possible that
 
 <b>For the Release Branch:</b>
 ```
-   git checkout rel_11.0-1
+   git checkout rel_11.5-0
    git pull
 ```
 <b>Clone and Build:</b>

docs/UBUNTUINSTALL.md

@@ -3,13 +3,13 @@ AOMP will install to /usr/lib/aomp. The AOMP environment variable will automatic
 
 On Ubuntu 18.04 LTS (bionic beaver), run these commands:
 ```
-wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_Ubuntu1804_11.0-1_amd64.deb
-sudo dpkg -i aomp_Ubuntu1804_11.0-1_amd64.deb
+wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_Ubuntu1804_11.5-0_amd64.deb
+sudo dpkg -i aomp_Ubuntu1804_11.5-0_amd64.deb
 ```
 On Ubuntu 16.04,  run these commands:
 ```
-wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.0-1/aomp_Ubuntu1604_11.0-1_amd64.deb
-sudo dpkg -i aomp_Ubuntu1604_11.0-1_amd64.deb
+wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_11.5-0/aomp_Ubuntu1604_11.5-0_amd64.deb
+sudo dpkg -i aomp_Ubuntu1604_11.5-0_amd64.deb
 ```
 The AOMP bin directory (which includes the standard clang and llvm binaries) is not intended to be in your PATH for typical operation.