Skip to content

Commit ac82c8b

Browse files
fabianmcgfabianmcg
authored
Revert "[OpenMP][Fix] libomptarget Fortran tests" (#75953)
Reverts #74543
1 parent 6590917 commit ac82c8b

11 files changed

+15
-21
lines changed

‎openmp/libomptarget/test/lit.cfg

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ config.test_flags = " -I " + config.test_source_root + \
7878
" -L " + config.library_dir + \
7979
" -L " + config.llvm_lib_directory
8080

81-
# compiler specific flags
82-
config.test_flags_clang = ""
83-
config.test_flags_flang = ""
84-
8581
if config.omp_host_rtl_directory:
8682
config.test_flags = config.test_flags + " -L " + \
8783
config.omp_host_rtl_directory
@@ -140,7 +136,7 @@ else: # Unices
140136
if config.cuda_libdir:
141137
config.test_flags += " -Wl,-rpath," + config.cuda_libdir
142138
if config.libomptarget_current_target.startswith('nvptx'):
143-
config.test_flags_clang += " --libomptarget-nvptx-bc-path=" + config.library_dir + '/DeviceRTL'
139+
config.test_flags += " --libomptarget-nvptx-bc-path=" + config.library_dir + '/DeviceRTL'
144140
if config.libomptarget_current_target.endswith('-LTO'):
145141
config.test_flags += " -foffload-lto"
146142
if config.libomptarget_current_target.endswith('-JIT-LTO') and evaluate_bool_env(
@@ -277,13 +273,13 @@ for libomptarget_target in config.libomptarget_all_targets:
277273
libomptarget_target, \
278274
"%not --crash %t"))
279275
config.substitutions.append(("%clangxx-" + libomptarget_target, \
280-
"%clangxx %openmp_flags %cuda_flags %flags %flags_clang -fopenmp-targets=" +\
276+
"%clangxx %openmp_flags %cuda_flags %flags -fopenmp-targets=" +\
281277
remove_suffix_if_present(libomptarget_target)))
282278
config.substitutions.append(("%clang-" + libomptarget_target, \
283-
"%clang %openmp_flags %cuda_flags %flags %flags_clang -fopenmp-targets=" +\
279+
"%clang %openmp_flags %cuda_flags %flags -fopenmp-targets=" +\
284280
remove_suffix_if_present(libomptarget_target)))
285281
config.substitutions.append(("%flang-" + libomptarget_target, \
286-
"%flang %openmp_flags %flags %flags_flang -fopenmp-targets=" +\
282+
"%flang %openmp_flags %flags -fopenmp-targets=" +\
287283
remove_suffix_if_present(libomptarget_target)))
288284
config.substitutions.append(("%fcheck-" + libomptarget_target, \
289285
config.libomptarget_filecheck + " %s"))
@@ -361,6 +357,4 @@ if config.libomptarget_current_target.startswith('nvptx') and config.cuda_path:
361357
else:
362358
config.substitutions.append(("%cuda_flags", ""))
363359
config.substitutions.append(("%flags", config.test_flags))
364-
config.substitutions.append(("%flags_clang", config.test_flags_clang))
365-
config.substitutions.append(("%flags_flang", config.test_flags_flang))
366360
config.substitutions.append(("%not", config.libomptarget_not))

‎openmp/libomptarget/test/offloading/fortran/basic-target-region-1D-array-section.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! Basic offloading test of arrays with provided lower
22
! and upper bounds as specified by OpenMP's sectioning
3-
! REQUIRES: flang
3+
! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
44
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
55
! UNSUPPORTED: aarch64-unknown-linux-gnu
66
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO

‎openmp/libomptarget/test/offloading/fortran/basic-target-region-3D-array-section.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! Basic offloading test of a regular array explicitly
22
! passed within a target region
3-
! REQUIRES: flang
3+
! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
44
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
55
! UNSUPPORTED: aarch64-unknown-linux-gnu
66
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO

‎openmp/libomptarget/test/offloading/fortran/basic-target-region-3D-array.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! Basic offloading test of a regular array explicitly
22
! passed within a target region
3-
! REQUIRES: flang
3+
! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
44
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
55
! UNSUPPORTED: aarch64-unknown-linux-gnu
66
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO

‎openmp/libomptarget/test/offloading/fortran/basic_target_region.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
! Basic offloading test with a target region
2-
! REQUIRES: flang
2+
! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
33
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
44
! UNSUPPORTED: aarch64-unknown-linux-gnu
55
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO

‎openmp/libomptarget/test/offloading/fortran/constant-arr-index.f90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
! that checks constant indexing on device
33
! correctly works (regression test for prior
44
! bug).
5-
! REQUIRES: flang
5+
! REQUIRES: flang, amdgcn-amd-amdhsa
6+
! UNSUPPORTED: nvptx64-nvidia-cuda
67
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
78
! UNSUPPORTED: aarch64-unknown-linux-gnu
89
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO

‎openmp/libomptarget/test/offloading/fortran/declare-target-array-in-target-region.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
! Offloading test with a target region mapping a declare target
22
! Fortran array writing some values to it and checking the host
33
! correctly receives the updates made on the device.
4-
! REQUIRES: flang
4+
! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
55
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
66
! UNSUPPORTED: aarch64-unknown-linux-gnu
77
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO

‎openmp/libomptarget/test/offloading/fortran/double-target-call-with-declare-target.f90

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
! declare target Fortran array and writing some values to
33
! it before checking the host correctly receives the
44
! correct updates made on the device.
5-
! REQUIRES: flang
6-
! UNSUPPORTED: nvptx64-nvidia-cuda
5+
! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
76
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
87
! UNSUPPORTED: aarch64-unknown-linux-gnu
98
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO

‎openmp/libomptarget/test/offloading/fortran/target-region-implicit-array.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! Basic offloading test of a regular array explicitly
22
! passed within a target region
3-
! REQUIRES: flang
3+
! REQUIRES: flang, amdgcn-amd-amdhsa, nvptx64-nvidia-cuda
44
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
55
! UNSUPPORTED: aarch64-unknown-linux-gnu
66
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO

‎openmp/libomptarget/test/offloading/fortran/target_map_common_block.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
! Basic offloading test with a target region
2-
! REQUIRES: flang
2+
! REQUIRES: flang, amdgcn-amd-amdhsa
33
! UNSUPPORTED: nvptx64-nvidia-cuda
44
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
55
! UNSUPPORTED: aarch64-unknown-linux-gnu

‎openmp/libomptarget/test/offloading/fortran/target_map_common_block2.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
! REQUIRES: flang
1+
! REQUIRES: flang, amdgcn-amd-amdhsa
22
! UNSUPPORTED: nvptx64-nvidia-cuda
33
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
44
! UNSUPPORTED: aarch64-unknown-linux-gnu

0 commit comments

Comments
 (0)