RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-01-31 20:51:52 +01:00
Code Issues Projects Releases Wiki Activity

Revert "[LTO] Add option enable NewPM with LTOCodeGenerator."

Browse Source 
This reverts commit 7a6a2cc81aaf064e6f5bc9a9a16973f552d2bdc2 because
it is causing failures on green dragon.
This commit is contained in:
Florian Hahn 2021-02-03 22:45:42 +00:00
parent b7fb55584a
commit 66a5e06679
6 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/llvm/LTO/legacy/LTOCodeGenerator.h
View File

@ -186,8 +186,6 @@ struct LTOCodeGenerator {
void setDisableVerify(bool Value) { DisableVerify = Value; } void setDisableVerify(bool Value) { DisableVerify = Value; }
void setUseNewPM(bool Value) { UseNewPM = Value; }
void setDiagnosticHandler(lto_diagnostic_handler_t, void *); void setDiagnosticHandler(lto_diagnostic_handler_t, void *);
LLVMContext &getContext() { return Context; } LLVMContext &getContext() { return Context; }
@ -248,7 +246,6 @@ private:
bool Freestanding = false; bool Freestanding = false;
std::unique_ptr<ToolOutputFile> StatsFile = nullptr; std::unique_ptr<ToolOutputFile> StatsFile = nullptr;
bool DisableVerify = false; bool DisableVerify = false;
bool UseNewPM = LLVM_ENABLE_NEW_PASS_MANAGER;
}; };
} }
#endif #endif

1
lib/LTO/LTOCodeGenerator.cpp
View File

@ -145,7 +145,6 @@ lto::Config LTOCodeGenerator::toConfig() const {
Conf.PreCodeGenPassesHook = [](legacy::PassManager &PM) { Conf.PreCodeGenPassesHook = [](legacy::PassManager &PM) {
PM.add(createObjCARCContractPass()); PM.add(createObjCARCContractPass());
}; };
Conf.UseNewPM = UseNewPM;
return Conf; return Conf;
} }

16
test/LTO/X86/diagnostic-handler-remarks.ll
View File

@ -1,32 +1,27 @@
; RUN: llvm-as < %s >%t.bc ; RUN: llvm-as < %s >%t.bc
; PR21108: Diagnostic handlers get pass remarks, even if they're not enabled. ; PR21108: Diagnostic handlers get pass remarks, even if they're not enabled.
; FIXME: Update checks for new pass manager.
; Confirm that there are -pass-remarks. ; Confirm that there are -pass-remarks.
; RUN: llvm-lto -use-new-pm=false \ ; RUN: llvm-lto -pass-remarks=inline \
; RUN: -pass-remarks=inline \
; RUN: -exported-symbol _func2 -pass-remarks-analysis=loop-vectorize \ ; RUN: -exported-symbol _func2 -pass-remarks-analysis=loop-vectorize \
; RUN: -exported-symbol _main -o %t.o %t.bc 2>&1 | \ ; RUN: -exported-symbol _main -o %t.o %t.bc 2>&1 | \
; RUN: FileCheck %s -allow-empty -check-prefix=REMARKS ; RUN: FileCheck %s -allow-empty -check-prefix=REMARKS
; RUN: llvm-nm %t.o | FileCheck %s -check-prefix NM ; RUN: llvm-nm %t.o | FileCheck %s -check-prefix NM
; RUN: llvm-lto -use-new-pm=false \ ; RUN: llvm-lto -pass-remarks=inline -use-diagnostic-handler \
; RUN: -pass-remarks=inline -use-diagnostic-handler \
; RUN: -exported-symbol _func2 -pass-remarks-analysis=loop-vectorize \ ; RUN: -exported-symbol _func2 -pass-remarks-analysis=loop-vectorize \
; RUN: -exported-symbol _main -o %t.o %t.bc 2>&1 | \ ; RUN: -exported-symbol _main -o %t.o %t.bc 2>&1 | \
; RUN: FileCheck %s -allow-empty -check-prefix=REMARKS_DH ; RUN: FileCheck %s -allow-empty -check-prefix=REMARKS_DH
; RUN: llvm-nm %t.o | FileCheck %s -check-prefix NM ; RUN: llvm-nm %t.o | FileCheck %s -check-prefix NM
; Confirm that -pass-remarks are not printed by default. ; Confirm that -pass-remarks are not printed by default.
; RUN: llvm-lto -use-new-pm=false \ ; RUN: llvm-lto \
; RUN: -exported-symbol _func2 \ ; RUN: -exported-symbol _func2 \
; RUN: -exported-symbol _main -o %t.o %t.bc 2>&1 | \ ; RUN: -exported-symbol _main -o %t.o %t.bc 2>&1 | \
; RUN: FileCheck %s -allow-empty ; RUN: FileCheck %s -allow-empty
; RUN: llvm-nm %t.o | FileCheck %s -check-prefix NM ; RUN: llvm-nm %t.o | FileCheck %s -check-prefix NM
; RUN: llvm-lto -use-new-pm=false \ ; RUN: llvm-lto -use-diagnostic-handler \
; RUN: -use-diagnostic-handler \
; RUN: -exported-symbol _func2 \ ; RUN: -exported-symbol _func2 \
; RUN: -exported-symbol _main -o %t.o %t.bc 2>&1 | \ ; RUN: -exported-symbol _main -o %t.o %t.bc 2>&1 | \
; RUN: FileCheck %s -allow-empty ; RUN: FileCheck %s -allow-empty
@ -34,8 +29,7 @@
; Optimization records are collected regardless of the diagnostic handler ; Optimization records are collected regardless of the diagnostic handler
; RUN: rm -f %t.yaml ; RUN: rm -f %t.yaml
; RUN: llvm-lto -use-new-pm=false \ ; RUN: llvm-lto -lto-pass-remarks-output=%t.yaml \
; RUN: -lto-pass-remarks-output=%t.yaml \
; RUN: -exported-symbol _func2 \ ; RUN: -exported-symbol _func2 \
; RUN: -exported-symbol _main -o %t.o %t.bc 2>&1 | \ ; RUN: -exported-symbol _main -o %t.o %t.bc 2>&1 | \
; RUN: FileCheck %s -allow-empty ; RUN: FileCheck %s -allow-empty

6
test/LTO/X86/disable-verify.ll
View File

@ -1,8 +1,6 @@
; RUN: llvm-as < %s >%t.bc ; RUN: llvm-as < %s >%t.bc
; RUN: llvm-lto -use-new-pm=false -debug-pass=Arguments -exported-symbol=_f -o /dev/null %t.bc 2>&1 -disable-verify | FileCheck %s ; RUN: llvm-lto -debug-pass=Arguments -exported-symbol=_f -o /dev/null %t.bc 2>&1 -disable-verify | FileCheck %s
; RUN: llvm-lto -use-new-pm=false -debug-pass=Arguments -exported-symbol=_f -o /dev/null %t.bc 2>&1 | FileCheck %s -check-prefix=VERIFY ; RUN: llvm-lto -debug-pass=Arguments -exported-symbol=_f -o /dev/null %t.bc 2>&1 | FileCheck %s -check-prefix=VERIFY
; FIXME: Update checks for new pass manager.
target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-apple-macosx10.10.0" target triple = "x86_64-apple-macosx10.10.0"

8
test/Other/X86/lto-hot-cold-split.ll
View File

@ -1,10 +1,6 @@
; RUN: opt -module-summary %s -o %t.bc ; RUN: opt -module-summary %s -o %t.bc
; RUN: llvm-lto -use-new-pm=false -hot-cold-split=true \ ; RUN: llvm-lto -hot-cold-split=true -thinlto-action=run %t.bc -debug-pass=Structure 2>&1 | FileCheck %s -check-prefix=OLDPM-ANYLTO-POSTLINK-Os
; RUN: -thinlto-action=run %t.bc -debug-pass=Structure 2>&1 | FileCheck %s -check-prefix=OLDPM-ANYLTO-POSTLINK-Os ; RUN: llvm-lto -hot-cold-split=true %t.bc -debug-pass=Structure 2>&1 | FileCheck %s -check-prefix=OLDPM-ANYLTO-POSTLINK-Os
; RUN: llvm-lto -use-new-pm=false -hot-cold-split=true \
; RUN: %t.bc -debug-pass=Structure 2>&1 | FileCheck %s -check-prefix=OLDPM-ANYLTO-POSTLINK-Os
; FIXME: Update checks for new pass manager.
; REQUIRES: asserts ; REQUIRES: asserts

7
tools/llvm-lto/llvm-lto.cpp
View File

@ -222,11 +222,6 @@ static cl::opt<bool> PrintMachOCPUOnly(
"print-macho-cpu-only", cl::init(false), "print-macho-cpu-only", cl::init(false),
cl::desc("Instead of running LTO, print the mach-o cpu in each IR file")); cl::desc("Instead of running LTO, print the mach-o cpu in each IR file"));
static cl::opt<bool>
UseNewPM("use-new-pm",
cl::desc("Run LTO passes using the new pass manager"),
cl::init(LLVM_ENABLE_NEW_PASS_MANAGER), cl::Hidden);
namespace { namespace {
struct ModuleInfo { struct ModuleInfo {
@ -1019,8 +1014,6 @@ int main(int argc, char **argv) {
CodeGen.setOptLevel(OptLevel - '0'); CodeGen.setOptLevel(OptLevel - '0');
CodeGen.setAttrs(codegen::getMAttrs()); CodeGen.setAttrs(codegen::getMAttrs());
CodeGen.setUseNewPM(UseNewPM);
if (auto FT = codegen::getExplicitFileType()) if (auto FT = codegen::getExplicitFileType())
CodeGen.setFileType(FT.getValue()); CodeGen.setFileType(FT.getValue());