[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]>

Author: Leporacanthicus

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

@@ -20,11 +20,11 @@ program wsloop_collapse
 ! FIRDialect:         %[[VAL_4:.*]] = fir.alloca i32 {bindc_name = "j", uniq_name = "_QEj"}
 ! FIRDialect:         %[[VAL_5:.*]] = fir.alloca i32 {bindc_name = "k", uniq_name = "_QEk"}
 ! FIRDialect:         %[[VAL_6:.*]] = fir.alloca i32 {bindc_name = "x", uniq_name = "_QEx"}
-! LLVMIRDialect:           %[[VAL_0:.*]] = llvm.mlir.constant(3 : i32) : i32
-! LLVMIRDialect:           %[[VAL_1:.*]] = llvm.mlir.constant(2 : i32) : i32
-! LLVMIRDialect:           %[[VAL_2:.*]] = llvm.mlir.constant(5 : i32) : i32
-! LLVMIRDialect:           %[[VAL_3:.*]] = llvm.mlir.constant(0 : i32) : i32
 ! LLVMIRDialect:           %[[VAL_4:.*]] = llvm.mlir.constant(1 : i32) : i32
+! LLVMIRDialect:           %[[VAL_3:.*]] = llvm.mlir.constant(0 : i32) : i32
+! LLVMIRDialect:           %[[VAL_2:.*]] = llvm.mlir.constant(5 : i32) : i32
+! LLVMIRDialect:           %[[VAL_1:.*]] = llvm.mlir.constant(2 : i32) : i32
+! LLVMIRDialect:           %[[VAL_0:.*]] = llvm.mlir.constant(3 : i32) : i32
 ! LLVMIRDialect:           %[[VAL_7:.*]] = llvm.mlir.constant(1 : i64) : i64
   a=3
 ! FIRDialect:         %[[VAL_7:.*]] = arith.constant 3 : i32
@@ -101,8 +101,6 @@ program wsloop_collapse
 ! LLVMIR:         %[[VAL_19:.*]] = alloca i32, align 4
 ! LLVMIR:         %[[VAL_20:.*]] = alloca i32, align 4
 ! LLVMIR:         br label %[[VAL_21:.*]]
-! LLVMIR:       omp.par.outlined.exit.exitStub:                   ; preds = %[[VAL_22:.*]]
-! LLVMIR:         ret void
 ! LLVMIR:       omp.par.region:                                   ; preds = %[[VAL_23:.*]]
 ! LLVMIR:         br label %[[VAL_24:.*]]
 ! LLVMIR:       omp.par.region1:                                  ; preds = %[[VAL_21]]
@@ -161,7 +159,6 @@ program wsloop_collapse
 ! LLVMIR:       omp_collapsed.after:                              ; preds = %[[VAL_70]]
 ! LLVMIR:         br label %[[VAL_73:.*]], !dbg !26
 ! LLVMIR:       omp_loop.after:                                   ; preds = %[[VAL_72]]
-! LLVMIR:         br label %[[VAL_22]], !dbg !27
 ! LLVMIR:       omp.par.pre_finalize:                             ; preds = %[[VAL_73]]
 ! LLVMIR:         br label %[[VAL_74:.*]]
   do i = 1, a

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

@@ -27,17 +27,15 @@ program wsloop_dynamic
 !FIRDialect:     %[[WS_LB:.*]] = arith.constant 1 : i32
 !FIRDialect:     %[[WS_UB:.*]] = arith.constant 9 : i32
 !FIRDialect:     %[[WS_STEP:.*]] = arith.constant 1 : i32
-!FIRDialect:     omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(dynamic, none) nowait inclusive
+!FIRDialect:     omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(dynamic) nowait inclusive
 
 !LLVMIRDialect-DAG:  %[[WS_UB:.*]] = llvm.mlir.constant(9 : i32) : i32
 !LLVMIRDialect-DAG:  %[[WS_LB_STEP:.*]] = llvm.mlir.constant(1 : i32) : i32
-!LLVMIRDialect:  omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(dynamic, none) nowait inclusive
+!LLVMIRDialect:  omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(dynamic) nowait inclusive
 
 !LLVMIR:  define internal void @_QQmain..omp_par
 !LLVMIR:  omp.par.entry:
 !LLVMIR:    br label %omp.par.region
-!LLVMIR:  omp.par.outlined.exit.exitStub:                   ; preds = %omp.par.pre_finalize
-!LLVMIR:    ret void
 !LLVMIR:  omp.par.region:                                   ; preds = %omp.par.entry
 !LLVMIR:    br label %omp.par.region1
 !LLVMIR:  omp.par.region1:                                  ; preds = %omp.par.region

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

@@ -36,8 +36,6 @@ program wsloop_dynamic
 !LLVMIR:  define internal void @_QQmain..omp_par
 !LLVMIR:  omp.par.entry:
 !LLVMIR:    br label %omp.par.region
-!LLVMIR:  omp.par.outlined.exit.exitStub:                   ; preds = %omp.par.pre_finalize
-!LLVMIR:    ret void
 !LLVMIR:  omp.par.region:                                   ; preds = %omp.par.entry
 !LLVMIR:    br label %omp.par.region1
 !LLVMIR:  omp.par.region1:                                  ; preds = %omp.par.region

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

@@ -36,8 +36,6 @@ program wsloop_dynamic
 !LLVMIR:  define internal void @_QQmain..omp_par
 !LLVMIR:  omp.par.entry:
 !LLVMIR:    br label %omp.par.region
-!LLVMIR:  omp.par.outlined.exit.exitStub:                   ; preds = %omp.par.pre_finalize
-!LLVMIR:    ret void
 !LLVMIR:  omp.par.region:                                   ; preds = %omp.par.entry
 !LLVMIR:    br label %omp.par.region1
 !LLVMIR:  omp.par.region1:                                  ; preds = %omp.par.region

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

@@ -27,17 +27,15 @@ program wsloop_dynamic
 !FIRDialect:     %[[WS_LB:.*]] = arith.constant 1 : i32
 !FIRDialect:     %[[WS_UB:.*]] = arith.constant 9 : i32
 !FIRDialect:     %[[WS_STEP:.*]] = arith.constant 1 : i32
-!FIRDialect:     omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(runtime, none, simd) nowait inclusive
+!FIRDialect:     omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(runtime, simd) nowait inclusive
 
 !LLVMIRDialect-DAG:  %[[WS_UB:.*]] = llvm.mlir.constant(9 : i32) : i32
 !LLVMIRDialect-DAG:  %[[WS_LB_STEP:.*]] = llvm.mlir.constant(1 : i32) : i32
-!LLVMIRDialect:  omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(runtime, none, simd) nowait inclusive
+!LLVMIRDialect:  omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(runtime, simd) nowait inclusive
 
 !LLVMIR:  define internal void @_QQmain..omp_par
 !LLVMIR:  omp.par.entry:
 !LLVMIR:    br label %omp.par.region
-!LLVMIR:  omp.par.outlined.exit.exitStub:                   ; preds = %omp.par.pre_finalize
-!LLVMIR:    ret void
 !LLVMIR:  omp.par.region:                                   ; preds = %omp.par.entry
 !LLVMIR:    br label %omp.par.region1
 !LLVMIR:  omp.par.region1:                                  ; preds = %omp.par.region

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

@@ -27,17 +27,15 @@ program wsloop
 !FIRDialect:     %[[WS_LB:.*]] = arith.constant 1 : i32
 !FIRDialect:     %[[WS_UB:.*]] = arith.constant 9 : i32
 !FIRDialect:     %[[WS_STEP:.*]] = arith.constant 1 : i32
-!FIRDialect:     omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(static, none) nowait inclusive
+!FIRDialect:     omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB]]) to (%[[WS_UB]]) step (%[[WS_STEP]]) schedule(static) nowait inclusive
 
 !LLVMIRDialect-DAG:  %[[WS_UB:.*]] = llvm.mlir.constant(9 : i32) : i32
 !LLVMIRDialect-DAG:  %[[WS_LB_STEP:.*]] = llvm.mlir.constant(1 : i32) : i32
-!LLVMIRDialect:  omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(static, none) nowait inclusive
+!LLVMIRDialect:  omp.wsloop (%[[I:.*]]) : i32 = (%[[WS_LB_STEP]]) to (%[[WS_UB]]) step (%[[WS_LB_STEP]]) schedule(static) nowait inclusive
 
 !LLVMIR:  define internal void @_QQmain..omp_par
 !LLVMIR:  omp.par.entry:
 !LLVMIR:    br label %omp.par.region
-!LLVMIR:  omp.par.outlined.exit.exitStub:                   ; preds = %omp.par.pre_finalize
-!LLVMIR:    ret void
 !LLVMIR:  omp.par.region:                                   ; preds = %omp.par.entry
 !LLVMIR:    br label %omp.par.region1
 !LLVMIR:  omp.par.region1:                                  ; preds = %omp.par.region