[flang-commits] [flang] [flang][NFC] Use hlfir=false and flang-deprecated-no-hlfir in legacy tests (PR #71957)

via flang-commits flang-commits at lists.llvm.org
Fri Nov 10 08:31:08 PST 2023


llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-flang-openmp

Author: None (jeanPerier)

<details>
<summary>Changes</summary>

Patch 2/3 of the transition step 1 described in
https://discourse.llvm.org/t/rfc-enabling-the-hlfir-lowering-by-default/72778/7.

All the modified tests are still here since coverage for the direct lowering to FIR was still needed while it was default. Some already have an HLFIR version, some have not and will need to be ported in step 2 described in the RFC.

Note that another 147 lit tests use -emit-fir/-emit-llvm outputs but do not need a flag since the HLFIR/no HLFIR output is the same for what is being tested.

---

Patch is 214.34 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/71957.diff


393 Files Affected:

- (modified) flang/test/Driver/OpenMP/map-types-and-sizes.f90 (+1-1) 
- (modified) flang/test/Driver/compiler_options.f90 (+2-2) 
- (modified) flang/test/Driver/optimization-remark.f90 (+1-1) 
- (modified) flang/test/Fir/achar.f90 (+1-1) 
- (modified) flang/test/Fir/dispatch.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/abs.f90 (+7-7) 
- (modified) flang/test/Lower/Intrinsics/achar.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/adjustl.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/adjustr.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/aint.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/all.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/anint.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/any.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/associated.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/atand.f90 (+3-3) 
- (modified) flang/test/Lower/Intrinsics/bessel_jn.f90 (+6-6) 
- (modified) flang/test/Lower/Intrinsics/bessel_yn.f90 (+6-6) 
- (modified) flang/test/Lower/Intrinsics/bge.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/bgt.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/ble.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/blt.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/btest.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/c_associated.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/c_f_pointer.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/c_funloc.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/c_loc.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/cmplx.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/count.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/cpu_time.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/date_and_time.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/dconjg.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/dim.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/dimag.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/dot_product.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/dprod.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/dreal.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/dshiftl.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/dshiftr.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/eoshift.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/exit-2.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/exit.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/exp.f90 (+7-7) 
- (modified) flang/test/Lower/Intrinsics/extends_type_of.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/findloc.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/get_command.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/get_command_argument-optional.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/get_command_argument.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/get_environment_variable-optional.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/get_environment_variable.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/iall.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/iand.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/iany.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/ibclr.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/ibits.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/ibset.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/ichar.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/ieee_class.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/ieee_copy_sign.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/ieee_is_finite.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/ieee_operator_eq.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/ieee_rounding.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/ieee_signbit.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/ieee_unordered.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/index.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/iparity.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/is_contiguous.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/is_iostat_value.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/ishft.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/ishftc.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/lbound.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/leadz.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/len.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/loc.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/log.f90 (+7-7) 
- (modified) flang/test/Lower/Intrinsics/maskl.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/maskr.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/matmul.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/max.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/maxloc.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/maxval.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/merge.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/merge_bits.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/minloc.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/minval.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/mod.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/modulo.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/move_alloc.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/mvbits.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/nearest.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/norm2.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/not.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/pack.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/parity.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/popcnt.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/poppar.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/present.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/product.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/random.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/real.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/repeat.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/reshape.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/rrspacing.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/same_type_as.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/scale.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/scan.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/selected_int_kind.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/selected_real_kind.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/set_exponent.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/shifta.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/shiftl.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/shiftr.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/size.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/spacing.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/spread.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/storage_size.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/sum.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/system_clock.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/trailz.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/transfer.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/transpose.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/transpose_opt.f90 (+5-5) 
- (modified) flang/test/Lower/Intrinsics/trim.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/ubound.f90 (+2-2) 
- (modified) flang/test/Lower/Intrinsics/ubound01.f90 (+1-1) 
- (modified) flang/test/Lower/Intrinsics/verify.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-atomic-capture.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-atomic-read.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-atomic-update-array.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-atomic-update.f90 (+2-2) 
- (modified) flang/test/Lower/OpenACC/acc-atomic-write.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-bounds.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-data-operands.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-data.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-declare.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-enter-data.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-exit-data.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-host-data.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-init.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-kernels-loop.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-kernels.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-loop.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-parallel-loop.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-parallel.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-private.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-reduction.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-serial-loop.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-serial.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-set.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-shutdown.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-update.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/acc-wait.f90 (+1-1) 
- (modified) flang/test/Lower/OpenACC/stop-stmt-in-region.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/array-bounds.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/atomic-capture.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/atomic-read.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/atomic-update.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/atomic-write.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/copyin.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/critical.f90 (+3-3) 
- (modified) flang/test/Lower/OpenMP/FIR/default-clause.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/firstprivate-commonblock.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/flush.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/lastprivate-commonblock.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/master.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/ordered-threads.f90 (+3-3) 
- (modified) flang/test/Lower/OpenMP/FIR/parallel-firstprivate-clause-scalar.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/parallel-lastprivate-clause-scalar.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/parallel-private-clause-fixes.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/parallel-private-clause.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/parallel-reduction-add.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/parallel-sections.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/parallel-wsloop-firstpriv.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/parallel-wsloop.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/parallel.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/private-commonblock.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/sections.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/simd.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/single.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/stop-stmt-in-region.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/target.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/task.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/taskgroup.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/threadprivate-char-array-chararray.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/threadprivate-commonblock.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/threadprivate-integer-different-kinds.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/threadprivate-non-global.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/threadprivate-pointer-allocatable.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/threadprivate-real-logical-complex-derivedtype.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/threadprivate-use-association-2.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/threadprivate-use-association.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/unstructured.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-chunks.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-collapse.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-monotonic.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-nonmonotonic.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-add.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-iand.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-ieor.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-ior.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-and.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-eqv.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-neqv.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-logical-or.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-max.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-min.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-reduction-mul.f90 (+2-2) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-simd.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop-variable.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/FIR/wsloop.f90 (+1-1) 
- (modified) flang/test/Lower/OpenMP/Todo/omp-default-clause-inner-loop.f90 (+2-2) 
- (modified) flang/test/Lower/allocatable-assignment.f90 (+1-1) 
- (modified) flang/test/Lower/allocatable-callee.f90 (+1-1) 
- (modified) flang/test/Lower/allocatable-caller.f90 (+1-1) 
- (modified) flang/test/Lower/allocatable-polymorphic.f90 (+2-2) 
- (modified) flang/test/Lower/allocatable-return.f90 (+1-1) 
- (modified) flang/test/Lower/allocatable-runtime.f90 (+1-1) 
- (modified) flang/test/Lower/allocatables.f90 (+1-1) 
- (modified) flang/test/Lower/allocate-mold.f90 (+1-1) 
- (modified) flang/test/Lower/allocate-source-allocatables.f90 (+1-1) 
- (modified) flang/test/Lower/allocate-source-pointers.f90 (+1-1) 
- (modified) flang/test/Lower/allocated.f90 (+1-1) 
- (modified) flang/test/Lower/always-execute-loop-body.f90 (+2-2) 
- (modified) flang/test/Lower/arithmetic-goto.f90 (+1-1) 
- (modified) flang/test/Lower/array-character.f90 (+1-1) 
- (modified) flang/test/Lower/array-constructor-1.f90 (+1-1) 
- (modified) flang/test/Lower/array-constructor-2.f90 (+1-1) 
- (modified) flang/test/Lower/array-constructor-index.f90 (+1-1) 
- (modified) flang/test/Lower/array-copy.f90 (+1-1) 
- (modified) flang/test/Lower/array-derived-assignments.f90 (+1-1) 
- (modified) flang/test/Lower/array-derived.f90 (+1-1) 
- (modified) flang/test/Lower/array-elemental-calls-2.f90 (+1-1) 
- (modified) flang/test/Lower/array-elemental-calls-3.f90 (+1-1) 
- (modified) flang/test/Lower/array-elemental-calls-char-byval.f90 (+1-1) 
- (modified) flang/test/Lower/array-elemental-calls-char.f90 (+1-1) 
- (modified) flang/test/Lower/array-elemental-calls.f90 (+1-1) 
- (modified) flang/test/Lower/array-elemental-subroutines.f90 (+1-1) 
- (modified) flang/test/Lower/array-expression-assumed-size.f90 (+2-2) 
- (modified) flang/test/Lower/array-expression-slice-1.f90 (+1-1) 
- (modified) flang/test/Lower/array-expression-slice-2.f90 (+1-1) 
- (modified) flang/test/Lower/array-expression-subscript.f90 (+1-1) 
- (modified) flang/test/Lower/array-expression.f90 (+1-1) 
- (modified) flang/test/Lower/array-substring.f90 (+1-1) 
- (modified) flang/test/Lower/array-temp.f90 (+1-1) 
- (modified) flang/test/Lower/array-user-def-assignments.f90 (+1-1) 
- (modified) flang/test/Lower/array-wide-char.f90 (+1-1) 
- (modified) flang/test/Lower/array.f90 (+1-1) 
- (modified) flang/test/Lower/assignment.f90 (+1-1) 
- (modified) flang/test/Lower/associate-construct-2.f90 (+1-1) 
- (modified) flang/test/Lower/associate-construct.f90 (+1-1) 
- (modified) flang/test/Lower/assumed-shape-callee.f90 (+1-1) 
- (modified) flang/test/Lower/assumed-shape-caller.f90 (+1-1) 
- (modified) flang/test/Lower/assumed-type.f90 (+1-1) 
- (modified) flang/test/Lower/basic-call.f90 (+1-1) 
- (modified) flang/test/Lower/basic-function.f90 (+1-1) 
- (modified) flang/test/Lower/block.f90 (+1-1) 
- (modified) flang/test/Lower/c-interoperability-c-pointer.f90 (+1-1) 
- (modified) flang/test/Lower/c-interoperability.f90 (+1-1) 
- (modified) flang/test/Lower/c_ptr-constant-init.f90 (+1-1) 
- (modified) flang/test/Lower/call-by-value-attr.f90 (+1-1) 
- (modified) flang/test/Lower/call-by-value.f90 (+1-1) 
- (modified) flang/test/Lower/call-copy-in-out.f90 (+1-1) 
- (modified) flang/test/Lower/call-implicit.f90 (+1-1) 
- (modified) flang/test/Lower/call-parenthesized-arg.f90 (+1-1) 
- (modified) flang/test/Lower/call-suspect.f90 (+1-1) 
- (modified) flang/test/Lower/call.f90 (+1-1) 
- (modified) flang/test/Lower/character-assignment.f90 (+1-1) 
- (modified) flang/test/Lower/character-concatenation.f90 (+1-1) 
- (modified) flang/test/Lower/character-elemental.f90 (+1-1) 
- (modified) flang/test/Lower/character-local-variables.f90 (+1-1) 
- (modified) flang/test/Lower/character-substrings.f90 (+1-1) 
- (modified) flang/test/Lower/complex-operations.f90 (+1-1) 
- (modified) flang/test/Lower/complex-real.f90 (+2-2) 
- (modified) flang/test/Lower/components.f90 (+1-1) 
- (modified) flang/test/Lower/computed-goto.f90 (+1-1) 
- (modified) flang/test/Lower/constant-literal-mangling.f90 (+1-1) 
- (modified) flang/test/Lower/control-flow.f90 (+1-1) 
- (modified) flang/test/Lower/cray-pointer.f90 (+2-2) 
- (modified) flang/test/Lower/default-initialization-globals.f90 (+1-1) 
- (modified) flang/test/Lower/default-initialization.f90 (+1-1) 
- (modified) flang/test/Lower/dense-attributed-array.f90 (+1-1) 
- (modified) flang/test/Lower/derived-allocatable-components.f90 (+1-1) 
- (modified) flang/test/Lower/derived-assignments.f90 (+1-1) 
- (modified) flang/test/Lower/derived-pointer-components.f90 (+1-1) 
- (modified) flang/test/Lower/derived-type-finalization.f90 (+1-1) 
- (modified) flang/test/Lower/derived-type-temp.f90 (+1-1) 
- (modified) flang/test/Lower/derived-types.f90 (+1-1) 
- (modified) flang/test/Lower/dispatch.f90 (+1-1) 
- (modified) flang/test/Lower/do_loop.f90 (+2-2) 
- (modified) flang/test/Lower/do_loop_unstructured.f90 (+2-2) 
- (modified) flang/test/Lower/dummy-argument-assumed-shape-optional.f90 (+1-1) 
- (modified) flang/test/Lower/dummy-argument-contiguous.f90 (+2-2) 
- (modified) flang/test/Lower/dummy-argument-optional-2.f90 (+1-1) 
- (modified) flang/test/Lower/dummy-argument-optional.f90 (+2-2) 
- (modified) flang/test/Lower/dummy-arguments.f90 (+1-1) 
- (modified) flang/test/Lower/dummy-procedure-character.f90 (+1-1) 
- (modified) flang/test/Lower/dummy-procedure-in-entry.f90 (+1-1) 
- (modified) flang/test/Lower/dummy-procedure.f90 (+1-1) 
- (modified) flang/test/Lower/entry-statement.f90 (+1-1) 
- (modified) flang/test/Lower/equivalence-1.f90 (+1-1) 
- (modified) flang/test/Lower/equivalence-2.f90 (+1-1) 
- (modified) flang/test/Lower/equivalence-with-host-assoc.f90 (+1-1) 
- (modified) flang/test/Lower/explicit-interface-results-2.f90 (+1-1) 
- (modified) flang/test/Lower/explicit-interface-results.f90 (+1-1) 
- (modified) flang/test/Lower/ext-proc-as-actual-argument-1.f90 (+1-1) 
- (modified) flang/test/Lower/ext-proc-as-actual-argument-2.f90 (+1-1) 
- (modified) flang/test/Lower/fail_image.f90 (+2-2) 
- (modified) flang/test/Lower/forall/array-constructor.f90 (+1-1) 
- (modified) flang/test/Lower/forall/array-pointer.f90 (+1-1) 
- (modified) flang/test/Lower/forall/array-subscripts.f90 (+1-1) 
- (modified) flang/test/Lower/forall/character-1.f90 (+2-2) 
- (modified) flang/test/Lower/forall/degenerate.f90 (+1-1) 
- (modified) flang/test/Lower/forall/forall-2.f90 (+2-2) 
- (modified) flang/test/Lower/forall/forall-allocatable-2.f90 (+1-1) 
- (modified) flang/test/Lower/forall/forall-allocatable.f90 (+1-1) 
- (modified) flang/test/Lower/forall/forall-array.f90 (+1-1) 
- (modified) flang/test/Lower/forall/forall-construct-2.f90 (+1-1) 
- (modified) flang/test/Lower/forall/forall-construct-3.f90 (+1-1) 
- (modified) flang/test/Lower/forall/forall-construct-4.f90 (+1-1) 
- (modified) flang/test/Lower/forall/forall-construct.f90 (+1-1) 
- (modified) flang/test/Lower/forall/forall-ranked.f90 (+1-1) 


``````````diff
diff --git a/flang/test/Driver/OpenMP/map-types-and-sizes.f90 b/flang/test/Driver/OpenMP/map-types-and-sizes.f90
index e4f429e479af158..3595a80ba706ae7 100644
--- a/flang/test/Driver/OpenMP/map-types-and-sizes.f90
+++ b/flang/test/Driver/OpenMP/map-types-and-sizes.f90
@@ -1,4 +1,4 @@
-!RUN: %flang_fc1 -emit-llvm -fopenmp %s -o - | FileCheck %s
+!RUN: %flang_fc1 -emit-llvm -fopenmp -flang-deprecated-no-hlfir %s -o - | FileCheck %s
 
 !===============================================================================
 ! Check MapTypes for target implicit captures
diff --git a/flang/test/Driver/compiler_options.f90 b/flang/test/Driver/compiler_options.f90
index 835e92c1229ecab..3edebb915c0952f 100644
--- a/flang/test/Driver/compiler_options.f90
+++ b/flang/test/Driver/compiler_options.f90
@@ -1,6 +1,6 @@
-! RUN: %flang -S -emit-llvm -o - %s | FileCheck %s
+! RUN: %flang -S -emit-llvm -flang-deprecated-no-hlfir -o - %s | FileCheck %s
 ! Test communication of COMPILER_OPTIONS from flang-new to flang-new -fc1.
-! CHECK: [[OPTSVAR:@_QQclX[0-9a-f]+]] = {{[a-z]+}} constant [[[OPTSLEN:[0-9]+]] x i8] c"{{.*}}flang-new{{(\.exe)?}} -S -emit-llvm -o - {{.*}}compiler_options.f90"
+! CHECK: [[OPTSVAR:@_QQclX[0-9a-f]+]] = {{[a-z]+}} constant [[[OPTSLEN:[0-9]+]] x i8] c"{{.*}}flang-new{{(\.exe)?}} -S -emit-llvm -flang-deprecated-no-hlfir -o - {{.*}}compiler_options.f90"
 program main
     use ISO_FORTRAN_ENV, only: compiler_options
     implicit none
diff --git a/flang/test/Driver/optimization-remark.f90 b/flang/test/Driver/optimization-remark.f90
index e7a7abfaf6ab83b..13fc24346eac68b 100644
--- a/flang/test/Driver/optimization-remark.f90
+++ b/flang/test/Driver/optimization-remark.f90
@@ -2,7 +2,7 @@
 ! and -Rpass-analysis)
 ! loop-delete isn't enabled at O0 so we use at least O1
 
-! DEFINE: %{output} = -emit-llvm -o /dev/null 2>&1
+! DEFINE: %{output} = -emit-llvm -flang-deprecated-no-hlfir -o /dev/null 2>&1
 
 ! Check fc1 can handle -Rpass
 ! RUN: %flang_fc1 %s -O1 -Rpass %{output} 2>&1 | FileCheck %s --check-prefix=REMARKS
diff --git a/flang/test/Fir/achar.f90 b/flang/test/Fir/achar.f90
index 73fd5a3daa30e5f..9b36d165e5133fd 100644
--- a/flang/test/Fir/achar.f90
+++ b/flang/test/Fir/achar.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! Tests ACHAR lowering (converting an INTEGER to a CHARACTER (singleton, LEN=1)
 ! along with conversion of CHARACTER to another KIND.
diff --git a/flang/test/Fir/dispatch.f90 b/flang/test/Fir/dispatch.f90
index ce60939410de691..2c06377c99034f2 100644
--- a/flang/test/Fir/dispatch.f90
+++ b/flang/test/Fir/dispatch.f90
@@ -1,5 +1,5 @@
-! RUN: bbc -polymorphic-type -emit-fir %s -o - | fir-opt --fir-polymorphic-op | FileCheck %s
-! RUN: bbc -polymorphic-type -emit-fir %s -o - | FileCheck %s --check-prefix=BT
+! RUN: bbc -polymorphic-type -emit-fir -hlfir=false %s -o - | fir-opt --fir-polymorphic-op | FileCheck %s
+! RUN: bbc -polymorphic-type -emit-fir -hlfir=false %s -o - | FileCheck %s --check-prefix=BT
 
 ! Tests codegen of fir.dispatch operation. This test is intentionally run from
 ! Fortran through bbc and tco so we have all the binding tables lowered to FIR
diff --git a/flang/test/Lower/Intrinsics/abs.f90 b/flang/test/Lower/Intrinsics/abs.f90
index 7986eeee0003061..8b977c3c0a968e2 100644
--- a/flang/test/Lower/Intrinsics/abs.f90
+++ b/flang/test/Lower/Intrinsics/abs.f90
@@ -1,10 +1,10 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s --check-prefixes="CHECK,CMPLX,CMPLX-PRECISE"
-! RUN: bbc -emit-fir --math-runtime=precise %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-PRECISE"
-! RUN: bbc --force-mlir-complex -emit-fir %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-FAST"
-! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s --check-prefixes="CHECK,CMPLX,CMPLX-PRECISE"
-! RUN: %flang_fc1 -emit-fir -mllvm --math-runtime=precise %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-PRECISE"
-! RUN: %flang_fc1 -emit-fir -mllvm --force-mlir-complex %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-FAST"
-! RUN: %flang_fc1 -fapprox-func -emit-fir %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-APPROX"
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s --check-prefixes="CHECK,CMPLX,CMPLX-PRECISE"
+! RUN: bbc -emit-fir -hlfir=false --math-runtime=precise %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-PRECISE"
+! RUN: bbc --force-mlir-complex -emit-fir -hlfir=false %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-FAST"
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s --check-prefixes="CHECK,CMPLX,CMPLX-PRECISE"
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -mllvm --math-runtime=precise %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-PRECISE"
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -mllvm --force-mlir-complex %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-FAST"
+! RUN: %flang_fc1 -fapprox-func -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s --check-prefixes="CMPLX,CMPLX-APPROX"
 
 ! Test abs intrinsic for various types (int, float, complex)
 
diff --git a/flang/test/Lower/Intrinsics/achar.f90 b/flang/test/Lower/Intrinsics/achar.f90
index db9fc9368cfad4b..32cf30dde9ab226 100644
--- a/flang/test/Lower/Intrinsics/achar.f90
+++ b/flang/test/Lower/Intrinsics/achar.f90
@@ -1,5 +1,5 @@
-! RUN: bbc -emit-fir %s -o - | fir-opt --canonicalize | FileCheck %s
-! RUN: %flang_fc1 -emit-fir %s -o - | fir-opt --canonicalize | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | fir-opt --canonicalize | FileCheck %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | fir-opt --canonicalize | FileCheck %s
 
 
 ! CHECK-LABEL:   func.func @_QPtest1(
diff --git a/flang/test/Lower/Intrinsics/adjustl.f90 b/flang/test/Lower/Intrinsics/adjustl.f90
index e5e60d6705062be..a8d004cd52665bb 100644
--- a/flang/test/Lower/Intrinsics/adjustl.f90
+++ b/flang/test/Lower/Intrinsics/adjustl.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABLE: adjustl_test
 subroutine adjustl_test
diff --git a/flang/test/Lower/Intrinsics/adjustr.f90 b/flang/test/Lower/Intrinsics/adjustr.f90
index 0f904c7b6f5e50c..07aa08c9945864e 100644
--- a/flang/test/Lower/Intrinsics/adjustr.f90
+++ b/flang/test/Lower/Intrinsics/adjustr.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABLE: adjustr_test
 subroutine adjustr_test
diff --git a/flang/test/Lower/Intrinsics/aint.f90 b/flang/test/Lower/Intrinsics/aint.f90
index 4095a9dd0ad312e..fb459953a06c3f2 100644
--- a/flang/test/Lower/Intrinsics/aint.f90
+++ b/flang/test/Lower/Intrinsics/aint.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABEL: func @_QPaint_test(
 ! CHECK-SAME: %[[VAL_0:.*]]: !fir.ref<f32>{{.*}}, %[[VAL_1:.*]]: !fir.ref<f32>{{.*}}) {
diff --git a/flang/test/Lower/Intrinsics/all.f90 b/flang/test/Lower/Intrinsics/all.f90
index db02105bd6d2d0a..3eb7ea70dfb16e6 100644
--- a/flang/test/Lower/Intrinsics/all.f90
+++ b/flang/test/Lower/Intrinsics/all.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABEL: all_test
 ! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>>{{.*}}) -> !fir.logical<4>
diff --git a/flang/test/Lower/Intrinsics/anint.f90 b/flang/test/Lower/Intrinsics/anint.f90
index fe479a07681eec8..4148d18f15b30d9 100644
--- a/flang/test/Lower/Intrinsics/anint.f90
+++ b/flang/test/Lower/Intrinsics/anint.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABEL: func.func @_QPanint_test(
 ! CHECK-SAME:                           %[[VAL_0:.*]]: !fir.ref<f32> {fir.bindc_name = "a"},
diff --git a/flang/test/Lower/Intrinsics/any.f90 b/flang/test/Lower/Intrinsics/any.f90
index b46c4f84cebe3b4..1ea22d9706744f7 100644
--- a/flang/test/Lower/Intrinsics/any.f90
+++ b/flang/test/Lower/Intrinsics/any.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABEL: any_test
 ! CHECK-SAME: %[[arg0:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>>{{.*}}) -> !fir.logical<4>
diff --git a/flang/test/Lower/Intrinsics/associated.f90 b/flang/test/Lower/Intrinsics/associated.f90
index 091c081c5087cef..f09d0546a651494 100644
--- a/flang/test/Lower/Intrinsics/associated.f90
+++ b/flang/test/Lower/Intrinsics/associated.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABEL: associated_test
 ! CHECK-SAME: %[[arg0:.*]]: !fir.ref<!fir.box<!fir.ptr<f32>>>{{.*}}, %[[arg1:.*]]: !fir.ref<!fir.box<!fir.ptr<!fir.array<?xf32>>>>{{.*}})
diff --git a/flang/test/Lower/Intrinsics/atand.f90 b/flang/test/Lower/Intrinsics/atand.f90
index eea9c79773cf055..2483bef46e60f6f 100644
--- a/flang/test/Lower/Intrinsics/atand.f90
+++ b/flang/test/Lower/Intrinsics/atand.f90
@@ -1,6 +1,6 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s --check-prefixes="CHECK,CHECK-FAST"
-! RUN: bbc --math-runtime=precise -emit-fir %s -o - | FileCheck %s --check-prefixes="CHECK,CHECK-PRECISE"
-! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s --check-prefixes="CHECK,CHECK-FAST"
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s --check-prefixes="CHECK,CHECK-FAST"
+! RUN: bbc --math-runtime=precise -emit-fir -hlfir=false %s -o - | FileCheck %s --check-prefixes="CHECK,CHECK-PRECISE"
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s --check-prefixes="CHECK,CHECK-FAST"
 
 function test_real4(x)
   real :: x, test_real4
diff --git a/flang/test/Lower/Intrinsics/bessel_jn.f90 b/flang/test/Lower/Intrinsics/bessel_jn.f90
index 9e0698a5986fe59..3fdef7446100d11 100644
--- a/flang/test/Lower/Intrinsics/bessel_jn.f90
+++ b/flang/test/Lower/Intrinsics/bessel_jn.f90
@@ -1,9 +1,9 @@
-! RUN: bbc -emit-fir %s -o - --math-runtime=fast | FileCheck --check-prefixes=ALL %s
-! RUN: %flang_fc1 -emit-fir -mllvm -math-runtime=fast %s -o - | FileCheck --check-prefixes=ALL %s
-! RUN: bbc -emit-fir %s -o - --math-runtime=relaxed | FileCheck --check-prefixes=ALL %s
-! RUN: %flang_fc1 -emit-fir -mllvm -math-runtime=relaxed %s -o - | FileCheck --check-prefixes=ALL %s
-! RUN: bbc -emit-fir %s -o - --math-runtime=precise | FileCheck --check-prefixes=ALL %s
-! RUN: %flang_fc1 -emit-fir -mllvm -math-runtime=precise %s -o - | FileCheck --check-prefixes=ALL %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - --math-runtime=fast | FileCheck --check-prefixes=ALL %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -mllvm -math-runtime=fast %s -o - | FileCheck --check-prefixes=ALL %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - --math-runtime=relaxed | FileCheck --check-prefixes=ALL %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -mllvm -math-runtime=relaxed %s -o - | FileCheck --check-prefixes=ALL %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - --math-runtime=precise | FileCheck --check-prefixes=ALL %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -mllvm -math-runtime=precise %s -o - | FileCheck --check-prefixes=ALL %s
 
 ! ALL-LABEL: @_QPtest_real4
 ! ALL-SAME: (%[[argx:.*]]: !fir.ref<f32>{{.*}}, %[[argn:.*]]: !fir.ref<i32>{{.*}}) -> f32
diff --git a/flang/test/Lower/Intrinsics/bessel_yn.f90 b/flang/test/Lower/Intrinsics/bessel_yn.f90
index cf1541dac0ec967..9f4fbfbb89d31fc 100644
--- a/flang/test/Lower/Intrinsics/bessel_yn.f90
+++ b/flang/test/Lower/Intrinsics/bessel_yn.f90
@@ -1,9 +1,9 @@
-! RUN: bbc -emit-fir %s -o - --math-runtime=fast | FileCheck --check-prefixes=ALL %s
-! RUN: %flang_fc1 -emit-fir -mllvm -math-runtime=fast %s -o - | FileCheck --check-prefixes=ALL %s
-! RUN: bbc -emit-fir %s -o - --math-runtime=relaxed | FileCheck --check-prefixes=ALL %s
-! RUN: %flang_fc1 -emit-fir -mllvm -math-runtime=relaxed %s -o - | FileCheck --check-prefixes=ALL %s
-! RUN: bbc -emit-fir %s -o - --math-runtime=precise | FileCheck --check-prefixes=ALL %s
-! RUN: %flang_fc1 -emit-fir -mllvm -math-runtime=precise %s -o - | FileCheck --check-prefixes=ALL %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - --math-runtime=fast | FileCheck --check-prefixes=ALL %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -mllvm -math-runtime=fast %s -o - | FileCheck --check-prefixes=ALL %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - --math-runtime=relaxed | FileCheck --check-prefixes=ALL %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -mllvm -math-runtime=relaxed %s -o - | FileCheck --check-prefixes=ALL %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - --math-runtime=precise | FileCheck --check-prefixes=ALL %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -mllvm -math-runtime=precise %s -o - | FileCheck --check-prefixes=ALL %s
 
 ! ALL-LABEL: @_QPtest_real4
 ! ALL-SAME: (%[[argx:.*]]: !fir.ref<f32>{{.*}}, %[[argn:.*]]: !fir.ref<i32>{{.*}}) -> f32
diff --git a/flang/test/Lower/Intrinsics/bge.f90 b/flang/test/Lower/Intrinsics/bge.f90
index 4f3095fe7294bfc..19ddf7d95c38813 100644
--- a/flang/test/Lower/Intrinsics/bge.f90
+++ b/flang/test/Lower/Intrinsics/bge.f90
@@ -1,5 +1,5 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
-! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s
 
 ! CHECK-LABEL: bge_test
 ! CHECK-SAME: %[[A:.*]]: !fir.ref<i32>{{.*}}, %[[B:.*]]: !fir.ref<i32>{{.*}}, %[[C:.*]]: !fir.ref<!fir.logical<4>>{{.*}}
diff --git a/flang/test/Lower/Intrinsics/bgt.f90 b/flang/test/Lower/Intrinsics/bgt.f90
index b31371a1f7d0344..fea8611c17014e9 100644
--- a/flang/test/Lower/Intrinsics/bgt.f90
+++ b/flang/test/Lower/Intrinsics/bgt.f90
@@ -1,5 +1,5 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
-! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s
 
 ! CHECK-LABEL: bgt_test
 ! CHECK-SAME: %[[A:.*]]: !fir.ref<i32>{{.*}}, %[[B:.*]]: !fir.ref<i32>{{.*}}, %[[C:.*]]: !fir.ref<!fir.logical<4>>{{.*}}
diff --git a/flang/test/Lower/Intrinsics/ble.f90 b/flang/test/Lower/Intrinsics/ble.f90
index fcdb32f4e46db1a..1c996a963e43090 100644
--- a/flang/test/Lower/Intrinsics/ble.f90
+++ b/flang/test/Lower/Intrinsics/ble.f90
@@ -1,5 +1,5 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
-! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s
 
 ! CHECK-LABEL: ble_test
 ! CHECK-SAME: %[[A:.*]]: !fir.ref<i32>{{.*}}, %[[B:.*]]: !fir.ref<i32>{{.*}}, %[[C:.*]]: !fir.ref<!fir.logical<4>>{{.*}}
diff --git a/flang/test/Lower/Intrinsics/blt.f90 b/flang/test/Lower/Intrinsics/blt.f90
index 05802f2612be14c..06a57fb579e6bb1 100644
--- a/flang/test/Lower/Intrinsics/blt.f90
+++ b/flang/test/Lower/Intrinsics/blt.f90
@@ -1,5 +1,5 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
-! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s
 
 ! CHECK-LABEL: blt_test
 ! CHECK-SAME: %[[A:.*]]: !fir.ref<i32>{{.*}}, %[[B:.*]]: !fir.ref<i32>{{.*}}, %[[C:.*]]: !fir.ref<!fir.logical<4>>{{.*}}
diff --git a/flang/test/Lower/Intrinsics/btest.f90 b/flang/test/Lower/Intrinsics/btest.f90
index a2bf7f56a62142d..6c0fccd0f5a9faf 100644
--- a/flang/test/Lower/Intrinsics/btest.f90
+++ b/flang/test/Lower/Intrinsics/btest.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABEL: btest_test
 function btest_test(i, j)
diff --git a/flang/test/Lower/Intrinsics/c_associated.f90 b/flang/test/Lower/Intrinsics/c_associated.f90
index 41e46768061022d..ba2d7f130f760d8 100644
--- a/flang/test/Lower/Intrinsics/c_associated.f90
+++ b/flang/test/Lower/Intrinsics/c_associated.f90
@@ -1,5 +1,5 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
-! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s
 
 ! Test intrinsic module procedure c_associated
 
diff --git a/flang/test/Lower/Intrinsics/c_f_pointer.f90 b/flang/test/Lower/Intrinsics/c_f_pointer.f90
index 145a306fc772d4e..8e8680777275d77 100644
--- a/flang/test/Lower/Intrinsics/c_f_pointer.f90
+++ b/flang/test/Lower/Intrinsics/c_f_pointer.f90
@@ -1,5 +1,5 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
-! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s
 
 ! Test intrinsic module procedure c_f_pointer
 
diff --git a/flang/test/Lower/Intrinsics/c_funloc.f90 b/flang/test/Lower/Intrinsics/c_funloc.f90
index 1f7e54e24b77af3..29a0e10e2b94f19 100644
--- a/flang/test/Lower/Intrinsics/c_funloc.f90
+++ b/flang/test/Lower/Intrinsics/c_funloc.f90
@@ -1,5 +1,5 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
-! RUN: %flang_fc1 -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s
 
 ! Test intrinsic module procedure c_funloc
 
diff --git a/flang/test/Lower/Intrinsics/c_loc.f90 b/flang/test/Lower/Intrinsics/c_loc.f90
index 524be0964c833ab..e73e63913566c91 100644
--- a/flang/test/Lower/Intrinsics/c_loc.f90
+++ b/flang/test/Lower/Intrinsics/c_loc.f90
@@ -1,5 +1,5 @@
-! RUN: bbc --use-desc-for-alloc=false --emit-fir %s -o - | FileCheck %s
-! RUN: %flang_fc1 -mllvm --use-desc-for-alloc=false -emit-fir %s -o - | FileCheck %s
+! RUN: bbc --use-desc-for-alloc=false --emit-fir -hlfir=false %s -o - | FileCheck %s
+! RUN: %flang_fc1 -mllvm --use-desc-for-alloc=false -emit-fir -flang-deprecated-no-hlfir %s -o - | FileCheck %s
 
 ! Test intrinsic module procedure c_loc
 
diff --git a/flang/test/Lower/Intrinsics/cmplx.f90 b/flang/test/Lower/Intrinsics/cmplx.f90
index 2db1a65cd98a0e1..fe08920ece5127b 100644
--- a/flang/test/Lower/Intrinsics/cmplx.f90
+++ b/flang/test/Lower/Intrinsics/cmplx.f90
@@ -3,7 +3,7 @@
 ! a disassociated pointer, or an optional argument.
 ! CMPLX without such argument is re-written by the front-end as a
 ! complex constructor that is tested elsewhere.
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABEL: func @_QPcmplx_test_scalar_ptr(
 ! CHECK-SAME:  %[[VAL_0:.*]]: !fir.ref<f32>
diff --git a/flang/test/Lower/Intrinsics/count.f90 b/flang/test/Lower/Intrinsics/count.f90
index 72e3275b8f7d149..1eef676e7924481 100644
--- a/flang/test/Lower/Intrinsics/count.f90
+++ b/flang/test/Lower/Intrinsics/count.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABEL: count_test1
 ! CHECK-SAME: %[[arg0:.*]]: !fir.ref<i32>{{.*}}, %[[arg1:.*]]: !fir.box<!fir.array<?x!fir.logical<4>>>{{.*}})
diff --git a/flang/test/Lower/Intrinsics/cpu_time.f90 b/flang/test/Lower/Intrinsics/cpu_time.f90
index 53762c185ca3fc4..25ff4f88211452d 100644
--- a/flang/test/Lower/Intrinsics/cpu_time.f90
+++ b/flang/test/Lower/Intrinsics/cpu_time.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABEL: cpu_time_test
 subroutine cpu_time_test(t)
diff --git a/flang/test/Lower/Intrinsics/date_and_time.f90 b/flang/test/Lower/Intrinsics/date_and_time.f90
index e54dca3c8e8cc57..900880f7784478a 100644
--- a/flang/test/Lower/Intrinsics/date_and_time.f90
+++ b/flang/test/Lower/Intrinsics/date_and_time.f90
@@ -1,4 +1,4 @@
-! RUN: bbc -emit-fir %s -o - | FileCheck %s
+! RUN: bbc -emit-fir -hlfir=false %s -o - | FileCheck %s
 
 ! CHECK-LABEL: func @_QPdate_and_time_test(
 ! CHECK-SAME: %[[date:[^:]+]]: !fir.boxchar<1>{{.*}}, %[[time:[^:]+]]: !fir.boxchar<1>{{.*}}, %[[zone:.*]]: !fir.boxchar<1>{{.*}}, %[[values:.*]]: !fir.box<!fir.array<?xi64>>{{.*}}) {
diff --git a/flang/test/Lower/Intrinsics/dconjg.f90 b/flang/test/Lower/Intrinsic...
[truncated]

``````````

</details>


https://github.com/llvm/llvm-project/pull/71957


More information about the flang-commits mailing list