Skip to content

Commit bfeebda

Browse files
mjklemmmjklemm
authored
[flang][OpenMP] Re-enable tests when building OpenMP as a runtime (#89046)
1 parent 195ba45 commit bfeebda

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+78
-64
lines changed

‎flang/test/Driver/include-omp-header.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
! This should just work
1111
! RUN: not rm omp_lib.h
12-
! RUN: %flang -cpp -fsyntax-only -fopenmp %s 2>&1
12+
! RUN: %flang -cpp -fsyntax-only %openmp_flags %s 2>&1
1313

1414
! Create an empty omp_lib.h header that _does not_ define omp_default_mem_alloc - this should lead to semantic errors
1515
! RUN: touch omp_lib.h
16-
! RUN: not %flang -cpp -fsyntax-only -fopenmp %s 2>&1 | FileCheck %s
16+
! RUN: not %flang -cpp -fsyntax-only %openmp_flags %s 2>&1 | FileCheck %s
1717
! RUN: rm omp_lib.h
1818

1919
! CHECK: error: Must have INTEGER type, but is REAL(4)

‎flang/test/Lower/OpenMP/atomic-capture.f90

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
! This test checks the lowering of atomic capture
44

5-
! RUN: bbc -fopenmp -emit-hlfir %s -o - | FileCheck %s
6-
! RUN: %flang_fc1 -emit-hlfir -fopenmp %s -o - | FileCheck %s
7-
5+
! RUN: bbc %openmp_flags -emit-hlfir %s -o - | FileCheck %s
6+
! RUN: %flang_fc1 -emit-hlfir %openmp_flags %s -o - | FileCheck %s
87

98

109
program OmpAtomicCapture

‎flang/test/Lower/OpenMP/atomic-read.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! REQUIRES: openmp_runtime
22

3-
! RUN: bbc -fopenmp -emit-hlfir %s -o - | FileCheck %s
3+
! RUN: bbc %openmp_flags -emit-hlfir %s -o - | FileCheck %s
44

55
! This test checks the lowering of atomic read
66

‎flang/test/Lower/OpenMP/atomic-update.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! REQUIRES: openmp_runtime
22

33
! This test checks lowering of atomic and atomic update constructs
4-
! RUN: bbc -fopenmp -emit-hlfir %s -o - | FileCheck %s
5-
! RUN: %flang_fc1 -emit-hlfir -fopenmp %s -o - | FileCheck %s
4+
! RUN: bbc %openmp_flags -emit-hlfir %s -o - | FileCheck %s
5+
! RUN: %flang_fc1 -emit-hlfir %openmp_flags %s -o - | FileCheck %s
66

77
program OmpAtomicUpdate
88
use omp_lib

‎flang/test/Lower/OpenMP/atomic-write.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! REQUIRES: openmp_runtime
22

3-
! RUN: bbc -fopenmp -emit-hlfir %s -o - | FileCheck %s
3+
! RUN: bbc %openmp_flags -emit-hlfir %s -o - | FileCheck %s
44

55
! This test checks the lowering of atomic write
66

‎flang/test/Lower/OpenMP/critical.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! REQUIRES: openmp_runtime
22

3-
!RUN: %flang_fc1 -emit-hlfir -fopenmp %s -o - | FileCheck %s
3+
!RUN: %flang_fc1 -emit-hlfir %openmp_flags %s -o - | FileCheck %s
44

55
!CHECK: omp.critical.declare @help2
66
!CHECK: omp.critical.declare @help1 hint(contended)

‎flang/test/Lower/OpenMP/omp-lib-num-threads.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
! REQUIRES: openmp_runtime
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp %s -o - 2>&1 | FileCheck %s
4-
! RUN: bbc -fopenmp -emit-hlfir -o - %s 2>&1 | FileCheck %s
5-
! RUN: %flang_fc1 -emit-fir -fopenmp %s -o - 2>&1 | FileCheck %s
6-
! RUN: bbc -emit-fir -fopenmp -o - %s 2>&1 | FileCheck %s
3+
! RUN: %flang_fc1 -emit-hlfir %openmp_flags %s -o - 2>&1 | FileCheck %s
4+
! RUN: bbc %openmp_flags -emit-hlfir -o - %s 2>&1 | FileCheck %s
5+
! RUN: %flang_fc1 -emit-fir %openmp_flags %s -o - 2>&1 | FileCheck %s
6+
! RUN: bbc -emit-fir %openmp_flags -o - %s 2>&1 | FileCheck %s
77
!
88
! Test that the calls to omp_lib's omp_get_num_threads and omp_set_num_threads
99
! get lowered even though their implementation is not in the omp_lib module

‎flang/test/Lower/OpenMP/parallel-sections.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! REQUIRES: openmp_runtime
22

3-
!RUN: %flang_fc1 -emit-hlfir -fopenmp %s -o - | FileCheck %s
3+
!RUN: %flang_fc1 -emit-hlfir %openmp_flags %s -o - | FileCheck %s
44

55
!===============================================================================
66
! Parallel sections construct

‎flang/test/Lower/OpenMP/parallel.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
! REQUIRES: openmp_runtime
22

3-
!RUN: %flang_fc1 -emit-hlfir -fopenmp %s -o - | FileCheck %s
3+
!RUN: %flang_fc1 -emit-hlfir %openmp_flags %s -o - | FileCheck %s
44

55
!CHECK-LABEL: func @_QPparallel_simple
66
subroutine parallel_simple()

‎flang/test/Lower/OpenMP/sections.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
! This test checks the lowering of OpenMP sections construct with several clauses present
44

5-
! RUN: %flang_fc1 -flang-experimental-hlfir -emit-hlfir -fopenmp %s -o - | FileCheck %s
6-
! RUN: bbc -hlfir -emit-hlfir -fopenmp %s -o - | FileCheck %s
5+
! RUN: %flang_fc1 -flang-experimental-hlfir -emit-hlfir %openmp_flags %s -o - | FileCheck %s
6+
! RUN: bbc -hlfir -emit-hlfir %openmp_flags %s -o - | FileCheck %s
77

88
!CHECK: func @_QQmain() attributes {fir.bindc_name = "sample"} {
99
!CHECK: %[[COUNT:.*]] = fir.address_of(@_QFEcount) : !fir.ref<i32>

0 commit comments

Comments
 (0)