Skip to content

Commit 0877c06

Browse files
committed
Update docs, README, and source install methods.
spack package.py -suppress flang/flang_runtime warnings, which spack thought were errors. -update amd-llvm-project, llvm-project tarball install -remove roctracer/rocprofiler from component list as these are not in the tarball -add TARBALL_INSTALL=1 to Makefile update changelog remove references to aomp11 in patch README
1 parent 3701b3b commit 0877c06

File tree

5 files changed

+26
-16
lines changed

5 files changed

+26
-16
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
AOMP ?= $(HOME)/rocm/aomp
77
AOMP_REPOS = $(shell pwd)
88
all:
9-
AOMP=$(AOMP) AOMP_REPOS=$(AOMP_REPOS) AOMP_CHECK_GIT_BRANCH=0 AOMP_APPLY_ROCM_PATCHES=0 $(AOMP_REPOS)/aomp/bin/build_aomp.sh
9+
AOMP=$(AOMP) AOMP_REPOS=$(AOMP_REPOS) AOMP_CHECK_GIT_BRANCH=0 AOMP_APPLY_ROCM_PATCHES=0 TARBALL_INSTALL=1 $(AOMP_REPOS)/aomp/bin/build_aomp.sh
1010
install:
1111
@echo "Installation complete to $(AOMP)"

bin/debian/changelog

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,14 @@ aomp (13.0-2) UNRELEASED; urgency=medium
540540
*
541541
* 13.0-2
542542
* Rebase all changes to the current LLVM development trunk which is the development of LLVM 13.
543-
* Known Issues:
544-
* Regression with QMCPACK deterministic tests
545-
* pow(double, int) is returning -inf
543+
* Set the default number of teams to 4 times the number of computation units for improving GPU occupancy.
544+
* Support for adjusting the number of threads in a team based on VGPR usage of a kernel
545+
* Enhanced the kernel trace (when LIBOMPTARGET_KERNEL_TRACE is set) with register usage information.
546+
This already includes the requested and actual number of teams and threads used for a kernel.
547+
* Updated ROCm components to 4.1.x branches.
548+
* Default Code Object v4.
549+
* Known Issues:
550+
* Regression with QMCPACK deterministic tests.
551+
* pow(double, int) is returning -inf.
546552

547-
-- Greg Rodgers <Gregory.Rodgers@amd.com> Sat, 10 Apr 2021 16:26:11 -0500
553+
-- Greg Rodgers <Gregory.Rodgers@amd.com> Sun, 11 Apr 2021 12:43:14 -0500

bin/package.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,14 @@ class Aomp(MakefilePackage):
2121

2222
def edit(self, spec, prefix):
2323
makefile = FileFilter('Makefile')
24-
filter_file('add_subdirectory(test)', '#add_subdirectory(test)','amd-llvm-project/compiler-rt/CMakeLists.txt', string=True)
25-
filter_file('add_subdirectory(test)', '#add_subdirectory(test)','amd-llvm-project/llvm/CMakeLists.txt', string=True)
24+
filter_file('add_subdirectory(test)', '#add_subdirectory(test)','llvm-project/compiler-rt/CMakeLists.txt', string=True)
25+
filter_file('add_subdirectory(test)', '#add_subdirectory(test)','llvm-project/llvm/CMakeLists.txt', string=True)
2626
filter_file('add_subdirectory(test)', '#add_subdirectory(test)','flang/CMakeLists.txt', string=True)
2727

28+
# Add -w to suppress warnings, which spack thinks are errors
29+
filter_file('-std=c11', '-std=c11 -w','flang/tools/flang1/flang1exe/CMakeLists.txt', string=True)
30+
filter_file('PRIVATE -fPIC)', 'PRIVATE -fPIC PRIVATE -w)','flang/runtime/flang/CMakeLists.txt', string=True)
31+
2832
def install(self, spec, prefix):
2933
make()
3034
make("install")

bin/patches/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ If we created a mirror, we would not get maintenance unless we kept updating the
1010

1111
The components that AOMP developers have direct control over are:
1212

13-
amd-llvm-project, aomp-extras, flang, aomp
13+
llvm-project, aomp-extras, flang, aomp
1414

1515
All other components are non-AOMP components that often require patching to
1616
work with AOMP. The AOMP build scripts for non-AOMP components use this patching process:
@@ -79,22 +79,22 @@ to verify there are no changes to the non-AOMP component.
7979
Lets use build_roct.sh as an example to create a fresh patch for the roct component.
8080
Before starting, be sure you are on the development branch of aomp repo
8181
which is currently amd-stg-openmp. For this demo assume your aomp component repos
82-
are stored at $HOME/git/aomp11. Run these commands:
82+
are stored at $HOME/git/aomp13. Run these commands:
8383

8484
```
85-
$HOME/git/aomp11/bin/build_roct.sh
86-
$HOME/git/aomp11/aomp/bin/build_roct.sh
87-
cd $HOME/git/aomp11/roct-thunk-interface
85+
$HOME/git/aomp13/bin/build_roct.sh
86+
$HOME/git/aomp13/aomp/bin/build_roct.sh
87+
cd $HOME/git/aomp13/roct-thunk-interface
8888
git status
89-
git diff >$HOME/git/aomp11/aomp/bin/patches/roct-thunk-interface.patch
90-
$HOME/git/aomp11/aomp/bin/build_roct.sh install
89+
git diff >$HOME/git/aomp13/aomp/bin/patches/roct-thunk-interface.patch
90+
$HOME/git/aomp13/aomp/bin/build_roct.sh install
9191
git status
9292
```
9393
Lastly, please push the updated patch into the aomp development branch
9494
for other developers to pick up with these commands:
9595

9696
```
97-
cd $HOME/git/aomp11/aomp
97+
cd $HOME/git/aomp13/aomp
9898
git add bin/patches/roct-thunk-interface.patch
9999
git commit -m "freshen patch for roct"
100100
git push

docs/RELEASESOURCEINSTALL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ To build and install aomp from the release source tarball run these commands:
1616
```
1717
wget https://github.com/ROCm-Developer-Tools/aomp/releases/download/rel_13.0-2/aomp-13.0-2.tar.gz
1818
tar -xzf aomp-13.0-2.tar.gz
19-
cd aomp
19+
cd aomp13
2020
nohup make &
2121
```
2222
Depending on your system, the last command could take a very long time. So it is recommended to use nohup and background the process. The simple Makefile that make will use runs build script "build_aomp.sh" and sets some flags to avoid git checks and applying ROCm patches. Here is that Makefile:

0 commit comments

Comments
 (0)