From c0bfaa93c705fdac2972e07398d5abadf64e3afd Mon Sep 17 00:00:00 2001 From: Dominik Adamski Date: Tue, 21 Oct 2025 05:47:47 -0500 Subject: [PATCH 01/10] Set CMake version to 4.1.2 This change requires patching hipfort and rocprofiler-register. --- bin/build_supp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build_supp.sh b/bin/build_supp.sh index 74b6c8532..f5eab99fd 100755 --- a/bin/build_supp.sh +++ b/bin/build_supp.sh @@ -415,7 +415,7 @@ function buildfftw(){ function buildcmake(){ _cname="cmake" - _version=3.25.2 + _version=4.1.2 _installdir=$AOMP_SUPP_INSTALL/$_cname-$_version _linkfrom=$AOMP_SUPP/$_cname _builddir=$AOMP_SUPP_BUILD/$_cname From 6a504853ffa32159e4d0ae529904280b07b1b02c Mon Sep 17 00:00:00 2001 From: Dominik Adamski Date: Tue, 21 Oct 2025 05:53:43 -0500 Subject: [PATCH 02/10] Modify build_project.sh No need to explicitly link Flang runtime for GPU code. --- bin/aomp_common_vars | 3 ++- bin/build_project.sh | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/aomp_common_vars b/bin/aomp_common_vars index acfcc5b4a..22a09ebab 100644 --- a/bin/aomp_common_vars +++ b/bin/aomp_common_vars @@ -30,7 +30,8 @@ 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_STRING=${AOMP_VERSION_STRING:-"$AOMP_VERSION-$AOMP_VERSION_MOD"} +AOMP_VERSION_STRING_DOTS=${AOMP_VERSION_STRING:-"$AOMP_VERSION-$AOMP_VERSION_MOD"} +AOMP_VERSION_STRING="${AOMP_VERSION_STRING_DOTS//./_}" ROCM_EXPECTED_MODVERSION=${ROCM_EXPECTED_MODVERSION:-6.2.4} export AOMP_VERSION_STRING AOMP_VERSION AOMP_VERSION_MOD ROCM_VERSION ROCM_EXPECTED_MODVERSION diff --git a/bin/build_project.sh b/bin/build_project.sh index cd79e4318..1e50c1337 100755 --- a/bin/build_project.sh +++ b/bin/build_project.sh @@ -112,7 +112,7 @@ MYCMAKEOPTS=(-DCMAKE_BUILD_TYPE="$BUILD_TYPE" -DLLVM_VERSION_SUFFIX="_AOMP${standalone_word}_$AOMP_VERSION_STRING" -DCLANG_VENDOR="AOMP${standalone_word}_$AOMP_VERSION_STRING" -DCLANG_DEFAULT_PIE_ON_LINUX=0 - -DLLVM_ENABLE_ZLIB=ON + -DLLVM_ENABLE_ZLIB=OFF -DBUG_REPORT_URL='https://github.com/ROCm/aomp' -DLLVM_ENABLE_BINDINGS=OFF -DCMAKE_PREFIX_PATH=$BUILD_DIR/build/$AOMP_PROJECT_REPO_NAME/lib/cmake @@ -153,7 +153,7 @@ MYCMAKEOPTS=(-DCMAKE_BUILD_TYPE="$BUILD_TYPE" if [ -f "$AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/openmp/device/CMakeLists.txt" ]; then MYCMAKEOPTS=("${MYCMAKEOPTS[@]}" -DLLVM_RUNTIME_TARGETS='default;amdgcn-amd-amdhsa' - -DRUNTIMES_amdgcn-amd-amdhsa_LLVM_ENABLE_RUNTIMES='openmp' + -DRUNTIMES_amdgcn-amd-amdhsa_LLVM_ENABLE_RUNTIMES='compiler-rt;libc;libcxx;libcxxabi;flang-rt;openmp' -DRUNTIMES_amdgcn-amd-amdhsa_LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON) fi @@ -167,7 +167,12 @@ MYCMAKEOPTS=("${MYCMAKEOPTS[@]}" -DCLANG_ENABLE_AMDCLANG=ON -DLLVM_ENABLE_RUNTIMES="$LLVM_RUNTIMES" -DLIBCXX_ENABLE_STATIC=ON - -DLIBCXXABI_ENABLE_STATIC=ON) + -DLIBCXXABI_ENABLE_STATIC=ON + -DLLVM_RUNTIME_TARGETS="default;amdgcn-amd-amdhsa" + -DRUNTIMES_amdgcn-amd-amdhsa_FLANG_RT_LIBC_PROVIDER=llvm + -DRUNTIMES_amdgcn-amd-amdhsa_FLANG_RT_LIBCXX_PROVIDER=llvm + -DRUNTIMES_amdgcn-amd-amdhsa_CACHE_FILES="$AOMP_REPOS/$AOMP_PROJECT_REPO_NAME/libcxx/cmake/caches/AMDGPU.cmake" + ) # Enable Compiler-rt Sanitizer Build if [ "$AOMP_BUILD_SANITIZER" == 1 ]; then From 98695f1ae96334318654d8904e7c8f1822af777a Mon Sep 17 00:00:00 2001 From: Dominik Adamski Date: Tue, 21 Oct 2025 05:59:38 -0500 Subject: [PATCH 03/10] Update smoke-fort-dev and GenASiS script Do not add -lflang_rt.hostdevice flag --- bin/run_genasis_flang_new.sh | 2 +- test/smoke-fort-dev/device_aassign/Makefile | 2 +- test/smoke-fort-dev/flang-315421/Makefile | 2 +- test/smoke-fort-dev/flang-464660-2/Makefile | 2 +- test/smoke-fort-dev/flang-523626/Makefile | 2 +- test/smoke-fort-dev/flang-529628/Makefile | 2 +- test/smoke-fort-dev/rocm-issue-201/Makefile | 2 +- test/smoke-fort-dev/target-cmplx4-div/Makefile | 2 +- test/smoke-fort-dev/target-cmplx8-div/Makefile | 4 ++-- test/smoke-fort-dev/tgt-abort-lhostdev/Makefile | 2 +- test/smoke-fort-dev/tgt-firstprivate/Makefile | 2 +- test/smoke-fort-dev/tgt-print-hello-lhostdev/Makefile | 2 +- test/smoke-fort-dev/tgt-print-val-lhostdev/Makefile | 2 +- test/smoke-fort-dev/tgt-stop-lhostdev/Makefile | 2 +- test/smoke-fort-dev/tgt-write-lhostdev/Makefile | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bin/run_genasis_flang_new.sh b/bin/run_genasis_flang_new.sh index d9c033bc0..205b6065b 100755 --- a/bin/run_genasis_flang_new.sh +++ b/bin/run_genasis_flang_new.sh @@ -113,7 +113,7 @@ fi export LD_LIBRARY_PATH=$AOMP/lib:$AOMPHIP/lib:$OPENMPI_DIR/lib:$LD_LIBRARY_PATH export FORTRAN_COMPILE="$AOMP/bin/$FLANG -c -fopenmp --offload-arch=$GPU_ID -fPIC -I$OPENMPI_DIR/lib -cpp $OMP_DEFINES -fstack-arrays" export CC_COMPILE="$AOMP/bin/clang -fPIC" -export FORTDEV_LIBS=${FORTDEV_LIBS:-"-lflang_rt.hostdevice"} +export FORTDEV_LIBS=${FORTDEV_LIBS} export FORTHOST_LIBS=${FORTHOST_LIBS:-"-lflang_rt.runtime"} export OTHER_LIBS="-lm -L$AOMP/lib $FORTHOST_LIBS $FORTDEV_LIBS -lomp -lomptarget -z muldefs " export FORTRAN_LINK="$AOMP/bin/clang $OTHER_LIBS" diff --git a/test/smoke-fort-dev/device_aassign/Makefile b/test/smoke-fort-dev/device_aassign/Makefile index 24c45470b..129329583 100644 --- a/test/smoke-fort-dev/device_aassign/Makefile +++ b/test/smoke-fort-dev/device_aassign/Makefile @@ -6,7 +6,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/flang-315421/Makefile b/test/smoke-fort-dev/flang-315421/Makefile index 728d6c58e..467f224e3 100644 --- a/test/smoke-fort-dev/flang-315421/Makefile +++ b/test/smoke-fort-dev/flang-315421/Makefile @@ -8,7 +8,7 @@ TESTSRC_ALL = $(TESTSRC_AUX) $(TESTSRC_MAIN) FLANG ?= flang OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_FLAGS += -DFAIL include ../Makefile.rules diff --git a/test/smoke-fort-dev/flang-464660-2/Makefile b/test/smoke-fort-dev/flang-464660-2/Makefile index 763819037..4be692b7b 100644 --- a/test/smoke-fort-dev/flang-464660-2/Makefile +++ b/test/smoke-fort-dev/flang-464660-2/Makefile @@ -9,7 +9,7 @@ TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) -OMP_FLAGS += -lflang_rt.hostdevice +#OMP_FLAGS += -lflang_rt.hostdevice #-ccc-print-phases #"-\#\#\#" diff --git a/test/smoke-fort-dev/flang-523626/Makefile b/test/smoke-fort-dev/flang-523626/Makefile index 917a141e3..601844089 100644 --- a/test/smoke-fort-dev/flang-523626/Makefile +++ b/test/smoke-fort-dev/flang-523626/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/flang-529628/Makefile b/test/smoke-fort-dev/flang-529628/Makefile index cb15b1258..4270be7ec 100644 --- a/test/smoke-fort-dev/flang-529628/Makefile +++ b/test/smoke-fort-dev/flang-529628/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/rocm-issue-201/Makefile b/test/smoke-fort-dev/rocm-issue-201/Makefile index 614425a1b..5376525fe 100644 --- a/test/smoke-fort-dev/rocm-issue-201/Makefile +++ b/test/smoke-fort-dev/rocm-issue-201/Makefile @@ -9,7 +9,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/target-cmplx4-div/Makefile b/test/smoke-fort-dev/target-cmplx4-div/Makefile index 2be17a799..da566a425 100644 --- a/test/smoke-fort-dev/target-cmplx4-div/Makefile +++ b/test/smoke-fort-dev/target-cmplx4-div/Makefile @@ -9,7 +9,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG = flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/target-cmplx8-div/Makefile b/test/smoke-fort-dev/target-cmplx8-div/Makefile index ad8af00b0..1f9005041 100644 --- a/test/smoke-fort-dev/target-cmplx8-div/Makefile +++ b/test/smoke-fort-dev/target-cmplx8-div/Makefile @@ -9,10 +9,10 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG = flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice #-ccc-print-phases #"-\#\#\#" diff --git a/test/smoke-fort-dev/tgt-abort-lhostdev/Makefile b/test/smoke-fort-dev/tgt-abort-lhostdev/Makefile index 5012481a6..f8f81e4d2 100644 --- a/test/smoke-fort-dev/tgt-abort-lhostdev/Makefile +++ b/test/smoke-fort-dev/tgt-abort-lhostdev/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/tgt-firstprivate/Makefile b/test/smoke-fort-dev/tgt-firstprivate/Makefile index 2cc256e80..0b30304d8 100644 --- a/test/smoke-fort-dev/tgt-firstprivate/Makefile +++ b/test/smoke-fort-dev/tgt-firstprivate/Makefile @@ -7,7 +7,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) FLANG ?= flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/tgt-print-hello-lhostdev/Makefile b/test/smoke-fort-dev/tgt-print-hello-lhostdev/Makefile index 5012481a6..f8f81e4d2 100644 --- a/test/smoke-fort-dev/tgt-print-hello-lhostdev/Makefile +++ b/test/smoke-fort-dev/tgt-print-hello-lhostdev/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/tgt-print-val-lhostdev/Makefile b/test/smoke-fort-dev/tgt-print-val-lhostdev/Makefile index 5012481a6..f8f81e4d2 100644 --- a/test/smoke-fort-dev/tgt-print-val-lhostdev/Makefile +++ b/test/smoke-fort-dev/tgt-print-val-lhostdev/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/tgt-stop-lhostdev/Makefile b/test/smoke-fort-dev/tgt-stop-lhostdev/Makefile index 5012481a6..f8f81e4d2 100644 --- a/test/smoke-fort-dev/tgt-stop-lhostdev/Makefile +++ b/test/smoke-fort-dev/tgt-stop-lhostdev/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/tgt-write-lhostdev/Makefile b/test/smoke-fort-dev/tgt-write-lhostdev/Makefile index 5012481a6..f8f81e4d2 100644 --- a/test/smoke-fort-dev/tgt-write-lhostdev/Makefile +++ b/test/smoke-fort-dev/tgt-write-lhostdev/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -CFLAGS = -lflang_rt.hostdevice +#CFLAGS = -lflang_rt.hostdevice OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases From 76fd20a68529d8842a5626fcc6871c28d6b092b2 Mon Sep 17 00:00:00 2001 From: Dominik Adamski Date: Tue, 28 Oct 2025 08:22:51 -0500 Subject: [PATCH 04/10] fix_flang_rt --- bin/build_llvm-flang-rt-host-dev.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/build_llvm-flang-rt-host-dev.sh b/bin/build_llvm-flang-rt-host-dev.sh index 1cc5db1a7..6d510053b 100755 --- a/bin/build_llvm-flang-rt-host-dev.sh +++ b/bin/build_llvm-flang-rt-host-dev.sh @@ -103,6 +103,7 @@ ${AOMP_CMAKE} "${AOMP_SET_NINJA_GEN[@]}" $CM_BUILD_TYPE \ -DCMAKE_CXX_COMPILER="$CMAKE_CXX_COMPILER" \ -DFLANG_RT_DEVICE_ARCHITECTURES="$ARCH_LIST" \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DFLANG_RT_EMBED_GPU_LLVM_IR=OFF \ "$AOMP_REPOS/llvm-project/runtimes" $AOMP_NINJA_BIN --version From 1bca7b311ffef23e15c069794950810a4e67fe60 Mon Sep 17 00:00:00 2001 From: Dominik Adamski Date: Wed, 29 Oct 2025 05:40:21 -0500 Subject: [PATCH 05/10] Add switch for -lflang_rt.hostdevice --- test/smoke-fort-dev/device_aassign/Makefile | 2 +- test/smoke-fort-dev/device_intrinsics/Makefile | 2 +- test/smoke-fort-dev/flang-315421/Makefile | 2 +- test/smoke-fort-dev/flang-464660-2/Makefile | 2 +- test/smoke-fort-dev/flang-523626/Makefile | 2 +- test/smoke-fort-dev/flang-529628/Makefile | 2 +- test/smoke-fort-dev/rocm-issue-201/Makefile | 2 +- test/smoke-fort-dev/target-cmplx4-div/Makefile | 2 +- test/smoke-fort-dev/target-cmplx8-div/Makefile | 3 +-- test/smoke-fort-dev/tgt-abort-lhostdev/Makefile | 2 +- test/smoke-fort-dev/tgt-firstprivate/Makefile | 2 +- test/smoke-fort-dev/tgt-print-hello-lhostdev/Makefile | 2 +- test/smoke-fort-dev/tgt-print-val-lhostdev/Makefile | 2 +- test/smoke-fort-dev/tgt-stop-lhostdev/Makefile | 2 +- test/smoke-fort-dev/tgt-write-lhostdev/Makefile | 2 +- 15 files changed, 15 insertions(+), 16 deletions(-) diff --git a/test/smoke-fort-dev/device_aassign/Makefile b/test/smoke-fort-dev/device_aassign/Makefile index 129329583..737a4c788 100644 --- a/test/smoke-fort-dev/device_aassign/Makefile +++ b/test/smoke-fort-dev/device_aassign/Makefile @@ -6,7 +6,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/device_intrinsics/Makefile b/test/smoke-fort-dev/device_intrinsics/Makefile index 69b8f2a0a..6bfa04f9d 100644 --- a/test/smoke-fort-dev/device_intrinsics/Makefile +++ b/test/smoke-fort-dev/device_intrinsics/Makefile @@ -11,7 +11,7 @@ TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) -CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) #-ccc-print-phases #"-\#\#\#" diff --git a/test/smoke-fort-dev/flang-315421/Makefile b/test/smoke-fort-dev/flang-315421/Makefile index 467f224e3..afd87871c 100644 --- a/test/smoke-fort-dev/flang-315421/Makefile +++ b/test/smoke-fort-dev/flang-315421/Makefile @@ -8,7 +8,7 @@ TESTSRC_ALL = $(TESTSRC_AUX) $(TESTSRC_MAIN) FLANG ?= flang OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_FLAGS += -DFAIL include ../Makefile.rules diff --git a/test/smoke-fort-dev/flang-464660-2/Makefile b/test/smoke-fort-dev/flang-464660-2/Makefile index 4be692b7b..04b080e2a 100644 --- a/test/smoke-fort-dev/flang-464660-2/Makefile +++ b/test/smoke-fort-dev/flang-464660-2/Makefile @@ -9,7 +9,7 @@ TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) -#OMP_FLAGS += -lflang_rt.hostdevice +OMP_FLAGS += $(FLANG_GPU_LINK_FLAGS) #-ccc-print-phases #"-\#\#\#" diff --git a/test/smoke-fort-dev/flang-523626/Makefile b/test/smoke-fort-dev/flang-523626/Makefile index 601844089..858890d84 100644 --- a/test/smoke-fort-dev/flang-523626/Makefile +++ b/test/smoke-fort-dev/flang-523626/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/flang-529628/Makefile b/test/smoke-fort-dev/flang-529628/Makefile index 4270be7ec..057d3d8d3 100644 --- a/test/smoke-fort-dev/flang-529628/Makefile +++ b/test/smoke-fort-dev/flang-529628/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/rocm-issue-201/Makefile b/test/smoke-fort-dev/rocm-issue-201/Makefile index 5376525fe..d9aa14594 100644 --- a/test/smoke-fort-dev/rocm-issue-201/Makefile +++ b/test/smoke-fort-dev/rocm-issue-201/Makefile @@ -9,7 +9,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/target-cmplx4-div/Makefile b/test/smoke-fort-dev/target-cmplx4-div/Makefile index da566a425..993964ce1 100644 --- a/test/smoke-fort-dev/target-cmplx4-div/Makefile +++ b/test/smoke-fort-dev/target-cmplx4-div/Makefile @@ -9,7 +9,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG = flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/target-cmplx8-div/Makefile b/test/smoke-fort-dev/target-cmplx8-div/Makefile index 1f9005041..265cd1e58 100644 --- a/test/smoke-fort-dev/target-cmplx8-div/Makefile +++ b/test/smoke-fort-dev/target-cmplx8-div/Makefile @@ -9,10 +9,9 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG = flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) -#CFLAGS = -lflang_rt.hostdevice #-ccc-print-phases #"-\#\#\#" diff --git a/test/smoke-fort-dev/tgt-abort-lhostdev/Makefile b/test/smoke-fort-dev/tgt-abort-lhostdev/Makefile index f8f81e4d2..77511f0af 100644 --- a/test/smoke-fort-dev/tgt-abort-lhostdev/Makefile +++ b/test/smoke-fort-dev/tgt-abort-lhostdev/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/tgt-firstprivate/Makefile b/test/smoke-fort-dev/tgt-firstprivate/Makefile index 0b30304d8..d4f708dc1 100644 --- a/test/smoke-fort-dev/tgt-firstprivate/Makefile +++ b/test/smoke-fort-dev/tgt-firstprivate/Makefile @@ -7,7 +7,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) FLANG ?= flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/tgt-print-hello-lhostdev/Makefile b/test/smoke-fort-dev/tgt-print-hello-lhostdev/Makefile index f8f81e4d2..77511f0af 100644 --- a/test/smoke-fort-dev/tgt-print-hello-lhostdev/Makefile +++ b/test/smoke-fort-dev/tgt-print-hello-lhostdev/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/tgt-print-val-lhostdev/Makefile b/test/smoke-fort-dev/tgt-print-val-lhostdev/Makefile index f8f81e4d2..77511f0af 100644 --- a/test/smoke-fort-dev/tgt-print-val-lhostdev/Makefile +++ b/test/smoke-fort-dev/tgt-print-val-lhostdev/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/tgt-stop-lhostdev/Makefile b/test/smoke-fort-dev/tgt-stop-lhostdev/Makefile index f8f81e4d2..77511f0af 100644 --- a/test/smoke-fort-dev/tgt-stop-lhostdev/Makefile +++ b/test/smoke-fort-dev/tgt-stop-lhostdev/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-dev/tgt-write-lhostdev/Makefile b/test/smoke-fort-dev/tgt-write-lhostdev/Makefile index f8f81e4d2..77511f0af 100644 --- a/test/smoke-fort-dev/tgt-write-lhostdev/Makefile +++ b/test/smoke-fort-dev/tgt-write-lhostdev/Makefile @@ -8,7 +8,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG ?= flang -#CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases From 556ec52c022f9b8f80d6ecbb903948886316cb4a Mon Sep 17 00:00:00 2001 From: Dominik Adamski Date: Wed, 29 Oct 2025 05:40:56 -0500 Subject: [PATCH 06/10] Restore AOMP original value --- bin/aomp_common_vars | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/aomp_common_vars b/bin/aomp_common_vars index 22a09ebab..acfcc5b4a 100644 --- a/bin/aomp_common_vars +++ b/bin/aomp_common_vars @@ -30,8 +30,7 @@ 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_STRING_DOTS=${AOMP_VERSION_STRING:-"$AOMP_VERSION-$AOMP_VERSION_MOD"} -AOMP_VERSION_STRING="${AOMP_VERSION_STRING_DOTS//./_}" +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 From de771812e84e93ebd79250730cb365a3390f2639 Mon Sep 17 00:00:00 2001 From: Dominik Adamski Date: Wed, 29 Oct 2025 14:04:16 -0500 Subject: [PATCH 07/10] Restore LLMV_ENABLE_ZLIB option --- bin/build_project.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build_project.sh b/bin/build_project.sh index 1e50c1337..9bbb8fb42 100755 --- a/bin/build_project.sh +++ b/bin/build_project.sh @@ -112,7 +112,7 @@ MYCMAKEOPTS=(-DCMAKE_BUILD_TYPE="$BUILD_TYPE" -DLLVM_VERSION_SUFFIX="_AOMP${standalone_word}_$AOMP_VERSION_STRING" -DCLANG_VENDOR="AOMP${standalone_word}_$AOMP_VERSION_STRING" -DCLANG_DEFAULT_PIE_ON_LINUX=0 - -DLLVM_ENABLE_ZLIB=OFF + -DLLVM_ENABLE_ZLIB=ON -DBUG_REPORT_URL='https://github.com/ROCm/aomp' -DLLVM_ENABLE_BINDINGS=OFF -DCMAKE_PREFIX_PATH=$BUILD_DIR/build/$AOMP_PROJECT_REPO_NAME/lib/cmake From 605ea8d24a3103037984a97a0ba8e96bbb06eb5d Mon Sep 17 00:00:00 2001 From: Dominik Adamski Date: Thu, 30 Oct 2025 15:24:01 -0500 Subject: [PATCH 08/10] Add switch for -lflang_rt.hostdevice for smoke-fort-fails --- test/smoke-fort-fails/flang-535320/Makefile | 2 +- test/smoke-fort-fails/flang-535416-O0/Makefile | 2 +- test/smoke-fort-fails/flang-535416-O2/Makefile | 2 +- test/smoke-fort-fails/flang-537499/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/smoke-fort-fails/flang-535320/Makefile b/test/smoke-fort-fails/flang-535320/Makefile index dcf29a670..9310cb425 100644 --- a/test/smoke-fort-fails/flang-535320/Makefile +++ b/test/smoke-fort-fails/flang-535320/Makefile @@ -9,7 +9,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG = flang -CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-fails/flang-535416-O0/Makefile b/test/smoke-fort-fails/flang-535416-O0/Makefile index 051d583d2..733e7e54c 100644 --- a/test/smoke-fort-fails/flang-535416-O0/Makefile +++ b/test/smoke-fort-fails/flang-535416-O0/Makefile @@ -9,7 +9,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG = flang -CFLAGS = -O0 -lflang_rt.hostdevice +CFLAGS = -O0 $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-fails/flang-535416-O2/Makefile b/test/smoke-fort-fails/flang-535416-O2/Makefile index 21683eca2..9202dd504 100644 --- a/test/smoke-fort-fails/flang-535416-O2/Makefile +++ b/test/smoke-fort-fails/flang-535416-O2/Makefile @@ -9,7 +9,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG = flang -CFLAGS = -O2 -lflang_rt.hostdevice +CFLAGS = -O2 $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases diff --git a/test/smoke-fort-fails/flang-537499/Makefile b/test/smoke-fort-fails/flang-537499/Makefile index c26c57de0..8fc489a5d 100644 --- a/test/smoke-fort-fails/flang-537499/Makefile +++ b/test/smoke-fort-fails/flang-537499/Makefile @@ -9,7 +9,7 @@ TESTSRC_AUX = TESTSRC_ALL = $(TESTSRC_MAIN) $(TESTSRC_AUX) FLANG = flang -CFLAGS = -lflang_rt.hostdevice +CFLAGS = $(FLANG_GPU_LINK_FLAGS) OMP_BIN = $(AOMP)/bin/$(FLANG) CC = $(OMP_BIN) $(VERBOSE) #-ccc-print-phases From 5fb025a103b2828b39d1168a7bc84e961dbd45fd Mon Sep 17 00:00:00 2001 From: Dominik Adamski Date: Thu, 30 Oct 2025 15:33:04 -0500 Subject: [PATCH 09/10] Add switch for libflang_rt.hostdevice.a for UMT --- bin/run_umt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/run_umt.sh b/bin/run_umt.sh index c4c13d780..8a82676f8 100755 --- a/bin/run_umt.sh +++ b/bin/run_umt.sh @@ -162,7 +162,7 @@ if [ "$1" == "build_umt" ]; then -DUMPIRE_ROOT=$AOMP_REPOS_TEST/$UMPIRE_SRC_DIR/install \ -DCAMP_ROOT=$AOMP_REPOS_TEST/$CAMP_SRC_DIR/install \ -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX -DCMAKE_Fortran_COMPILER=$FC \ - -DCMAKE_FORTRAN_OFFLOAD_LIB=$AOMP/lib/libflang_rt.hostdevice.a \ + -DCMAKE_FORTRAN_OFFLOAD_LIB=$FLANG_GPU_LINK_FLAGS \ -DCMAKE_Fortran_LINKER_WRAPPER_FLAG="-Wl," \ -DENABLE_CUDA=OFF \ -DENABLE_OPENMP=ON -DOPENMP_HAS_FORTRAN_INTERFACE=ON \ From 9fc918a0a0bf6ace11fc46d8cf3f6e545aa1521f Mon Sep 17 00:00:00 2001 From: Dominik Adamski Date: Fri, 7 Nov 2025 10:31:12 -0600 Subject: [PATCH 10/10] use cmake 3.29.0 --- bin/build_supp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build_supp.sh b/bin/build_supp.sh index eb6067d4d..8ee2e7473 100755 --- a/bin/build_supp.sh +++ b/bin/build_supp.sh @@ -415,7 +415,7 @@ function buildfftw(){ function buildcmake(){ _cname="cmake" - _version=4.1.2 + _version=3.29.0 _installdir=$AOMP_SUPP_INSTALL/$_cname-$_version _linkfrom=$AOMP_SUPP/$_cname _builddir=$AOMP_SUPP_BUILD/$_cname