https://github.com/ergawy updated https://github.com/llvm/llvm-project/pull/138816
>From e0eb1611a67579562edefe1c66263c2cc562c5d7 Mon Sep 17 00:00:00 2001 From: ergawy <kareem.erg...@amd.com> Date: Wed, 7 May 2025 02:41:14 -0500 Subject: [PATCH] [flang] Generlize names of delayed privatization CLI flags Remove the `openmp` prefix from delayed privatization/localization flags since they are now used for `do concurrent` as well. --- flang/include/flang/Support/Flags.h | 17 ++++++++++++++++ flang/lib/Lower/Bridge.cpp | 2 +- flang/lib/Lower/OpenMP/OpenMP.cpp | 1 + flang/lib/Lower/OpenMP/Utils.cpp | 12 ----------- flang/lib/Lower/OpenMP/Utils.h | 2 -- flang/lib/Support/CMakeLists.txt | 1 + flang/lib/Support/Flags.cpp | 20 +++++++++++++++++++ .../distribute-standalone-private.f90 | 4 ++-- .../DelayedPrivatization/equivalence.f90 | 4 ++-- .../target-private-allocatable.f90 | 4 ++-- .../target-private-multiple-variables.f90 | 4 ++-- .../target-private-simple.f90 | 4 ++-- .../OpenMP/allocatable-multiple-vars.f90 | 4 ++-- .../OpenMP/cfg-conversion-omp.private.f90 | 2 +- .../test/Lower/OpenMP/debug_info_conflict.f90 | 2 +- ...elayed-privatization-allocatable-array.f90 | 4 ++-- ...privatization-allocatable-firstprivate.f90 | 6 +++--- ...ayed-privatization-allocatable-private.f90 | 4 ++-- .../OpenMP/delayed-privatization-array.f90 | 12 +++++------ .../delayed-privatization-character-array.f90 | 8 ++++---- .../delayed-privatization-character.f90 | 8 ++++---- .../delayed-privatization-default-init.f90 | 4 ++-- .../delayed-privatization-firstprivate.f90 | 4 ++-- ...rivatization-lower-allocatable-to-llvm.f90 | 2 +- .../OpenMP/delayed-privatization-pointer.f90 | 4 ++-- ...yed-privatization-private-firstprivate.f90 | 4 ++-- .../OpenMP/delayed-privatization-private.f90 | 4 ++-- .../delayed-privatization-reduction-byref.f90 | 2 +- .../delayed-privatization-reduction.f90 | 4 ++-- .../different_vars_lastprivate_barrier.f90 | 2 +- .../Lower/OpenMP/firstprivate-commonblock.f90 | 2 +- .../test/Lower/OpenMP/private-commonblock.f90 | 2 +- .../Lower/OpenMP/private-derived-type.f90 | 4 ++-- .../OpenMP/same_var_first_lastprivate.f90 | 2 +- .../Lower/do_concurrent_delayed_locality.f90 | 2 +- 35 files changed, 96 insertions(+), 71 deletions(-) create mode 100644 flang/include/flang/Support/Flags.h create mode 100644 flang/lib/Support/Flags.cpp diff --git a/flang/include/flang/Support/Flags.h b/flang/include/flang/Support/Flags.h new file mode 100644 index 0000000000000..bcbb72f8e50d0 --- /dev/null +++ b/flang/include/flang/Support/Flags.h @@ -0,0 +1,17 @@ +//===-- include/flang/Support/Flags.h ---------------------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#ifndef FORTRAN_SUPPORT_FLAGS_H_ +#define FORTRAN_SUPPORT_FLAGS_H_ + +#include "llvm/Support/CommandLine.h" + +extern llvm::cl::opt<bool> enableDelayedPrivatization; +extern llvm::cl::opt<bool> enableDelayedPrivatizationStaging; + +#endif // FORTRAN_SUPPORT_FLAGS_H_ diff --git a/flang/lib/Lower/Bridge.cpp b/flang/lib/Lower/Bridge.cpp index 49675d34215a9..9f3c50a52973a 100644 --- a/flang/lib/Lower/Bridge.cpp +++ b/flang/lib/Lower/Bridge.cpp @@ -13,7 +13,6 @@ #include "flang/Lower/Bridge.h" #include "OpenMP/DataSharingProcessor.h" -#include "OpenMP/Utils.h" #include "flang/Lower/Allocatable.h" #include "flang/Lower/CallInterface.h" #include "flang/Lower/Coarray.h" @@ -63,6 +62,7 @@ #include "flang/Semantics/runtime-type-info.h" #include "flang/Semantics/symbol.h" #include "flang/Semantics/tools.h" +#include "flang/Support/Flags.h" #include "flang/Support/Version.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/IR/BuiltinAttributes.h" diff --git a/flang/lib/Lower/OpenMP/OpenMP.cpp b/flang/lib/Lower/OpenMP/OpenMP.cpp index 5a975384bd371..f76afa2309233 100644 --- a/flang/lib/Lower/OpenMP/OpenMP.cpp +++ b/flang/lib/Lower/OpenMP/OpenMP.cpp @@ -34,6 +34,7 @@ #include "flang/Parser/parse-tree.h" #include "flang/Semantics/openmp-directive-sets.h" #include "flang/Semantics/tools.h" +#include "flang/Support/Flags.h" #include "flang/Support/OpenMP-utils.h" #include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h" #include "mlir/Dialect/OpenMP/OpenMPDialect.h" diff --git a/flang/lib/Lower/OpenMP/Utils.cpp b/flang/lib/Lower/OpenMP/Utils.cpp index 711d4af287691..c226c2558e7aa 100644 --- a/flang/lib/Lower/OpenMP/Utils.cpp +++ b/flang/lib/Lower/OpenMP/Utils.cpp @@ -33,18 +33,6 @@ llvm::cl::opt<bool> treatIndexAsSection( llvm::cl::desc("In the OpenMP data clauses treat `a(N)` as `a(N:N)`."), llvm::cl::init(true)); -llvm::cl::opt<bool> enableDelayedPrivatization( - "openmp-enable-delayed-privatization", - llvm::cl::desc( - "Emit `[first]private` variables as clauses on the MLIR ops."), - llvm::cl::init(true)); - -llvm::cl::opt<bool> enableDelayedPrivatizationStaging( - "openmp-enable-delayed-privatization-staging", - llvm::cl::desc("For partially supported constructs, emit `[first]private` " - "variables as clauses on the MLIR ops."), - llvm::cl::init(false)); - namespace Fortran { namespace lower { namespace omp { diff --git a/flang/lib/Lower/OpenMP/Utils.h b/flang/lib/Lower/OpenMP/Utils.h index 30b4613837b9a..a7eb2dc5ee664 100644 --- a/flang/lib/Lower/OpenMP/Utils.h +++ b/flang/lib/Lower/OpenMP/Utils.h @@ -17,8 +17,6 @@ #include <cstdint> extern llvm::cl::opt<bool> treatIndexAsSection; -extern llvm::cl::opt<bool> enableDelayedPrivatization; -extern llvm::cl::opt<bool> enableDelayedPrivatizationStaging; namespace fir { class FirOpBuilder; diff --git a/flang/lib/Support/CMakeLists.txt b/flang/lib/Support/CMakeLists.txt index 4ee381589a208..363f57ce97dae 100644 --- a/flang/lib/Support/CMakeLists.txt +++ b/flang/lib/Support/CMakeLists.txt @@ -44,6 +44,7 @@ endif() add_flang_library(FortranSupport default-kinds.cpp + Flags.cpp Fortran.cpp Fortran-features.cpp idioms.cpp diff --git a/flang/lib/Support/Flags.cpp b/flang/lib/Support/Flags.cpp new file mode 100644 index 0000000000000..02f64981618dd --- /dev/null +++ b/flang/lib/Support/Flags.cpp @@ -0,0 +1,20 @@ +//===-- lib/Support/Flags.cpp ---------------------------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "flang/Support/Flags.h" + +llvm::cl::opt<bool> enableDelayedPrivatization("enable-delayed-privatization", + llvm::cl::desc( + "Emit private/local variables as clauses/specifiers on MLIR ops."), + llvm::cl::init(true)); + +llvm::cl::opt<bool> enableDelayedPrivatizationStaging( + "enable-delayed-privatization-staging", + llvm::cl::desc("For partially supported constructs, emit private/local " + "variables as clauses/specifiers on MLIR ops."), + llvm::cl::init(false)); diff --git a/flang/test/Lower/OpenMP/DelayedPrivatization/distribute-standalone-private.f90 b/flang/test/Lower/OpenMP/DelayedPrivatization/distribute-standalone-private.f90 index a9c85db79fa31..92aeb3fbc1ee7 100644 --- a/flang/test/Lower/OpenMP/DelayedPrivatization/distribute-standalone-private.f90 +++ b/flang/test/Lower/OpenMP/DelayedPrivatization/distribute-standalone-private.f90 @@ -1,6 +1,6 @@ -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization-staging \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization-staging \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization-staging -o - %s 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization-staging -o - %s 2>&1 \ ! RUN: | FileCheck %s subroutine standalone_distribute diff --git a/flang/test/Lower/OpenMP/DelayedPrivatization/equivalence.f90 b/flang/test/Lower/OpenMP/DelayedPrivatization/equivalence.f90 index 721bfff012f14..5234862feaa76 100644 --- a/flang/test/Lower/OpenMP/DelayedPrivatization/equivalence.f90 +++ b/flang/test/Lower/OpenMP/DelayedPrivatization/equivalence.f90 @@ -1,8 +1,8 @@ ! Test delayed privatization for variables that are storage associated via `EQUIVALENCE`. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 \ ! RUN: | FileCheck %s subroutine private_common diff --git a/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-allocatable.f90 b/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-allocatable.f90 index 87c2c2ae26796..3d93fbc6e446e 100644 --- a/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-allocatable.f90 +++ b/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-allocatable.f90 @@ -1,8 +1,8 @@ ! Tests delayed privatization for `targets ... private(..)` for allocatables. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization-staging \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization-staging \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization-staging -o - %s 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization-staging -o - %s 2>&1 \ ! RUN: | FileCheck %s subroutine target_allocatable diff --git a/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-multiple-variables.f90 b/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-multiple-variables.f90 index ad7bfb3d7c247..12e15a2aafc2d 100644 --- a/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-multiple-variables.f90 +++ b/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-multiple-variables.f90 @@ -1,8 +1,8 @@ ! Tests delayed privatization for `targets ... private(..)` for allocatables. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization-staging \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization-staging \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization-staging -o - %s 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization-staging -o - %s 2>&1 \ ! RUN: | FileCheck %s subroutine target_allocatable(lb, ub, l) diff --git a/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-simple.f90 b/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-simple.f90 index 5abf2cbb15c92..f543068d29753 100644 --- a/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-simple.f90 +++ b/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-simple.f90 @@ -1,8 +1,8 @@ ! Tests delayed privatization for `targets ... private(..)` for simple variables. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization-staging \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization-staging \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization-staging -o - %s 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization-staging -o - %s 2>&1 \ ! RUN: | FileCheck %s subroutine target_simple diff --git a/flang/test/Lower/OpenMP/allocatable-multiple-vars.f90 b/flang/test/Lower/OpenMP/allocatable-multiple-vars.f90 index e6450a13e13a0..91ba75f2198e3 100644 --- a/flang/test/Lower/OpenMP/allocatable-multiple-vars.f90 +++ b/flang/test/Lower/OpenMP/allocatable-multiple-vars.f90 @@ -1,9 +1,9 @@ ! Test early privatization for multiple allocatable variables. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization=false \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization=false \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization=false -o - %s 2>&1 |\ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization=false -o - %s 2>&1 |\ ! RUN: FileCheck %s subroutine delayed_privatization_allocatable diff --git a/flang/test/Lower/OpenMP/cfg-conversion-omp.private.f90 b/flang/test/Lower/OpenMP/cfg-conversion-omp.private.f90 index 8b8adf2b140c7..f8d771d10d281 100644 --- a/flang/test/Lower/OpenMP/cfg-conversion-omp.private.f90 +++ b/flang/test/Lower/OpenMP/cfg-conversion-omp.private.f90 @@ -2,7 +2,7 @@ ! RUN: split-file %s %t && cd %t -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - test.f90 2>&1 | \ ! RUN: fir-opt --cfg-conversion -o test.cfg-conv.mlir ! RUN: FileCheck --input-file=test.cfg-conv.mlir %s --check-prefix="CFGConv" diff --git a/flang/test/Lower/OpenMP/debug_info_conflict.f90 b/flang/test/Lower/OpenMP/debug_info_conflict.f90 index 5e52db281da23..b80900476053a 100644 --- a/flang/test/Lower/OpenMP/debug_info_conflict.f90 +++ b/flang/test/Lower/OpenMP/debug_info_conflict.f90 @@ -1,7 +1,7 @@ ! Tests that there no debug-info conflicts arise because of DI attached to nested ! OMP regions arguments. -! RUN: %flang -c -fopenmp -g -mmlir --openmp-enable-delayed-privatization=true \ +! RUN: %flang -c -fopenmp -g -mmlir --enable-delayed-privatization=true \ ! RUN: %s -o - 2>&1 | FileCheck %s subroutine bar (b) diff --git a/flang/test/Lower/OpenMP/delayed-privatization-allocatable-array.f90 b/flang/test/Lower/OpenMP/delayed-privatization-allocatable-array.f90 index 9b6dbabf0c6ff..d1c7167546b43 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-allocatable-array.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-allocatable-array.f90 @@ -1,8 +1,8 @@ ! Test delayed privatization for allocatable arrays. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 |\ ! RUN: FileCheck %s subroutine delayed_privatization_private(var1, l1) diff --git a/flang/test/Lower/OpenMP/delayed-privatization-allocatable-firstprivate.f90 b/flang/test/Lower/OpenMP/delayed-privatization-allocatable-firstprivate.f90 index 01ca1073ae849..612bb55c770f7 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-allocatable-firstprivate.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-allocatable-firstprivate.f90 @@ -2,9 +2,9 @@ ! RUN: split-file %s %t -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %t/test_ir.f90 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/test_ir.f90 2>&1 |\ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %t/test_ir.f90 2>&1 |\ ! RUN: FileCheck %s !--- test_ir.f90 @@ -38,7 +38,7 @@ subroutine delayed_privatization_allocatable ! CHECK-NEXT: hlfir.assign %[[ORIG_BASE_LD]] to %[[PRIV_PRIV_ARG]] realloc ! CHECK-NEXT: } -! RUN: %flang -c -emit-llvm -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang -c -emit-llvm -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %t/test_compilation_to_obj.f90 | \ ! RUN: llvm-dis 2>&1 |\ ! RUN: FileCheck %s -check-prefix=LLVM diff --git a/flang/test/Lower/OpenMP/delayed-privatization-allocatable-private.f90 b/flang/test/Lower/OpenMP/delayed-privatization-allocatable-private.f90 index 4ce66f52110e0..67cfb864bc8f3 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-allocatable-private.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-allocatable-private.f90 @@ -1,8 +1,8 @@ ! Test delayed privatization for allocatables: `private`. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 |\ ! RUN: FileCheck %s subroutine delayed_privatization_allocatable diff --git a/flang/test/Lower/OpenMP/delayed-privatization-array.f90 b/flang/test/Lower/OpenMP/delayed-privatization-array.f90 index c447fa6f27a75..9aaf75f66dbbb 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-array.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-array.f90 @@ -2,19 +2,19 @@ ! RUN: split-file %s %t -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %t/one_dim_array.f90 2>&1 | FileCheck %s --check-prefix=ONE_DIM -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - \ ! RUN: %t/one_dim_array.f90 2>&1 | FileCheck %s --check-prefix=ONE_DIM -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %t/two_dim_array.f90 2>&1 | FileCheck %s --check-prefix=TWO_DIM -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - \ ! RUN: %t/two_dim_array.f90 2>&1 | FileCheck %s --check-prefix=TWO_DIM -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %t/one_dim_array_default_lb.f90 2>&1 | FileCheck %s --check-prefix=ONE_DIM_DEFAULT_LB -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - \ ! RUN: %t/one_dim_array_default_lb.f90 2>&1 | FileCheck %s --check-prefix=ONE_DIM_DEFAULT_LB !--- one_dim_array.f90 diff --git a/flang/test/Lower/OpenMP/delayed-privatization-character-array.f90 b/flang/test/Lower/OpenMP/delayed-privatization-character-array.f90 index 4c7287283c7ad..383b033d772aa 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-character-array.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-character-array.f90 @@ -2,14 +2,14 @@ ! RUN: split-file %s %t -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %t/static_len.f90 2>&1 | FileCheck %s --check-prefix=STATIC_LEN -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/static_len.f90 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %t/static_len.f90 2>&1 \ ! RUN: | FileCheck %s --check-prefix=STATIC_LEN -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %t/dyn_len.f90 2>&1 | FileCheck %s --check-prefix=DYN_LEN -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/dyn_len.f90 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %t/dyn_len.f90 2>&1 \ ! RUN: | FileCheck %s --check-prefix=DYN_LEN !--- static_len.f90 diff --git a/flang/test/Lower/OpenMP/delayed-privatization-character.f90 b/flang/test/Lower/OpenMP/delayed-privatization-character.f90 index 3d1a312963371..d0f7ef6f2cd0c 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-character.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-character.f90 @@ -2,14 +2,14 @@ ! RUN: split-file %s %t -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %t/dyn_len.f90 2>&1 | FileCheck %s --check-prefix=DYN_LEN -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/dyn_len.f90 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %t/dyn_len.f90 2>&1 \ ! RUN: | FileCheck %s --check-prefix=DYN_LEN -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %t/static_len.f90 2>&1 | FileCheck %s --check-prefix=STATIC_LEN -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/static_len.f90 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %t/static_len.f90 2>&1 \ ! RUN: | FileCheck %s --check-prefix=STATIC_LEN !--- dyn_len.f90 diff --git a/flang/test/Lower/OpenMP/delayed-privatization-default-init.f90 b/flang/test/Lower/OpenMP/delayed-privatization-default-init.f90 index 87d4605217a8a..cb17e4cd6afc1 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-default-init.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-default-init.f90 @@ -1,8 +1,8 @@ ! Test delayed privatization for derived types with default initialization. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 |\ ! RUN: FileCheck %s subroutine delayed_privatization_default_init diff --git a/flang/test/Lower/OpenMP/delayed-privatization-firstprivate.f90 b/flang/test/Lower/OpenMP/delayed-privatization-firstprivate.f90 index 904ea783ad5b4..3f80b5e1bd209 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-firstprivate.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-firstprivate.f90 @@ -1,8 +1,8 @@ ! Test delayed privatization for the `firstprivate` clause. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 \ ! RUN: | FileCheck %s subroutine delayed_privatization_firstprivate diff --git a/flang/test/Lower/OpenMP/delayed-privatization-lower-allocatable-to-llvm.f90 b/flang/test/Lower/OpenMP/delayed-privatization-lower-allocatable-to-llvm.f90 index ac9a6d8746cf2..effc356590e9a 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-lower-allocatable-to-llvm.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-lower-allocatable-to-llvm.f90 @@ -1,7 +1,7 @@ ! Tests the OMPIRBuilder can handle multiple privatization regions that contain ! multiple BBs (for example, for allocatables). -! RUN: %flang -S -emit-llvm -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang -S -emit-llvm -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %s 2>&1 | FileCheck %s subroutine foo(x) diff --git a/flang/test/Lower/OpenMP/delayed-privatization-pointer.f90 b/flang/test/Lower/OpenMP/delayed-privatization-pointer.f90 index f39ac9199e8bd..38ead806199c1 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-pointer.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-pointer.f90 @@ -1,8 +1,8 @@ ! Test delayed privatization for pointers: `private`. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 |\ ! RUN: FileCheck %s subroutine delayed_privatization_pointer diff --git a/flang/test/Lower/OpenMP/delayed-privatization-private-firstprivate.f90 b/flang/test/Lower/OpenMP/delayed-privatization-private-firstprivate.f90 index d961210dcbc38..ad53703d3122e 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-private-firstprivate.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-private-firstprivate.f90 @@ -1,8 +1,8 @@ ! Test delayed privatization for both `private` and `firstprivate` clauses. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 \ ! RUN: | FileCheck %s subroutine delayed_privatization_private_firstprivate diff --git a/flang/test/Lower/OpenMP/delayed-privatization-private.f90 b/flang/test/Lower/OpenMP/delayed-privatization-private.f90 index 69c362e4828bf..84d6caedf5010 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-private.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-private.f90 @@ -1,8 +1,8 @@ ! Test delayed privatization for the `private` clause. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 \ ! RUN: | FileCheck %s subroutine delayed_privatization_private diff --git a/flang/test/Lower/OpenMP/delayed-privatization-reduction-byref.f90 b/flang/test/Lower/OpenMP/delayed-privatization-reduction-byref.f90 index f463f2b4630ae..4b6a643f94059 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-reduction-byref.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-reduction-byref.f90 @@ -3,7 +3,7 @@ ! that the block arguments are added in the proper order (reductions first and ! then delayed privatization. -! RUN: bbc -emit-hlfir -fopenmp --force-byref-reduction --openmp-enable-delayed-privatization -o - %s 2>&1 | FileCheck %s +! RUN: bbc -emit-hlfir -fopenmp --force-byref-reduction --enable-delayed-privatization -o - %s 2>&1 | FileCheck %s subroutine red_and_delayed_private integer :: red diff --git a/flang/test/Lower/OpenMP/delayed-privatization-reduction.f90 b/flang/test/Lower/OpenMP/delayed-privatization-reduction.f90 index a1ddbc30d6e46..f8f78b0531091 100644 --- a/flang/test/Lower/OpenMP/delayed-privatization-reduction.f90 +++ b/flang/test/Lower/OpenMP/delayed-privatization-reduction.f90 @@ -3,9 +3,9 @@ ! that the block arguments are added in the proper order (reductions first and ! then delayed privatization. -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \ +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \ ! RUN: -o - %s 2>&1 | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \ +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 \ ! RUN: | FileCheck %s subroutine red_and_delayed_private diff --git a/flang/test/Lower/OpenMP/different_vars_lastprivate_barrier.f90 b/flang/test/Lower/OpenMP/different_vars_lastprivate_barrier.f90 index b74e083925aba..5bf634c86652b 100644 --- a/flang/test/Lower/OpenMP/different_vars_lastprivate_barrier.f90 +++ b/flang/test/Lower/OpenMP/different_vars_lastprivate_barrier.f90 @@ -1,4 +1,4 @@ -! RUN: %flang_fc1 -fopenmp -mmlir --openmp-enable-delayed-privatization-staging=true -emit-hlfir %s -o - | FileCheck %s +! RUN: %flang_fc1 -fopenmp -mmlir --enable-delayed-privatization-staging=true -emit-hlfir %s -o - | FileCheck %s subroutine first_and_lastprivate(var) integer i diff --git a/flang/test/Lower/OpenMP/firstprivate-commonblock.f90 b/flang/test/Lower/OpenMP/firstprivate-commonblock.f90 index 315e1b7745a6f..1b029c193b7b6 100644 --- a/flang/test/Lower/OpenMP/firstprivate-commonblock.f90 +++ b/flang/test/Lower/OpenMP/firstprivate-commonblock.f90 @@ -1,5 +1,5 @@ ! RUN: %flang_fc1 -emit-hlfir -fopenmp \ -! RUN: -mmlir --openmp-enable-delayed-privatization=true -o - %s 2>&1 \ +! RUN: -mmlir --enable-delayed-privatization=true -o - %s 2>&1 \ ! RUN: | FileCheck %s !CHECK: func.func @_QPfirstprivate_common() { diff --git a/flang/test/Lower/OpenMP/private-commonblock.f90 b/flang/test/Lower/OpenMP/private-commonblock.f90 index 009b086a0c7fd..8f5f641dea325 100644 --- a/flang/test/Lower/OpenMP/private-commonblock.f90 +++ b/flang/test/Lower/OpenMP/private-commonblock.f90 @@ -1,5 +1,5 @@ ! RUN: %flang_fc1 -emit-hlfir -fopenmp \ -! RUN: -mmlir --openmp-enable-delayed-privatization=true -o - %s 2>&1 \ +! RUN: -mmlir --enable-delayed-privatization=true -o - %s 2>&1 \ ! RUN: | FileCheck %s !CHECK: func.func @_QPprivate_common() { diff --git a/flang/test/Lower/OpenMP/private-derived-type.f90 b/flang/test/Lower/OpenMP/private-derived-type.f90 index cb51c2b34b424..3947a0d68b58c 100644 --- a/flang/test/Lower/OpenMP/private-derived-type.f90 +++ b/flang/test/Lower/OpenMP/private-derived-type.f90 @@ -1,5 +1,5 @@ -! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization-staging=true -o - %s | FileCheck %s -! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization-staging=true -o - %s | FileCheck %s +! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization-staging=true -o - %s | FileCheck %s +! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization-staging=true -o - %s | FileCheck %s subroutine s4 type y3 diff --git a/flang/test/Lower/OpenMP/same_var_first_lastprivate.f90 b/flang/test/Lower/OpenMP/same_var_first_lastprivate.f90 index 45d6f91f67f1f..14d860c30f6f2 100644 --- a/flang/test/Lower/OpenMP/same_var_first_lastprivate.f90 +++ b/flang/test/Lower/OpenMP/same_var_first_lastprivate.f90 @@ -1,4 +1,4 @@ -! RUN: %flang_fc1 -fopenmp -mmlir --openmp-enable-delayed-privatization-staging=true -emit-hlfir %s -o - | FileCheck %s +! RUN: %flang_fc1 -fopenmp -mmlir --enable-delayed-privatization-staging=true -emit-hlfir %s -o - | FileCheck %s subroutine first_and_lastprivate integer i diff --git a/flang/test/Lower/do_concurrent_delayed_locality.f90 b/flang/test/Lower/do_concurrent_delayed_locality.f90 index 9b234087ed4be..6cae0eb46db13 100644 --- a/flang/test/Lower/do_concurrent_delayed_locality.f90 +++ b/flang/test/Lower/do_concurrent_delayed_locality.f90 @@ -1,4 +1,4 @@ -! RUN: %flang_fc1 -emit-hlfir -mmlir --openmp-enable-delayed-privatization-staging=true -o - %s | FileCheck %s +! RUN: %flang_fc1 -emit-hlfir -mmlir --enable-delayed-privatization-staging=true -o - %s | FileCheck %s subroutine do_concurrent_with_locality_specs implicit none _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
