Open
Conversation
llvmorg-github-actions
Bot
added
clang:driver
|
@llvm/pr-subscribers-flang-driver @llvm/pr-subscribers-clang-driver Author: Kelvin Li (kkwli) ChangesThis patch is to enable emitting module summary for ThinLTO. Full diff: https://github.com/llvm/llvm-project/pull/195999.diff 5 Files Affected:
diff --git a/clang/lib/Driver/ToolChains/Flang.cpp b/clang/lib/Driver/ToolChains/Flang.cpp
index ce503b74295e4..965136963b206 100644
--- a/clang/lib/Driver/ToolChains/Flang.cpp
+++ b/clang/lib/Driver/ToolChains/Flang.cpp
@@ -276,9 +276,6 @@ void Flang::addLTOOptions(const ArgList &Args, ArgStringList &CmdArgs) const {
if (LTOMode == LTOK_Full)
CmdArgs.push_back("-flto=full");
else if (LTOMode == LTOK_Thin) {
- Diags.Report(
- Diags.getCustomDiagID(DiagnosticsEngine::Warning,
- "the option '-flto=thin' is a work in progress"));
CmdArgs.push_back("-flto=thin");
}
Args.addAllArgs(CmdArgs, {options::OPT_ffat_lto_objects,
diff --git a/flang/lib/Frontend/FrontendActions.cpp b/flang/lib/Frontend/FrontendActions.cpp
index 4e058786a9a72..4f56d65062e98 100644
--- a/flang/lib/Frontend/FrontendActions.cpp
+++ b/flang/lib/Frontend/FrontendActions.cpp
@@ -1046,8 +1046,8 @@ void CodeGenAction::runOptimizationPipeline(llvm::raw_pwrite_stream &os) {
llvm::ModulePassManager mpm;
// The module summary should be emitted by default for regular LTO
// except for ld64 targets.
- bool emitSummary =
- opts.PrepareForFullLTO && (triple.getVendor() != llvm::Triple::Apple);
+ bool emitSummary = (opts.PrepareForFullLTO || opts.PrepareForThinLTO) &&
+ (triple.getVendor() != llvm::Triple::Apple);
if (opts.PrepareForFatLTO)
mpm = pb.buildFatLTODefaultPipeline(level, opts.PrepareForThinLTO,
emitSummary);
@@ -1060,23 +1060,17 @@ void CodeGenAction::runOptimizationPipeline(llvm::raw_pwrite_stream &os) {
if (action == BackendActionTy::Backend_EmitBC ||
action == BackendActionTy::Backend_EmitLL || opts.PrepareForFatLTO) {
- if (opts.PrepareForThinLTO) {
- // TODO: ThinLTO module summary support is yet to be enabled.
- if (action == BackendActionTy::Backend_EmitBC)
- mpm.addPass(llvm::BitcodeWriterPass(os));
- else if (action == BackendActionTy::Backend_EmitLL)
- mpm.addPass(llvm::PrintModulePass(os));
- } else {
+ if (!opts.PrepareForThinLTO)
if (emitSummary && !llvmModule->getModuleFlag("ThinLTO"))
llvmModule->addModuleFlag(llvm::Module::Error, "ThinLTO", uint32_t(0));
- if (action == BackendActionTy::Backend_EmitBC)
- mpm.addPass(llvm::BitcodeWriterPass(
- os, /*ShouldPreserveUseListOrder=*/false, emitSummary));
- else if (action == BackendActionTy::Backend_EmitLL)
- mpm.addPass(llvm::PrintModulePass(os, /*Banner=*/"",
- /*ShouldPreserveUseListOrder=*/false,
+
+ if (action == BackendActionTy::Backend_EmitBC)
+ mpm.addPass(llvm::BitcodeWriterPass(os, /*ShouldPreserveUseListOrder=*/false,
emitSummary));
- }
+ else if (action == BackendActionTy::Backend_EmitLL)
+ mpm.addPass(llvm::PrintModulePass(os, /*Banner=*/"",
+ /*ShouldPreserveUseListOrder=*/false,
+ emitSummary));
}
// FIXME: This should eventually be replaced by a first-class driver option.
diff --git a/flang/test/Driver/lto-bc.f90 b/flang/test/Driver/lto-bc.f90
index cca7f8cce739b..6fa1df6175ed3 100644
--- a/flang/test/Driver/lto-bc.f90
+++ b/flang/test/Driver/lto-bc.f90
@@ -18,9 +18,9 @@
! THIN-NEXT: ret void
! THIN-NEXT: }
! THIN-NOT: !{{.*}} = !{i32 1, !"ThinLTO", i32 0}
-! THIN-NOT: ^{{.*}} = module:
-! THIN-NOT: ^{{.*}} = gv: (name:
-! THIN-NOT: ^{{.*}} = blockcount:
+! THIN: ^{{.*}} = module:
+! THIN: ^{{.*}} = gv: (name:
+! THIN: ^{{.*}} = blockcount:
! RUN: %flang -flto %s -c -o - | llvm-dis -o - | FileCheck %s --check-prefix=FULL
! FULL: define void @_QQmain()
@@ -33,5 +33,8 @@
! RUN: %flang_fc1 -flto -emit-llvm-bc %s -o - | llvm-bcanalyzer -dump| FileCheck --check-prefix=MOD-SUMM %s
! MOD-SUMM: FULL_LTO_GLOBALVAL_SUMMARY_BLOCK
+
+! RUN: %flang_fc1 -flto=thin -emit-llvm-bc %s -o - | llvm-bcanalyzer -dump| FileCheck --check-prefix=THIN-MOD-SUMM %s
+! THIN-MOD-SUMM: <GLOBALVAL_SUMMARY_BLOCK
program main
end program
diff --git a/flang/test/Driver/lto-fatlto.f90 b/flang/test/Driver/lto-fatlto.f90
index 2ea251eafacbf..47dc6700fa595 100644
--- a/flang/test/Driver/lto-fatlto.f90
+++ b/flang/test/Driver/lto-fatlto.f90
@@ -1,7 +1,12 @@
! REQUIRES: x86-registered-target
! checks fatlto objects: that valid bitcode is included in the object file generated.
-! RUN: %flang -fc1 -triple x86_64-unknown-linux-gnu -flto -ffat-lto-objects -emit-obj %s -o %t.o
+! RUN: %flang_fc1 -triple x86_64-unknown-linux-gnu -flto -ffat-lto-objects -emit-obj %s -o %t.o
+! RUN: llvm-readelf -S %t.o | FileCheck %s --check-prefixes=ELF
+! RUN: llvm-objcopy --dump-section=.llvm.lto=%t.bc %t.o
+! RUN: llvm-dis %t.bc -o - | FileCheck %s --check-prefixes=DIS
+
+! RUN: %flang_fc1 -triple x86_64-unknown-linux-gnu -flto=thin -ffat-lto-objects -emit-obj %s -o %t.o
! RUN: llvm-readelf -S %t.o | FileCheck %s --check-prefixes=ELF
! RUN: llvm-objcopy --dump-section=.llvm.lto=%t.bc %t.o
! RUN: llvm-dis %t.bc -o - | FileCheck %s --check-prefixes=DIS
@@ -11,7 +16,7 @@
! DIS-NEXT: ret void
! DIS-NEXT: }
-! RUN: %flang -fc1 -triple x86_64-unknown-linux-gnu -flto -ffat-lto-objects -S %s -o - | FileCheck %s --check-prefixes=ASM
+! RUN: %flang_fc1 -triple x86_64-unknown-linux-gnu -flto -ffat-lto-objects -S %s -o - | FileCheck %s --check-prefixes=ASM
! ASM: .section .llvm.lto,"e",@llvm_lto
! ASM-NEXT: .Lllvm.embedded.object:
diff --git a/flang/test/Driver/lto-flags.f90 b/flang/test/Driver/lto-flags.f90
index be9416810716a..7699cfa4e2967 100644
--- a/flang/test/Driver/lto-flags.f90
+++ b/flang/test/Driver/lto-flags.f90
@@ -30,7 +30,6 @@
! FULL-LTO: "-fc1"
! FULL-LTO-SAME: "-flto=full"
-! THIN-LTO-ALL: flang{{.*}}: warning: the option '-flto=thin' is a work in progress
! THIN-LTO-ALL: "-fc1"
! THIN-LTO-ALL-SAME: "-flto=thin"
! THIN-LTO-LINKER-PLUGIN: "-plugin-opt=thinlto"
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
🐧 Linux x64 Test ResultsThe build failed before running any tests. Click on a failure below to see the details. tools/clang/lib/Driver/CMakeFiles/obj.clangDriver.dir/ToolChains/Flang.cpp.oIf these failures are unrelated to your changes (for example tests are broken or flaky at HEAD), please open an issue at https://github.com/llvm/llvm-project/issues and add the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This patch is to enable emitting module summary for ThinLTO.