From 8be96b95c4c9c19960cd2312a023b24b76cfb4c8 Mon Sep 17 00:00:00 2001 From: Bjorn Pettersson Date: Thu, 8 Jul 2021 14:24:03 +0200 Subject: [PATCH] [NewPM] Consistently use 'simplifycfg' rather than 'simplify-cfg' There was an alias between 'simplifycfg' and 'simplify-cfg' in the PassRegistry. That was the original reason for this patch, which effectively removes the alias. This patch also replaces all occurrances of 'simplify-cfg' by 'simplifycfg'. Reason for choosing that form for the name is that it matches the DEBUG_TYPE for the pass, and the legacy PM name and also how it is spelled out in other passes such as 'loop-simplifycfg', and in other options such as 'simplifycfg-merge-cond-stores'. I for some reason the name should be changed to 'simplify-cfg' in the future, then I think such a renaming should be more widely done and not only impacting the PassRegistry. Reviewed By: aeubanks Differential Revision: https://reviews.llvm.org/D105627 --- lib/Analysis/InlineCost.cpp | 2 +- lib/FuzzMutate/FuzzerCLI.cpp | 2 +- lib/Passes/PassBuilder.cpp | 4 ++-- lib/Passes/PassRegistry.def | 3 +-- lib/Transforms/IPO/PassManagerBuilder.cpp | 2 +- lib/Transforms/Scalar/SimpleLoopUnswitch.cpp | 8 ++++---- test/Analysis/MemorySSA/update-remove-dead-blocks.ll | 2 +- test/Other/cgscc-disconnected-invalidation.ll | 2 +- test/Other/cgscc-iterate-function-mutation.ll | 4 ++-- test/Other/pass-pipelines.ll | 2 +- test/Other/print-module-scope.ll | 4 ++-- test/Transforms/Coroutines/ArgAddr.ll | 2 +- test/Transforms/Coroutines/coro-alloc-with-param-O0.ll | 2 +- test/Transforms/Coroutines/coro-alloc-with-param-O2.ll | 2 +- test/Transforms/Coroutines/coro-alloca-01.ll | 2 +- test/Transforms/Coroutines/coro-alloca-02.ll | 2 +- test/Transforms/Coroutines/coro-alloca-03.ll | 2 +- test/Transforms/Coroutines/coro-alloca-04.ll | 2 +- test/Transforms/Coroutines/coro-alloca-05.ll | 2 +- test/Transforms/Coroutines/coro-alloca-06.ll | 2 +- test/Transforms/Coroutines/coro-alloca-07.ll | 2 +- test/Transforms/Coroutines/coro-alloca-08.ll | 2 +- test/Transforms/Coroutines/coro-byval-param.ll | 2 +- .../Coroutines/coro-catchswitch-cleanuppad.ll | 2 +- test/Transforms/Coroutines/coro-catchswitch.ll | 2 +- test/Transforms/Coroutines/coro-debug.ll | 2 +- .../Coroutines/coro-eh-aware-edge-split-00.ll | 2 +- .../Coroutines/coro-eh-aware-edge-split-01.ll | 2 +- .../Coroutines/coro-eh-aware-edge-split-02.ll | 2 +- test/Transforms/Coroutines/coro-frame-arrayalloca.ll | 2 +- .../Coroutines/coro-frame-reuse-alloca-00.ll | 2 +- .../Coroutines/coro-frame-reuse-alloca-01.ll | 2 +- .../Coroutines/coro-frame-reuse-alloca-02.ll | 2 +- .../Coroutines/coro-frame-reuse-alloca-03.ll | 2 +- .../Coroutines/coro-frame-reuse-alloca-04.ll | 2 +- .../Coroutines/coro-frame-reuse-alloca-05.ll | 2 +- test/Transforms/Coroutines/coro-frame-unreachable.ll | 2 +- test/Transforms/Coroutines/coro-frame.ll | 2 +- test/Transforms/Coroutines/coro-heap-elide.ll | 2 +- test/Transforms/Coroutines/coro-materialize.ll | 2 +- test/Transforms/Coroutines/coro-padding.ll | 2 +- test/Transforms/Coroutines/coro-param-copy.ll | 2 +- test/Transforms/Coroutines/coro-retcon-frame.ll | 2 +- test/Transforms/Coroutines/coro-retcon-once-value2.ll | 2 +- .../Coroutines/coro-retcon-resume-values2.ll | 2 +- test/Transforms/Coroutines/coro-retcon-unreachable.ll | 2 +- test/Transforms/Coroutines/coro-spill-after-phi.ll | 2 +- test/Transforms/Coroutines/coro-spill-corobegin.ll | 2 +- .../Coroutines/coro-spill-defs-before-corobegin.ll | 2 +- test/Transforms/Coroutines/coro-spill-promise.ll | 2 +- test/Transforms/Coroutines/coro-split-00.ll | 2 +- test/Transforms/Coroutines/coro-split-02.ll | 2 +- test/Transforms/Coroutines/coro-split-alloc.ll | 2 +- test/Transforms/Coroutines/coro-split-dbg.ll | 2 +- test/Transforms/Coroutines/coro-split-eh-00.ll | 2 +- test/Transforms/Coroutines/coro-split-eh-01.ll | 2 +- test/Transforms/Coroutines/coro-split-hidden.ll | 2 +- test/Transforms/Coroutines/coro-split-musttail.ll | 2 +- test/Transforms/Coroutines/coro-split-musttail1.ll | 2 +- test/Transforms/Coroutines/coro-split-musttail2.ll | 2 +- test/Transforms/Coroutines/coro-split-musttail3.ll | 2 +- .../Coroutines/coro-split-sink-lifetime-01.ll | 2 +- .../Coroutines/coro-split-sink-lifetime-02.ll | 2 +- .../Coroutines/coro-split-sink-lifetime-03.ll | 2 +- .../Coroutines/coro-split-sink-lifetime-04.ll | 2 +- test/Transforms/Coroutines/coro-zero-alloca.ll | 2 +- test/Transforms/Coroutines/no-suspend.ll | 2 +- test/Transforms/Inline/monster_scc.ll | 2 +- test/Transforms/InstCombine/assume-align.ll | 2 +- test/Transforms/LoopUnroll/peel-loop-inner.ll | 2 +- test/Transforms/LoopUnroll/peel-loop.ll | 4 ++-- test/Transforms/PGOProfile/chr.ll | 2 +- test/Transforms/PruneEH/2008-06-02-Weak.ll | 2 +- test/Transforms/PruneEH/ipo-nounwind.ll | 2 +- test/Transforms/PruneEH/looptest.ll | 2 +- test/Transforms/PruneEH/musttail.ll | 2 +- test/Transforms/PruneEH/operand-bundles.ll | 2 +- test/Transforms/PruneEH/pr23971.ll | 2 +- test/Transforms/PruneEH/pr26263.ll | 4 ++-- test/Transforms/PruneEH/recursivetest.ll | 2 +- test/Transforms/PruneEH/seh-nounwind.ll | 2 +- test/Transforms/PruneEH/simpletest.ll | 2 +- .../SimplifyCFG/1elt-ptr-vec-alignment-crash.ll | 2 +- .../SimplifyCFG/ARM/switch-to-lookup-table.ll | 10 +++++----- .../SimplifyCFG/ForwardSwitchConditionToPHI.ll | 4 ++-- test/Transforms/SimplifyCFG/X86/CoveredLookupTable.ll | 2 +- .../Transforms/SimplifyCFG/X86/disable-lookup-table.ll | 2 +- test/Transforms/SimplifyCFG/X86/sink-common-code.ll | 2 +- test/Transforms/SimplifyCFG/X86/switch-covered-bug.ll | 2 +- test/Transforms/SimplifyCFG/X86/switch-table-bug.ll | 2 +- .../SimplifyCFG/X86/switch_to_lookup_table.ll | 2 +- test/Transforms/SimplifyCFG/basictest.ll | 2 +- test/Transforms/SimplifyCFG/branch-fold-threshold.ll | 6 +++--- test/Transforms/SimplifyCFG/convergent.ll | 2 +- test/Transforms/SimplifyCFG/multiple-phis.ll | 2 +- test/Transforms/SimplifyCFG/no-md-sink.ll | 2 +- .../SimplifyCFG/preserve-llvm-loop-metadata.ll | 2 +- test/Transforms/SimplifyCFG/rangereduce.ll | 2 +- test/Transforms/SimplifyCFG/switch-dead-default.ll | 4 ++-- test/Transforms/SimplifyCFG/switch_undef.ll | 2 +- test/Transforms/SimplifyCFG/unprofitable-pr.ll | 2 +- test/Transforms/SimplifyCFG/wc-widen-block.ll | 2 +- tools/bugpoint/CrashDebugger.cpp | 2 +- 103 files changed, 119 insertions(+), 120 deletions(-) diff --git a/lib/Analysis/InlineCost.cpp b/lib/Analysis/InlineCost.cpp index 4e03629148c..e73b0fa1440 100644 --- a/lib/Analysis/InlineCost.cpp +++ b/lib/Analysis/InlineCost.cpp @@ -2211,7 +2211,7 @@ bool CallAnalyzer::visitSwitchInst(SwitchInst &SI) { // proportional to the size of the tree or the size of jump table range. // // NB: We convert large switches which are just used to initialize large phi - // nodes to lookup tables instead in simplify-cfg, so this shouldn't prevent + // nodes to lookup tables instead in simplifycfg, so this shouldn't prevent // inlining those. It will prevent inlining in cases where the optimization // does not (yet) fire. diff --git a/lib/FuzzMutate/FuzzerCLI.cpp b/lib/FuzzMutate/FuzzerCLI.cpp index 1527062cfd9..be1887445d0 100644 --- a/lib/FuzzMutate/FuzzerCLI.cpp +++ b/lib/FuzzMutate/FuzzerCLI.cpp @@ -88,7 +88,7 @@ void llvm::handleExecNameEncodedOptimizerOpts(StringRef ExecName) { } else if (Opt == "earlycse") { Args.push_back("-passes=early-cse"); } else if (Opt == "simplifycfg") { - Args.push_back("-passes=simplify-cfg"); + Args.push_back("-passes=simplifycfg"); } else if (Opt == "gvn") { Args.push_back("-passes=gvn"); } else if (Opt == "sccp") { diff --git a/lib/Passes/PassBuilder.cpp b/lib/Passes/PassBuilder.cpp index a5b7e7d3f42..145ecffeb3a 100644 --- a/lib/Passes/PassBuilder.cpp +++ b/lib/Passes/PassBuilder.cpp @@ -1154,7 +1154,7 @@ PassBuilder::buildModuleSimplificationPipeline(OptimizationLevel Level, // Promote any localized globals to SSA registers. // FIXME: Should this instead by a run of SROA? - // FIXME: We should probably run instcombine and simplify-cfg afterward to + // FIXME: We should probably run instcombine and simplifycfg afterward to // delete control flows that are dead once globals have been folded to // constants. MPM.addPass(createModuleToFunctionPassAdaptor(PromotePass())); @@ -1388,7 +1388,7 @@ PassBuilder::buildModuleOptimizationPipeline(OptimizationLevel Level, } // FIXME: We need to run some loop optimizations to re-rotate loops after - // simplify-cfg and others undo their rotation. + // simplifycfg and others undo their rotation. // Optimize the loop execution. These passes operate on entire loop nests // rather than on each loop in an inside-out manner, and so they are actually diff --git a/lib/Passes/PassRegistry.def b/lib/Passes/PassRegistry.def index 1a379c1abec..f7bb2bc07c8 100644 --- a/lib/Passes/PassRegistry.def +++ b/lib/Passes/PassRegistry.def @@ -301,7 +301,6 @@ FUNCTION_PASS("scalarize-masked-mem-intrin", ScalarizeMaskedMemIntrinPass()) FUNCTION_PASS("scalarizer", ScalarizerPass()) FUNCTION_PASS("separate-const-offset-from-gep", SeparateConstOffsetFromGEPPass()) FUNCTION_PASS("sccp", SCCPPass()) -FUNCTION_PASS("simplifycfg", SimplifyCFGPass()) FUNCTION_PASS("sink", SinkingPass()) FUNCTION_PASS("slp-vectorizer", SLPVectorizerPass()) FUNCTION_PASS("slsr", StraightLineStrengthReducePass()) @@ -352,7 +351,7 @@ FUNCTION_PASS_WITH_PARAMS("msan", }, parseMSanPassOptions, "recover;kernel;track-origins=N") -FUNCTION_PASS_WITH_PARAMS("simplify-cfg", +FUNCTION_PASS_WITH_PARAMS("simplifycfg", "SimplifyCFGPass", [](SimplifyCFGOptions Opts) { return SimplifyCFGPass(Opts); diff --git a/lib/Transforms/IPO/PassManagerBuilder.cpp b/lib/Transforms/IPO/PassManagerBuilder.cpp index 7f8ba79c99b..d64d3702fa1 100644 --- a/lib/Transforms/IPO/PassManagerBuilder.cpp +++ b/lib/Transforms/IPO/PassManagerBuilder.cpp @@ -454,7 +454,7 @@ void PassManagerBuilder::addFunctionSimplificationPasses( else MPM.add(createLoopUnswitchPass(SizeLevel || OptLevel < 3, DivergentTarget)); // FIXME: We break the loop pass pipeline here in order to do full - // simplify-cfg. Eventually loop-simplifycfg should be enhanced to replace the + // simplifycfg. Eventually loop-simplifycfg should be enhanced to replace the // need for this. MPM.add(createCFGSimplificationPass()); MPM.add(createInstructionCombiningPass()); diff --git a/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp b/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp index 67ce313117a..e219c3970bb 100644 --- a/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp +++ b/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp @@ -420,7 +420,7 @@ static Loop *getTopMostExitingLoop(BasicBlock *ExitBB, LoopInfo &LI) { /// hoists the branch above that split. Preserves loop simplified form /// (splitting the exit block as necessary). It simplifies the branch within /// the loop to an unconditional branch but doesn't remove it entirely. Further -/// cleanup can be done with some simplify-cfg like pass. +/// cleanup can be done with some simplifycfg like pass. /// /// If `SE` is not null, it will be updated based on the potential loop SCEVs /// invalidated by this. @@ -648,7 +648,7 @@ static bool unswitchTrivialBranch(Loop &L, BranchInst &BI, DominatorTree &DT, /// considered for unswitching so this is a stable transform and the same /// switch will not be revisited. If after unswitching there is only a single /// in-loop successor, the switch is further simplified to an unconditional -/// branch. Still more cleanup can be done with some simplify-cfg like pass. +/// branch. Still more cleanup can be done with some simplifycfg like pass. /// /// If `SE` is not null, it will be updated based on the potential loop SCEVs /// invalidated by this. @@ -983,7 +983,7 @@ static bool unswitchAllTrivialConditions(Loop &L, DominatorTree &DT, if (auto *SI = dyn_cast(CurrentTerm)) { // Don't bother trying to unswitch past a switch with a constant // condition. This should be removed prior to running this pass by - // simplify-cfg. + // simplifycfg. if (isa(SI->getCondition())) return Changed; @@ -1012,7 +1012,7 @@ static bool unswitchAllTrivialConditions(Loop &L, DominatorTree &DT, return Changed; // Don't bother trying to unswitch past an unconditional branch or a branch - // with a constant value. These should be removed by simplify-cfg prior to + // with a constant value. These should be removed by simplifycfg prior to // running this pass. if (!BI->isConditional() || isa(BI->getCondition())) return Changed; diff --git a/test/Analysis/MemorySSA/update-remove-dead-blocks.ll b/test/Analysis/MemorySSA/update-remove-dead-blocks.ll index fab27878458..6f07b2a20fb 100644 --- a/test/Analysis/MemorySSA/update-remove-dead-blocks.ll +++ b/test/Analysis/MemorySSA/update-remove-dead-blocks.ll @@ -1,7 +1,7 @@ ; RUN: opt -loop-unswitch -loop-reduce -loop-simplifycfg -verify-memoryssa -S %s | FileCheck %s ; TODO: also run with NPM, but currently LSR does not preserve LCSSA, causing a verification failure on the test. -; opt -passes='loop-mssa(unswitch,loop-reduce,simplify-cfg)' -verify-memoryssa -S %s | FileCheck %s +; opt -passes='loop-mssa(unswitch,loop-reduce,simplifycfg)' -verify-memoryssa -S %s | FileCheck %s ; Test case for PR47557. diff --git a/test/Other/cgscc-disconnected-invalidation.ll b/test/Other/cgscc-disconnected-invalidation.ll index 0567605fcf9..4f50729153e 100644 --- a/test/Other/cgscc-disconnected-invalidation.ll +++ b/test/Other/cgscc-disconnected-invalidation.ll @@ -1,7 +1,7 @@ ; Test that patterns of transformations which disconnect a region of the call ; graph mid-traversal and then invalidate it function correctly. ; -; RUN: opt -S -passes='cgscc(inline,function(simplify-cfg))' < %s | FileCheck %s +; RUN: opt -S -passes='cgscc(inline,function(simplifycfg))' < %s | FileCheck %s define internal void @test_scc_internal(i1 %flag) { ; CHECK-NOT: @test_scc_internal diff --git a/test/Other/cgscc-iterate-function-mutation.ll b/test/Other/cgscc-iterate-function-mutation.ll index 2075a06a756..f4e4b889f50 100644 --- a/test/Other/cgscc-iterate-function-mutation.ll +++ b/test/Other/cgscc-iterate-function-mutation.ll @@ -1,11 +1,11 @@ -; RUN: opt -aa-pipeline=basic-aa -passes='cgscc(function-attrs,function(simplify-cfg))' -S < %s | FileCheck %s +; RUN: opt -aa-pipeline=basic-aa -passes='cgscc(function-attrs,function(simplifycfg))' -S < %s | FileCheck %s declare void @readnone() nofree nosync readnone declare void @unknown() declare void @reference_function_pointer(void()*) nofree nosync readnone ; The @test1_* set of functions checks that when we mutate functions with -; simplify-cfg to delete call edges and this ends up splitting both the SCCs +; simplifycfg to delete call edges and this ends up splitting both the SCCs ; and the RefSCCs that those functions are in, we re-run the CGSCC passes to ; observe the refined call graph structure. diff --git a/test/Other/pass-pipelines.ll b/test/Other/pass-pipelines.ll index 30b98ae8011..ef9c4d24a77 100644 --- a/test/Other/pass-pipelines.ll +++ b/test/Other/pass-pipelines.ll @@ -54,7 +54,7 @@ ; CHECK-O2-NOT: Manager ; CHECK-O2: Loop Pass Manager ; CHECK-O2-NOT: Manager -; FIXME: We shouldn't be pulling out to simplify-cfg and instcombine and +; FIXME: We shouldn't be pulling out to simplifycfg and instcombine and ; causing new loop pass managers. ; CHECK-O2: Simplify the CFG ; CHECK-O2-NOT: Manager diff --git a/test/Other/print-module-scope.ll b/test/Other/print-module-scope.ll index 805297dfe43..c35648424be 100644 --- a/test/Other/print-module-scope.ll +++ b/test/Other/print-module-scope.ll @@ -7,13 +7,13 @@ ; RUN: -simplifycfg -print-after=simplifycfg -print-module-scope \ ; RUN: | FileCheck %s -check-prefix=CFG ; RUN: opt < %s 2>&1 -disable-output \ -; RUN: -passes=simplify-cfg -print-after-all -print-module-scope \ +; RUN: -passes=simplifycfg -print-after-all -print-module-scope \ ; RUN: | FileCheck %s -check-prefix=CFG ; RUN: opt -enable-new-pm=0 < %s 2>&1 -disable-output \ ; RUN: -simplifycfg -print-after=simplifycfg -filter-print-funcs=foo -print-module-scope \ ; RUN: | FileCheck %s -check-prefix=FOO ; RUN: opt < %s 2>&1 -disable-output \ -; RUN: -passes=simplify-cfg -print-after-all -filter-print-funcs=foo -print-module-scope \ +; RUN: -passes=simplifycfg -print-after-all -filter-print-funcs=foo -print-module-scope \ ; RUN: | FileCheck %s -check-prefix=FOO ; CFG: IR Dump After {{Simplify the CFG|SimplifyCFGPass}} {{.*}}foo diff --git a/test/Transforms/Coroutines/ArgAddr.ll b/test/Transforms/Coroutines/ArgAddr.ll index d11f2fb762e..fe1bc5814b3 100644 --- a/test/Transforms/Coroutines/ArgAddr.ll +++ b/test/Transforms/Coroutines/ArgAddr.ll @@ -1,6 +1,6 @@ ; Need to move users of allocas that were moved into the coroutine frame after ; coro.begin. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define nonnull i8* @f(i32 %n) "coroutine.presplit"="1" { ; CHECK-LABEL: @f( diff --git a/test/Transforms/Coroutines/coro-alloc-with-param-O0.ll b/test/Transforms/Coroutines/coro-alloc-with-param-O0.ll index b3a69c85d7e..71f2905cc90 100644 --- a/test/Transforms/Coroutines/coro-alloc-with-param-O0.ll +++ b/test/Transforms/Coroutines/coro-alloc-with-param-O0.ll @@ -1,6 +1,6 @@ ; Check that we can handle the case when both alloc function and ; the user body consume the same argument. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s ; using copy of this (as it would happen under -O0) define i8* @f_copy(i64 %this_arg) "coroutine.presplit"="1" { diff --git a/test/Transforms/Coroutines/coro-alloc-with-param-O2.ll b/test/Transforms/Coroutines/coro-alloc-with-param-O2.ll index 7e85b9e07fc..1c1496fccd9 100644 --- a/test/Transforms/Coroutines/coro-alloc-with-param-O2.ll +++ b/test/Transforms/Coroutines/coro-alloc-with-param-O2.ll @@ -1,6 +1,6 @@ ; Check that we can handle the case when both alloc function and ; the user body consume the same argument. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s ; using this directly (as it would happen under -O2) define i8* @f_direct(i64 %this) "coroutine.presplit"="1" { diff --git a/test/Transforms/Coroutines/coro-alloca-01.ll b/test/Transforms/Coroutines/coro-alloca-01.ll index 4371bd30242..75bbe4c2b08 100644 --- a/test/Transforms/Coroutines/coro-alloca-01.ll +++ b/test/Transforms/Coroutines/coro-alloca-01.ll @@ -1,6 +1,6 @@ ; Tests that CoroSplit can succesfully determine allocas should live on the frame ; if their aliases are used across suspension points through PHINode. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f(i1 %n) "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-alloca-02.ll b/test/Transforms/Coroutines/coro-alloca-02.ll index 276daab6484..658d50dbf6d 100644 --- a/test/Transforms/Coroutines/coro-alloca-02.ll +++ b/test/Transforms/Coroutines/coro-alloca-02.ll @@ -1,6 +1,6 @@ ; Tests that if an alloca is escaped through storing the address, ; the alloac will be put on the frame. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f() "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-alloca-03.ll b/test/Transforms/Coroutines/coro-alloca-03.ll index e90464746bc..26fe74af157 100644 --- a/test/Transforms/Coroutines/coro-alloca-03.ll +++ b/test/Transforms/Coroutines/coro-alloca-03.ll @@ -1,5 +1,5 @@ ; Tests that allocas escaped through function calls will live on the frame. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f() "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-alloca-04.ll b/test/Transforms/Coroutines/coro-alloca-04.ll index 7e3a852adbc..651ced6d72e 100644 --- a/test/Transforms/Coroutines/coro-alloca-04.ll +++ b/test/Transforms/Coroutines/coro-alloca-04.ll @@ -1,6 +1,6 @@ ; Tests that CoroSplit can succesfully determine allocas should live on the frame ; if their aliases are used across suspension points through PHINode. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f(i1 %n) "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-alloca-05.ll b/test/Transforms/Coroutines/coro-alloca-05.ll index af4f73d1c24..e9db5d464f1 100644 --- a/test/Transforms/Coroutines/coro-alloca-05.ll +++ b/test/Transforms/Coroutines/coro-alloca-05.ll @@ -1,6 +1,6 @@ ; Tests that allocas after coro.begin are properly that do not need to ; live on the frame are properly moved to the .resume function. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f() "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-alloca-06.ll b/test/Transforms/Coroutines/coro-alloca-06.ll index 9adc65416f7..44badce3c8b 100644 --- a/test/Transforms/Coroutines/coro-alloca-06.ll +++ b/test/Transforms/Coroutines/coro-alloca-06.ll @@ -1,6 +1,6 @@ ; Test that in some simple cases allocas will not live on the frame even ; though their pointers are stored. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s %handle = type { i8* } diff --git a/test/Transforms/Coroutines/coro-alloca-07.ll b/test/Transforms/Coroutines/coro-alloca-07.ll index c02b6b13f1c..36522be3d45 100644 --- a/test/Transforms/Coroutines/coro-alloca-07.ll +++ b/test/Transforms/Coroutines/coro-alloca-07.ll @@ -1,6 +1,6 @@ ; Tests that CoroSplit can succesfully determine allocas should live on the frame ; if their aliases are used across suspension points through PHINode. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f(i1 %n) "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-alloca-08.ll b/test/Transforms/Coroutines/coro-alloca-08.ll index 4baa867c8c4..59da1f5824b 100644 --- a/test/Transforms/Coroutines/coro-alloca-08.ll +++ b/test/Transforms/Coroutines/coro-alloca-08.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s %"struct.std::coroutine_handle" = type { i8* } %"struct.std::coroutine_handle.0" = type { %"struct.std::coroutine_handle" } diff --git a/test/Transforms/Coroutines/coro-byval-param.ll b/test/Transforms/Coroutines/coro-byval-param.ll index d331f24e6dd..2309fa113fb 100644 --- a/test/Transforms/Coroutines/coro-byval-param.ll +++ b/test/Transforms/Coroutines/coro-byval-param.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s %promise_type = type { i8 } %struct.A = type <{ i64, i64, i32, [4 x i8] }> diff --git a/test/Transforms/Coroutines/coro-catchswitch-cleanuppad.ll b/test/Transforms/Coroutines/coro-catchswitch-cleanuppad.ll index 7805983920a..4650820c84e 100644 --- a/test/Transforms/Coroutines/coro-catchswitch-cleanuppad.ll +++ b/test/Transforms/Coroutines/coro-catchswitch-cleanuppad.ll @@ -1,6 +1,6 @@ ; Tests the PHI nodes in cleanuppads for catchswitch instructions are correctly ; split up. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s declare i32 @__CxxFrameHandler3(...) define i8* @f2(i1 %val) "coroutine.presplit"="1" personality i32 (...)* @__CxxFrameHandler3 { diff --git a/test/Transforms/Coroutines/coro-catchswitch.ll b/test/Transforms/Coroutines/coro-catchswitch.ll index ff591194a46..27e9b9ef965 100644 --- a/test/Transforms/Coroutines/coro-catchswitch.ll +++ b/test/Transforms/Coroutines/coro-catchswitch.ll @@ -1,5 +1,5 @@ ; Verifies that we can insert the spill for a PHI preceding the catchswitch -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i686-pc-windows-msvc" diff --git a/test/Transforms/Coroutines/coro-debug.ll b/test/Transforms/Coroutines/coro-debug.ll index 9ae279ca620..b766794ffab 100644 --- a/test/Transforms/Coroutines/coro-debug.ll +++ b/test/Transforms/Coroutines/coro-debug.ll @@ -1,5 +1,5 @@ ; Tests that debug information is sane after coro-split -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s source_filename = "simple-repro.c" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/test/Transforms/Coroutines/coro-eh-aware-edge-split-00.ll b/test/Transforms/Coroutines/coro-eh-aware-edge-split-00.ll index fdb1289df3a..b091afe5c46 100644 --- a/test/Transforms/Coroutines/coro-eh-aware-edge-split-00.ll +++ b/test/Transforms/Coroutines/coro-eh-aware-edge-split-00.ll @@ -1,5 +1,5 @@ ; Check that we can handle edge splits leading into a landingpad -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/test/Transforms/Coroutines/coro-eh-aware-edge-split-01.ll b/test/Transforms/Coroutines/coro-eh-aware-edge-split-01.ll index 0e71236b333..c57f92d18ce 100644 --- a/test/Transforms/Coroutines/coro-eh-aware-edge-split-01.ll +++ b/test/Transforms/Coroutines/coro-eh-aware-edge-split-01.ll @@ -1,5 +1,5 @@ ; Check that we can handle edge splits leading into a landingpad -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/test/Transforms/Coroutines/coro-eh-aware-edge-split-02.ll b/test/Transforms/Coroutines/coro-eh-aware-edge-split-02.ll index ec13b06969d..1f36e657839 100644 --- a/test/Transforms/Coroutines/coro-eh-aware-edge-split-02.ll +++ b/test/Transforms/Coroutines/coro-eh-aware-edge-split-02.ll @@ -1,5 +1,5 @@ ; Check that we can handle edge splits leading into a landingpad -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/test/Transforms/Coroutines/coro-frame-arrayalloca.ll b/test/Transforms/Coroutines/coro-frame-arrayalloca.ll index d57c4142df7..3d168e1e169 100644 --- a/test/Transforms/Coroutines/coro-frame-arrayalloca.ll +++ b/test/Transforms/Coroutines/coro-frame-arrayalloca.ll @@ -1,5 +1,5 @@ ; Check that we can handle spills of array allocas -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s declare void @consume.double.ptr(double*) declare void @consume.i32.ptr(i32*) diff --git a/test/Transforms/Coroutines/coro-frame-reuse-alloca-00.ll b/test/Transforms/Coroutines/coro-frame-reuse-alloca-00.ll index 9670be6680a..bfa6612e1d3 100644 --- a/test/Transforms/Coroutines/coro-frame-reuse-alloca-00.ll +++ b/test/Transforms/Coroutines/coro-frame-reuse-alloca-00.ll @@ -1,5 +1,5 @@ ; Check that we can handle spills of array allocas -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -reuse-storage-in-coroutine-frame -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -reuse-storage-in-coroutine-frame -S | FileCheck %s %struct.big_structure = type { [500 x i8] } declare void @consume(%struct.big_structure*) diff --git a/test/Transforms/Coroutines/coro-frame-reuse-alloca-01.ll b/test/Transforms/Coroutines/coro-frame-reuse-alloca-01.ll index d745d90977b..2d493e4b0a8 100644 --- a/test/Transforms/Coroutines/coro-frame-reuse-alloca-01.ll +++ b/test/Transforms/Coroutines/coro-frame-reuse-alloca-01.ll @@ -1,6 +1,6 @@ ; Tests that variables in a Corotuine whose lifetime range is not overlapping each other ; re-use the same slot in Coroutine frame. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -reuse-storage-in-coroutine-frame -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -reuse-storage-in-coroutine-frame -S | FileCheck %s %"struct.task::promise_type" = type { i8 } %struct.awaitable = type { i8 } %struct.big_structure = type { [500 x i8] } diff --git a/test/Transforms/Coroutines/coro-frame-reuse-alloca-02.ll b/test/Transforms/Coroutines/coro-frame-reuse-alloca-02.ll index c251509191a..e35ecba06c8 100644 --- a/test/Transforms/Coroutines/coro-frame-reuse-alloca-02.ll +++ b/test/Transforms/Coroutines/coro-frame-reuse-alloca-02.ll @@ -1,6 +1,6 @@ ; Tests that variables of different type in a Corotuine whose lifetime range is not overlapping each other ; re-use the same slot in Coroutine frame. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -reuse-storage-in-coroutine-frame -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -reuse-storage-in-coroutine-frame -S | FileCheck %s %"struct.task::promise_type" = type { i8 } %struct.awaitable = type { i8 } %struct.big_structure = type { [500 x i8] } diff --git a/test/Transforms/Coroutines/coro-frame-reuse-alloca-03.ll b/test/Transforms/Coroutines/coro-frame-reuse-alloca-03.ll index 18a00980387..440ab2c6cd5 100644 --- a/test/Transforms/Coroutines/coro-frame-reuse-alloca-03.ll +++ b/test/Transforms/Coroutines/coro-frame-reuse-alloca-03.ll @@ -1,5 +1,5 @@ ; Check that we should not reuse alloca sotrage in O0. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s %struct.big_structure = type { [500 x i8] } declare void @consume(%struct.big_structure*) diff --git a/test/Transforms/Coroutines/coro-frame-reuse-alloca-04.ll b/test/Transforms/Coroutines/coro-frame-reuse-alloca-04.ll index bfc5f467865..3549d2e9827 100644 --- a/test/Transforms/Coroutines/coro-frame-reuse-alloca-04.ll +++ b/test/Transforms/Coroutines/coro-frame-reuse-alloca-04.ll @@ -1,6 +1,6 @@ ; Tests that variables of different type with incompatible alignment in a Corotuine whose lifetime ; range is not overlapping each other should not re-use the same slot in Coroutine frame. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -reuse-storage-in-coroutine-frame -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -reuse-storage-in-coroutine-frame -S | FileCheck %s %"struct.task::promise_type" = type { i8 } %struct.awaitable = type { i8 } %struct.big_structure = type { [500 x i8] } diff --git a/test/Transforms/Coroutines/coro-frame-reuse-alloca-05.ll b/test/Transforms/Coroutines/coro-frame-reuse-alloca-05.ll index f336097a004..d82d1cebec2 100644 --- a/test/Transforms/Coroutines/coro-frame-reuse-alloca-05.ll +++ b/test/Transforms/Coroutines/coro-frame-reuse-alloca-05.ll @@ -1,6 +1,6 @@ ; Tests that variables of different type with incompatible alignment in a Corotuine whose ; lifetime range is not overlapping each other re-use the same slot in CorotuineFrame. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -reuse-storage-in-coroutine-frame -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -reuse-storage-in-coroutine-frame -S | FileCheck %s %"struct.task::promise_type" = type { i8 } %struct.awaitable = type { i8 } %struct.big_structure = type { [500 x i8] } diff --git a/test/Transforms/Coroutines/coro-frame-unreachable.ll b/test/Transforms/Coroutines/coro-frame-unreachable.ll index a3ef133e8e1..695d6300ebd 100644 --- a/test/Transforms/Coroutines/coro-frame-unreachable.ll +++ b/test/Transforms/Coroutines/coro-frame-unreachable.ll @@ -1,5 +1,5 @@ ; Check that coro-split doesn't choke on intrinsics in unreachable blocks -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S define i8* @f(i1 %arg) "coroutine.presplit"="1" personality i32 0 { entry: diff --git a/test/Transforms/Coroutines/coro-frame.ll b/test/Transforms/Coroutines/coro-frame.ll index 86cf40c8019..775972ab6a0 100644 --- a/test/Transforms/Coroutines/coro-frame.ll +++ b/test/Transforms/Coroutines/coro-frame.ll @@ -1,5 +1,5 @@ ; Check that we can handle spills of the result of the invoke instruction -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f(i64 %this) "coroutine.presplit"="1" personality i32 0 { entry: diff --git a/test/Transforms/Coroutines/coro-heap-elide.ll b/test/Transforms/Coroutines/coro-heap-elide.ll index dea6bd93c23..9c6165a3851 100644 --- a/test/Transforms/Coroutines/coro-heap-elide.ll +++ b/test/Transforms/Coroutines/coro-heap-elide.ll @@ -2,7 +2,7 @@ ; elided and any tail calls referencing the coroutine frame has the tail ; call attribute removed. ; RUN: opt < %s -S \ -; RUN: -passes='cgscc(inline,function(coro-elide,instsimplify,simplify-cfg))' \ +; RUN: -passes='cgscc(inline,function(coro-elide,instsimplify,simplifycfg))' \ ; RUN: -aa-pipeline='basic-aa' | FileCheck %s declare void @print(i32) nounwind diff --git a/test/Transforms/Coroutines/coro-materialize.ll b/test/Transforms/Coroutines/coro-materialize.ll index fcc1f896558..faf91544022 100644 --- a/test/Transforms/Coroutines/coro-materialize.ll +++ b/test/Transforms/Coroutines/coro-materialize.ll @@ -1,5 +1,5 @@ ; Verifies that we materialize instruction across suspend points -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f(i32 %n) "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-padding.ll b/test/Transforms/Coroutines/coro-padding.ll index e8801c8e8e1..991f6f42ace 100644 --- a/test/Transforms/Coroutines/coro-padding.ll +++ b/test/Transforms/Coroutines/coro-padding.ll @@ -1,6 +1,6 @@ ; Check that we will insert the correct padding if natural alignment of the ; spilled data does not match the alignment specified in alloca instruction. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s %PackedStruct = type <{ i64 }> diff --git a/test/Transforms/Coroutines/coro-param-copy.ll b/test/Transforms/Coroutines/coro-param-copy.ll index b5a4e7059b3..0a939d7fbf0 100644 --- a/test/Transforms/Coroutines/coro-param-copy.ll +++ b/test/Transforms/Coroutines/coro-param-copy.ll @@ -1,6 +1,6 @@ ; Check that we create copy the data from the alloca into the coroutine ; frame slot if it was written to. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f() "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-retcon-frame.ll b/test/Transforms/Coroutines/coro-retcon-frame.ll index 3380f4ace76..fed3586c93c 100644 --- a/test/Transforms/Coroutines/coro-retcon-frame.ll +++ b/test/Transforms/Coroutines/coro-retcon-frame.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s target datalayout = "p:64:64:64" diff --git a/test/Transforms/Coroutines/coro-retcon-once-value2.ll b/test/Transforms/Coroutines/coro-retcon-once-value2.ll index a3637af82b1..c3a4680b039 100644 --- a/test/Transforms/Coroutines/coro-retcon-once-value2.ll +++ b/test/Transforms/Coroutines/coro-retcon-once-value2.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --include-generated-funcs -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse,coro-cleanup' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse,coro-cleanup' -S | FileCheck %s target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.12.0" diff --git a/test/Transforms/Coroutines/coro-retcon-resume-values2.ll b/test/Transforms/Coroutines/coro-retcon-resume-values2.ll index 5d0ed292d8f..4fd95bc2beb 100644 --- a/test/Transforms/Coroutines/coro-retcon-resume-values2.ll +++ b/test/Transforms/Coroutines/coro-retcon-resume-values2.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --include-generated-funcs -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse,simplify-cfg,coro-cleanup' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse,simplifycfg,coro-cleanup' -S | FileCheck %s define i8* @f(i8* %buffer, i32 %n) "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-retcon-unreachable.ll b/test/Transforms/Coroutines/coro-retcon-unreachable.ll index 17795f068ad..965f1547752 100644 --- a/test/Transforms/Coroutines/coro-retcon-unreachable.ll +++ b/test/Transforms/Coroutines/coro-retcon-unreachable.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -passes='function(coro-early),cgscc(coro-split),function(simplify-cfg,early-cse)' -S | FileCheck %s +; RUN: opt < %s -passes='function(coro-early),cgscc(coro-split),function(simplifycfg,early-cse)' -S | FileCheck %s target datalayout = "E-p:64:64" %swift.type = type { i64 } diff --git a/test/Transforms/Coroutines/coro-spill-after-phi.ll b/test/Transforms/Coroutines/coro-spill-after-phi.ll index 3947ec0561a..6f435fc9a17 100644 --- a/test/Transforms/Coroutines/coro-spill-after-phi.ll +++ b/test/Transforms/Coroutines/coro-spill-after-phi.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; Verifies that we insert spills of PHI instruction _after) all PHI Nodes -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse,simplify-cfg' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse,simplifycfg' -S | FileCheck %s ; Verifies that the both phis are stored correctly in the coroutine frame ; CHECK: %f.Frame = type { void (%f.Frame*)*, void (%f.Frame*)*, i32, i32, i1 } diff --git a/test/Transforms/Coroutines/coro-spill-corobegin.ll b/test/Transforms/Coroutines/coro-spill-corobegin.ll index e361699c24b..fd1d7c3b4ec 100644 --- a/test/Transforms/Coroutines/coro-spill-corobegin.ll +++ b/test/Transforms/Coroutines/coro-spill-corobegin.ll @@ -1,5 +1,5 @@ ; Check that we can spills coro.begin from an inlined inner coroutine. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s %g.Frame = type { void (%g.Frame*)*, void (%g.Frame*)*, i32, i1, i32 } diff --git a/test/Transforms/Coroutines/coro-spill-defs-before-corobegin.ll b/test/Transforms/Coroutines/coro-spill-defs-before-corobegin.ll index 78362186223..861af80e0f1 100644 --- a/test/Transforms/Coroutines/coro-spill-defs-before-corobegin.ll +++ b/test/Transforms/Coroutines/coro-spill-defs-before-corobegin.ll @@ -1,5 +1,5 @@ ; Verifies that phi and invoke definitions before CoroBegin are spilled properly. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse,simplify-cfg' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse,simplifycfg' -S | FileCheck %s define i8* @f(i1 %n) "coroutine.presplit"="1" personality i32 0 { entry: diff --git a/test/Transforms/Coroutines/coro-spill-promise.ll b/test/Transforms/Coroutines/coro-spill-promise.ll index 2eb3454cf6b..82566655393 100644 --- a/test/Transforms/Coroutines/coro-spill-promise.ll +++ b/test/Transforms/Coroutines/coro-spill-promise.ll @@ -1,5 +1,5 @@ ; Check that promise object is reloaded from the correct index of the coro frame. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s %"class.task::promise_type" = type { [64 x i8] } diff --git a/test/Transforms/Coroutines/coro-split-00.ll b/test/Transforms/Coroutines/coro-split-00.ll index eac0d177d8a..d5c6279a6a8 100644 --- a/test/Transforms/Coroutines/coro-split-00.ll +++ b/test/Transforms/Coroutines/coro-split-00.ll @@ -1,5 +1,5 @@ ; Tests that coro-split pass splits the coroutine into f, f.resume and f.destroy -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f() "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-split-02.ll b/test/Transforms/Coroutines/coro-split-02.ll index caaf0e3e7d1..b0242731c7b 100644 --- a/test/Transforms/Coroutines/coro-split-02.ll +++ b/test/Transforms/Coroutines/coro-split-02.ll @@ -1,7 +1,7 @@ ; Tests that coro-split can handle the case when a code after coro.suspend uses ; a value produces between coro.save and coro.suspend (%Result.i19) ; and checks whether stray coro.saves are properly removed -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse,simplify-cfg' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse,simplifycfg' -S | FileCheck %s %"struct.std::coroutine_handle" = type { i8* } %"struct.std::coroutine_handle.0" = type { %"struct.std::coroutine_handle" } diff --git a/test/Transforms/Coroutines/coro-split-alloc.ll b/test/Transforms/Coroutines/coro-split-alloc.ll index 09ee4443c2a..5bc40484b4c 100644 --- a/test/Transforms/Coroutines/coro-split-alloc.ll +++ b/test/Transforms/Coroutines/coro-split-alloc.ll @@ -1,5 +1,5 @@ ; Tests that coro-split passes initialized values to coroutine frame allocator. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f(i32 %argument) "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-split-dbg.ll b/test/Transforms/Coroutines/coro-split-dbg.ll index b64b0e5a6c9..78783855365 100644 --- a/test/Transforms/Coroutines/coro-split-dbg.ll +++ b/test/Transforms/Coroutines/coro-split-dbg.ll @@ -1,6 +1,6 @@ ; Make sure that coro-split correctly deals with debug information. ; The test here is simply that it does not result in bad IR that will crash opt. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -disable-output +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -disable-output source_filename = "coro.c" target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/test/Transforms/Coroutines/coro-split-eh-00.ll b/test/Transforms/Coroutines/coro-split-eh-00.ll index 7b9ca3d7ec1..dba8f4798c5 100644 --- a/test/Transforms/Coroutines/coro-split-eh-00.ll +++ b/test/Transforms/Coroutines/coro-split-eh-00.ll @@ -1,6 +1,6 @@ ; Tests that coro-split removes cleanup code after coro.end in resume functions ; and retains it in the start function. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f(i1 %val) "coroutine.presplit"="1" personality i32 3 { entry: diff --git a/test/Transforms/Coroutines/coro-split-eh-01.ll b/test/Transforms/Coroutines/coro-split-eh-01.ll index f57fe6d3a51..26fd8255245 100644 --- a/test/Transforms/Coroutines/coro-split-eh-01.ll +++ b/test/Transforms/Coroutines/coro-split-eh-01.ll @@ -1,6 +1,6 @@ ; Tests that coro-split removes cleanup code after coro.end in resume functions ; and retains it in the start function. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define i8* @f2(i1 %val) "coroutine.presplit"="1" personality i32 4 { entry: diff --git a/test/Transforms/Coroutines/coro-split-hidden.ll b/test/Transforms/Coroutines/coro-split-hidden.ll index d4f058f5d37..1933258df7a 100644 --- a/test/Transforms/Coroutines/coro-split-hidden.ll +++ b/test/Transforms/Coroutines/coro-split-hidden.ll @@ -1,7 +1,7 @@ ; Tests that coro-split can convert functions with hidden visibility. ; These may be generated by a frontend such as Clang, when inlining with ; '-fvisibility-inlines-hidden'. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define hidden i8* @f() "coroutine.presplit"="1" { entry: diff --git a/test/Transforms/Coroutines/coro-split-musttail.ll b/test/Transforms/Coroutines/coro-split-musttail.ll index b069f5d123d..c1a68a12423 100644 --- a/test/Transforms/Coroutines/coro-split-musttail.ll +++ b/test/Transforms/Coroutines/coro-split-musttail.ll @@ -1,6 +1,6 @@ ; Tests that coro-split will convert coro.resume followed by a suspend to a ; musttail call. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define void @f() #0 { entry: diff --git a/test/Transforms/Coroutines/coro-split-musttail1.ll b/test/Transforms/Coroutines/coro-split-musttail1.ll index 0b1e3f2dd55..fd8b41a3495 100644 --- a/test/Transforms/Coroutines/coro-split-musttail1.ll +++ b/test/Transforms/Coroutines/coro-split-musttail1.ll @@ -1,6 +1,6 @@ ; Tests that coro-split will convert coro.resume followed by a suspend to a ; musttail call. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define void @f() #0 { entry: diff --git a/test/Transforms/Coroutines/coro-split-musttail2.ll b/test/Transforms/Coroutines/coro-split-musttail2.ll index 08d9cf11a58..9ea46a70a6b 100644 --- a/test/Transforms/Coroutines/coro-split-musttail2.ll +++ b/test/Transforms/Coroutines/coro-split-musttail2.ll @@ -1,6 +1,6 @@ ; Tests that coro-split will convert coro.resume followed by a suspend to a ; musttail call. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define void @fakeresume1(i8*) { entry: diff --git a/test/Transforms/Coroutines/coro-split-musttail3.ll b/test/Transforms/Coroutines/coro-split-musttail3.ll index b6b527a613e..24c7c5377b8 100644 --- a/test/Transforms/Coroutines/coro-split-musttail3.ll +++ b/test/Transforms/Coroutines/coro-split-musttail3.ll @@ -1,6 +1,6 @@ ; Tests that coro-split will convert coro.resume followed by a suspend to a ; musttail call. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s define void @f() #0 { entry: diff --git a/test/Transforms/Coroutines/coro-split-sink-lifetime-01.ll b/test/Transforms/Coroutines/coro-split-sink-lifetime-01.ll index d4c33fb93b4..1b34ec9951d 100644 --- a/test/Transforms/Coroutines/coro-split-sink-lifetime-01.ll +++ b/test/Transforms/Coroutines/coro-split-sink-lifetime-01.ll @@ -1,6 +1,6 @@ ; Tests that coro-split will optimize the lifetime.start maker of each local variable, ; sink them to the places after the suspend block. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse,simplify-cfg' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse,simplifycfg' -S | FileCheck %s %"struct.std::coroutine_handle" = type { i8* } %"struct.std::coroutine_handle.0" = type { %"struct.std::coroutine_handle" } diff --git a/test/Transforms/Coroutines/coro-split-sink-lifetime-02.ll b/test/Transforms/Coroutines/coro-split-sink-lifetime-02.ll index ad157f94cad..8d54cb6b017 100644 --- a/test/Transforms/Coroutines/coro-split-sink-lifetime-02.ll +++ b/test/Transforms/Coroutines/coro-split-sink-lifetime-02.ll @@ -1,6 +1,6 @@ ; Tests that coro-split will optimize the lifetime.start maker of each local variable, ; sink them to the places after the suspend block. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s %"struct.std::coroutine_handle" = type { i8* } %"struct.std::coroutine_handle.0" = type { %"struct.std::coroutine_handle" } diff --git a/test/Transforms/Coroutines/coro-split-sink-lifetime-03.ll b/test/Transforms/Coroutines/coro-split-sink-lifetime-03.ll index 31913669ff9..92a25b6ac9e 100644 --- a/test/Transforms/Coroutines/coro-split-sink-lifetime-03.ll +++ b/test/Transforms/Coroutines/coro-split-sink-lifetime-03.ll @@ -1,6 +1,6 @@ ; Corresponding to coro-split-sink-lifetime-01.ll. This file tests that whether the CoroFrame ; pass knows the operand of lifetime.start intrinsic may be GEP as well. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse,simplify-cfg' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse,simplifycfg' -S | FileCheck %s %"struct.std::coroutine_handle" = type { i8* } %"struct.std::coroutine_handle.0" = type { %"struct.std::coroutine_handle" } diff --git a/test/Transforms/Coroutines/coro-split-sink-lifetime-04.ll b/test/Transforms/Coroutines/coro-split-sink-lifetime-04.ll index c3be84a202a..0eac5edec1f 100644 --- a/test/Transforms/Coroutines/coro-split-sink-lifetime-04.ll +++ b/test/Transforms/Coroutines/coro-split-sink-lifetime-04.ll @@ -1,6 +1,6 @@ ; Tests that coro-split will optimize the lifetime.start maker of each local variable, ; sink them to the places after the suspend block. -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse,simplify-cfg' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse,simplifycfg' -S | FileCheck %s %"struct.std::coroutine_handle" = type { i8* } %"struct.std::coroutine_handle.0" = type { %"struct.std::coroutine_handle" } diff --git a/test/Transforms/Coroutines/coro-zero-alloca.ll b/test/Transforms/Coroutines/coro-zero-alloca.ll index da35653bc23..5a38c58d1d3 100644 --- a/test/Transforms/Coroutines/coro-zero-alloca.ll +++ b/test/Transforms/Coroutines/coro-zero-alloca.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse' -S | FileCheck %s declare i8* @malloc(i64) declare void @free(i8*) diff --git a/test/Transforms/Coroutines/no-suspend.ll b/test/Transforms/Coroutines/no-suspend.ll index 3d31396df79..03ec4b4a2df 100644 --- a/test/Transforms/Coroutines/no-suspend.ll +++ b/test/Transforms/Coroutines/no-suspend.ll @@ -1,5 +1,5 @@ ; Test no suspend coroutines -; RUN: opt < %s -passes='cgscc(coro-split),simplify-cfg,early-cse,simplify-cfg' -S | FileCheck %s +; RUN: opt < %s -passes='cgscc(coro-split),simplifycfg,early-cse,simplifycfg' -S | FileCheck %s ; Coroutine with no-suspends will turn into: ; diff --git a/test/Transforms/Inline/monster_scc.ll b/test/Transforms/Inline/monster_scc.ll index b4e45e06570..81b6090374e 100644 --- a/test/Transforms/Inline/monster_scc.ll +++ b/test/Transforms/Inline/monster_scc.ll @@ -17,7 +17,7 @@ ; more than 16 calls in them. ; ; This test is extracted from the following C++ program compiled with Clang. -; The IR is simplified with SROA, instcombine, and simplify-cfg. Then C++ +; The IR is simplified with SROA, instcombine, and simplifycfg. Then C++ ; linkage stuff, attributes, target specific things, metadata and comments were ; removed. The order of the fuctions is also made more predictable than Clang's ; output order. diff --git a/test/Transforms/InstCombine/assume-align.ll b/test/Transforms/InstCombine/assume-align.ll index f0bd8c892b8..99e9fd656c5 100644 --- a/test/Transforms/InstCombine/assume-align.ll +++ b/test/Transforms/InstCombine/assume-align.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -S -passes=instcombine,simplify-cfg < %s 2>&1 | FileCheck %s +; RUN: opt -S -passes=instcombine,simplifycfg < %s 2>&1 | FileCheck %s declare void @llvm.assume(i1 noundef) diff --git a/test/Transforms/LoopUnroll/peel-loop-inner.ll b/test/Transforms/LoopUnroll/peel-loop-inner.ll index 8d89053c96f..bcfecbf228d 100644 --- a/test/Transforms/LoopUnroll/peel-loop-inner.ll +++ b/test/Transforms/LoopUnroll/peel-loop-inner.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt < %s -S -passes='require,loop-unroll,simplify-cfg,instcombine' -unroll-force-peel-count=3 -verify-dom-info | FileCheck %s +; RUN: opt < %s -S -passes='require,loop-unroll,simplifycfg,instcombine' -unroll-force-peel-count=3 -verify-dom-info | FileCheck %s define void @basic(i32 %K, i32 %N) { ; CHECK-LABEL: @basic( diff --git a/test/Transforms/LoopUnroll/peel-loop.ll b/test/Transforms/LoopUnroll/peel-loop.ll index 16e2dfcfd99..8a0ac2db4c7 100644 --- a/test/Transforms/LoopUnroll/peel-loop.ll +++ b/test/Transforms/LoopUnroll/peel-loop.ll @@ -1,6 +1,6 @@ ; RUN: opt < %s -S -loop-unroll -unroll-force-peel-count=3 -verify-dom-info -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -instcombine | FileCheck %s -; RUN: opt < %s -S -passes='require,loop-unroll,simplify-cfg,instcombine' -unroll-force-peel-count=3 -verify-dom-info | FileCheck %s -; RUN: opt < %s -S -passes='require,loop-unroll,simplify-cfg,instcombine' -unroll-force-peel-count=3 -verify-dom-info | FileCheck %s +; RUN: opt < %s -S -passes='require,loop-unroll,simplifycfg,instcombine' -unroll-force-peel-count=3 -verify-dom-info | FileCheck %s +; RUN: opt < %s -S -passes='require,loop-unroll,simplifycfg,instcombine' -unroll-force-peel-count=3 -verify-dom-info | FileCheck %s ; Basic loop peeling - check that we can peel-off the first 3 loop iterations ; when explicitly requested. diff --git a/test/Transforms/PGOProfile/chr.ll b/test/Transforms/PGOProfile/chr.ll index 5f9acdc969d..41f2812eb4b 100644 --- a/test/Transforms/PGOProfile/chr.ll +++ b/test/Transforms/PGOProfile/chr.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -chr -instcombine -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S -enable-new-pm=0 | FileCheck %s -; RUN: opt < %s -passes='require,function(chr,instcombine,simplify-cfg)' -S | FileCheck %s +; RUN: opt < %s -passes='require,function(chr,instcombine,simplifycfg)' -S | FileCheck %s declare void @foo() declare void @bar() diff --git a/test/Transforms/PruneEH/2008-06-02-Weak.ll b/test/Transforms/PruneEH/2008-06-02-Weak.ll index 65f21c81321..0e89ad65e4c 100644 --- a/test/Transforms/PruneEH/2008-06-02-Weak.ll +++ b/test/Transforms/PruneEH/2008-06-02-Weak.ll @@ -1,5 +1,5 @@ ; RUN: opt < %s -prune-eh -enable-new-pm=0 -S | FileCheck %s -; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s +; RUN: opt < %s -passes='function-attrs,function(simplifycfg)' -S | FileCheck %s ; We should not infer 'nounwind' for/from a weak function, ; since it can be overriden by throwing implementation. diff --git a/test/Transforms/PruneEH/ipo-nounwind.ll b/test/Transforms/PruneEH/ipo-nounwind.ll index 8b01c99727b..12b52bcf263 100644 --- a/test/Transforms/PruneEH/ipo-nounwind.ll +++ b/test/Transforms/PruneEH/ipo-nounwind.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -S -prune-eh -enable-new-pm=0 < %s | FileCheck --check-prefixes=ALL,OLDPM %s -; RUN: opt -S -passes='function-attrs,function(simplify-cfg)' < %s | FileCheck --check-prefixes=ALL,NEWPM %s +; RUN: opt -S -passes='function-attrs,function(simplifycfg)' < %s | FileCheck --check-prefixes=ALL,NEWPM %s declare void @may_throw() diff --git a/test/Transforms/PruneEH/looptest.ll b/test/Transforms/PruneEH/looptest.ll index 8be8ba81eda..5f4413322cd 100644 --- a/test/Transforms/PruneEH/looptest.ll +++ b/test/Transforms/PruneEH/looptest.ll @@ -1,5 +1,5 @@ ; RUN: opt < %s -prune-eh -S -enable-new-pm=0 | FileCheck %s -; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s +; RUN: opt < %s -passes='function-attrs,function(simplifycfg)' -S | FileCheck %s declare void @nounwind() nounwind diff --git a/test/Transforms/PruneEH/musttail.ll b/test/Transforms/PruneEH/musttail.ll index 1dfce4c4c6c..7c97d6118d2 100644 --- a/test/Transforms/PruneEH/musttail.ll +++ b/test/Transforms/PruneEH/musttail.ll @@ -1,5 +1,5 @@ ; RUN: opt -prune-eh -enable-new-pm=0 -S < %s | FileCheck %s -; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s +; RUN: opt < %s -passes='function-attrs,function(simplifycfg)' -S | FileCheck %s declare void @noreturn() diff --git a/test/Transforms/PruneEH/operand-bundles.ll b/test/Transforms/PruneEH/operand-bundles.ll index a64c97db36a..1f6eec07456 100644 --- a/test/Transforms/PruneEH/operand-bundles.ll +++ b/test/Transforms/PruneEH/operand-bundles.ll @@ -1,5 +1,5 @@ ; RUN: opt < %s -prune-eh -enable-new-pm=0 -S | FileCheck %s -; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s +; RUN: opt < %s -passes='function-attrs,function(simplifycfg)' -S | FileCheck %s declare void @nounwind() nounwind diff --git a/test/Transforms/PruneEH/pr23971.ll b/test/Transforms/PruneEH/pr23971.ll index 4f4f1e42e35..f50898aefe1 100644 --- a/test/Transforms/PruneEH/pr23971.ll +++ b/test/Transforms/PruneEH/pr23971.ll @@ -1,5 +1,5 @@ ; RUN: opt -S -prune-eh -enable-new-pm=0 < %s | FileCheck %s -; RUN: opt -S -passes='function-attrs,function(simplify-cfg)' < %s | FileCheck %s +; RUN: opt -S -passes='function-attrs,function(simplifycfg)' < %s | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/test/Transforms/PruneEH/pr26263.ll b/test/Transforms/PruneEH/pr26263.ll index 3ff8193f58d..91bf448cb07 100644 --- a/test/Transforms/PruneEH/pr26263.ll +++ b/test/Transforms/PruneEH/pr26263.ll @@ -1,9 +1,9 @@ -; PruneEH is less powerful than simplify-cfg in terms of cfg simplification, +; PruneEH is less powerful than simplifycfg in terms of cfg simplification, ; so it leaves some of the unreachable stuff hanging around. ; Checking it with CHECK-OLD. ; ; RUN: opt -prune-eh -enable-new-pm=0 -S < %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-OLD -; RUN: opt -passes='function-attrs,function(simplify-cfg)' -S < %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-NEW +; RUN: opt -passes='function-attrs,function(simplifycfg)' -S < %s | FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-NEW target datalayout = "e-m:x-p:32:32-i64:64-f80:32-n8:16:32-a:0:32-S32" target triple = "i386-pc-windows-msvc" diff --git a/test/Transforms/PruneEH/recursivetest.ll b/test/Transforms/PruneEH/recursivetest.ll index 9732b92e1ec..c90ee0e7104 100644 --- a/test/Transforms/PruneEH/recursivetest.ll +++ b/test/Transforms/PruneEH/recursivetest.ll @@ -1,5 +1,5 @@ ; RUN: opt < %s -prune-eh -enable-new-pm=0 -S | FileCheck %s -; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s +; RUN: opt < %s -passes='function-attrs,function(simplifycfg)' -S | FileCheck %s ; CHECK-LABEL: define internal i32 @foo() define internal i32 @foo() personality i32 (...)* @__gxx_personality_v0 { diff --git a/test/Transforms/PruneEH/seh-nounwind.ll b/test/Transforms/PruneEH/seh-nounwind.ll index 25c496cbf50..77c56e4eb5f 100644 --- a/test/Transforms/PruneEH/seh-nounwind.ll +++ b/test/Transforms/PruneEH/seh-nounwind.ll @@ -1,5 +1,5 @@ ; RUN: opt -S -prune-eh -enable-new-pm=0 < %s | FileCheck %s -; RUN: opt -S -passes='function-attrs,function(simplify-cfg)' < %s | FileCheck %s +; RUN: opt -S -passes='function-attrs,function(simplifycfg)' < %s | FileCheck %s ; Don't remove invokes of nounwind functions if the personality handles async ; exceptions. The @div function in this test can fault, even though it can't diff --git a/test/Transforms/PruneEH/simpletest.ll b/test/Transforms/PruneEH/simpletest.ll index 8d427158d8e..efd30c60aa0 100644 --- a/test/Transforms/PruneEH/simpletest.ll +++ b/test/Transforms/PruneEH/simpletest.ll @@ -1,5 +1,5 @@ ; RUN: opt < %s -prune-eh -enable-new-pm=0 -S | FileCheck %s -; RUN: opt < %s -passes='function-attrs,function(simplify-cfg)' -S | FileCheck %s +; RUN: opt < %s -passes='function-attrs,function(simplifycfg)' -S | FileCheck %s declare void @nounwind() nounwind diff --git a/test/Transforms/SimplifyCFG/1elt-ptr-vec-alignment-crash.ll b/test/Transforms/SimplifyCFG/1elt-ptr-vec-alignment-crash.ll index 360fd0079cd..23f9d10d5da 100644 --- a/test/Transforms/SimplifyCFG/1elt-ptr-vec-alignment-crash.ll +++ b/test/Transforms/SimplifyCFG/1elt-ptr-vec-alignment-crash.ll @@ -1,4 +1,4 @@ -; RUN: opt -passes=simplify-cfg -S < %s | FileCheck %s +; RUN: opt -passes=simplifycfg -S < %s | FileCheck %s ; Ensure that we do not crash when trying to evaluate alignment of a <1 x ???*>. diff --git a/test/Transforms/SimplifyCFG/ARM/switch-to-lookup-table.ll b/test/Transforms/SimplifyCFG/ARM/switch-to-lookup-table.ll index 4dcc37300f8..f466709eade 100644 --- a/test/Transforms/SimplifyCFG/ARM/switch-to-lookup-table.ll +++ b/test/Transforms/SimplifyCFG/ARM/switch-to-lookup-table.ll @@ -5,11 +5,11 @@ ; RUN: opt -S -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -switch-to-lookup -mtriple=arm -relocation-model=rwpi < %s | FileCheck %s --check-prefix=CHECK --check-prefix=DISABLE ; RUN: opt -S -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -switch-to-lookup -mtriple=arm -relocation-model=ropi-rwpi < %s | FileCheck %s --check-prefix=CHECK --check-prefix=DISABLE -; RUN: opt -S -passes='simplify-cfg' -mtriple=arm -relocation-model=static < %s | FileCheck %s --check-prefix=CHECK --check-prefix=ENABLE -; RUN: opt -S -passes='simplify-cfg' -mtriple=arm -relocation-model=pic < %s | FileCheck %s --check-prefix=CHECK --check-prefix=ENABLE -; RUN: opt -S -passes='simplify-cfg' -mtriple=arm -relocation-model=ropi < %s | FileCheck %s --check-prefix=CHECK --check-prefix=DISABLE -; RUN: opt -S -passes='simplify-cfg' -mtriple=arm -relocation-model=rwpi < %s | FileCheck %s --check-prefix=CHECK --check-prefix=DISABLE -; RUN: opt -S -passes='simplify-cfg' -mtriple=arm -relocation-model=ropi-rwpi < %s | FileCheck %s --check-prefix=CHECK --check-prefix=DISABLE +; RUN: opt -S -passes='simplifycfg' -mtriple=arm -relocation-model=static < %s | FileCheck %s --check-prefix=CHECK --check-prefix=ENABLE +; RUN: opt -S -passes='simplifycfg' -mtriple=arm -relocation-model=pic < %s | FileCheck %s --check-prefix=CHECK --check-prefix=ENABLE +; RUN: opt -S -passes='simplifycfg' -mtriple=arm -relocation-model=ropi < %s | FileCheck %s --check-prefix=CHECK --check-prefix=DISABLE +; RUN: opt -S -passes='simplifycfg' -mtriple=arm -relocation-model=rwpi < %s | FileCheck %s --check-prefix=CHECK --check-prefix=DISABLE +; RUN: opt -S -passes='simplifycfg' -mtriple=arm -relocation-model=ropi-rwpi < %s | FileCheck %s --check-prefix=CHECK --check-prefix=DISABLE ; CHECK: @{{.*}} = private unnamed_addr constant [3 x i32] [i32 1234, i32 5678, i32 15532] ; ENABLE: @{{.*}} = private unnamed_addr constant [3 x i32*] [i32* @c1, i32* @c2, i32* @c3] diff --git a/test/Transforms/SimplifyCFG/ForwardSwitchConditionToPHI.ll b/test/Transforms/SimplifyCFG/ForwardSwitchConditionToPHI.ll index f0637bb69f5..b57284d1668 100644 --- a/test/Transforms/SimplifyCFG/ForwardSwitchConditionToPHI.ll +++ b/test/Transforms/SimplifyCFG/ForwardSwitchConditionToPHI.ll @@ -2,8 +2,8 @@ ; RUN: opt < %s -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -forward-switch-cond=false -S | FileCheck %s --check-prefix=NO_FWD ; RUN: opt < %s -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -forward-switch-cond=true -S | FileCheck %s --check-prefix=FWD -; RUN: opt < %s -passes='simplify-cfg' -S | FileCheck %s --check-prefix=NO_FWD -; RUN: opt < %s -passes='simplify-cfg' -S | FileCheck %s --check-prefix=FWD +; RUN: opt < %s -passes='simplifycfg' -S | FileCheck %s --check-prefix=NO_FWD +; RUN: opt < %s -passes='simplifycfg' -S | FileCheck %s --check-prefix=FWD ; PR10131 diff --git a/test/Transforms/SimplifyCFG/X86/CoveredLookupTable.ll b/test/Transforms/SimplifyCFG/X86/CoveredLookupTable.ll index 9bf28fc2839..dadd20b6c61 100644 --- a/test/Transforms/SimplifyCFG/X86/CoveredLookupTable.ll +++ b/test/Transforms/SimplifyCFG/X86/CoveredLookupTable.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -switch-to-lookup -S %s | FileCheck %s -; RUN: opt -passes='simplify-cfg' -S %s | FileCheck %s +; RUN: opt -passes='simplifycfg' -S %s | FileCheck %s ; rdar://15268442 target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" diff --git a/test/Transforms/SimplifyCFG/X86/disable-lookup-table.ll b/test/Transforms/SimplifyCFG/X86/disable-lookup-table.ll index 07d0adb48a4..949b36f4712 100644 --- a/test/Transforms/SimplifyCFG/X86/disable-lookup-table.ll +++ b/test/Transforms/SimplifyCFG/X86/disable-lookup-table.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -switch-to-lookup -S -mtriple=x86_64-unknown-linux-gnu | FileCheck %s -; RUN: opt < %s -passes='simplify-cfg' -S -mtriple=x86_64-unknown-linux-gnu | FileCheck %s +; RUN: opt < %s -passes='simplifycfg' -S -mtriple=x86_64-unknown-linux-gnu | FileCheck %s ; In the presence of "-no-jump-tables"="true", simplifycfg should not convert switches to lookup tables. diff --git a/test/Transforms/SimplifyCFG/X86/sink-common-code.ll b/test/Transforms/SimplifyCFG/X86/sink-common-code.ll index c99668264c6..0a566675623 100644 --- a/test/Transforms/SimplifyCFG/X86/sink-common-code.ll +++ b/test/Transforms/SimplifyCFG/X86/sink-common-code.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -sink-common-insts -S | FileCheck %s -; RUN: opt < %s -passes='simplify-cfg' -S | FileCheck %s +; RUN: opt < %s -passes='simplifycfg' -S | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" target triple = "x86_64-pc-linux-gnu" diff --git a/test/Transforms/SimplifyCFG/X86/switch-covered-bug.ll b/test/Transforms/SimplifyCFG/X86/switch-covered-bug.ll index 6e0639e20e6..8adb5ab000f 100644 --- a/test/Transforms/SimplifyCFG/X86/switch-covered-bug.ll +++ b/test/Transforms/SimplifyCFG/X86/switch-covered-bug.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -S -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -switch-to-lookup < %s -mtriple=x86_64-apple-darwin12.0.0 | FileCheck %s -; RUN: opt -S -passes='simplify-cfg' < %s -mtriple=x86_64-apple-darwin12.0.0 | FileCheck %s +; RUN: opt -S -passes='simplifycfg' < %s -mtriple=x86_64-apple-darwin12.0.0 | FileCheck %s ; rdar://17887153 target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" diff --git a/test/Transforms/SimplifyCFG/X86/switch-table-bug.ll b/test/Transforms/SimplifyCFG/X86/switch-table-bug.ll index 04b8999cc4c..c2f3b307e28 100644 --- a/test/Transforms/SimplifyCFG/X86/switch-table-bug.ll +++ b/test/Transforms/SimplifyCFG/X86/switch-table-bug.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -S -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -switch-to-lookup < %s -mtriple=x86_64-apple-darwin12.0.0 | FileCheck %s -; RUN: opt -S -passes='simplify-cfg' < %s -mtriple=x86_64-apple-darwin12.0.0 | FileCheck %s +; RUN: opt -S -passes='simplifycfg' < %s -mtriple=x86_64-apple-darwin12.0.0 | FileCheck %s ; rdar://17735071 target datalayout = "e-p:64:64:64-S128-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f16:16:16-f32:32:32-f64:64:64-f128:128:128-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64" diff --git a/test/Transforms/SimplifyCFG/X86/switch_to_lookup_table.ll b/test/Transforms/SimplifyCFG/X86/switch_to_lookup_table.ll index 002fb5531e7..8b5b8001b2e 100644 --- a/test/Transforms/SimplifyCFG/X86/switch_to_lookup_table.ll +++ b/test/Transforms/SimplifyCFG/X86/switch_to_lookup_table.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -simplifycfg -switch-to-lookup=true -keep-loops=false -S -mtriple=x86_64-unknown-linux-gnu | FileCheck %s -; RUN: opt < %s -passes='simplify-cfg' -S -mtriple=x86_64-unknown-linux-gnu | FileCheck %s +; RUN: opt < %s -passes='simplifycfg' -S -mtriple=x86_64-unknown-linux-gnu | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/test/Transforms/SimplifyCFG/basictest.ll b/test/Transforms/SimplifyCFG/basictest.ll index b0ca9844adf..803f001f558 100644 --- a/test/Transforms/SimplifyCFG/basictest.ll +++ b/test/Transforms/SimplifyCFG/basictest.ll @@ -2,7 +2,7 @@ ; Test CFG simplify removal of branch instructions. ; ; RUN: opt < %s -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s -; RUN: opt < %s -passes=simplify-cfg -S | FileCheck %s +; RUN: opt < %s -passes=simplifycfg -S | FileCheck %s define void @test1() { ; CHECK-LABEL: @test1( diff --git a/test/Transforms/SimplifyCFG/branch-fold-threshold.ll b/test/Transforms/SimplifyCFG/branch-fold-threshold.ll index 8f53b95419e..c1fd267aef9 100644 --- a/test/Transforms/SimplifyCFG/branch-fold-threshold.ll +++ b/test/Transforms/SimplifyCFG/branch-fold-threshold.ll @@ -1,9 +1,9 @@ ; RUN: opt %s -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s --check-prefix=NORMAL ; RUN: opt %s -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S -bonus-inst-threshold=2 | FileCheck %s --check-prefix=AGGRESSIVE ; RUN: opt %s -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S -bonus-inst-threshold=4 | FileCheck %s --check-prefix=WAYAGGRESSIVE -; RUN: opt %s -passes=simplify-cfg -S | FileCheck %s --check-prefix=NORMAL -; RUN: opt %s -passes='simplify-cfg' -S | FileCheck %s --check-prefix=AGGRESSIVE -; RUN: opt %s -passes='simplify-cfg' -S | FileCheck %s --check-prefix=WAYAGGRESSIVE +; RUN: opt %s -passes=simplifycfg -S | FileCheck %s --check-prefix=NORMAL +; RUN: opt %s -passes='simplifycfg' -S | FileCheck %s --check-prefix=AGGRESSIVE +; RUN: opt %s -passes='simplifycfg' -S | FileCheck %s --check-prefix=WAYAGGRESSIVE define i32 @foo(i32 %a, i32 %b, i32 %c, i32 %d, i32* %input) { ; NORMAL-LABEL: @foo( diff --git a/test/Transforms/SimplifyCFG/convergent.ll b/test/Transforms/SimplifyCFG/convergent.ll index 07464a7b9d0..3d12f376e30 100644 --- a/test/Transforms/SimplifyCFG/convergent.ll +++ b/test/Transforms/SimplifyCFG/convergent.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -S -simplifycfg -simplifycfg-require-and-preserve-domtree=1 < %s | FileCheck %s -; RUN: opt -S -passes=simplify-cfg < %s | FileCheck %s +; RUN: opt -S -passes=simplifycfg < %s | FileCheck %s declare void @foo() convergent diff --git a/test/Transforms/SimplifyCFG/multiple-phis.ll b/test/Transforms/SimplifyCFG/multiple-phis.ll index 4d44042a489..b8a8df339d1 100644 --- a/test/Transforms/SimplifyCFG/multiple-phis.ll +++ b/test/Transforms/SimplifyCFG/multiple-phis.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -keep-loops=false -S < %s | FileCheck %s -; RUN: opt -passes='simplify-cfg' -S < %s | FileCheck %s +; RUN: opt -passes='simplifycfg' -S < %s | FileCheck %s ; It's not worthwhile to if-convert one of the phi nodes and leave ; the other behind, because that still requires a branch. If diff --git a/test/Transforms/SimplifyCFG/no-md-sink.ll b/test/Transforms/SimplifyCFG/no-md-sink.ll index ff2c01db444..3444ce96ada 100644 --- a/test/Transforms/SimplifyCFG/no-md-sink.ll +++ b/test/Transforms/SimplifyCFG/no-md-sink.ll @@ -1,5 +1,5 @@ ; RUN: opt < %s -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -sink-common-insts -S | FileCheck %s -; RUN: opt < %s -passes='simplify-cfg' -S | FileCheck %s +; RUN: opt < %s -passes='simplifycfg' -S | FileCheck %s define i1 @test1(i1 zeroext %flag, i8* %y) #0 { entry: diff --git a/test/Transforms/SimplifyCFG/preserve-llvm-loop-metadata.ll b/test/Transforms/SimplifyCFG/preserve-llvm-loop-metadata.ll index c29f86fea49..6962dc075d3 100644 --- a/test/Transforms/SimplifyCFG/preserve-llvm-loop-metadata.ll +++ b/test/Transforms/SimplifyCFG/preserve-llvm-loop-metadata.ll @@ -1,5 +1,5 @@ ; RUN: opt -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -keep-loops=false -S < %s | FileCheck %s -; RUN: opt -passes='simplify-cfg' -S < %s | FileCheck %s +; RUN: opt -passes='simplifycfg' -S < %s | FileCheck %s define void @test1(i32 %n) #0 { entry: diff --git a/test/Transforms/SimplifyCFG/rangereduce.ll b/test/Transforms/SimplifyCFG/rangereduce.ll index 687f5e72f73..6e3b01b6a95 100644 --- a/test/Transforms/SimplifyCFG/rangereduce.ll +++ b/test/Transforms/SimplifyCFG/rangereduce.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -switch-to-lookup -S | FileCheck %s -; RUN: opt < %s -passes='simplify-cfg' -S | FileCheck %s +; RUN: opt < %s -passes='simplifycfg' -S | FileCheck %s target datalayout = "e-n32" diff --git a/test/Transforms/SimplifyCFG/switch-dead-default.ll b/test/Transforms/SimplifyCFG/switch-dead-default.ll index 4e04861c9f4..b42024ee489 100644 --- a/test/Transforms/SimplifyCFG/switch-dead-default.ll +++ b/test/Transforms/SimplifyCFG/switch-dead-default.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt %s -S -passes='simplify-cfg' -simplifycfg-require-and-preserve-domtree=1 | FileCheck %s +; RUN: opt %s -S -passes='simplifycfg' -simplifycfg-require-and-preserve-domtree=1 | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" declare void @foo(i32) @@ -220,7 +220,7 @@ default: } ; Check that we can eliminate both dead cases and dead defaults -; within a single run of simplify-cfg +; within a single run of simplifycfg define void @test7(i8 %a) { ; CHECK-LABEL: @test7( ; CHECK-NEXT: [[AND:%.*]] = and i8 [[A:%.*]], -2 diff --git a/test/Transforms/SimplifyCFG/switch_undef.ll b/test/Transforms/SimplifyCFG/switch_undef.ll index 410dd8ce4c6..c87af842c87 100644 --- a/test/Transforms/SimplifyCFG/switch_undef.ll +++ b/test/Transforms/SimplifyCFG/switch_undef.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt %s -keep-loops=false -switch-to-lookup=true -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S | FileCheck %s -; RUN: opt %s -passes='simplify-cfg' -S | FileCheck %s +; RUN: opt %s -passes='simplifycfg' -S | FileCheck %s define void @f6() #0 { ; CHECK-LABEL: @f6( diff --git a/test/Transforms/SimplifyCFG/unprofitable-pr.ll b/test/Transforms/SimplifyCFG/unprofitable-pr.ll index 566cda0e627..8d227cf9897 100644 --- a/test/Transforms/SimplifyCFG/unprofitable-pr.ll +++ b/test/Transforms/SimplifyCFG/unprofitable-pr.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt -simplifycfg -simplifycfg-require-and-preserve-domtree=1 -simplifycfg-max-small-block-size=6 -S < %s | FileCheck %s -; RUN: opt -passes=simplify-cfg -simplifycfg-max-small-block-size=6 -S < %s | FileCheck %s +; RUN: opt -passes=simplifycfg -simplifycfg-max-small-block-size=6 -S < %s | FileCheck %s target datalayout = "e-p:64:64-p5:32:32-A5" diff --git a/test/Transforms/SimplifyCFG/wc-widen-block.ll b/test/Transforms/SimplifyCFG/wc-widen-block.ll index ab73e65de99..ea4abedaf88 100644 --- a/test/Transforms/SimplifyCFG/wc-widen-block.ll +++ b/test/Transforms/SimplifyCFG/wc-widen-block.ll @@ -1,5 +1,5 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py -; RUN: opt -passes=simplify-cfg -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s +; RUN: opt -passes=simplifycfg -simplifycfg-require-and-preserve-domtree=1 -S < %s | FileCheck %s define i32 @basic(i1 %cond_0, i32* %p) { ; CHECK-LABEL: @basic( diff --git a/tools/bugpoint/CrashDebugger.cpp b/tools/bugpoint/CrashDebugger.cpp index d06bca9a125..2601ee318f7 100644 --- a/tools/bugpoint/CrashDebugger.cpp +++ b/tools/bugpoint/CrashDebugger.cpp @@ -425,7 +425,7 @@ void simpleSimplifyCfg(Function &F, SmallVectorImpl &BBs) { } /// ReduceCrashingBlocks reducer - This works by setting the terminators of /// all terminators except the specified basic blocks to a 'ret' instruction, -/// then running the simplify-cfg pass. This has the effect of chopping up +/// then running the simplifycfg pass. This has the effect of chopping up /// the CFG really fast which can reduce large functions quickly. /// class ReduceCrashingBlocks : public ListReducer {