Skip to content

Commit

Permalink
Update docs for 17.0-2.
Browse files Browse the repository at this point in the history
  • Loading branch information
estewart08 committed Apr 28, 2023
1 parent 0e61d8b commit 85ad992
Show file tree
Hide file tree
Showing 12 changed files with 70 additions and 51 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AOMP - V 17.0-1
AOMP - V 17.0-2
==============

This is README.md for https://github.com/ROCM-Developer-Tools/aomp.
Expand All @@ -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 17.0-1](https://github.com/ROCm-Developer-Tools/aomp/releases).
Currently AOMP 17.0-2 is under development.
The last [release is AOMP 17.0-2](https://github.com/ROCm-Developer-Tools/aomp/releases).
Currently AOMP 17.0-3 is under development.

Attention Users! Please use this repository for [issues](https://github.com/ROCm-Developer-Tools/aomp/issues).
Do not put issues in any of the source code repositories.
Expand Down
14 changes: 7 additions & 7 deletions bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ These are some important environment variables and their default values.
| AOMP_REPOS | $HOME/git/aomp17.0 | The base directory for all AOMP build repositories
| AOMP_STANDALONE_BUILD | 1 | Build all components, do NOT use installed ROCm
| AOMP_VERSION | 17.0 | Clang version.
| AOMP_VERSION_MOD | 2 | This implies the next release will be AOMP_17.0-2.
| AOMP_VERSION_MOD | 3 | This implies the next release will be AOMP_17.0-3.
| 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
Expand Down Expand Up @@ -120,7 +120,7 @@ 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/llvm. To test one of your
previous AOMP source builds, set AOMP to an older physical installation directory, such as
AOMP=$HOME/rocm/aomp_17.0-0. Be careful that if you set AOMP for testing purposes that
AOMP=$HOME/rocm/aomp_17.0-1. Be careful that if you set AOMP for testing purposes that
it is reset to the correct value when rebuilding aomp from source.

## Quick Start to AOMP Development
Expand Down Expand Up @@ -288,17 +288,17 @@ The install location is defined by the $AOMP environment variable. The value of
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 17.0-1 the install scripts will put all files and directories
in $HOME/rocm/aomp_17.0-1 and create a symbolic link as follows:
For example, when building AOMP version 17.0-2 the install scripts will put all files and directories
in $HOME/rocm/aomp_17.0-2 and create a symbolic link as follows:

```
ln -sf ${AOMP}_17.0-1 ${AOMP}
ln -sf ${AOMP}_17.0-2 ${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_17.0-1 and you want to test aomp_17.0-0, do this:
For example, if the aomp symbolic link currently points to aomp_17.0-2 and you want to test aomp_17.0-1, do this:

```
export AOMP=$HOME/rocm/aomp_17.0-0
export AOMP=$HOME/rocm/aomp_17.0-1
```

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\>.
Expand Down
21 changes: 20 additions & 1 deletion bin/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
aomp (17.0-1) UNRELEASED; urgency=medium
aomp (17.0-2) UNRELEASED; urgency=medium

* Initial release of aomp is 0.3-2
* Please see example in /usr/lib/aomp/examples/vmuldemo
Expand Down Expand Up @@ -832,5 +832,24 @@ aomp (17.0-1) UNRELEASED; urgency=medium
* Implement dynamic LDS accesses from non-kernel functions.
* Insert alloca for kernel args at function entry block instead of the launch point.
* Respect EnvVar for syncronous kernel launch in NextGen.
*
* 17.0-2
* Changed gpurun to set value of both GPU_MAX_HW_QUEUES and
* LIBOMPTARGET_AMDGPU_NUM_HSA_QUEUES to 1 if there is shared use of GPU by
* multiple mpi ranks. Also, it is set to 1 ONLY if it was not already set by
* caller.
* Added environment variables LIBOMPTARGET_AMDGPU_ KERNEL_BUSYWAIT and
* LIBOMPTARGET_AMDGPU_DATA_BUSYWAIT to control how much time to wait in an
* active state for kernel completion and data transfer completion respectively.
* The default is 0 which means to wait indefinitely in blocked state. If set,
* and the specified timeout expires, the waiting runtime jumps to waiting for
* signal in blocked state.
* Changed run_babelstream.sh to set LIBOMPTARGET_AMDGPU_KERNEL_BUSYWAIT and
* LIBOMPTARGET_AMDGPU_DATA_BUSYWAIT to improve performance.
* Fixed the amdgpu nextgen plugin to work for cov5 (code object version 5). The
* default code object version is cov4.
* Fixed the amdgpu nextgen plugin to work with OMPT (OpenMP Tools environment).
* Fixed the amdgpu nextgen plugin to work for multiple architectures supported
* in same image.

-- Greg Rodgers <Gregory.Rodgers@amd.com> Thu, 19 May 2022 23:34:44 -0500
4 changes: 2 additions & 2 deletions bin/package.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ class Aomp(MakefilePackage):
""" llvm openmp compiler from AMD"""

homepage = "https://github.com/ROCm-Developer-Tools/aomp"
url = "https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp-17.0-1.tar.gz"
url = "https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp-17.0-2.tar.gz"

# Fixme: this will be adjusted when spack create is called. When copying over to your own package.py omit this line.
version('17.0-1', sha256='7ea4e218b171585441278f3562d97779006b12bc3b5dc201901f2d757226da84')
version('17.0-2', sha256='7ea4e218b171585441278f3562d97779006b12bc3b5dc201901f2d757226da84')

family = 'compiler'

Expand Down
12 changes: 6 additions & 6 deletions docs/CENTOSINSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ AOMP will install to /usr/lib/aomp. The AOMP environment variable will automatic

### Download and Install (CentOS 9)
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_CENTOS_9-17.0-1.x86_64.rpm
sudo rpm -i aomp_CENTOS_9-17.0-1.x86_64.rpm
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_CENTOS_9-17.0-2.x86_64.rpm
sudo rpm -i aomp_CENTOS_9-17.0-2.x86_64.rpm
```
### Download and Install (CentOS 8)
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_CENTOS_8-17.0-1.x86_64.rpm
sudo rpm -i aomp_CENTOS_8-17.0-1.x86_64.rpm
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_CENTOS_8-17.0-2.x86_64.rpm
sudo rpm -i aomp_CENTOS_8-17.0-2.x86_64.rpm
```
### Download and Install (CentOS 7)
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_CENTOS_7-17.0-1.x86_64.rpm
sudo rpm -i aomp_CENTOS_7-17.0-1.x86_64.rpm
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_CENTOS_7-17.0-2.x86_64.rpm
sudo rpm -i aomp_CENTOS_7-17.0-2.x86_64.rpm
```
Confirm AOMP environment variable is set:
```
Expand Down
24 changes: 12 additions & 12 deletions docs/NOROOTINSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ To install the debian package without root access into your home directory, you

On Ubuntu 20.04:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_Ubuntu2004_17.0-1_amd64.deb
dpkg -x aomp_Ubuntu2004_17.0-1_amd64.deb /tmp/temproot
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_Ubuntu2004_17.0-2_amd64.deb
dpkg -x aomp_Ubuntu2004_17.0-2_amd64.deb /tmp/temproot
```
On Ubuntu 22.04:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_Ubuntu2204_17.0-1_amd64.deb
dpkg -x aomp_Ubuntu2204_17.0-1_amd64.deb /tmp/temproot
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_Ubuntu2204_17.0-2_amd64.deb
dpkg -x aomp_Ubuntu2204_17.0-2_amd64.deb /tmp/temproot
```
Move to $HOME and set variables:
```
Expand All @@ -31,23 +31,23 @@ To install the rpm package without root access into your home directory, you can
```
For SLES15-SP4:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_SLES15_SP4-17.0-1.x86_64.rpm
rpm2cpio aomp_SLES15_SP4-17.0-1.x86_64.rpm | cpio -idmv
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_SLES15_SP4-17.0-2.x86_64.rpm
rpm2cpio aomp_SLES15_SP4-17.0-2.x86_64.rpm | cpio -idmv
```
For CentOS/RHEL 7:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_CENTOS_7-17.0-1.x86_64.rpm
rpm2cpio aomp_CENTOS_7-17.0-1.x86_64.rpm | cpio -idmv
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_CENTOS_7-17.0-2.x86_64.rpm
rpm2cpio aomp_CENTOS_7-17.0-2.x86_64.rpm | cpio -idmv
```
For CentOS 8:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_CENTOS_8-17.0-1.x86_64.rpm
rpm2cpio aomp_CENTOS_8-17.0-1.x86_64.rpm | cpio -idmv
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_CENTOS_8-17.0-2.x86_64.rpm
rpm2cpio aomp_CENTOS_8-17.0-2.x86_64.rpm | cpio -idmv
```
For CentOS 9:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_CENTOS_9-17.0-1.x86_64.rpm
rpm2cpio aomp_CENTOS_9-17.0-1.x86_64.rpm | cpio -idmv
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_CENTOS_9-17.0-2.x86_64.rpm
rpm2cpio aomp_CENTOS_9-17.0-2.x86_64.rpm | cpio -idmv
```
Move to $HOME and set variables:
```
Expand Down
12 changes: 6 additions & 6 deletions docs/RELEASESOURCEINSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ To build AOMP from source you must: 1. Install certain distribution packages, 2.
To build and install aomp from the release source tarball run these commands:

```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp-17.0-1.tar.gz
tar -xzf aomp-17.0-1.tar.gz
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp-17.0-2.tar.gz
tar -xzf aomp-17.0-2.tar.gz
cd aomp17.0
nohup make &
```
Expand All @@ -30,17 +30,17 @@ 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_17.0-1 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_17.0-1.
The build_aomp.sh script will install into $HOME/rocm/aomp_17.0-2 and create a symbolic link from $HOME/rocm/aomp to $HOME/rocm/aomp_17.0-2.
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_17.0-0.
To enable a backlevel version of AOMP, simply set AOMP to $HOME/rocm/aomp_17.0-1.

## Build AOMP with spack

Assuming your have installed the [prerequisites](SOURCEINSTALL_PREREQUISITE.md), use these commands to fetch the source and build aomp. Currently the aomp configuration is not yet in the spack git hub so you must create the spack package first.

```
wget https://github.com/ROCm-Developer-Tools/aomp/blob/aomp-17.0-1/bin/package.py
spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp-17.0-1.tar.gz
wget https://github.com/ROCm-Developer-Tools/aomp/blob/aomp-17.0-2/bin/package.py
spack create -n aomp -t makefile --force https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp-17.0-2.tar.gz
spack edit aomp
spack install aomp
```
Expand Down
6 changes: 3 additions & 3 deletions docs/RHELINSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ sudo yum install perl-Digest-MD5 perl-URI-Encode
```
### Download and Install
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_CENTOS_7-17.0-1.x86_64.rpm
sudo rpm -i aomp_CENTOS_7-17.0-1.x86_64.rpm
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_CENTOS_7-17.0-2.x86_64.rpm
sudo rpm -i aomp_CENTOS_7-17.0-2.x86_64.rpm
```
If CUDA is not installed the installation may cancel, to bypass this:
```
sudo rpm -i --nodeps aomp_CENTOS_7-17.0-1.x86_64.rpm
sudo rpm -i --nodeps aomp_CENTOS_7-17.0-2.x86_64.rpm
```
Confirm AOMP environment variable is set:
```
Expand Down
4 changes: 2 additions & 2 deletions docs/SLES15INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# AOMP SUSE SLES-15-SP4 Install
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_17.0-1/aomp_SLES15_SP4-17.0-1.x86_64.rpm
sudo rpm -i aomp_SLES15_SP4-17.0-1.x86_64.rpm
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_SLES15_SP4-17.0-2.x86_64.rpm
sudo rpm -i aomp_SLES15_SP4-17.0-2.x86_64.rpm
```
Confirm AOMP environment variable is set:
```
Expand Down
8 changes: 4 additions & 4 deletions docs/SOURCEINSTALL.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Source Install V 17.0-2
# Source Install V 17.0-3

Build and install from sources is possible. However, the source build for AOMP is complex for several reasons.
- Many repos are required.
Expand Down Expand Up @@ -40,14 +40,14 @@ Here are the commands to do a source build of AOMP:
```

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.
These commands will build a previous release of AOMP such as aomp-17.0-1.<br>
These commands will build a previous release of AOMP such as aomp-17.0-2.<br>
<b>Release Branch:</b>
```
export AOMP_VERSION=17.0
export AOMP_REPOS=$HOME/git/aomp${AOMP_VERSION}
mkdir -p $AOMP_REPOS
cd $AOMP_REPOS
git clone -b aomp-17.0-1 https://github.com/ROCm-Developer-Tools/aomp
git clone -b aomp-17.0-2 https://github.com/ROCm-Developer-Tools/aomp
```
<b>Clone and build:</b>
```
Expand All @@ -69,7 +69,7 @@ The above command will produce output like this showing you the location and bra
MANIFEST FILE: ~/git/aomp17.0/aomp/bin/../manifests/aomp_17.0.xml

<b>Release Branch:</b><br>
MANIFEST FILE: ~/git/aomp17.0/aomp/bin/../manifests/aomp_17.0-1.xml
MANIFEST FILE: ~/git/aomp17.0/aomp/bin/../manifests/aomp_17.0-2.xml
```
repo src branch path repo name last hash updated commitor for author
-------- ------ ---- --------- --------- ------- -------- ----------
Expand Down
8 changes: 4 additions & 4 deletions docs/UBUNTUINSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ AOMP will install to /usr/lib/aomp. The AOMP environment variable will automatic

On Ubuntu 20.04, run these commands:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_Ubuntu2004_17.0-1_amd64.deb
sudo dpkg -i aomp_Ubuntu2004_17.0-1_amd64.deb
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_Ubuntu2004_17.0-2_amd64.deb
sudo dpkg -i aomp_Ubuntu2004_17.0-2_amd64.deb
```
On Ubuntu 22.04, run these commands:
```
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-1/aomp_Ubuntu2204_17.0-1_amd64.deb
sudo dpkg -i aomp_Ubuntu2204_17.0-1_amd64.deb
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_17.0-2/aomp_Ubuntu2204_17.0-2_amd64.deb
sudo dpkg -i aomp_Ubuntu2204_17.0-2_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.
Expand Down
2 changes: 1 addition & 1 deletion test/run_test_suite.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
DISABLED_LIST="raja omptests"

# Available Suites - Qmcpack will timeout at 20 minutes
SUITE_LIST=${SUITE_LIST:-"ovo examples smoke smokefails hipopenmp omp5 openmpapps nekbone sollve kokkos llnl openlibm qmcpack usm"}
SUITE_LIST=${SUITE_LIST:-"ovo examples smoke hipopenmp omp5 openmpapps nekbone sollve llnl openlibm qmcpack"}

#Groups
GROUP_LIST="epsdb"
Expand Down

0 comments on commit 85ad992

Please sign in to comment.