https://github.com/kiranchandramohan updated
https://github.com/llvm/llvm-project/pull/101701
>From b33ae618fafdad93660eb31368a462e728a2cff9 Mon Sep 17 00:00:00 2001
From: Kiran Chandramohan <kiran.chandramo...@arm.com>
Date: Fri, 19 Jul 2024 12:46:08 +0000
Subject: [PATCH 1/2] [Flang][Driver] Deprecate Ofast
---
clang/include/clang/Basic/DiagnosticDriverKinds.td | 4 ++++
clang/include/clang/Driver/Options.td | 7 +++++--
clang/lib/Driver/ToolChains/Flang.cpp | 1 +
flang/test/Driver/fast-math.f90 | 5 +++++
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td
b/clang/include/clang/Basic/DiagnosticDriverKinds.td
index 42c39ac6606c7f..7408d58cdb7722 100644
--- a/clang/include/clang/Basic/DiagnosticDriverKinds.td
+++ b/clang/include/clang/Basic/DiagnosticDriverKinds.td
@@ -452,6 +452,10 @@ def warn_drv_deprecated_arg_ofast : Warning<
"argument '-Ofast' is deprecated; use '-O3 -ffast-math' for the same
behavior,"
" or '-O3' to enable only conforming optimizations">,
InGroup<DeprecatedOFast>;
+def warn_drv_deprecated_arg_ofast_for_flang : Warning<
+ "argument '-Ofast' is deprecated; use '-O3 -ffast-math -fstack-arrays' for
the same behavior,"
+ " or '-O3 -fstack-arrays' to enable only conforming optimizations">,
+ InGroup<DeprecatedOFast>;
def warn_drv_deprecated_custom : Warning<
"argument '%0' is deprecated, %1">, InGroup<Deprecated>;
def warn_drv_assuming_mfloat_abi_is : Warning<
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index 2721c1b5d8dc55..2106581a86c1ee 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -933,10 +933,13 @@ def O : Joined<["-"], "O">, Group<O_Group>,
def O_flag : Flag<["-"], "O">, Visibility<[ClangOption, CC1Option, FC1Option]>,
Alias<O>, AliasArgs<["1"]>;
def Ofast : Joined<["-"], "Ofast">, Group<O_Group>,
- Visibility<[ClangOption, CC1Option, FlangOption]>,
+ Visibility<[ClangOption, CC1Option, FlangOption, FC1Option]>,
HelpTextForVariants<[ClangOption, CC1Option],
"Deprecated; use '-O3 -ffast-math' for the same
behavior,"
- " or '-O3' to enable only conforming optimizations">;
+ " or '-O3' to enable only conforming optimizations">,
+ HelpTextForVariants<[FlangOption, FC1Option],
+ "Deprecated; use '-O3 -ffast-math -fstack-arrays' for the same behavior,"
+ " or '-O3 -fstack-arrays' to enable only conforming optimizations">;
def P : Flag<["-"], "P">,
Visibility<[ClangOption, CC1Option, FlangOption, FC1Option]>,
Group<Preprocessor_Group>,
diff --git a/clang/lib/Driver/ToolChains/Flang.cpp
b/clang/lib/Driver/ToolChains/Flang.cpp
index a7d0cc99f27d2d..7e59080b680ec1 100644
--- a/clang/lib/Driver/ToolChains/Flang.cpp
+++ b/clang/lib/Driver/ToolChains/Flang.cpp
@@ -934,6 +934,7 @@ void Flang::ConstructJob(Compilation &C, const JobAction
&JA,
D.Diag(diag::warn_O4_is_O3);
} else if (A->getOption().matches(options::OPT_Ofast)) {
CmdArgs.push_back("-O3");
+ D.Diag(diag::warn_drv_deprecated_arg_ofast_for_flang);
} else {
A->render(Args, CmdArgs);
}
diff --git a/flang/test/Driver/fast-math.f90 b/flang/test/Driver/fast-math.f90
index 47175488b98bcc..e677432bc04fae 100644
--- a/flang/test/Driver/fast-math.f90
+++ b/flang/test/Driver/fast-math.f90
@@ -1,6 +1,11 @@
! Test for correct forwarding of fast-math flags from the compiler driver to
the
! frontend driver
+! Check warning message for Ofast deprecation
+! RUN: %flang -Ofast -### %s -o %t 2>&1 | FileCheck %s
+! CHECK: warning: argument '-Ofast' is deprecated; use '-O3 -ffast-math
-fstack-arrays' for the same behavior, or '-O3
+! -fstack-arrays' to enable only conforming optimizations [-Wdeprecated-ofast]
+
! -Ofast => -ffast-math -O3 -fstack-arrays
! RUN: %flang -Ofast -fsyntax-only -### %s -o %t 2>&1 \
! RUN: | FileCheck --check-prefix=CHECK-OFAST %s
>From 88f77927b2c16036b66225bed3cb436a9bccc8d6 Mon Sep 17 00:00:00 2001
From: Kiran Chandramohan <kiran.chandramo...@arm.com>
Date: Wed, 15 Jan 2025 12:48:25 +0000
Subject: [PATCH 2/2] Changes for rebase
---
clang/include/clang/Driver/Options.td | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index 2106581a86c1ee..aea32bfc9df63a 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -934,12 +934,11 @@ def O_flag : Flag<["-"], "O">, Visibility<[ClangOption,
CC1Option, FC1Option]>,
Alias<O>, AliasArgs<["1"]>;
def Ofast : Joined<["-"], "Ofast">, Group<O_Group>,
Visibility<[ClangOption, CC1Option, FlangOption, FC1Option]>,
- HelpTextForVariants<[ClangOption, CC1Option],
- "Deprecated; use '-O3 -ffast-math' for the same
behavior,"
- " or '-O3' to enable only conforming optimizations">,
HelpTextForVariants<[FlangOption, FC1Option],
"Deprecated; use '-O3 -ffast-math -fstack-arrays' for the same behavior,"
- " or '-O3 -fstack-arrays' to enable only conforming optimizations">;
+ " or '-O3 -fstack-arrays' to enable only conforming optimizations">,
+ HelpText<"Deprecated; use '-O3 -ffast-math' for the same behavior,"
+ " or '-O3' to enable only conforming optimizations">;
def P : Flag<["-"], "P">,
Visibility<[ClangOption, CC1Option, FlangOption, FC1Option]>,
Group<Preprocessor_Group>,
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
