https://github.com/lenary updated https://github.com/llvm/llvm-project/pull/163664
>From fe539821c126eb5462cbb94b8e7fa7f7b8bd019b Mon Sep 17 00:00:00 2001 From: Sam Elliott <[email protected]> Date: Tue, 14 Oct 2025 21:46:45 -0700 Subject: [PATCH 1/2] [clang][Driver] Support Outline Flags on RISC-V and X86 These two targets both also support the machine outliner, so these flags should probably be cross-target. This updates the docs for these flags as well. --- clang/include/clang/Driver/Options.td | 16 ++++++++++------ clang/lib/Driver/ToolChains/CommonArgs.cpp | 12 ++++++++---- clang/test/Driver/aarch64-outliner.c | 3 --- clang/test/Driver/riscv-outliner.c | 7 +++++++ clang/test/Driver/unsupported-outliner.c | 3 +++ clang/test/Driver/x86-outliner.c | 7 +++++++ 6 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 clang/test/Driver/riscv-outliner.c create mode 100644 clang/test/Driver/unsupported-outliner.c create mode 100644 clang/test/Driver/x86-outliner.c diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 611b68e5281f0..d62b771f463ea 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -5127,12 +5127,16 @@ def mms_bitfields : Flag<["-"], "mms-bitfields">, Group<m_Group>, Visibility<[ClangOption, CC1Option]>, HelpText<"Set the default structure layout to be compatible with the Microsoft compiler standard">, MarshallingInfoFlag<LangOpts<"MSBitfields">>; -def moutline : Flag<["-"], "moutline">, Group<f_clang_Group>, - Visibility<[ClangOption, CC1Option]>, - HelpText<"Enable function outlining (AArch64 only)">; -def mno_outline : Flag<["-"], "mno-outline">, Group<f_clang_Group>, - Visibility<[ClangOption, CC1Option]>, - HelpText<"Disable function outlining (AArch64 only)">; +def moutline + : Flag<["-"], "moutline">, + Group<f_clang_Group>, + Visibility<[ClangOption, CC1Option]>, + HelpText<"Enable function outlining (AArch64,Arm,RISC-V,X86 only)">; +def mno_outline + : Flag<["-"], "mno-outline">, + Group<f_clang_Group>, + Visibility<[ClangOption, CC1Option]>, + HelpText<"Disable function outlining (AArch64,Arm,RISC-V,X86 only)">; def mno_ms_bitfields : Flag<["-"], "mno-ms-bitfields">, Group<m_Group>, HelpText<"Do not set the default structure layout to be compatible with the Microsoft compiler standard">; def mskip_rax_setup : Flag<["-"], "mskip-rax-setup">, Group<m_Group>, diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp b/clang/lib/Driver/ToolChains/CommonArgs.cpp index 99400ac701fbe..24b12fbf88f6f 100644 --- a/clang/lib/Driver/ToolChains/CommonArgs.cpp +++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp @@ -2916,12 +2916,16 @@ void tools::addMachineOutlinerArgs(const Driver &D, if (Arg *A = Args.getLastArg(options::OPT_moutline, options::OPT_mno_outline)) { if (A->getOption().matches(options::OPT_moutline)) { - // We only support -moutline in AArch64 and ARM targets right now. If - // we're not compiling for these, emit a warning and ignore the flag. - // Otherwise, add the proper mllvm flags. - if (!(Triple.isARM() || Triple.isThumb() || Triple.isAArch64())) { + // We only support -moutline in AArch64, ARM, RISC-V and X86 targets right + // now. If we're not compiling for these, emit a warning and ignore the + // flag. Otherwise, add the proper mllvm flags. + if (!(Triple.isARM() || Triple.isThumb() || Triple.isAArch64() || + Triple.isRISCV() || Triple.isX86())) { D.Diag(diag::warn_drv_moutline_unsupported_opt) << Triple.getArchName(); } else { + // FIXME: This should probably use the `nooutline` attribute rather than + // tweaking Pipeline Pass flags, so `-mno-outline` and `-moutline` + // objects can be combined correctly during LTO. addArg(Twine("-enable-machine-outliner")); } } else { diff --git a/clang/test/Driver/aarch64-outliner.c b/clang/test/Driver/aarch64-outliner.c index c5d28d121513f..5ed822f122fc4 100644 --- a/clang/test/Driver/aarch64-outliner.c +++ b/clang/test/Driver/aarch64-outliner.c @@ -4,6 +4,3 @@ // RUN: %clang --target=aarch64 -moutline -mno-outline -S %s -### 2>&1 | FileCheck %s -check-prefix=OFF // RUN: %clang --target=aarch64_be -moutline -mno-outline -S %s -### 2>&1 | FileCheck %s -check-prefix=OFF // OFF: "-mllvm" "-enable-machine-outliner=never" -// RUN: %clang --target=x86_64 -moutline -S %s -### 2>&1 | FileCheck %s -check-prefix=WARN -// WARN: warning: 'x86_64' does not support '-moutline'; flag ignored [-Woption-ignored] -// WARN-NOT: "-mllvm" "-enable-machine-outliner" diff --git a/clang/test/Driver/riscv-outliner.c b/clang/test/Driver/riscv-outliner.c new file mode 100644 index 0000000000000..9e9905ab4fd8a --- /dev/null +++ b/clang/test/Driver/riscv-outliner.c @@ -0,0 +1,7 @@ +// RUN: %clang --target=riscv32 -moutline -S %s -### 2>&1 | FileCheck %s -check-prefix=ON +// RUN: %clang --target=riscv64 -moutline -S %s -### 2>&1 | FileCheck %s -check-prefix=ON +// ON: "-mllvm" "-enable-machine-outliner" + +// RUN: %clang --target=riscv32 -moutline -mno-outline -S %s -### 2>&1 | FileCheck %s -check-prefix=OFF +// RUN: %clang --target=riscv64 -moutline -mno-outline -S %s -### 2>&1 | FileCheck %s -check-prefix=OFF +// OFF: "-mllvm" "-enable-machine-outliner=never" diff --git a/clang/test/Driver/unsupported-outliner.c b/clang/test/Driver/unsupported-outliner.c new file mode 100644 index 0000000000000..ff543a8e36e2a --- /dev/null +++ b/clang/test/Driver/unsupported-outliner.c @@ -0,0 +1,3 @@ +// RUN: %clang --target=ppc64 -moutline -S %s -### 2>&1 | FileCheck %s -check-prefix=WARN +// WARN: warning: 'ppc64' does not support '-moutline'; flag ignored [-Woption-ignored] +// WARN-NOT: "-mllvm" "-enable-machine-outliner" diff --git a/clang/test/Driver/x86-outliner.c b/clang/test/Driver/x86-outliner.c new file mode 100644 index 0000000000000..e2af85d3d16ab --- /dev/null +++ b/clang/test/Driver/x86-outliner.c @@ -0,0 +1,7 @@ +// RUN: %clang --target=i386 -moutline -S %s -### 2>&1 | FileCheck %s -check-prefix=ON +// RUN: %clang --target=x86_64 -moutline -S %s -### 2>&1 | FileCheck %s -check-prefix=ON +// ON: "-mllvm" "-enable-machine-outliner" + +// RUN: %clang --target=i386 -moutline -mno-outline -S %s -### 2>&1 | FileCheck %s -check-prefix=OFF +// RUN: %clang --target=x86_64 -moutline -mno-outline -S %s -### 2>&1 | FileCheck %s -check-prefix=OFF +// OFF: "-mllvm" "-enable-machine-outliner=never" >From 12c00943981c411ef1efe2c2077219299380296d Mon Sep 17 00:00:00 2001 From: Sam Elliott <[email protected]> Date: Thu, 16 Oct 2025 13:48:07 -0700 Subject: [PATCH 2/2] Release Note --- clang/docs/ReleaseNotes.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index edb872c1f388d..6ebc2f0f63fa7 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -287,6 +287,7 @@ Modified Compiler Flags ----------------------- - The `-gkey-instructions` compiler flag is now enabled by default when DWARF is emitted for plain C/C++ and optimizations are enabled. (#GH149509) - The `-fconstexpr-steps` compiler flag now accepts value `0` to opt out of this limit. (#GH160440) +- The `-mno-outline` and `-moutline` compiler flags are now allowed on RISC-V and X86, which both support the machine outliner. Removed Compiler Flags ------------------------- _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
