Vendor import of llvm-project main llvmorg-15-init-17826-g1f8ae9d7e7e4, - src

diff options


context:
space:
mode:

author	Dimitry Andric <dim@FreeBSD.org>	2022-07-27 19:50:45 +0000
committer	Dimitry Andric <dim@FreeBSD.org>	2022-07-27 19:50:54 +0000
commit	08e8dd7b9db7bb4a9de26d44c1cbfd24e869c014 (patch)
tree	041e72e32710b1e742516d8c9f1575bf0116d3e3 /llvm/lib/LTO
parent	4b4fe385e49bd883fd183b5f21c1ea486c722e61 (diff)

Vendor import of llvm-project main llvmorg-15-init-17826-g1f8ae9d7e7e4,vendor/llvm-project/llvmorg-15-init-17827-gd77882e66779 vendor/llvm-project/llvmorg-15-init-17826-g1f8ae9d7e7e4

the last commit before the upstream release/16.x branch was created.

Diffstat (limited to 'llvm/lib/LTO')

-rw-r--r--

llvm/lib/LTO/LTO.cpp

-rw-r--r--

llvm/lib/LTO/LTOBackend.cpp

-rw-r--r--

llvm/lib/LTO/LTOCodeGenerator.cpp

-rw-r--r--

llvm/lib/LTO/ThinLTOCodeGenerator.cpp

4 files changed, 25 insertions, 0 deletions

diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp
index a9e04ba760ca..cc7be24c1dbd 100644
--- a/llvm/lib/LTO/LTO.cpp
+++ b/llvm/lib/LTO/LTO.cpp

@@ -1103,6 +1103,8 @@ Error LTO::runRegularLTO(AddStreamFn AddStream) {

updateVCallVisibilityInModule(*RegularLTO.CombinedModule,

Conf.HasWholeProgramVisibility,

DynamicExportSymbols);

+ updatePublicTypeTestCalls(*RegularLTO.CombinedModule,

+ Conf.HasWholeProgramVisibility);

if (Conf.PreOptModuleHook &&

!Conf.PreOptModuleHook(0, *RegularLTO.CombinedModule))

@@ -1482,6 +1484,8 @@ Error LTO::runThinLTO(AddStreamFn AddStream, FileCache Cache,

std::set<GlobalValue::GUID> ExportedGUIDs;

+ if (hasWholeProgramVisibility(Conf.HasWholeProgramVisibility))

+ ThinLTO.CombinedIndex.setWithWholeProgramVisibility();

// If allowed, upgrade public vcall visibility to linkage unit visibility in

// the summaries before whole program devirtualization below.

updateVCallVisibilityInIndex(ThinLTO.CombinedIndex,

diff --git a/llvm/lib/LTO/LTOBackend.cpp b/llvm/lib/LTO/LTOBackend.cpp
index e248e58e4e4e..2e32469b4926 100644
--- a/llvm/lib/LTO/LTOBackend.cpp
+++ b/llvm/lib/LTO/LTOBackend.cpp

@@ -40,6 +40,7 @@

#include "llvm/Support/ToolOutputFile.h"

#include "llvm/Support/raw_ostream.h"

#include "llvm/Target/TargetMachine.h"

+#include "llvm/Transforms/IPO/WholeProgramDevirt.h"

#include "llvm/Transforms/Scalar/LoopPassManager.h"

#include "llvm/Transforms/Utils/FunctionImportUtils.h"

#include "llvm/Transforms/Utils/SplitModule.h"

@@ -560,6 +561,8 @@ Error lto::thinBackend(const Config &Conf, unsigned Task, AddStreamFn AddStream,

// the module, if applicable.

Mod.setPartialSampleProfileRatio(CombinedIndex);

+ updatePublicTypeTestCalls(Mod, CombinedIndex.withWholeProgramVisibility());

if (Conf.CodeGenOnly) {

codegen(Conf, TM.get(), AddStream, Task, Mod, CombinedIndex);

return finalizeOptimizationRemarks(std::move(DiagnosticOutputFile));

diff --git a/llvm/lib/LTO/LTOCodeGenerator.cpp b/llvm/lib/LTO/LTOCodeGenerator.cpp
index 2abf249cbd62..2f7c485b9fc8 100644
--- a/llvm/lib/LTO/LTOCodeGenerator.cpp
+++ b/llvm/lib/LTO/LTOCodeGenerator.cpp

@@ -520,6 +520,8 @@ bool LTOCodeGenerator::optimize() {

// linker option in the old LTO API, but this call allows it to be specified

// via the internal option. Must be done before WPD invoked via the optimizer

// pipeline run below.

+ updatePublicTypeTestCalls(*MergedModule,

+ /* WholeProgramVisibilityEnabledInLTO */ false);

updateVCallVisibilityInModule(*MergedModule,

/* WholeProgramVisibilityEnabledInLTO */ false,

// FIXME: This needs linker information via a

@@ -539,6 +541,16 @@ bool LTOCodeGenerator::optimize() {

// Add an appropriate DataLayout instance for this module...

MergedModule->setDataLayout(TargetMach->createDataLayout());

+ if (!SaveIRBeforeOptPath.empty()) {

+ std::error_code EC;

+ raw_fd_ostream OS(SaveIRBeforeOptPath, EC, sys::fs::OF_None);

+ if (EC)

+ report_fatal_error(Twine("Failed to open ") + SaveIRBeforeOptPath +

+ " to save optimized bitcode\n");

+ WriteBitcodeToFile(*MergedModule, OS,

+ /* ShouldPreserveUseListOrder */ true);

+ }

ModuleSummaryIndex CombinedIndex(false);

TargetMach = createTargetMachine();

if (!opt(Config, TargetMach.get(), 0, *MergedModule, /*IsThinLTO=*/false,

diff --git a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
index a1041b3c85f5..2c723bef7d12 100644
--- a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
+++ b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp

@@ -452,6 +452,10 @@ ProcessThinLTOModule(Module &TheModule, ModuleSummaryIndex &Index,

bool DisableCodeGen, StringRef SaveTempsDir,

bool Freestanding, unsigned OptLevel, unsigned count,

bool DebugPassManager) {

+ // See comment at call to updateVCallVisibilityInIndex() for why

+ // WholeProgramVisibilityEnabledInLTO is false.

+ updatePublicTypeTestCalls(TheModule,

+ /* WholeProgramVisibilityEnabledInLTO */ false);

// "Benchmark"-like optimization: single-source case

bool SingleModule = (ModuleMap.size() == 1);

@@ -1047,6 +1051,8 @@ void ThinLTOCodeGenerator::run() {

// Currently there is no support for enabling whole program visibility via a

// linker option in the old LTO API, but this call allows it to be specified

// via the internal option. Must be done before WPD below.

+ if (hasWholeProgramVisibility(/* WholeProgramVisibilityEnabledInLTO */ false))

+ Index->setWithWholeProgramVisibility();

updateVCallVisibilityInIndex(*Index,

/* WholeProgramVisibilityEnabledInLTO */ false,

// FIXME: This needs linker information via a