Disable hlfir since it is enabled by default

bsc-pm · Nov 21, 2023 · 0a6d6c6 · 0a6d6c6
1 parent 796b83a
commit 0a6d6c6
Show file tree

Hide file tree

Showing 73 changed files with 73 additions and 73 deletions.
diff --git a/flang/test/OmpSs-RT/lit.local.cfg b/flang/test/OmpSs-RT/lit.local.cfg
@@ -9,7 +9,7 @@ local_config.append(("%oss-mod-compile-and-run", \
 
 # Insert before already defined match substitution
 local_config.append(("%oss-compile", \
-	"%flang -fompss-2 %s -o %t"))
+	"%flang -flang-deprecated-no-hlfir -fompss-2 %s -o %t"))
 
 local_config.append(("%oss-run", "%t"))
 

diff --git a/flang/test/OmpSs/Lower/FIR/associate.f90 b/flang/test/OmpSs/Lower/FIR/associate.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 PROGRAM S
   IMPLICIT NONE

diff --git a/flang/test/OmpSs/Lower/FIR/bug_directive_lexsuc.f90 b/flang/test/OmpSs/Lower/FIR/bug_directive_lexsuc.f90
@@ -3,7 +3,7 @@
 ! In this case STOP must have the OmpSsConstruct as a lexicalSuccessor
 ! to marks it as a start new block evaluation.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 PROGRAM P
     IMPLICIT NONE

diff --git a/flang/test/OmpSs/Lower/FIR/copyinout.f90 b/flang/test/OmpSs/Lower/FIR/copyinout.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 subroutine test_intent_in(x)
   real :: x(:)
   call bar_intent_in(x)

diff --git a/flang/test/OmpSs/Lower/FIR/dsa-duplicates.f90 b/flang/test/OmpSs/Lower/FIR/dsa-duplicates.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! Test test checks we do not emit duplicates data-sharings
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     INTEGER :: I, J, K

diff --git a/flang/test/OmpSs/Lower/FIR/dsa-duplicates01.f90 b/flang/test/OmpSs/Lower/FIR/dsa-duplicates01.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! Test test checks we do not emit duplicates data-sharings
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     INTEGER :: I, J, K, U

diff --git a/flang/test/OmpSs/Lower/FIR/mod-use.f90 b/flang/test/OmpSs/Lower/FIR/mod-use.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 module mod
   implicit none

diff --git a/flang/test/OmpSs/Lower/FIR/oss-deferred-assumed-shape-dsa.f90 b/flang/test/OmpSs/Lower/FIR/oss-deferred-assumed-shape-dsa.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 ! - [x] assumed-shape
 ! - [x] deferred-shape

diff --git a/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array.f90 b/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array.f90
@@ -1,6 +1,6 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 deps.
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 ! Assumed-shape
 

diff --git a/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array01.f90 b/flang/test/OmpSs/Lower/FIR/oss-dep-nonconst-array01.f90
@@ -3,7 +3,7 @@
 
 ! explicit-shape non constant shape
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 PROGRAM P
   IMPLICIT NONE

diff --git a/flang/test/OmpSs/Lower/FIR/oss-dep.f90 b/flang/test/OmpSs/Lower/FIR/oss-dep.f90
@@ -2,7 +2,7 @@
 
 ! Test for program
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 ! Support list

diff --git a/flang/test/OmpSs/Lower/FIR/oss-dep01.f90 b/flang/test/OmpSs/Lower/FIR/oss-dep01.f90
@@ -2,7 +2,7 @@
 
 ! Test for subroutine
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 ! Support list

diff --git a/flang/test/OmpSs/Lower/FIR/oss-dep02.f90 b/flang/test/OmpSs/Lower/FIR/oss-dep02.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 DepOp for multidimensional arrays.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 program task

diff --git a/flang/test/OmpSs/Lower/FIR/oss-like-dep.f90 b/flang/test/OmpSs/Lower/FIR/oss-like-dep.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 like dependencies.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     IMPLICIT NONE

diff --git a/flang/test/OmpSs/Lower/FIR/oss-loop-nested-do.f90 b/flang/test/OmpSs/Lower/FIR/oss-loop-nested-do.f90
@@ -2,7 +2,7 @@
 ! This test checks lowering of OmpSs-2 loop Directives.
 ! All induction variables inside the construct are private
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 subroutine task()
     INTEGER :: I

diff --git a/flang/test/OmpSs/Lower/FIR/oss-outline-deps.f90 b/flang/test/OmpSs/Lower/FIR/oss-outline-deps.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 DepOp (outline task).
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 MODULE M

diff --git a/flang/test/OmpSs/Lower/FIR/oss-outline-deps01.f90 b/flang/test/OmpSs/Lower/FIR/oss-outline-deps01.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 DepOp (outline task).
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 MODULE M

diff --git a/flang/test/OmpSs/Lower/FIR/oss-outline-deps02.f90 b/flang/test/OmpSs/Lower/FIR/oss-outline-deps02.f90
@@ -2,7 +2,7 @@
 ! This test checks lowering of OmpSs-2 DepOp
 ! derived type (outline task).
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 MODULE M
     TYPE TY

diff --git a/flang/test/OmpSs/Lower/FIR/oss-release.f90 b/flang/test/OmpSs/Lower/FIR/oss-release.f90
@@ -2,7 +2,7 @@
 
 ! Test for program
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 program release

diff --git a/flang/test/OmpSs/Lower/FIR/oss-task-for.f90 b/flang/test/OmpSs/Lower/FIR/oss-task-for.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 task do Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     INTEGER :: I

diff --git a/flang/test/OmpSs/Lower/FIR/oss-task.f90 b/flang/test/OmpSs/Lower/FIR/oss-task.f90
@@ -1,6 +1,6 @@
 ! This test checks lowering of OmpSs-2 task Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 program task

diff --git a/flang/test/OmpSs/Lower/FIR/oss-taskloop-for.f90 b/flang/test/OmpSs/Lower/FIR/oss-taskloop-for.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 taskloop do Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     INTEGER :: I

diff --git a/flang/test/OmpSs/Lower/FIR/oss-taskloop.f90 b/flang/test/OmpSs/Lower/FIR/oss-taskloop.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 taskloop Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program task
     INTEGER :: I

diff --git a/flang/test/OmpSs/Lower/FIR/oss-taskwait.f90 b/flang/test/OmpSs/Lower/FIR/oss-taskwait.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 taskwait Directive.
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 program taskwait
     INTEGER :: I

diff --git a/flang/test/OmpSs/Lower/FIR/oss-vla.f90 b/flang/test/OmpSs/Lower/FIR/oss-vla.f90
@@ -2,7 +2,7 @@
 
 ! Test for subroutine
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 subroutine task(X)

diff --git a/flang/test/OmpSs/Lower/FIR/outline-task-clauses-array.f90 b/flang/test/OmpSs/Lower/FIR/outline-task-clauses-array.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 !$OSS TASK INOUT(X)
 SUBROUTINE S1(X)

diff --git a/flang/test/OmpSs/Lower/FIR/outline-task-in-out.f90 b/flang/test/OmpSs/Lower/FIR/outline-task-in-out.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 !$OSS TASK OUT(X)
 SUBROUTINE S1(X)

diff --git a/flang/test/OmpSs/Lower/FIR/stmt-function.f90 b/flang/test/OmpSs/Lower/FIR/stmt-function.f90
@@ -5,7 +5,7 @@
 ! It seems that N and M are not in the SymMap and we cannot bind
 ! them with our task symbol
 
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 SUBROUTINE FOO(N, M)
     IMPLICIT NONE

diff --git a/flang/test/OmpSs/Lower/FIR/test-task-call.f90 b/flang/test/OmpSs/Lower/FIR/test-task-call.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s --check-prefix=FIRDialect
 
 MODULE MOO
 CONTAINS

diff --git a/flang/test/OmpSs/Lower/FIR/toutline01.f90 b/flang/test/OmpSs/Lower/FIR/toutline01.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -emit-fir -fompss-2 %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -emit-fir -fompss-2 %s -o - | FileCheck %s
 
 ! Based on Lower/array-constructor-2.f90
 

diff --git a/flang/test/OmpSs/Lower/FIR/toutline02.f90 b/flang/test/OmpSs/Lower/FIR/toutline02.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -emit-fir -fompss-2 %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -emit-fir -fompss-2 %s -o - | FileCheck %s
 
 ! Based on Lower/call-by-value.f90
 

diff --git a/flang/test/OmpSs/Lower/FIR/toutline03.f90 b/flang/test/OmpSs/Lower/FIR/toutline03.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -emit-fir -fompss-2 %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -emit-fir -fompss-2 %s -o - | FileCheck %s
 
 ! Based on Lower/dummy-argument-assumed-shape-optional.f90
 

diff --git a/flang/test/OmpSs/Lower/FIR/toutline04.f90 b/flang/test/OmpSs/Lower/FIR/toutline04.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s
 
 ! Based on Lower/dummy-argument-optional.f90
 

diff --git a/flang/test/OmpSs/Lower/FIR/toutline05.f90 b/flang/test/OmpSs/Lower/FIR/toutline05.f90
@@ -1,6 +1,6 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! Test calls with POINTER dummy arguments on the caller side.
-! RUN: bbc -fompss-2 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | FileCheck %s
 
 ! Based on Lower/pointer-args-caller.f90
 

diff --git a/flang/test/OmpSs/Lower/FIR/toutline06.f90 b/flang/test/OmpSs/Lower/FIR/toutline06.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -fompss-2 -polymorphic-type -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -fompss-2 -polymorphic-type -emit-fir %s -o - | FileCheck %s
 ! XFAIL: true
 ! NOTE: Fow now let's wait until merge upstream to see what we can do to
 ! support this

diff --git a/flang/test/OmpSs/Lower/FIR/toutline07.f90 b/flang/test/OmpSs/Lower/FIR/toutline07.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -hlfir=false -emit-fir %s -o - | FileCheck %s
 
 ! Borrowed from Lower/call-copy-in-out.f90
 

diff --git a/flang/test/OmpSs/Lower/FIR/unstructured-body01.f90 b/flang/test/OmpSs/Lower/FIR/unstructured-body01.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 PROGRAM P

diff --git a/flang/test/OmpSs/Lower/FIR/unstructured-body02.f90 b/flang/test/OmpSs/Lower/FIR/unstructured-body02.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -fompss-2 -emit-fir %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 -emit-fir %s -o - | \
 ! RUN:   FileCheck %s --check-prefix=FIRDialect
 
 PROGRAM P

diff --git a/flang/test/OmpSs/Lower/HLFIR/oss-task.f90 b/flang/test/OmpSs/Lower/HLFIR/oss-task.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -emit-hlfir %s -o - | FileCheck %s --check-prefix=HLFIRDialect
+! RUN: bbc -hlfir=false -fompss-2 -emit-hlfir %s -o - | FileCheck %s --check-prefix=HLFIRDialect
 PROGRAM P
   IMPLICIT NONE
   INTEGER :: X

diff --git a/flang/test/OmpSs/Lower/HLFIRToFIR/oss-task.f90 b/flang/test/OmpSs/Lower/HLFIRToFIR/oss-task.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -hlfir -emit-fir %s -o - | FileCheck %s --check-prefix=HLFIRToFIR
+! RUN: bbc -hlfir=false -fompss-2 -hlfir -emit-fir %s -o - | FileCheck %s --check-prefix=HLFIRToFIR
 PROGRAM P
   IMPLICIT NONE
   INTEGER :: X

diff --git a/flang/test/OmpSs/Lower/HLFIRToLLVMDialect/oss-task.f90 b/flang/test/OmpSs/Lower/HLFIRToLLVMDialect/oss-task.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -hlfir -emit-fir %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir -o - 2>&1 | FileCheck %s --check-prefix=HLFIRToLLVMDialect
+! RUN: bbc -hlfir=false -fompss-2 -hlfir -emit-fir %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir -o - 2>&1 | FileCheck %s --check-prefix=HLFIRToLLVMDialect
 PROGRAM P
   IMPLICIT NONE
   INTEGER :: X

diff --git a/flang/test/OmpSs/Lower/HLFIRToLLVMIR/oss-task.f90 b/flang/test/OmpSs/Lower/HLFIRToLLVMIR/oss-task.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 -hlfir -emit-fir %s -o - | tco | FileCheck %s --check-prefix=HLFIRToLLVMIR
+! RUN: bbc -hlfir=false -fompss-2 -hlfir -emit-fir %s -o - | tco | FileCheck %s --check-prefix=HLFIRToLLVMIR
 
 ! Here we check we eliminate HLFIR generated duplicates
 

diff --git a/flang/test/OmpSs/Lower/LLVMDialect/associate.f90 b/flang/test/OmpSs/Lower/LLVMDialect/associate.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | FileCheck %s --check-prefix=LLVMIRDialect
 
 PROGRAM S
   IMPLICIT NONE

diff --git a/flang/test/OmpSs/Lower/LLVMDialect/bug_directive_lexsuc.f90 b/flang/test/OmpSs/Lower/LLVMDialect/bug_directive_lexsuc.f90
@@ -1,5 +1,5 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 | FileCheck %s --check-prefix=LLVMIRDialect
 
 PROGRAM P
     IMPLICIT NONE

diff --git a/flang/test/OmpSs/Lower/LLVMDialect/canonizalize-skip.f90 b/flang/test/OmpSs/Lower/LLVMDialect/canonizalize-skip.f90
@@ -1,7 +1,7 @@
 ! This test Canonicalize does not perform optimizations between values
 ! that are defined outside the task and used inside.
 
-! RUN: bbc -fompss-2 %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | \
 ! RUN:   fir-opt --canonicalize 2>&1 | \
 ! RUN:   FileCheck %s --check-prefix=LLVMIRDialect
 

diff --git a/flang/test/OmpSs/Lower/LLVMDialect/cse-skip.f90 b/flang/test/OmpSs/Lower/LLVMDialect/cse-skip.f90
@@ -1,7 +1,7 @@
 ! This test CSE (mlir) does not perform optimizations between values
 ! that are defined outside the task and used inside.
 
-! RUN: bbc -fompss-2 %s -o - | \
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | \
 ! RUN:   fir-opt --cse 2>&1 | \
 ! RUN:   FileCheck %s --check-prefix=LLVMIRDialect
 

diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-dep.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-dep.f90
@@ -3,7 +3,7 @@
 
 ! Test for program
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 ! Support list
 ! - [x] scalar

diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-dep01.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-dep01.f90
@@ -3,7 +3,7 @@
 
 ! Test for subroutine
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 ! Support list
 ! - [x] assumed-size array

diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-like-dep.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-like-dep.f90
@@ -1,7 +1,7 @@
 ! NOTE: Assertions have been autogenerated by /home/rpenacob/llvm-mono/mlir/utils/generate-test-checks.py
 ! This test checks lowering of OmpSs-2 like dependencies.
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 program task
     IMPLICIT NONE

diff --git a/flang/test/OmpSs/Lower/LLVMDialect/oss-loop-nested-do.f90 b/flang/test/OmpSs/Lower/LLVMDialect/oss-loop-nested-do.f90
@@ -2,7 +2,7 @@
 ! This test checks lowering of OmpSs-2 loop Directives.
 ! All induction variables inside the construct are private
 
-! RUN: bbc -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
+! RUN: bbc -hlfir=false -fompss-2 %s -o - | fir-opt --cg-rewrite --fir-to-llvm-ir 2>&1 |  FileCheck %s --check-prefix=LLVMIRDialect
 
 subroutine task()
     INTEGER :: I