diff --git a/llvm/lib/Analysis/InlineCost.cpp b/llvm/lib/Analysis/InlineCost.cpp --- a/llvm/lib/Analysis/InlineCost.cpp +++ b/llvm/lib/Analysis/InlineCost.cpp @@ -2003,7 +2003,7 @@ // 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/llvm/lib/FuzzMutate/FuzzerCLI.cpp b/llvm/lib/FuzzMutate/FuzzerCLI.cpp --- a/llvm/lib/FuzzMutate/FuzzerCLI.cpp +++ b/llvm/lib/FuzzMutate/FuzzerCLI.cpp @@ -88,7 +88,7 @@ } 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/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -1154,7 +1154,7 @@ // 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 @@ } // 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/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def --- a/llvm/lib/Passes/PassRegistry.def +++ b/llvm/lib/Passes/PassRegistry.def @@ -301,7 +301,6 @@ 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()) @@ -351,7 +350,7 @@ }, 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/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp --- a/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp +++ b/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp @@ -454,7 +454,7 @@ 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/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp --- a/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp +++ b/llvm/lib/Transforms/Scalar/SimpleLoopUnswitch.cpp @@ -420,7 +420,7 @@ /// 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 @@ /// 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 @@ 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 @@ 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/llvm/test/Analysis/MemorySSA/update-remove-dead-blocks.ll b/llvm/test/Analysis/MemorySSA/update-remove-dead-blocks.ll --- a/llvm/test/Analysis/MemorySSA/update-remove-dead-blocks.ll +++ b/llvm/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/llvm/test/Other/cgscc-disconnected-invalidation.ll b/llvm/test/Other/cgscc-disconnected-invalidation.ll --- a/llvm/test/Other/cgscc-disconnected-invalidation.ll +++ b/llvm/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/llvm/test/Other/cgscc-iterate-function-mutation.ll b/llvm/test/Other/cgscc-iterate-function-mutation.ll --- a/llvm/test/Other/cgscc-iterate-function-mutation.ll +++ b/llvm/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/llvm/test/Other/pass-pipelines.ll b/llvm/test/Other/pass-pipelines.ll --- a/llvm/test/Other/pass-pipelines.ll +++ b/llvm/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/llvm/test/Other/print-module-scope.ll b/llvm/test/Other/print-module-scope.ll --- a/llvm/test/Other/print-module-scope.ll +++ b/llvm/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/llvm/test/Transforms/Coroutines/coro-heap-elide.ll b/llvm/test/Transforms/Coroutines/coro-heap-elide.ll --- a/llvm/test/Transforms/Coroutines/coro-heap-elide.ll +++ b/llvm/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/llvm/test/Transforms/Inline/monster_scc.ll b/llvm/test/Transforms/Inline/monster_scc.ll --- a/llvm/test/Transforms/Inline/monster_scc.ll +++ b/llvm/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/llvm/test/Transforms/InstCombine/assume-align.ll b/llvm/test/Transforms/InstCombine/assume-align.ll --- a/llvm/test/Transforms/InstCombine/assume-align.ll +++ b/llvm/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/llvm/test/Transforms/LoopUnroll/peel-loop-inner.ll b/llvm/test/Transforms/LoopUnroll/peel-loop-inner.ll --- a/llvm/test/Transforms/LoopUnroll/peel-loop-inner.ll +++ b/llvm/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/llvm/test/Transforms/LoopUnroll/peel-loop.ll b/llvm/test/Transforms/LoopUnroll/peel-loop.ll --- a/llvm/test/Transforms/LoopUnroll/peel-loop.ll +++ b/llvm/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/llvm/test/Transforms/PGOProfile/chr.ll b/llvm/test/Transforms/PGOProfile/chr.ll --- a/llvm/test/Transforms/PGOProfile/chr.ll +++ b/llvm/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/llvm/test/Transforms/PruneEH/2008-06-02-Weak.ll b/llvm/test/Transforms/PruneEH/2008-06-02-Weak.ll --- a/llvm/test/Transforms/PruneEH/2008-06-02-Weak.ll +++ b/llvm/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/llvm/test/Transforms/PruneEH/ipo-nounwind.ll b/llvm/test/Transforms/PruneEH/ipo-nounwind.ll --- a/llvm/test/Transforms/PruneEH/ipo-nounwind.ll +++ b/llvm/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/llvm/test/Transforms/PruneEH/looptest.ll b/llvm/test/Transforms/PruneEH/looptest.ll --- a/llvm/test/Transforms/PruneEH/looptest.ll +++ b/llvm/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/llvm/test/Transforms/PruneEH/musttail.ll b/llvm/test/Transforms/PruneEH/musttail.ll --- a/llvm/test/Transforms/PruneEH/musttail.ll +++ b/llvm/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/llvm/test/Transforms/PruneEH/operand-bundles.ll b/llvm/test/Transforms/PruneEH/operand-bundles.ll --- a/llvm/test/Transforms/PruneEH/operand-bundles.ll +++ b/llvm/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/llvm/test/Transforms/PruneEH/pr23971.ll b/llvm/test/Transforms/PruneEH/pr23971.ll --- a/llvm/test/Transforms/PruneEH/pr23971.ll +++ b/llvm/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/llvm/test/Transforms/PruneEH/pr26263.ll b/llvm/test/Transforms/PruneEH/pr26263.ll --- a/llvm/test/Transforms/PruneEH/pr26263.ll +++ b/llvm/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/llvm/test/Transforms/PruneEH/recursivetest.ll b/llvm/test/Transforms/PruneEH/recursivetest.ll --- a/llvm/test/Transforms/PruneEH/recursivetest.ll +++ b/llvm/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/llvm/test/Transforms/PruneEH/seh-nounwind.ll b/llvm/test/Transforms/PruneEH/seh-nounwind.ll --- a/llvm/test/Transforms/PruneEH/seh-nounwind.ll +++ b/llvm/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/llvm/test/Transforms/PruneEH/simpletest.ll b/llvm/test/Transforms/PruneEH/simpletest.ll --- a/llvm/test/Transforms/PruneEH/simpletest.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/1elt-ptr-vec-alignment-crash.ll b/llvm/test/Transforms/SimplifyCFG/1elt-ptr-vec-alignment-crash.ll --- a/llvm/test/Transforms/SimplifyCFG/1elt-ptr-vec-alignment-crash.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/ARM/switch-to-lookup-table.ll b/llvm/test/Transforms/SimplifyCFG/ARM/switch-to-lookup-table.ll --- a/llvm/test/Transforms/SimplifyCFG/ARM/switch-to-lookup-table.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/ForwardSwitchConditionToPHI.ll b/llvm/test/Transforms/SimplifyCFG/ForwardSwitchConditionToPHI.ll --- a/llvm/test/Transforms/SimplifyCFG/ForwardSwitchConditionToPHI.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/X86/CoveredLookupTable.ll b/llvm/test/Transforms/SimplifyCFG/X86/CoveredLookupTable.ll --- a/llvm/test/Transforms/SimplifyCFG/X86/CoveredLookupTable.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/X86/disable-lookup-table.ll b/llvm/test/Transforms/SimplifyCFG/X86/disable-lookup-table.ll --- a/llvm/test/Transforms/SimplifyCFG/X86/disable-lookup-table.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/X86/sink-common-code.ll b/llvm/test/Transforms/SimplifyCFG/X86/sink-common-code.ll --- a/llvm/test/Transforms/SimplifyCFG/X86/sink-common-code.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/X86/switch-covered-bug.ll b/llvm/test/Transforms/SimplifyCFG/X86/switch-covered-bug.ll --- a/llvm/test/Transforms/SimplifyCFG/X86/switch-covered-bug.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/X86/switch-table-bug.ll b/llvm/test/Transforms/SimplifyCFG/X86/switch-table-bug.ll --- a/llvm/test/Transforms/SimplifyCFG/X86/switch-table-bug.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/X86/switch_to_lookup_table.ll b/llvm/test/Transforms/SimplifyCFG/X86/switch_to_lookup_table.ll --- a/llvm/test/Transforms/SimplifyCFG/X86/switch_to_lookup_table.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/basictest.ll b/llvm/test/Transforms/SimplifyCFG/basictest.ll --- a/llvm/test/Transforms/SimplifyCFG/basictest.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/branch-fold-threshold.ll b/llvm/test/Transforms/SimplifyCFG/branch-fold-threshold.ll --- a/llvm/test/Transforms/SimplifyCFG/branch-fold-threshold.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/convergent.ll b/llvm/test/Transforms/SimplifyCFG/convergent.ll --- a/llvm/test/Transforms/SimplifyCFG/convergent.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/multiple-phis.ll b/llvm/test/Transforms/SimplifyCFG/multiple-phis.ll --- a/llvm/test/Transforms/SimplifyCFG/multiple-phis.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/no-md-sink.ll b/llvm/test/Transforms/SimplifyCFG/no-md-sink.ll --- a/llvm/test/Transforms/SimplifyCFG/no-md-sink.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/preserve-llvm-loop-metadata.ll b/llvm/test/Transforms/SimplifyCFG/preserve-llvm-loop-metadata.ll --- a/llvm/test/Transforms/SimplifyCFG/preserve-llvm-loop-metadata.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/rangereduce.ll b/llvm/test/Transforms/SimplifyCFG/rangereduce.ll --- a/llvm/test/Transforms/SimplifyCFG/rangereduce.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/switch-dead-default.ll b/llvm/test/Transforms/SimplifyCFG/switch-dead-default.ll --- a/llvm/test/Transforms/SimplifyCFG/switch-dead-default.ll +++ b/llvm/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 @@ } ; 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/llvm/test/Transforms/SimplifyCFG/switch_undef.ll b/llvm/test/Transforms/SimplifyCFG/switch_undef.ll --- a/llvm/test/Transforms/SimplifyCFG/switch_undef.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/unprofitable-pr.ll b/llvm/test/Transforms/SimplifyCFG/unprofitable-pr.ll --- a/llvm/test/Transforms/SimplifyCFG/unprofitable-pr.ll +++ b/llvm/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/llvm/test/Transforms/SimplifyCFG/wc-widen-block.ll b/llvm/test/Transforms/SimplifyCFG/wc-widen-block.ll --- a/llvm/test/Transforms/SimplifyCFG/wc-widen-block.ll +++ b/llvm/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/llvm/tools/bugpoint/CrashDebugger.cpp b/llvm/tools/bugpoint/CrashDebugger.cpp --- a/llvm/tools/bugpoint/CrashDebugger.cpp +++ b/llvm/tools/bugpoint/CrashDebugger.cpp @@ -425,7 +425,7 @@ } /// 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 {