Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions bin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ There are options to select a subset of components to build and install.
```
2) Select a subset of components to build.
```
./build_aomp.sh select openmp flang flang_runtime
./build_aomp.sh select openmp
```
The default AOMP source build is a standalone build of all components needed for compilation and execution with the exception of the kfd Linux kernel module for AMD GPUs or the CUDA SDK for Nvidia GPUs.

Expand Down Expand Up @@ -298,7 +298,7 @@ export AOMP_GPU=`/opt/rocm/lib/llvm/bin/offload-arch`

## The AOMP developer patch subsystem

Of the many repos identified above, AOMP developers may only change core aomp repositories (llvm-project, aomp, aomp-extras, and flang). AOMP required changes to other non-core components must be patched. The [patches/README.md](patches/README.md) describes the AOMP patch mechanism in detail.
Of the many repos identified above, AOMP developers may only change core aomp repositories (llvm-project, aomp, and aomp-extras). AOMP required changes to other non-core components must be patched. The [patches/README.md](patches/README.md) describes the AOMP patch mechanism in detail.

## Building debuggable compiler

Expand Down Expand Up @@ -328,16 +328,3 @@ The default is 1, which creates these CMake vars:
```

Change it to 0 to avoid `ccache`.


## AOMP_SKIP_FLANG

The default for this variable is 0. Setting this to 1 will shorten build time by
changing the defaults for AOMP_COMPONENT_LIST and AOMP_PROJECTS_LIST to

```
AOMP_COMPONENT_LIST=" prereq project"
AOMP_PROJECTS_LIST="clang;lld"
```

The AOMP_SKIP_FLANG variable is for developers working upstream but not on LLVM flang.
12 changes: 0 additions & 12 deletions bin/aomp_common_vars
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ else
-DCMAKE_CXX_COMPILER_LAUNCHER="$_ccache_bin")
fi

AOMP_SKIP_FLANG=${AOMP_SKIP_FLANG:-1}
AOMP_SKIP_FLANG_NEW=${AOMP_SKIP_FLANG_NEW:-0}
AOMP_FLANG_DRIVER=${AOMP_FLANG_DRIVER:-flang}
AOMP_SKIP_AMD_FLANGRT=${AOMP_SKIP_AMD_FLANGRT:-1}

if [ "$AOMP_SKIP_FLANG_NEW" == 1 ] ; then
Expand Down Expand Up @@ -414,16 +412,6 @@ else
AOMP_PROJECT_REPO_NAME="../llvm-project"
fi
fi
AOMP_FLANG_REPO_NAME=${AOMP_FLANG_REPO_NAME:-flang}

# Last version of rocm (5.5) that supports the legacy driver (command generation)
# The archives are built during flang-classic.
AOMP_FLANG_CLASSIC_REL=${AOMP_FLANG_CLASSIC_REL:-${AOMP_REPOS}/${AOMP_FLANG_REPO_NAME}/flang-classic}
if [ -d "$AOMP_FLANG_CLASSIC_REL/llvm-classic" ] ; then
AOMP_BUILD_FLANG_CLASSIC=1
else
AOMP_BUILD_FLANG_CLASSIC=0
fi

# The AOMP_XXX_REPO_NAME is the directory name following $AOMP_REPOS.

Expand Down
34 changes: 3 additions & 31 deletions bin/build_aomp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,6 @@ if ! $TOPSUDO touch "$AOMP_INSTALL_DIR/testfile"; then
fi
$TOPSUDO rm "$AOMP_INSTALL_DIR/testfile"

#Check for gawk on Ubuntu, which is needed for the flang build.
GAWK=$(gawk --version | grep "^GNU Awk")
OS=$(grep "^NAME=" < /etc/os-release)

if [[ -z "$GAWK" ]] && [[ "$OS" == *"Ubuntu"* ]] ; then
echo
echo "Build Error: gawk was not found and is required for building flang! Please run 'sudo apt-get install gawk' and run build_aomp.sh again."
echo
exit 1
fi

if [ "$DISABLE_LLVM_TESTS" == "1" ]; then
export DO_TESTS="-DLLVM_INCLUDE_TESTS=OFF -DCLANG_INCLUDE_TESTS=OFF"
fi
Expand All @@ -104,12 +93,9 @@ if [ "$AOMP_STANDALONE_BUILD" == 1 ] ; then
# rocclr, we have no HIP or OpenCL for ppc64 :-( However, rocr works for ppc64 so AOMP works.
if [ "$_hostarch" == "x86_64" ] ; then
# These components build on x86_64, so add them to components list
if [ "$AOMP_SKIP_FLANG" == 0 ] ; then
components="$components llvm-classic flang-classic pgmath flang flang_runtime"
fi
components="$components hipcc hipamd hipify"
fi
if [ "$AOMP_SKIP_FLANG_NEW" == 0 ] && [ "$AOMP_SKIP_FLANG" == 1 ] ; then
if [ "$AOMP_SKIP_FLANG_NEW" == 0 ] ; then
# We can only build hipfort for flang
components="$components hipfort "
fi
Expand All @@ -133,13 +119,6 @@ else
# roctracer, rocprofiler, rocm_smi_lib, and amdsmi should be found
# in ROCM in /opt/rocm. The ROCM build only needs these components:
components="llvm_runtimes_standalone"
if [ "$AOMP_SKIP_FLANG" == 0 ] ; then
if [ "$SANITIZER" == 1 ] && [ -f "$AOMP/bin/flang-classic" ] ; then
components="$components pgmath flang flang_runtime"
else
components="$components llvm-classic flang-classic pgmath flang flang_runtime"
fi
fi
fi
echo "COMPONENTS:$components"

Expand Down Expand Up @@ -196,24 +175,17 @@ echo

if [ "$AOMP_STANDALONE_BUILD" -eq 0 ]; then
cd "$BUILD_DIR/build" || exit
classic_version=$(ls flang-classic)
classic_install_manifest=$classic_version/install_manifest.txt
if [ "$SANITIZER" == 1 ]; then
install_manifest_orig=asan/install_manifest.txt
install_manifest=asan/install_manifest.txt
else
install_manifest_orig=install_manifest.txt
install_manifest=install_manifest.txt
fi

# Clean file log
rm -f "$BUILD_DIR/build/installed_files.txt"

for directory in ./*/; do
pushd "$directory" > /dev/null || exit
if [[ "$directory" =~ "flang-classic" ]]; then
install_manifest=$classic_install_manifest
else
install_manifest="$install_manifest_orig"
fi
if [ -f "$install_manifest" ]; then
cat "$install_manifest" >> "$BUILD_DIR/build/installed_files.txt"
echo "" >> "$BUILD_DIR/build/installed_files.txt"
Expand Down
2 changes: 0 additions & 2 deletions bin/build_fixups.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ if [ "$AOMP_STANDALONE_BUILD" == 1 ] ; then
$SUDO cp "$AOMP_SRC/LICENSE" "$AOMP/share/doc/aomp/LICENSE.apache2"
echo $SUDO cp "$AOMP_REPOS/$AOMP_EXTRAS_REPO_NAME/LICENSE" "$AOMP/share/doc/aomp/LICENSE.mit"
$SUDO cp "$AOMP_REPOS/$AOMP_EXTRAS_REPO_NAME/LICENSE" "$AOMP/share/doc/aomp/LICENSE.mit"
echo $SUDO cp "$AOMP_REPOS/$AOMP_FLANG_REPO_NAME/LICENSE.txt" "$AOMP/share/doc/aomp/LICENSE.flang"
$SUDO cp "$AOMP_REPOS/$AOMP_FLANG_REPO_NAME/LICENSE.txt" "$AOMP/share/doc/aomp/LICENSE.flang"
fi

echo Cleaning AOMP Directory...
Expand Down
164 changes: 0 additions & 164 deletions bin/build_flang-classic.sh

This file was deleted.

Loading
Loading