[flang-commits] [flang] [clang] [flang][driver] add -flang-deprecated-no-hlfir hidden option (PR #71820)
via flang-commits
flang-commits at lists.llvm.org
Thu Nov 9 10:18:41 PST 2023
https://github.com/jeanPerier updated https://github.com/llvm/llvm-project/pull/71820
>From bf7d4afdde4cae23f28bd8725f9a09b7141b7ed1 Mon Sep 17 00:00:00 2001
From: Jean Perier <jperier at nvidia.com>
Date: Thu, 9 Nov 2023 03:11:31 -0800
Subject: [PATCH 1/2] [flang][driver] add -flang-deprecated-no-hlfir hidden
option
Patch 1/3 of the transition step 1 to HLFIR enabled by default described
in https://discourse.llvm.org/t/rfc-enabling-the-hlfir-lowering-by-default/72778/7
This option will allow to use the lowering without the HLFIR step during
a grace period until. It is not meant to be a long term switch for
flang.
---
clang/include/clang/Driver/Options.td | 4 ++++
clang/lib/Driver/ToolChains/Flang.cpp | 1 +
flang/lib/Frontend/CompilerInvocation.cpp | 6 ++++++
flang/test/Driver/driver-help-hidden.f90 | 2 ++
flang/test/HLFIR/hlfir-flags.f90 | 1 +
5 files changed, 14 insertions(+)
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
index 7d933aabd16d7fa..11d231be7f1ee60 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -6210,6 +6210,10 @@ def flang_experimental_hlfir : Flag<["-"], "flang-experimental-hlfir">,
Flags<[HelpHidden]>, Visibility<[FlangOption, FC1Option]>,
HelpText<"Use HLFIR lowering (experimental)">;
+def flang_deprecated_no_hlfir : Flag<["-"], "flang-deprecated-no-hlfir">,
+ Flags<[HelpHidden]>, Visibility<[FlangOption, FC1Option]>,
+ HelpText<"Do not use HLFIR lowering (deprecated)">;
+
def flang_experimental_polymorphism : Flag<["-"], "flang-experimental-polymorphism">,
Flags<[HelpHidden]>, Visibility<[FlangOption, FC1Option]>,
HelpText<"Enable Fortran 2003 polymorphism (experimental)">;
diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp
index 999039f83ddfb92..ce0f7e4da006d5f 100644
--- a/clang/lib/Driver/ToolChains/Flang.cpp
+++ b/clang/lib/Driver/ToolChains/Flang.cpp
@@ -143,6 +143,7 @@ void Flang::addCodegenOptions(const ArgList &Args,
CmdArgs.push_back("-fversion-loops-for-stride");
Args.addAllArgs(CmdArgs, {options::OPT_flang_experimental_hlfir,
+ options::OPT_flang_deprecated_no_hlfir,
options::OPT_flang_experimental_polymorphism,
options::OPT_fno_ppc_native_vec_elem_order,
options::OPT_fppc_native_vec_elem_order,
diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp
index ba2ecab3742587a..a1d71da76634c71 100644
--- a/flang/lib/Frontend/CompilerInvocation.cpp
+++ b/flang/lib/Frontend/CompilerInvocation.cpp
@@ -1073,6 +1073,12 @@ bool CompilerInvocation::createFromArgs(
res.loweringOpts.setLowerToHighLevelFIR(true);
}
+ // -flang-deprecated-no-hlfir
+ if (args.hasArg(clang::driver::options::OPT_flang_deprecated_no_hlfir) &&
+ !args.hasArg(clang::driver::options::OPT_emit_hlfir)) {
+ res.loweringOpts.setLowerToHighLevelFIR(false);
+ }
+
if (args.hasArg(clang::driver::options::OPT_flang_experimental_polymorphism)) {
res.loweringOpts.setPolymorphicTypeImpl(true);
}
diff --git a/flang/test/Driver/driver-help-hidden.f90 b/flang/test/Driver/driver-help-hidden.f90
index 6d399f1d179a022..5e0e459c21c93e2 100644
--- a/flang/test/Driver/driver-help-hidden.f90
+++ b/flang/test/Driver/driver-help-hidden.f90
@@ -49,6 +49,8 @@
! CHECK-NEXT: -fintegrated-as Enable the integrated assembler
! CHECK-NEXT: -fintrinsic-modules-path <dir>
! CHECK-NEXT: Specify where to find the compiled intrinsic modules
+! CHECK-NEXT: -flang-deprecated-no-hlfir
+! CHECK-NEXT: Do not use HLFIR lowering (deprecated)
! CHECK-NEXT: -flang-experimental-hlfir
! CHECK-NEXT: Use HLFIR lowering (experimental)
! CHECK-NEXT: -flang-experimental-polymorphism
diff --git a/flang/test/HLFIR/hlfir-flags.f90 b/flang/test/HLFIR/hlfir-flags.f90
index ccd6184e0265266..8ba9b21562a60ce 100644
--- a/flang/test/HLFIR/hlfir-flags.f90
+++ b/flang/test/HLFIR/hlfir-flags.f90
@@ -4,6 +4,7 @@
! RUN: %flang_fc1 -emit-hlfir -flang-experimental-hlfir -o - %s | FileCheck --check-prefix HLFIR --check-prefix ALL %s
! RUN: bbc -emit-hlfir -hlfir -o - %s | FileCheck --check-prefix HLFIR --check-prefix ALL %s
! RUN: %flang_fc1 -emit-fir -o - %s | FileCheck %s --check-prefix NO-HLFIR --check-prefix ALL
+! RUN: %flang_fc1 -emit-fir -flang-deprecated-no-hlfir -o - %s | FileCheck %s --check-prefix NO-HLFIR --check-prefix ALL
! RUN: bbc -emit-fir -o - %s | FileCheck %s --check-prefix NO-HLFIR --check-prefix ALL
! RUN: %flang_fc1 -emit-fir -flang-experimental-hlfir -o - %s | FileCheck --check-prefix FIR --check-prefix ALL %s
! RUN: bbc -emit-fir -hlfir -o - %s | FileCheck --check-prefix FIR --check-prefix ALL %s
>From 2ab03f8ce378cf5e9992fcf5e37e8b773cee8919 Mon Sep 17 00:00:00 2001
From: Jean Perier <jperier at nvidia.com>
Date: Thu, 9 Nov 2023 10:13:15 -0800
Subject: [PATCH 2/2] update frontend-forwarding.f90 and add conflicting opts
error
---
flang/lib/Frontend/CompilerInvocation.cpp | 7 +++++++
flang/test/Driver/frontend-forwarding.f90 | 2 ++
flang/test/Driver/hlfir-no-hlfir-error.f90 | 16 ++++++++++++++++
3 files changed, 25 insertions(+)
create mode 100644 flang/test/Driver/hlfir-no-hlfir-error.f90
diff --git a/flang/lib/Frontend/CompilerInvocation.cpp b/flang/lib/Frontend/CompilerInvocation.cpp
index a1d71da76634c71..3fef3771ed0da0d 100644
--- a/flang/lib/Frontend/CompilerInvocation.cpp
+++ b/flang/lib/Frontend/CompilerInvocation.cpp
@@ -1076,6 +1076,13 @@ bool CompilerInvocation::createFromArgs(
// -flang-deprecated-no-hlfir
if (args.hasArg(clang::driver::options::OPT_flang_deprecated_no_hlfir) &&
!args.hasArg(clang::driver::options::OPT_emit_hlfir)) {
+ if (args.hasArg(clang::driver::options::OPT_flang_experimental_hlfir)) {
+ const unsigned diagID = diags.getCustomDiagID(
+ clang::DiagnosticsEngine::Error,
+ "Options '-flang-experimental-hlfir' and "
+ "'-flang-deprecated-no-hlfir' cannot be both specified");
+ diags.Report(diagID);
+ }
res.loweringOpts.setLowerToHighLevelFIR(false);
}
diff --git a/flang/test/Driver/frontend-forwarding.f90 b/flang/test/Driver/frontend-forwarding.f90
index 520f4898feb0a6b..20455791c9ff4d6 100644
--- a/flang/test/Driver/frontend-forwarding.f90
+++ b/flang/test/Driver/frontend-forwarding.f90
@@ -18,6 +18,7 @@
! RUN: -fversion-loops-for-stride \
! RUN: -flang-experimental-polymorphism \
! RUN: -flang-experimental-hlfir \
+! RUN: -flang-deprecated-no-hlfir \
! RUN: -fno-ppc-native-vector-element-order \
! RUN: -fppc-native-vector-element-order \
! RUN: -mllvm -print-before-all \
@@ -49,6 +50,7 @@
! CHECK: "-fversion-loops-for-stride"
! CHECK: "-flang-experimental-polymorphism"
! CHECK: "-flang-experimental-hlfir"
+! CHECK: "-flang-deprecated-no-hlfir"
! CHECK: "-fno-ppc-native-vector-element-order"
! CHECK: "-fppc-native-vector-element-order"
! CHECK: "-Rpass"
diff --git a/flang/test/Driver/hlfir-no-hlfir-error.f90 b/flang/test/Driver/hlfir-no-hlfir-error.f90
new file mode 100644
index 000000000000000..2410393b6cd9c1a
--- /dev/null
+++ b/flang/test/Driver/hlfir-no-hlfir-error.f90
@@ -0,0 +1,16 @@
+! Test that -flang-experimental-hlfir and -flang-deprecated-no-hlfir
+! options cannot be both used.
+
+!--------------------------
+! FLANG DRIVER (flang-new)
+!--------------------------
+! RUN: not %flang -flang-experimental-hlfir -flang-deprecated-no-hlfir %s 2>&1 | FileCheck %s
+
+!-----------------------------------------
+! FRONTEND FLANG DRIVER (flang-new -fc1)
+!-----------------------------------------
+! RUN: not %flang_fc1 -emit-llvm -flang-experimental-hlfir -flang-deprecated-no-hlfir %s 2>&1 | FileCheck %s
+
+! CHECK:error: Options '-flang-experimental-hlfir' and '-flang-deprecated-no-hlfir' cannot be both specified
+
+end
More information about the flang-commits
mailing list