Skip to content

Commit a13f961

Browse files
LeporacanthicusjeanPerier
Leporacanthicus
authored and
jeanPerier
committed
[rebase][OpenMP] Fix OpenMP test expecting none in wsloop
Also move some llvm constant emitted at another location now. Co-authored-by: Mats Petersson <[email protected]>
1 parent dd2b1a3 commit a13f961

File tree

6 files changed

+10
-23
lines changed

6 files changed

+10
-23
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ program wsloop_collapse
2020
! FIRDialect: %[[VAL_4:.*]] = fir.alloca i32 {bindc_name = "j", uniq_name = "_QEj"}
2121
! FIRDialect: %[[VAL_5:.*]] = fir.alloca i32 {bindc_name = "k", uniq_name = "_QEk"}
2222
! FIRDialect: %[[VAL_6:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QEx"}
23-
! LLVMIRDialect: %[[VAL_0:.*]] = llvm.mlir.constant(3 : i32) : i32
24-
! LLVMIRDialect: %[[VAL_1:.*]] = llvm.mlir.constant(2 : i32) : i32
25-
! LLVMIRDialect: %[[VAL_2:.*]] = llvm.mlir.constant(5 : i32) : i32
26-
! LLVMIRDialect: %[[VAL_3:.*]] = llvm.mlir.constant(0 : i32) : i32
2723
! LLVMIRDialect: %[[VAL_4:.*]] = llvm.mlir.constant(1 : i32) : i32
24+
! LLVMIRDialect: %[[VAL_3:.*]] = llvm.mlir.constant(0 : i32) : i32
25+
! LLVMIRDialect: %[[VAL_2:.*]] = llvm.mlir.constant(5 : i32) : i32
26+
! LLVMIRDialect: %[[VAL_1:.*]] = llvm.mlir.constant(2 : i32) : i32
27+
! LLVMIRDialect: %[[VAL_0:.*]] = llvm.mlir.constant(3 : i32) : i32
2828
! LLVMIRDialect: %[[VAL_7:.*]] = llvm.mlir.constant(1 : i64) : i64
2929
a=3
3030
! FIRDialect: %[[VAL_7:.*]] = arith.constant 3 : i32
@@ -101,8 +101,6 @@ program wsloop_collapse
101101
! LLVMIR: %[[VAL_19:.*]] = alloca i32, align 4
102102
! LLVMIR: %[[VAL_20:.*]] = alloca i32, align 4
103103
! LLVMIR: br label %[[VAL_21:.*]]
104-
! LLVMIR: omp.par.outlined.exit.exitStub: ; preds = %[[VAL_22:.*]]
105-
! LLVMIR: ret void
106104
! LLVMIR: omp.par.region: ; preds = %[[VAL_23:.*]]
107105
! LLVMIR: br label %[[VAL_24:.*]]
108106
! LLVMIR: omp.par.region1: ; preds = %[[VAL_21]]
@@ -161,7 +159,6 @@ program wsloop_collapse
161159
! LLVMIR: omp_collapsed.after: ; preds = %[[VAL_70]]
162160
! LLVMIR: br label %[[VAL_73:.*]], !dbg !26
163161
! LLVMIR: omp_loop.after: ; preds = %[[VAL_72]]
164-
! LLVMIR: br label %[[VAL_22]], !dbg !27
165162
! LLVMIR: omp.par.pre_finalize: ; preds = %[[VAL_73]]
166163
! LLVMIR: br label %[[VAL_74:.*]]
167164
do i = 1, a

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,15 @@ 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, none) nowait inclusive
30+
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(dynamic) nowait inclusive
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, none) nowait inclusive
34+
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(dynamic) nowait inclusive
3535

3636
!LLVMIR: define internal void @_QQmain..omp_par
3737
!LLVMIR: omp.par.entry:
3838
!LLVMIR: br label %omp.par.region
39-
!LLVMIR: omp.par.outlined.exit.exitStub: ; preds = %omp.par.pre_finalize
40-
!LLVMIR: ret void
4139
!LLVMIR: omp.par.region: ; preds = %omp.par.entry
4240
!LLVMIR: br label %omp.par.region1
4341
!LLVMIR: omp.par.region1: ; preds = %omp.par.region

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ program wsloop_dynamic
3636
!LLVMIR: define internal void @_QQmain..omp_par
3737
!LLVMIR: omp.par.entry:
3838
!LLVMIR: br label %omp.par.region
39-
!LLVMIR: omp.par.outlined.exit.exitStub: ; preds = %omp.par.pre_finalize
40-
!LLVMIR: ret void
4139
!LLVMIR: omp.par.region: ; preds = %omp.par.entry
4240
!LLVMIR: br label %omp.par.region1
4341
!LLVMIR: omp.par.region1: ; preds = %omp.par.region

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ program wsloop_dynamic
3636
!LLVMIR: define internal void @_QQmain..omp_par
3737
!LLVMIR: omp.par.entry:
3838
!LLVMIR: br label %omp.par.region
39-
!LLVMIR: omp.par.outlined.exit.exitStub: ; preds = %omp.par.pre_finalize
40-
!LLVMIR: ret void
4139
!LLVMIR: omp.par.region: ; preds = %omp.par.entry
4240
!LLVMIR: br label %omp.par.region1
4341
!LLVMIR: omp.par.region1: ; preds = %omp.par.region

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,15 @@ 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, none, simd) nowait inclusive
30+
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(runtime, simd) nowait inclusive
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, none, simd) nowait inclusive
34+
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(runtime, simd) nowait inclusive
3535

3636
!LLVMIR: define internal void @_QQmain..omp_par
3737
!LLVMIR: omp.par.entry:
3838
!LLVMIR: br label %omp.par.region
39-
!LLVMIR: omp.par.outlined.exit.exitStub: ; preds = %omp.par.pre_finalize
40-
!LLVMIR: ret void
4139
!LLVMIR: omp.par.region: ; preds = %omp.par.entry
4240
!LLVMIR: br label %omp.par.region1
4341
!LLVMIR: omp.par.region1: ; preds = %omp.par.region

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,15 @@ 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, none) nowait inclusive
30+
!FIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(static) nowait inclusive
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, none) nowait inclusive
34+
!LLVMIRDialect: omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(static) nowait inclusive
3535

3636
!LLVMIR: define internal void @_QQmain..omp_par
3737
!LLVMIR: omp.par.entry:
3838
!LLVMIR: br label %omp.par.region
39-
!LLVMIR: omp.par.outlined.exit.exitStub: ; preds = %omp.par.pre_finalize
40-
!LLVMIR: ret void
4139
!LLVMIR: omp.par.region: ; preds = %omp.par.entry
4240
!LLVMIR: br label %omp.par.region1
4341
!LLVMIR: omp.par.region1: ; preds = %omp.par.region

0 commit comments

Comments
 (0)