From 096d9814aa07d8bf1939f75c3c632fcff2c3f573 Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Sun, 12 Sep 2021 14:39:49 -0700 Subject: [PATCH] [opt] Remove some legacy PM flags Reviewed By: asbirlea Differential Revision: https://reviews.llvm.org/D109664 --- llvm/docs/CommandGuide/opt.rst | 13 ------- llvm/test/Transforms/Attributor/internalize.ll | 4 +- llvm/test/Transforms/Coroutines/coro-inline.ll | 2 +- .../globals-aa-required-for-vectorization.ll | 1 - llvm/test/Transforms/PhaseOrdering/lto-licm.ll | 1 - llvm/tools/opt/opt.cpp | 43 +--------------------- 6 files changed, 4 insertions(+), 60 deletions(-) diff --git a/llvm/docs/CommandGuide/opt.rst b/llvm/docs/CommandGuide/opt.rst index 31cfaad..73d63f2 100644 --- a/llvm/docs/CommandGuide/opt.rst +++ b/llvm/docs/CommandGuide/opt.rst @@ -64,15 +64,6 @@ OPTIONS available. The order in which the options occur on the command line are the order in which they are executed (within pass constraints). -.. option:: -disable-inlining - - This option simply removes the inlining pass from the standard list. - -.. option:: -disable-opt - - This option is only meaningful when `-std-link-opts` is given. It - disables most passes. - .. option:: -strip-debug This option causes opt to strip debug information from the module before @@ -113,10 +104,6 @@ OPTIONS opt -load=plugin.so -help -.. option:: -p - - Print module after each transformation. - EXIT STATUS ----------- diff --git a/llvm/test/Transforms/Attributor/internalize.ll b/llvm/test/Transforms/Attributor/internalize.ll index 3b0998c..640200b 100644 --- a/llvm/test/Transforms/Attributor/internalize.ll +++ b/llvm/test/Transforms/Attributor/internalize.ll @@ -6,8 +6,8 @@ ; Deep Wrapper enabled -; RUN: opt -attributor -attributor-manifest-internal -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=11 -attributor-allow-deep-wrappers -disable-inlining -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_NPM,NOT_CGSCC_OPM,NOT_TUNIT_NPM,IS__TUNIT____,IS________OPM,IS__TUNIT_OPM,CHECK_ENABLED,NOT_CGSCC_NPM_ENABLED,NOT_CGSCC_OPM_ENABLED,NOT_TUNIT_NPM_ENABLED,IS__TUNIT_____ENABLED,IS________OPM_ENABLED,IS__TUNIT_OPM_ENABLED -; RUN: opt -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=11 -attributor-allow-deep-wrappers -disable-inlining -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_OPM,NOT_CGSCC_NPM,NOT_TUNIT_OPM,IS__TUNIT____,IS________NPM,IS__TUNIT_NPM,CHECK_ENABLED,NOT_CGSCC_OPM_ENABLED,NOT_CGSCC_NPM_ENABLED,NOT_TUNIT_OPM_ENABLED,IS__TUNIT_____ENABLED,IS________NPM_ENABLED,IS__TUNIT_NPM_ENABLED +; RUN: opt -attributor -attributor-manifest-internal -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=11 -attributor-allow-deep-wrappers -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_NPM,NOT_CGSCC_OPM,NOT_TUNIT_NPM,IS__TUNIT____,IS________OPM,IS__TUNIT_OPM,CHECK_ENABLED,NOT_CGSCC_NPM_ENABLED,NOT_CGSCC_OPM_ENABLED,NOT_TUNIT_NPM_ENABLED,IS__TUNIT_____ENABLED,IS________OPM_ENABLED,IS__TUNIT_OPM_ENABLED +; RUN: opt -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-max-iterations-verify -attributor-annotate-decl-cs -attributor-max-iterations=11 -attributor-allow-deep-wrappers -S < %s | FileCheck %s --check-prefixes=CHECK,NOT_CGSCC_OPM,NOT_CGSCC_NPM,NOT_TUNIT_OPM,IS__TUNIT____,IS________NPM,IS__TUNIT_NPM,CHECK_ENABLED,NOT_CGSCC_OPM_ENABLED,NOT_CGSCC_NPM_ENABLED,NOT_TUNIT_OPM_ENABLED,IS__TUNIT_____ENABLED,IS________NPM_ENABLED,IS__TUNIT_NPM_ENABLED ; TEST 1: This function is of linkage `linkonce`, we cannot internalize this ; function and use information derived from it diff --git a/llvm/test/Transforms/Coroutines/coro-inline.ll b/llvm/test/Transforms/Coroutines/coro-inline.ll index 76f65df..ad90b3e 100644 --- a/llvm/test/Transforms/Coroutines/coro-inline.ll +++ b/llvm/test/Transforms/Coroutines/coro-inline.ll @@ -1,5 +1,5 @@ ; RUN: opt < %s -passes='always-inline,cgscc(coro-split)' -S | FileCheck %s -; RUN: opt < %s -sample-profile-file=%S/Inputs/sample.text.prof -pgo-kind=pgo-sample-use-pipeline -passes='sample-profile,cgscc(coro-split)' -disable-inlining=true -S | FileCheck %s +; RUN: opt < %s -sample-profile-file=%S/Inputs/sample.text.prof -pgo-kind=pgo-sample-use-pipeline -passes='sample-profile,cgscc(coro-split)' -S | FileCheck %s ; Function Attrs: alwaysinline ssp uwtable define void @ff() #0 { diff --git a/llvm/test/Transforms/PhaseOrdering/AArch64/globals-aa-required-for-vectorization.ll b/llvm/test/Transforms/PhaseOrdering/AArch64/globals-aa-required-for-vectorization.ll index 251792c..130b176 100644 --- a/llvm/test/Transforms/PhaseOrdering/AArch64/globals-aa-required-for-vectorization.ll +++ b/llvm/test/Transforms/PhaseOrdering/AArch64/globals-aa-required-for-vectorization.ll @@ -1,5 +1,4 @@ ; RUN: opt -passes='lto' -S %s | FileCheck %s -; RUN: opt -std-link-opts -enable-new-pm=false -S %s | FileCheck %s target triple = "arm64e-apple-darwin" diff --git a/llvm/test/Transforms/PhaseOrdering/lto-licm.ll b/llvm/test/Transforms/PhaseOrdering/lto-licm.ll index 41e8c81..f804b1e 100644 --- a/llvm/test/Transforms/PhaseOrdering/lto-licm.ll +++ b/llvm/test/Transforms/PhaseOrdering/lto-licm.ll @@ -1,5 +1,4 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -enable-new-pm=0 -std-link-opts -S < %s | FileCheck %s ; RUN: opt -passes='lto' -S < %s | FileCheck %s define void @hoist_fdiv(float* %a, float %b) { diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp index 094f517..e21853e 100644 --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -102,9 +102,6 @@ static cl::opt Force("f", cl::desc("Enable binary output on terminals")); static cl::opt -PrintEachXForm("p", cl::desc("Print module after each transformation")); - -static cl::opt NoOutput("disable-output", cl::desc("Do not write result bitcode file"), cl::Hidden); @@ -146,17 +143,7 @@ static cl::opt StripNamedMetadata("strip-named-metadata", cl::desc("Strip module-level named metadata")); -static cl::opt - DisableInline("disable-inlining", - cl::desc("Do not run the inliner pass (legacy PM only)")); -static cl::opt -DisableOptimizations("disable-opt", - cl::desc("Do not run any optimization passes")); - -static cl::opt StandardLinkOpts( - "std-link-opts", - cl::desc("Include the standard link time optimizations (legacy PM only)")); static cl::opt OptLevelO0("O0", cl::desc("Optimization level 0. Similar to clang -O0. " @@ -368,9 +355,7 @@ static void AddOptimizationPasses(legacy::PassManagerBase &MPM, Builder.OptLevel = OptLevel; Builder.SizeLevel = SizeLevel; - if (DisableInline) { - // No inlining pass - } else if (OptLevel > 1) { + if (OptLevel > 1) { Builder.Inliner = createFunctionInliningPass(OptLevel, SizeLevel, false); } else { Builder.Inliner = createAlwaysInlinerLegacyPass(); @@ -418,17 +403,6 @@ static void AddOptimizationPasses(legacy::PassManagerBase &MPM, Builder.populateModulePassManager(MPM); } -static void AddStandardLinkPasses(legacy::PassManagerBase &PM) { - PassManagerBuilder Builder; - Builder.VerifyInput = true; - if (DisableOptimizations) - Builder.OptLevel = 0; - - if (!DisableInline) - Builder.Inliner = createFunctionInliningPass(); - Builder.populateLTOPassManager(PM); -} - //===----------------------------------------------------------------------===// // CodeGen-related helper functions. // @@ -909,12 +883,6 @@ int main(int argc, char **argv) { // Create a new optimization pass for each one specified on the command line for (unsigned i = 0; i < PassList.size(); ++i) { - if (StandardLinkOpts && - StandardLinkOpts.getPosition() < PassList.getPosition(i)) { - AddStandardLinkPasses(Passes); - StandardLinkOpts = false; - } - if (OptLevelO0 && OptLevelO0.getPosition() < PassList.getPosition(i)) { AddOptimizationPasses(Passes, *FPasses, TM.get(), 0, 0); OptLevelO0 = false; @@ -976,15 +944,6 @@ int main(int argc, char **argv) { } } } - - if (PrintEachXForm) - Passes.add( - createPrintModulePass(errs(), "", PreserveAssemblyUseListOrder)); - } - - if (StandardLinkOpts) { - AddStandardLinkPasses(Passes); - StandardLinkOpts = false; } if (OptLevelO0) -- 2.7.4