Reland [OpenMP][Fix] libomptarget Fortran tests (#76189)
This patch fixes the erroneous multiple-target requirement in Fortran
offloading tests. Additionally, it adds two new variables
(test_flags_clang, test_flags_flang) to lit.cfg so that
compiler-specific flags for Clang and Flang can be specified.
This patch re-lands: #74543. The error was caused by having:
```
config.substitutions.append(("%flags", config.test_flags))
config.substitutions.append(("%flags_clang", config.test_flags_clang))
config.substitutions.append(("%flags_flang", config.test_flags_flang))
```
when instead it has to be:
```
config.substitutions.append(("%flags_clang", config.test_flags_clang))
config.substitutions.append(("%flags_flang", config.test_flags_flang))
config.substitutions.append(("%flags", config.test_flags))
```
because LIT replaces with the first longest sub-string match.
GitOrigin-RevId: 12250c4092b9f8fd043b37cbb73555706a4a412b
diff --git a/libomptarget/test/lit.cfg b/libomptarget/test/lit.cfg
index adbdd7c..19c5e5c 100644
--- a/libomptarget/test/lit.cfg
+++ b/libomptarget/test/lit.cfg
@@ -78,6 +78,10 @@
" -L " + config.library_dir + \
" -L " + config.llvm_lib_directory
+# compiler specific flags
+config.test_flags_clang = ""
+config.test_flags_flang = ""
+
if config.omp_host_rtl_directory:
config.test_flags = config.test_flags + " -L " + \
config.omp_host_rtl_directory
@@ -136,7 +140,7 @@
if config.cuda_libdir:
config.test_flags += " -Wl,-rpath," + config.cuda_libdir
if config.libomptarget_current_target.startswith('nvptx'):
- config.test_flags += " --libomptarget-nvptx-bc-path=" + config.library_dir + '/DeviceRTL'
+ config.test_flags_clang += " --libomptarget-nvptx-bc-path=" + config.library_dir + '/DeviceRTL'
if config.libomptarget_current_target.endswith('-LTO'):
config.test_flags += " -foffload-lto"
if config.libomptarget_current_target.endswith('-JIT-LTO') and evaluate_bool_env(
@@ -273,13 +277,13 @@
libomptarget_target, \
"%not --crash %t"))
config.substitutions.append(("%clangxx-" + libomptarget_target, \
- "%clangxx %openmp_flags %cuda_flags %flags -fopenmp-targets=" +\
+ "%clangxx %openmp_flags %cuda_flags %flags %flags_clang -fopenmp-targets=" +\
remove_suffix_if_present(libomptarget_target)))
config.substitutions.append(("%clang-" + libomptarget_target, \
- "%clang %openmp_flags %cuda_flags %flags -fopenmp-targets=" +\
+ "%clang %openmp_flags %cuda_flags %flags %flags_clang -fopenmp-targets=" +\
remove_suffix_if_present(libomptarget_target)))
config.substitutions.append(("%flang-" + libomptarget_target, \
- "%flang %openmp_flags %flags -fopenmp-targets=" +\
+ "%flang %openmp_flags %flags %flags_flang -fopenmp-targets=" +\
remove_suffix_if_present(libomptarget_target)))
config.substitutions.append(("%fcheck-" + libomptarget_target, \
config.libomptarget_filecheck + " %s"))
@@ -356,5 +360,7 @@
config.substitutions.append(("%cuda_flags", "--cuda-path=" + config.cuda_path))
else:
config.substitutions.append(("%cuda_flags", ""))
+config.substitutions.append(("%flags_clang", config.test_flags_clang))
+config.substitutions.append(("%flags_flang", config.test_flags_flang))
config.substitutions.append(("%flags", config.test_flags))
config.substitutions.append(("%not", config.libomptarget_not))
diff --git a/libomptarget/test/offloading/fortran/basic-target-region-1D-array-section.f90 b/libomptarget/test/offloading/fortran/basic-target-region-1D-array-section.f90
index 993b91d..476b77e 100644
--- a/libomptarget/test/offloading/fortran/basic-target-region-1D-array-section.f90
+++ b/libomptarget/test/offloading/fortran/basic-target-region-1D-array-section.f90
@@ -1,6 +1,6 @@
! Basic offloading test of arrays with provided lower
! and upper bounds as specified by OpenMP's sectioning
-! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
+! REQUIRES: flang
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/basic-target-region-3D-array-section.f90 b/libomptarget/test/offloading/fortran/basic-target-region-3D-array-section.f90
index 669d367..229798b 100644
--- a/libomptarget/test/offloading/fortran/basic-target-region-3D-array-section.f90
+++ b/libomptarget/test/offloading/fortran/basic-target-region-3D-array-section.f90
@@ -1,6 +1,6 @@
! Basic offloading test of a regular array explicitly
! passed within a target region
-! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
+! REQUIRES: flang
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90 b/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90
index c87d6ee..ea30481 100644
--- a/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90
+++ b/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90
@@ -1,6 +1,6 @@
! Basic offloading test of a regular array explicitly
! passed within a target region
-! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
+! REQUIRES: flang
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/basic_target_region.f90 b/libomptarget/test/offloading/fortran/basic_target_region.f90
index 6423ac7..d856d42 100644
--- a/libomptarget/test/offloading/fortran/basic_target_region.f90
+++ b/libomptarget/test/offloading/fortran/basic_target_region.f90
@@ -1,5 +1,5 @@
! Basic offloading test with a target region
-! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
+! REQUIRES: flang
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/constant-arr-index.f90 b/libomptarget/test/offloading/fortran/constant-arr-index.f90
index 9064f60..6696305 100644
--- a/libomptarget/test/offloading/fortran/constant-arr-index.f90
+++ b/libomptarget/test/offloading/fortran/constant-arr-index.f90
@@ -2,8 +2,7 @@
! that checks constant indexing on device
! correctly works (regression test for prior
! bug).
-! REQUIRES: flang, amdgcn-amd-amdhsa
-! UNSUPPORTED: nvptx64-nvidia-cuda
+! REQUIRES: flang
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/declare-target-array-in-target-region.f90 b/libomptarget/test/offloading/fortran/declare-target-array-in-target-region.f90
index d2e59d9..c091461 100644
--- a/libomptarget/test/offloading/fortran/declare-target-array-in-target-region.f90
+++ b/libomptarget/test/offloading/fortran/declare-target-array-in-target-region.f90
@@ -1,7 +1,7 @@
! Offloading test with a target region mapping a declare target
! Fortran array writing some values to it and checking the host
! correctly receives the updates made on the device.
-! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
+! REQUIRES: flang
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/double-target-call-with-declare-target.f90 b/libomptarget/test/offloading/fortran/double-target-call-with-declare-target.f90
index 884acb2..56c9672 100644
--- a/libomptarget/test/offloading/fortran/double-target-call-with-declare-target.f90
+++ b/libomptarget/test/offloading/fortran/double-target-call-with-declare-target.f90
@@ -2,7 +2,8 @@
! declare target Fortran array and writing some values to
! it before checking the host correctly receives the
! correct updates made on the device.
-! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
+! REQUIRES: flang
+! UNSUPPORTED: nvptx64-nvidia-cuda
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/target-region-implicit-array.f90 b/libomptarget/test/offloading/fortran/target-region-implicit-array.f90
index 5ef2547..ada6ef2 100644
--- a/libomptarget/test/offloading/fortran/target-region-implicit-array.f90
+++ b/libomptarget/test/offloading/fortran/target-region-implicit-array.f90
@@ -1,6 +1,6 @@
! Basic offloading test of a regular array explicitly
! passed within a target region
-! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
+! REQUIRES: flang
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
diff --git a/libomptarget/test/offloading/fortran/target_map_common_block.f90 b/libomptarget/test/offloading/fortran/target_map_common_block.f90
index e782ef8..f20423e 100644
--- a/libomptarget/test/offloading/fortran/target_map_common_block.f90
+++ b/libomptarget/test/offloading/fortran/target_map_common_block.f90
@@ -1,5 +1,5 @@
! Basic offloading test with a target region
-! REQUIRES: flang, amdgcn-amd-amdhsa
+! REQUIRES: flang
! UNSUPPORTED: nvptx64-nvidia-cuda
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
diff --git a/libomptarget/test/offloading/fortran/target_map_common_block2.f90 b/libomptarget/test/offloading/fortran/target_map_common_block2.f90
index 8a9c475..24e3e2b 100644
--- a/libomptarget/test/offloading/fortran/target_map_common_block2.f90
+++ b/libomptarget/test/offloading/fortran/target_map_common_block2.f90
@@ -1,4 +1,4 @@
-! REQUIRES: flang, amdgcn-amd-amdhsa
+! REQUIRES: flang
! UNSUPPORTED: nvptx64-nvidia-cuda
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
