This is an archive of the discontinued LLVM Phabricator instance.

Differential D83367

[NewPM][opt] Translate "-O#" to NPM's "default<O#>"
ClosedPublic

Authored by aeubanks on Jul 7 2020, 8:31 PM.

Details

Reviewers
ychen
hans
asbirlea
Commits
rG3f17332aa715: [NewPM][opt] Translate "-O#" to NPM's "default<O#>"
Summary

Fixes 52 check-llvm tests under NPM.

Diff Detail

Event Timeline

aeubanks created this revision.Jul 7 2020, 8:31 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 7 2020, 8:31 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B63353: Diff 276307.Jul 7 2020, 9:04 PM
hans accepted this revision.Jul 8 2020, 5:37 AM
This revision is now accepted and ready to land.Jul 8 2020, 5:37 AM
Closed by commit rG3f17332aa715: [NewPM][opt] Translate "-O#" to NPM's "default<O#>" (authored by aeubanks). · Explain WhyJul 8 2020, 9:01 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
test/
Other/
8 lines
tools/
opt/
12 lines

Diff 276307

llvm/test/Other/opt-hot-cold-split.ll

; RUN: opt -mtriple=x86_64-- -Os -hot-cold-split=true -debug-pass=Structure < %s -o /dev/null 2>&1 | FileCheck %s -check-prefix=DEFAULT-Os ; RUN: opt -mtriple=x86_64-- -Os -hot-cold-split=true -debug-pass=Structure < %s -o /dev/null 2>&1 | FileCheck %s -check-prefix=DEFAULT-Os
; RUN: opt -mtriple=x86_64-- -Os -hot-cold-split=true -passes='lto-pre-link<Os>' -debug-pass-manager < %s -o /dev/null 2>&1 | FileCheck %s -check-prefix=LTO-PRELINK-Os ; RUN: opt -mtriple=x86_64-- -hot-cold-split=true -passes='lto-pre-link<Os>' -debug-pass-manager < %s -o /dev/null 2>&1 | FileCheck %s -check-prefix=LTO-PRELINK-Os
; RUN: opt -mtriple=x86_64-- -Os -hot-cold-split=true -passes='thinlto-pre-link<Os>' -debug-pass-manager < %s -o /dev/null 2>&1 | FileCheck %s -check-prefix=THINLTO-PRELINK-Os ; RUN: opt -mtriple=x86_64-- -hot-cold-split=true -passes='thinlto-pre-link<Os>' -debug-pass-manager < %s -o /dev/null 2>&1 | FileCheck %s -check-prefix=THINLTO-PRELINK-Os
; RUN: opt -mtriple=x86_64-- -Os -hot-cold-split=true -passes='lto<Os>' -debug-pass-manager < %s -o /dev/null 2>&1 | FileCheck %s -check-prefix=LTO-POSTLINK-Os ; RUN: opt -mtriple=x86_64-- -hot-cold-split=true -passes='lto<Os>' -debug-pass-manager < %s -o /dev/null 2>&1 | FileCheck %s -check-prefix=LTO-POSTLINK-Os
; RUN: opt -mtriple=x86_64-- -Os -hot-cold-split=true -passes='thinlto<Os>' -debug-pass-manager < %s -o /dev/null 2>&1 | FileCheck %s -check-prefix=THINLTO-POSTLINK-Os ; RUN: opt -mtriple=x86_64-- -hot-cold-split=true -passes='thinlto<Os>' -debug-pass-manager < %s -o /dev/null 2>&1 | FileCheck %s -check-prefix=THINLTO-POSTLINK-Os
; REQUIRES: asserts ; REQUIRES: asserts
; Splitting should occur late. ; Splitting should occur late.
; DEFAULT-Os: Hot Cold Splitting ; DEFAULT-Os: Hot Cold Splitting
; DEFAULT-Os: Simplify the CFG ; DEFAULT-Os: Simplify the CFG
; LTO-PRELINK-Os-NOT: pass: HotColdSplittingPass ; LTO-PRELINK-Os-NOT: pass: HotColdSplittingPass
; THINLTO-PRELINK-Os-NOT: Running pass: HotColdSplittingPass ; THINLTO-PRELINK-Os-NOT: Running pass: HotColdSplittingPass
; LTO-POSTLINK-Os: HotColdSplitting ; LTO-POSTLINK-Os: HotColdSplitting
; THINLTO-POSTLINK-Os: HotColdSplitting ; THINLTO-POSTLINK-Os: HotColdSplitting

llvm/tools/opt/opt.cpp

Show First 20 Lines • Show All 741 Lines • ▼ Show 20 Lines if (PassPipeline.getNumOccurrences() > 0 && PassList.size() > 0) {
errs() errs()
<< "Cannot specify passes via both -foo-pass and --passes=foo-pass"; << "Cannot specify passes via both -foo-pass and --passes=foo-pass";
return 1; return 1;
} }
SmallVector<StringRef, 4> Passes; SmallVector<StringRef, 4> Passes;
for (const auto &P : PassList) { for (const auto &P : PassList) {
Passes.push_back(P->getPassArgument()); Passes.push_back(P->getPassArgument());
} }
if (OptLevelO0)
Passes.push_back("default<O0>");
if (OptLevelO1)
Passes.push_back("default<O1>");
if (OptLevelO2)
Passes.push_back("default<O2>");
if (OptLevelO3)
Passes.push_back("default<O3>");
if (OptLevelOs)
Passes.push_back("default<Os>");
if (OptLevelOz)
Passes.push_back("default<Oz>");
OutputKind OK = OK_NoOutput; OutputKind OK = OK_NoOutput;
if (!NoOutput) if (!NoOutput)
OK = OutputAssembly OK = OutputAssembly
? OK_OutputAssembly ? OK_OutputAssembly
: (OutputThinLTOBC ? OK_OutputThinLTOBitcode : OK_OutputBitcode); : (OutputThinLTOBC ? OK_OutputThinLTOBitcode : OK_OutputBitcode);
VerifierKind VK = VK_VerifyInAndOut; VerifierKind VK = VK_VerifyInAndOut;
if (NoVerify) if (NoVerify)
▲ Show 20 Lines • Show All 281 Lines • Show Last 20 Lines