Skip to content

Commit 7e51f21

Browse files
jeanPerierjeanPerier
committed
[rebase][OpenMP] move inclusive in test
1 parent a13f961 commit 7e51f21

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

‎flang/test/Lower/OpenMP/omp-parallel-private-clause-fixes.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
! CHECK: %[[VAL_2:.*]] = arith.constant 1 : i32
1414
! CHECK: %[[VAL_3:.*]] = fir.load %[[VAL_4:.*]] : !fir.ref<i32>
1515
! CHECK: %[[VAL_5:.*]] = arith.constant 1 : i32
16-
! CHECK: omp.wsloop (%[[VAL_6:.*]]) : i32 = (%[[VAL_2]]) to (%[[VAL_3]]) step (%[[VAL_5]]) inclusive {
16+
! CHECK: omp.wsloop (%[[VAL_6:.*]]) : i32 = (%[[VAL_2]]) to (%[[VAL_3]]) inclusive step (%[[VAL_5]]) {
1717
! CHECK: %[[VAL_7:.*]] = arith.constant 1 : i32
1818
! CHECK: %[[VAL_8:.*]] = fir.convert %[[VAL_7]] : (i32) -> index
1919
! CHECK: %[[VAL_9:.*]] = fir.load %[[VAL_4]] : !fir.ref<i32>

‎flang/test/Lower/OpenMP/omp-wsloop-collapse.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,15 @@ program wsloop_collapse
164164
do i = 1, a
165165
do j= 1, b
166166
do k = 1, c
167-
! FIRDialect: omp.wsloop (%[[VAL_9:.*]], %[[VAL_10:.*]], %[[VAL_11:.*]]) : i32 = (%[[VAL_20]], %[[VAL_23]], %[[VAL_26]]) to (%[[VAL_21]], %[[VAL_24]], %[[VAL_27]]) step (%[[VAL_22]], %[[VAL_25]], %[[VAL_28]]) collapse(3) inclusive {
167+
! FIRDialect: omp.wsloop (%[[VAL_9:.*]], %[[VAL_10:.*]], %[[VAL_11:.*]]) : i32 = (%[[VAL_20]], %[[VAL_23]], %[[VAL_26]]) to (%[[VAL_21]], %[[VAL_24]], %[[VAL_27]]) inclusive step (%[[VAL_22]], %[[VAL_25]], %[[VAL_28]]) collapse(3) {
168168
! FIRDialect: %[[VAL_12:.*]] = fir.load %[[VAL_6]] : !fir.ref<i32>
169169
! FIRDialect: %[[VAL_13:.*]] = arith.addi %[[VAL_12]], %[[VAL_9]] : i32
170170
! FIRDialect: %[[VAL_14:.*]] = arith.addi %[[VAL_13]], %[[VAL_10]] : i32
171171
! FIRDialect: %[[VAL_15:.*]] = arith.addi %[[VAL_14]], %[[VAL_11]] : i32
172172
! FIRDialect: fir.store %[[VAL_15]] to %[[VAL_6]] : !fir.ref<i32>
173173
! FIRDialect: omp.yield
174174
! FIRDialect: }
175-
! LLVMIRDialect: omp.wsloop (%[[VAL_24:.*]], %[[VAL_25:.*]], %[[VAL_26:.*]]) : i32 = (%[[VAL_4]], %[[VAL_4]], %[[VAL_4]]) to (%[[VAL_21]], %[[VAL_22]], %[[VAL_23]]) step (%[[VAL_4]], %[[VAL_4]], %[[VAL_4]]) collapse(3) inclusive {
175+
! LLVMIRDialect: omp.wsloop (%[[VAL_24:.*]], %[[VAL_25:.*]], %[[VAL_26:.*]]) : i32 = (%[[VAL_4]], %[[VAL_4]], %[[VAL_4]]) to (%[[VAL_21]], %[[VAL_22]], %[[VAL_23]]) inclusive step (%[[VAL_4]], %[[VAL_4]], %[[VAL_4]]) collapse(3) {
176176
! LLVMIRDialect: %[[VAL_27:.*]] = llvm.load %[[VAL_20]] : !llvm.ptr<i32>
177177
! LLVMIRDialect: %[[VAL_28:.*]] = llvm.add %[[VAL_27]], %[[VAL_24]] : i32
178178
! LLVMIRDialect: %[[VAL_29:.*]] = llvm.add %[[VAL_28]], %[[VAL_25]] : i32

‎flang/test/Lower/OpenMP/omp-wsloop-dynamic.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ program wsloop_dynamic
2727
!FIRDialect: %[[WS_LB:.*]] = arith.constant 1 : i32
2828
!FIRDialect: %[[WS_UB:.*]] = arith.constant 9 : i32
2929
!FIRDialect: %[[WS_STEP:.*]] = arith.constant 1 : i32
30-
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(dynamic) nowait inclusive
30+
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) inclusive step (%[[WS_STEP]]) schedule(dynamic) nowait
3131

3232
!LLVMIRDialect-DAG: %[[WS_UB:.*]] = llvm.mlir.constant(9 : i32) : i32
3333
!LLVMIRDialect-DAG: %[[WS_LB_STEP:.*]] = llvm.mlir.constant(1 : i32) : i32
34-
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(dynamic) nowait inclusive
34+
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) inclusive step (%[[WS_LB_STEP]]) schedule(dynamic) nowait
3535

3636
!LLVMIR: define internal void @_QQmain..omp_par
3737
!LLVMIR: omp.par.entry:

‎flang/test/Lower/OpenMP/omp-wsloop-monotonic.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ program wsloop_dynamic
2727
!FIRDialect: %[[WS_LB:.*]] = arith.constant 1 : i32
2828
!FIRDialect: %[[WS_UB:.*]] = arith.constant 9 : i32
2929
!FIRDialect: %[[WS_STEP:.*]] = arith.constant 1 : i32
30-
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(dynamic, monotonic) nowait inclusive
30+
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) inclusive step (%[[WS_STEP]]) schedule(dynamic, monotonic) nowait
3131

3232
!LLVMIRDialect-DAG: %[[WS_UB:.*]] = llvm.mlir.constant(9 : i32) : i32
3333
!LLVMIRDialect-DAG: %[[WS_LB_STEP:.*]] = llvm.mlir.constant(1 : i32) : i32
34-
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(dynamic, monotonic) nowait inclusive
34+
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) inclusive step (%[[WS_LB_STEP]]) schedule(dynamic, monotonic) nowait
3535

3636
!LLVMIR: define internal void @_QQmain..omp_par
3737
!LLVMIR: omp.par.entry:

‎flang/test/Lower/OpenMP/omp-wsloop-nonmonotonic.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ program wsloop_dynamic
2727
!FIRDialect: %[[WS_LB:.*]] = arith.constant 1 : i32
2828
!FIRDialect: %[[WS_UB:.*]] = arith.constant 9 : i32
2929
!FIRDialect: %[[WS_STEP:.*]] = arith.constant 1 : i32
30-
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(dynamic, nonmonotonic) nowait inclusive
30+
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) inclusive step (%[[WS_STEP]]) schedule(dynamic, nonmonotonic) nowait
3131

3232
!LLVMIRDialect-DAG: %[[WS_UB:.*]] = llvm.mlir.constant(9 : i32) : i32
3333
!LLVMIRDialect-DAG: %[[WS_LB_STEP:.*]] = llvm.mlir.constant(1 : i32) : i32
34-
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(dynamic, nonmonotonic) nowait inclusive
34+
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) inclusive step (%[[WS_LB_STEP]]) schedule(dynamic, nonmonotonic) nowait
3535

3636
!LLVMIR: define internal void @_QQmain..omp_par
3737
!LLVMIR: omp.par.entry:

‎flang/test/Lower/OpenMP/omp-wsloop-simd.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ program wsloop_dynamic
2727
!FIRDialect: %[[WS_LB:.*]] = arith.constant 1 : i32
2828
!FIRDialect: %[[WS_UB:.*]] = arith.constant 9 : i32
2929
!FIRDialect: %[[WS_STEP:.*]] = arith.constant 1 : i32
30-
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(runtime, simd) nowait inclusive
30+
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) inclusive step (%[[WS_STEP]]) schedule(runtime, simd) nowait
3131

3232
!LLVMIRDialect-DAG: %[[WS_UB:.*]] = llvm.mlir.constant(9 : i32) : i32
3333
!LLVMIRDialect-DAG: %[[WS_LB_STEP:.*]] = llvm.mlir.constant(1 : i32) : i32
34-
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(runtime, simd) nowait inclusive
34+
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) inclusive step (%[[WS_LB_STEP]]) schedule(runtime, simd) nowait
3535

3636
!LLVMIR: define internal void @_QQmain..omp_par
3737
!LLVMIR: omp.par.entry:

‎flang/test/Lower/OpenMP/omp-wsloop.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ program wsloop
2727
!FIRDialect: %[[WS_LB:.*]] = arith.constant 1 : i32
2828
!FIRDialect: %[[WS_UB:.*]] = arith.constant 9 : i32
2929
!FIRDialect: %[[WS_STEP:.*]] = arith.constant 1 : i32
30-
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(static) nowait inclusive
30+
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) inclusive step (%[[WS_STEP]]) schedule(static) nowait
3131

3232
!LLVMIRDialect-DAG: %[[WS_UB:.*]] = llvm.mlir.constant(9 : i32) : i32
3333
!LLVMIRDialect-DAG: %[[WS_LB_STEP:.*]] = llvm.mlir.constant(1 : i32) : i32
34-
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(static) nowait inclusive
34+
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) inclusive step (%[[WS_LB_STEP]]) schedule(static) nowait
3535

3636
!LLVMIR: define internal void @_QQmain..omp_par
3737
!LLVMIR: omp.par.entry:

0 commit comments

Comments
 (0)