RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

Revert "ThinLTO: Verify bitcode before lauching the ThinLTOCodeGenerator."

Browse Source 
This reverts commit r303438 while deliberating buildbot breakage.

llvm-svn: 303467
This commit is contained in:
Adrian Prantl 2017-05-19 23:32:21 +00:00
parent be57ef6b4f
commit d6c341f96a
6 changed files with 7 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/Transforms/IPO/FunctionImport.h
View File

@ -53,9 +53,8 @@ public:
: Index(Index), ModuleLoader(std::move(ModuleLoader)) {}
/// Import functions in Module \p M based on the supplied import list.
Expected<bool> importFunctions(
Module &M, const ImportMapTy &ImportList,
Optional<std::function<void(Module &)>> PostBitcodeLoading = None);
Expected<bool>
importFunctions(Module &M, const ImportMapTy &ImportList);
private:
/// The summaries index used to trigger importing.

35
lib/LTO/ThinLTOCodeGenerator.cpp
View File

@ -25,11 +25,9 @@
#include "llvm/Bitcode/BitcodeWriterPass.h"
#include "llvm/ExecutionEngine/ObjectMemoryBuffer.h"
#include "llvm/IR/DiagnosticPrinter.h"
#include "llvm/IR/DebugInfo.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/LegacyPassManager.h"
#include "llvm/IR/Mangler.h"
#include "llvm/IR/Verifier.h"
#include "llvm/IRReader/IRReader.h"
#include "llvm/LTO/LTO.h"
#include "llvm/Linker/Linker.h"
@ -64,7 +62,6 @@ namespace llvm {
extern cl::opt<bool> LTODiscardValueNames;
extern cl::opt<std::string> LTORemarksFilename;
extern cl::opt<bool> LTOPassRemarksWithHotness;
extern cl::opt<bool> LTOStripInvalidDebugInfo;
}
namespace {
@ -145,30 +142,6 @@ static void promoteModule(Module &TheModule, const ModuleSummaryIndex &Index) {
report_fatal_error("renameModuleForThinLTO failed");
}
namespace {
class ThinLTODiagnosticInfo : public DiagnosticInfo {
const Twine &Msg;
public:
ThinLTODiagnosticInfo(const Twine &DiagMsg,
DiagnosticSeverity Severity = DS_Error)
: DiagnosticInfo(DK_Linker, Severity), Msg(DiagMsg) {}
void print(DiagnosticPrinter &DP) const override { DP << Msg; }
};
}
/// Verify the module and strip broken debug info.
static void verifyLoadedModule(Module &TheModule) {
bool BrokenDebugInfo = false;
if (verifyModule(TheModule, &dbgs(),
LTOStripInvalidDebugInfo ? &BrokenDebugInfo : nullptr))
report_fatal_error("Broken module found, compilation aborted!");
if (BrokenDebugInfo) {
TheModule.getContext().diagnose(ThinLTODiagnosticInfo(
"Invalid debug info found, debug info will be stripped", DS_Warning));
StripDebugInfo(TheModule);
}
}
static std::unique_ptr<Module>
loadModuleFromBuffer(const MemoryBufferRef &Buffer, LLVMContext &Context,
bool Lazy, bool IsImporting) {
@ -186,8 +159,6 @@ loadModuleFromBuffer(const MemoryBufferRef &Buffer, LLVMContext &Context,
});
report_fatal_error("Can't load module, abort.");
}
if (!Lazy)
verifyLoadedModule(*ModuleOrErr.get());
return std::move(ModuleOrErr.get());
}
@ -201,8 +172,7 @@ crossImportIntoModule(Module &TheModule, const ModuleSummaryIndex &Index,
};
FunctionImporter Importer(Index, Loader);
Expected<bool> Result =
Importer.importFunctions(TheModule, ImportList, {verifyLoadedModule});
Expected<bool> Result = Importer.importFunctions(TheModule, ImportList);
if (!Result) {
handleAllErrors(Result.takeError(), [&](ErrorInfoBase &EIB) {
SMDiagnostic Err = SMDiagnostic(TheModule.getModuleIdentifier(),
@ -225,8 +195,7 @@ static void optimizeModule(Module &TheModule, TargetMachine &TM,
PMB.OptLevel = OptLevel;
PMB.LoopVectorize = true;
PMB.SLPVectorize = true;
// Already did this in verifyLoadedModule().
PMB.VerifyInput = false;
PMB.VerifyInput = true;
PMB.VerifyOutput = false;
legacy::PassManager PM;

5
lib/Transforms/IPO/FunctionImport.cpp
View File

@ -646,8 +646,7 @@ void llvm::thinLTOInternalizeModule(Module &TheModule,
// index.
//
Expected<bool> FunctionImporter::importFunctions(
Module &DestModule, const FunctionImporter::ImportMapTy &ImportList,
Optional<std::function<void(Module &)>> PostBitcodeLoading) {
Module &DestModule, const FunctionImporter::ImportMapTy &ImportList) {
DEBUG(dbgs() << "Starting import for Module "
<< DestModule.getModuleIdentifier() << "\n");
unsigned ImportedCount = 0;
@ -755,8 +754,6 @@ Expected<bool> FunctionImporter::importFunctions(
// Upgrade debug info after we're done materializing all the globals and we
// have loaded all the required metadata!
UpgradeDebugInfo(*SrcModule);
if (PostBitcodeLoading)
(*PostBitcodeLoading)(*SrcModule);
// Link in the specified functions.
if (renameModuleForThinLTO(*SrcModule, Index, &GlobalsToImport))

15
test/LTO/X86/Inputs/strip-debug-info-bar.ll
View File

@ -1,15 +0,0 @@
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.12"
define void @bar() !dbg !3 {
ret void
}
!llvm.module.flags = !{!0}
!llvm.dbg.cu = !{!1}
!0 = !{i32 2, !"Debug Info Version", i32 3}
!1 = distinct !DICompileUnit(language: DW_LANG_C99, file: !2)
!2 = !DIFile(filename: "broken", directory: "")
!3 = distinct !DISubprogram(line: 1000, isDefinition: true)

BIN
test/LTO/X86/Inputs/strip-debug-info.bc Normal file
View File

Binary file not shown.

49
test/LTO/X86/strip-debug-info.ll
View File

@ -1,61 +1,16 @@
; RUN: llvm-as -disable-verify %s -o %t.bc
; ---- Full LTO ---------------------------------------------
; RUN: not llvm-lto -lto-strip-invalid-debug-info=false \
; RUN: -o %t.o %t.bc 2>&1 | \
; RUN: -o %t.o %S/Inputs/strip-debug-info.bc 2>&1 | \
; RUN: FileCheck %s -allow-empty -check-prefix=CHECK-ERR
; RUN: llvm-lto -lto-strip-invalid-debug-info=true \
; RUN: -exported-symbol foo -exported-symbol _foo \
; RUN: -o %t.o %t.bc 2>&1 | \
; RUN: -o %t.o %S/Inputs/strip-debug-info.bc 2>&1 | \
; RUN: FileCheck %s -allow-empty -check-prefix=CHECK-WARN
; RUN: llvm-nm %t.o | FileCheck %s
; ---- Thin LTO (codegen only) ------------------------------
; RUN: not llvm-lto -thinlto -thinlto-action=codegen \
; RUN: -lto-strip-invalid-debug-info=false \
; RUN: %t.bc -disable-verify 2>&1 | \
; RUN: FileCheck %s -allow-empty -check-prefix=CHECK-ERR
; RUN: llvm-lto -thinlto -thinlto-action=codegen \
; RUN: -lto-strip-invalid-debug-info=true \
; RUN: %t.bc -disable-verify 2>&1 | \
; RUN: FileCheck %s -allow-empty -check-prefix=CHECK-WARN
; ---- Thin LTO (optimize, strip main file) -----------------
; RUN: opt -disable-verify -module-summary %s -o %t.bc
; RUN: opt -disable-verify -module-summary %S/Inputs/strip-debug-info-bar.ll \
; RUN: -o %t2.bc
; RUN: not llvm-lto -thinlto -thinlto-action=run \
; RUN: -lto-strip-invalid-debug-info=false \
; RUN: %t.bc -disable-verify 2>&1 | \
; RUN: FileCheck %s -allow-empty -check-prefix=CHECK-ERR
; RUN: llvm-lto -thinlto -thinlto-action=run \
; RUN: -lto-strip-invalid-debug-info=true \
; RUN: %t.bc -disable-verify 2>&1 | \
; RUN: FileCheck %s -allow-empty -check-prefix=CHECK-WARN
; ---- Thin LTO (optimize, strip imported file) -------------
; RUN: opt -disable-verify -strip-debug -module-summary %t.bc -o %t-stripped.bc
; RUN: llvm-lto -thinlto-action=thinlink -o %t.index.bc %t-stripped.bc %t2.bc
; RUN: not llvm-lto -thinlto -thinlto-action=import \
; RUN: -thinlto-index=%t.index.bc \
; RUN: -lto-strip-invalid-debug-info=false \
; RUN: -exported-symbol foo -exported-symbol _foo \
; RUN: %t-stripped.bc -disable-verify 2>&1 | \
; RUN: FileCheck %s -allow-empty -check-prefix=CHECK-ERR
; RUN: llvm-lto -thinlto -thinlto-action=import \
; RUN: -lto-strip-invalid-debug-info=true \
; RUN: -thinlto-index=%t.index.bc \
; RUN: -exported-symbol foo -exported-symbol _foo \
; RUN: %t-stripped.bc -disable-verify 2>&1 | \
; RUN: FileCheck %s -allow-empty -check-prefix=CHECK-WARN
; CHECK-ERR: Broken module found, compilation aborted
; CHECK-WARN: Invalid debug info found, debug info will be stripped
; CHECK-WARN-NOT: Broken module found
; CHECK: foo
target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.12"
declare void @bar()
define void @foo() {
call void @bar()
ret void
}