Skip to content

Commit 7e9887a

Browse files
ergawyergawy
authored
[flang] Generlize names of delayed privatization CLI flags (#138816)
Remove the `openmp` prefix from delayed privatization/localization flags since they are now used for `do concurrent` as well. PR stack: - #137928 - #138505 - #138506 - #138512 - #138534 - #138816 (this PR)
1 parent 9ea4924 commit 7e9887a

35 files changed

+96
-71
lines changed

‎flang/include/flang/Support/Flags.h

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
//===-- include/flang/Support/Flags.h ---------------------------*- C++ -*-===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#ifndef FORTRAN_SUPPORT_FLAGS_H_
10+
#define FORTRAN_SUPPORT_FLAGS_H_
11+
12+
#include "llvm/Support/CommandLine.h"
13+
14+
extern llvm::cl::opt<bool> enableDelayedPrivatization;
15+
extern llvm::cl::opt<bool> enableDelayedPrivatizationStaging;
16+
17+
#endif // FORTRAN_SUPPORT_FLAGS_H_

‎flang/lib/Lower/Bridge.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "flang/Lower/Bridge.h"
1414

1515
#include "OpenMP/DataSharingProcessor.h"
16-
#include "OpenMP/Utils.h"
1716
#include "flang/Lower/Allocatable.h"
1817
#include "flang/Lower/CallInterface.h"
1918
#include "flang/Lower/Coarray.h"
@@ -63,6 +62,7 @@
6362
#include "flang/Semantics/runtime-type-info.h"
6463
#include "flang/Semantics/symbol.h"
6564
#include "flang/Semantics/tools.h"
65+
#include "flang/Support/Flags.h"
6666
#include "flang/Support/Version.h"
6767
#include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"
6868
#include "mlir/IR/BuiltinAttributes.h"

‎flang/lib/Lower/OpenMP/OpenMP.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include "flang/Parser/parse-tree.h"
3535
#include "flang/Semantics/openmp-directive-sets.h"
3636
#include "flang/Semantics/tools.h"
37+
#include "flang/Support/Flags.h"
3738
#include "flang/Support/OpenMP-utils.h"
3839
#include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"
3940
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"

‎flang/lib/Lower/OpenMP/Utils.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,6 @@ llvm::cl::opt<bool> treatIndexAsSection(
3333
llvm::cl::desc("In the OpenMP data clauses treat `a(N)` as `a(N:N)`."),
3434
llvm::cl::init(true));
3535

36-
llvm::cl::opt<bool> enableDelayedPrivatization(
37-
"openmp-enable-delayed-privatization",
38-
llvm::cl::desc(
39-
"Emit `[first]private` variables as clauses on the MLIR ops."),
40-
llvm::cl::init(true));
41-
42-
llvm::cl::opt<bool> enableDelayedPrivatizationStaging(
43-
"openmp-enable-delayed-privatization-staging",
44-
llvm::cl::desc("For partially supported constructs, emit `[first]private` "
45-
"variables as clauses on the MLIR ops."),
46-
llvm::cl::init(false));
47-
4836
namespace Fortran {
4937
namespace lower {
5038
namespace omp {

‎flang/lib/Lower/OpenMP/Utils.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
#include <cstdint>
1818

1919
extern llvm::cl::opt<bool> treatIndexAsSection;
20-
extern llvm::cl::opt<bool> enableDelayedPrivatization;
21-
extern llvm::cl::opt<bool> enableDelayedPrivatizationStaging;
2220

2321
namespace fir {
2422
class FirOpBuilder;

‎flang/lib/Support/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ endif()
4444

4545
add_flang_library(FortranSupport
4646
default-kinds.cpp
47+
Flags.cpp
4748
Fortran.cpp
4849
Fortran-features.cpp
4950
idioms.cpp

‎flang/lib/Support/Flags.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//===-- lib/Support/Flags.cpp ---------------------------------*- C++ -*-===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
#include "flang/Support/Flags.h"
10+
11+
llvm::cl::opt<bool> enableDelayedPrivatization("enable-delayed-privatization",
12+
llvm::cl::desc(
13+
"Emit private/local variables as clauses/specifiers on MLIR ops."),
14+
llvm::cl::init(true));
15+
16+
llvm::cl::opt<bool> enableDelayedPrivatizationStaging(
17+
"enable-delayed-privatization-staging",
18+
llvm::cl::desc("For partially supported constructs, emit private/local "
19+
"variables as clauses/specifiers on MLIR ops."),
20+
llvm::cl::init(false));

‎flang/test/Lower/OpenMP/DelayedPrivatization/distribute-standalone-private.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization-staging \
1+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization-staging \
22
! RUN: -o - %s 2>&1 | FileCheck %s
3-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization-staging -o - %s 2>&1 \
3+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization-staging -o - %s 2>&1 \
44
! RUN: | FileCheck %s
55

66
subroutine standalone_distribute

‎flang/test/Lower/OpenMP/DelayedPrivatization/equivalence.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Test delayed privatization for variables that are storage associated via `EQUIVALENCE`.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 \
66
! RUN: | FileCheck %s
77

88
subroutine private_common

‎flang/test/Lower/OpenMP/DelayedPrivatization/target-private-allocatable.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Tests delayed privatization for `targets ... private(..)` for allocatables.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization-staging \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization-staging \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization-staging -o - %s 2>&1 \
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization-staging -o - %s 2>&1 \
66
! RUN: | FileCheck %s
77

88
subroutine target_allocatable

‎flang/test/Lower/OpenMP/DelayedPrivatization/target-private-multiple-variables.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Tests delayed privatization for `targets ... private(..)` for allocatables.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization-staging \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization-staging \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization-staging -o - %s 2>&1 \
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization-staging -o - %s 2>&1 \
66
! RUN: | FileCheck %s
77

88
subroutine target_allocatable(lb, ub, l)

‎flang/test/Lower/OpenMP/DelayedPrivatization/target-private-simple.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Tests delayed privatization for `targets ... private(..)` for simple variables.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization-staging \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization-staging \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization-staging -o - %s 2>&1 \
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization-staging -o - %s 2>&1 \
66
! RUN: | FileCheck %s
77

88
subroutine target_simple

‎flang/test/Lower/OpenMP/allocatable-multiple-vars.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
! Test early privatization for multiple allocatable variables.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization=false \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization=false \
44
! RUN: -o - %s 2>&1 | FileCheck %s
55

6-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization=false -o - %s 2>&1 |\
6+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization=false -o - %s 2>&1 |\
77
! RUN: FileCheck %s
88

99
subroutine delayed_privatization_allocatable

‎flang/test/Lower/OpenMP/cfg-conversion-omp.private.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
! RUN: split-file %s %t && cd %t
44

5-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
5+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
66
! RUN: -o - test.f90 2>&1 | \
77
! RUN: fir-opt --cfg-conversion -o test.cfg-conv.mlir
88
! RUN: FileCheck --input-file=test.cfg-conv.mlir %s --check-prefix="CFGConv"

‎flang/test/Lower/OpenMP/debug_info_conflict.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
! Tests that there no debug-info conflicts arise because of DI attached to nested
22
! OMP regions arguments.
33

4-
! RUN: %flang -c -fopenmp -g -mmlir --openmp-enable-delayed-privatization=true \
4+
! RUN: %flang -c -fopenmp -g -mmlir --enable-delayed-privatization=true \
55
! RUN: %s -o - 2>&1 | FileCheck %s
66

77
subroutine bar (b)

‎flang/test/Lower/OpenMP/delayed-privatization-allocatable-array.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Test delayed privatization for allocatable arrays.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 |\
66
! RUN: FileCheck %s
77

88
subroutine delayed_privatization_private(var1, l1)

‎flang/test/Lower/OpenMP/delayed-privatization-allocatable-firstprivate.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
! RUN: split-file %s %t
44

5-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
5+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
66
! RUN: -o - %t/test_ir.f90 2>&1 | FileCheck %s
7-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/test_ir.f90 2>&1 |\
7+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %t/test_ir.f90 2>&1 |\
88
! RUN: FileCheck %s
99

1010
!--- test_ir.f90
@@ -38,7 +38,7 @@ subroutine delayed_privatization_allocatable
3838
! CHECK-NEXT: hlfir.assign %[[ORIG_BASE_LD]] to %[[PRIV_PRIV_ARG]] realloc
3939
! CHECK-NEXT: }
4040

41-
! RUN: %flang -c -emit-llvm -fopenmp -mmlir --openmp-enable-delayed-privatization \
41+
! RUN: %flang -c -emit-llvm -fopenmp -mmlir --enable-delayed-privatization \
4242
! RUN: -o - %t/test_compilation_to_obj.f90 | \
4343
! RUN: llvm-dis 2>&1 |\
4444
! RUN: FileCheck %s -check-prefix=LLVM

‎flang/test/Lower/OpenMP/delayed-privatization-allocatable-private.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Test delayed privatization for allocatables: `private`.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 |\
66
! RUN: FileCheck %s
77

88
subroutine delayed_privatization_allocatable

‎flang/test/Lower/OpenMP/delayed-privatization-array.f90

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
! RUN: split-file %s %t
44

5-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
5+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
66
! RUN: -o - %t/one_dim_array.f90 2>&1 | FileCheck %s --check-prefix=ONE_DIM
7-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - \
7+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - \
88
! RUN: %t/one_dim_array.f90 2>&1 | FileCheck %s --check-prefix=ONE_DIM
99

10-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
10+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
1111
! RUN: -o - %t/two_dim_array.f90 2>&1 | FileCheck %s --check-prefix=TWO_DIM
12-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - \
12+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - \
1313
! RUN: %t/two_dim_array.f90 2>&1 | FileCheck %s --check-prefix=TWO_DIM
1414

15-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
15+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
1616
! RUN: -o - %t/one_dim_array_default_lb.f90 2>&1 | FileCheck %s --check-prefix=ONE_DIM_DEFAULT_LB
17-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - \
17+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - \
1818
! RUN: %t/one_dim_array_default_lb.f90 2>&1 | FileCheck %s --check-prefix=ONE_DIM_DEFAULT_LB
1919

2020
!--- one_dim_array.f90

‎flang/test/Lower/OpenMP/delayed-privatization-character-array.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
! RUN: split-file %s %t
44

5-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
5+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
66
! RUN: -o - %t/static_len.f90 2>&1 | FileCheck %s --check-prefix=STATIC_LEN
7-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/static_len.f90 2>&1 \
7+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %t/static_len.f90 2>&1 \
88
! RUN: | FileCheck %s --check-prefix=STATIC_LEN
99

10-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
10+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
1111
! RUN: -o - %t/dyn_len.f90 2>&1 | FileCheck %s --check-prefix=DYN_LEN
12-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/dyn_len.f90 2>&1 \
12+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %t/dyn_len.f90 2>&1 \
1313
! RUN: | FileCheck %s --check-prefix=DYN_LEN
1414

1515
!--- static_len.f90

‎flang/test/Lower/OpenMP/delayed-privatization-character.f90

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
! RUN: split-file %s %t
44

5-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
5+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
66
! RUN: -o - %t/dyn_len.f90 2>&1 | FileCheck %s --check-prefix=DYN_LEN
7-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/dyn_len.f90 2>&1 \
7+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %t/dyn_len.f90 2>&1 \
88
! RUN: | FileCheck %s --check-prefix=DYN_LEN
99

10-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
10+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
1111
! RUN: -o - %t/static_len.f90 2>&1 | FileCheck %s --check-prefix=STATIC_LEN
12-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %t/static_len.f90 2>&1 \
12+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %t/static_len.f90 2>&1 \
1313
! RUN: | FileCheck %s --check-prefix=STATIC_LEN
1414

1515
!--- dyn_len.f90

‎flang/test/Lower/OpenMP/delayed-privatization-default-init.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Test delayed privatization for derived types with default initialization.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 |\
66
! RUN: FileCheck %s
77

88
subroutine delayed_privatization_default_init

‎flang/test/Lower/OpenMP/delayed-privatization-firstprivate.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Test delayed privatization for the `firstprivate` clause.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 \
66
! RUN: | FileCheck %s
77

88
subroutine delayed_privatization_firstprivate

‎flang/test/Lower/OpenMP/delayed-privatization-lower-allocatable-to-llvm.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
! Tests the OMPIRBuilder can handle multiple privatization regions that contain
22
! multiple BBs (for example, for allocatables).
33

4-
! RUN: %flang -S -emit-llvm -fopenmp -mmlir --openmp-enable-delayed-privatization \
4+
! RUN: %flang -S -emit-llvm -fopenmp -mmlir --enable-delayed-privatization \
55
! RUN: -o - %s 2>&1 | FileCheck %s
66

77
subroutine foo(x)

‎flang/test/Lower/OpenMP/delayed-privatization-pointer.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Test delayed privatization for pointers: `private`.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 |\
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 |\
66
! RUN: FileCheck %s
77

88
subroutine delayed_privatization_pointer

‎flang/test/Lower/OpenMP/delayed-privatization-private-firstprivate.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Test delayed privatization for both `private` and `firstprivate` clauses.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 \
66
! RUN: | FileCheck %s
77

88
subroutine delayed_privatization_private_firstprivate

‎flang/test/Lower/OpenMP/delayed-privatization-private.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
! Test delayed privatization for the `private` clause.
22

3-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
3+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
44
! RUN: -o - %s 2>&1 | FileCheck %s
5-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \
5+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 \
66
! RUN: | FileCheck %s
77

88
subroutine delayed_privatization_private

‎flang/test/Lower/OpenMP/delayed-privatization-reduction-byref.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
! that the block arguments are added in the proper order (reductions first and
44
! then delayed privatization.
55

6-
! RUN: bbc -emit-hlfir -fopenmp --force-byref-reduction --openmp-enable-delayed-privatization -o - %s 2>&1 | FileCheck %s
6+
! RUN: bbc -emit-hlfir -fopenmp --force-byref-reduction --enable-delayed-privatization -o - %s 2>&1 | FileCheck %s
77

88
subroutine red_and_delayed_private
99
integer :: red

‎flang/test/Lower/OpenMP/delayed-privatization-reduction.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
! that the block arguments are added in the proper order (reductions first and
44
! then delayed privatization.
55

6-
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --openmp-enable-delayed-privatization \
6+
! RUN: %flang_fc1 -emit-hlfir -fopenmp -mmlir --enable-delayed-privatization \
77
! RUN: -o - %s 2>&1 | FileCheck %s
8-
! RUN: bbc -emit-hlfir -fopenmp --openmp-enable-delayed-privatization -o - %s 2>&1 \
8+
! RUN: bbc -emit-hlfir -fopenmp --enable-delayed-privatization -o - %s 2>&1 \
99
! RUN: | FileCheck %s
1010

1111
subroutine red_and_delayed_private

‎flang/test/Lower/OpenMP/different_vars_lastprivate_barrier.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
! RUN: %flang_fc1 -fopenmp -mmlir --openmp-enable-delayed-privatization-staging=true -emit-hlfir %s -o - | FileCheck %s
1+
! RUN: %flang_fc1 -fopenmp -mmlir --enable-delayed-privatization-staging=true -emit-hlfir %s -o - | FileCheck %s
22

33
subroutine first_and_lastprivate(var)
44
integer i

‎flang/test/Lower/OpenMP/firstprivate-commonblock.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
! RUN: %flang_fc1 -emit-hlfir -fopenmp \
2-
! RUN: -mmlir --openmp-enable-delayed-privatization=true -o - %s 2>&1 \
2+
! RUN: -mmlir --enable-delayed-privatization=true -o - %s 2>&1 \
33
! RUN: | FileCheck %s
44

55
!CHECK: func.func @_QPfirstprivate_common() {

‎flang/test/Lower/OpenMP/private-commonblock.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
! RUN: %flang_fc1 -emit-hlfir -fopenmp \
2-
! RUN: -mmlir --openmp-enable-delayed-privatization=true -o - %s 2>&1 \
2+
! RUN: -mmlir --enable-delayed-privatization=true -o - %s 2>&1 \
33
! RUN: | FileCheck %s
44

55
!CHECK: func.func @_QPprivate_common() {

0 commit comments

Comments
 (0)