diff options
27 files changed, 144 insertions, 144 deletions
diff --git a/compiler/Android.bp b/compiler/Android.bp index c904746435..67cd48ba42 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -147,13 +147,13 @@ art_cc_defaults { "optimizing/bounds_check_elimination.cc", "optimizing/builder.cc", "optimizing/cha_guard_optimization.cc", - "optimizing/code_flow_simplifier.cc", "optimizing/code_generation_data.cc", "optimizing/code_generator.cc", "optimizing/code_generator_utils.cc", "optimizing/code_sinking.cc", "optimizing/constant_folding.cc", "optimizing/constructor_fence_redundancy_elimination.cc", + "optimizing/control_flow_simplifier.cc", "optimizing/data_type.cc", "optimizing/dead_code_elimination.cc", "optimizing/escape.cc", @@ -459,8 +459,8 @@ art_cc_defaults { "linker/output_stream_test.cc", "oat/jni_stub_hash_map_test.cc", "optimizing/bounds_check_elimination_test.cc", - "optimizing/code_flow_simplifier_test.cc", "optimizing/constant_folding_test.cc", + "optimizing/control_flow_simplifier_test.cc", "optimizing/data_type_test.cc", "optimizing/dead_code_elimination_test.cc", "optimizing/dominator_test.cc", diff --git a/compiler/optimizing/code_flow_simplifier.cc b/compiler/optimizing/control_flow_simplifier.cc index 855da3e959..3e1c0ac0fc 100644 --- a/compiler/optimizing/code_flow_simplifier.cc +++ b/compiler/optimizing/control_flow_simplifier.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "code_flow_simplifier.h" +#include "control_flow_simplifier.h" #include "optimizing/nodes.h" #include "reference_type_propagation.h" @@ -23,9 +23,9 @@ namespace art HIDDEN { static constexpr size_t kMaxInstructionsInBranch = 1u; -HCodeFlowSimplifier::HCodeFlowSimplifier(HGraph* graph, - OptimizingCompilerStats* stats, - const char* name) +HControlFlowSimplifier::HControlFlowSimplifier(HGraph* graph, + OptimizingCompilerStats* stats, + const char* name) : HOptimization(graph, name, stats) { } @@ -95,7 +95,7 @@ static std::pair<bool, HPhi*> HasAtMostOnePhiWithDifferentInputs(HBasicBlock* bl return {true, select_phi}; } -bool HCodeFlowSimplifier::TryGenerateSelectSimpleDiamondPattern( +bool HControlFlowSimplifier::TryGenerateSelectSimpleDiamondPattern( HBasicBlock* block, ScopedArenaSafeMap<HInstruction*, HSelect*>* cache) { DCHECK(block->GetLastInstruction()->IsIf()); HIf* if_instruction = block->GetLastInstruction()->AsIf(); @@ -230,7 +230,7 @@ bool HCodeFlowSimplifier::TryGenerateSelectSimpleDiamondPattern( return true; } -HBasicBlock* HCodeFlowSimplifier::TryFixupDoubleDiamondPattern(HBasicBlock* block) { +HBasicBlock* HControlFlowSimplifier::TryFixupDoubleDiamondPattern(HBasicBlock* block) { DCHECK(block->GetLastInstruction()->IsIf()); HIf* if_instruction = block->GetLastInstruction()->AsIf(); HBasicBlock* true_block = if_instruction->IfTrueSuccessor(); @@ -323,12 +323,12 @@ HBasicBlock* HCodeFlowSimplifier::TryFixupDoubleDiamondPattern(HBasicBlock* bloc return inner_if_block; } -bool HCodeFlowSimplifier::Run() { +bool HControlFlowSimplifier::Run() { bool did_select = false; // Select cache with local allocator. ScopedArenaAllocator allocator(graph_->GetArenaStack()); ScopedArenaSafeMap<HInstruction*, HSelect*> cache( - std::less<HInstruction*>(), allocator.Adapter(kArenaAllocCodeFlowSimplifier)); + std::less<HInstruction*>(), allocator.Adapter(kArenaAllocControlFlowSimplifier)); // Iterate in post order in the unlikely case that removing one occurrence of // the selection pattern empties a branch block of another occurrence. diff --git a/compiler/optimizing/code_flow_simplifier.h b/compiler/optimizing/control_flow_simplifier.h index 36d8d3d95b..0c74ec299f 100644 --- a/compiler/optimizing/code_flow_simplifier.h +++ b/compiler/optimizing/control_flow_simplifier.h @@ -54,8 +54,8 @@ * run after the instruction simplifier has removed redundant suspend checks. */ -#ifndef ART_COMPILER_OPTIMIZING_CODE_FLOW_SIMPLIFIER_H_ -#define ART_COMPILER_OPTIMIZING_CODE_FLOW_SIMPLIFIER_H_ +#ifndef ART_COMPILER_OPTIMIZING_CONTROL_FLOW_SIMPLIFIER_H_ +#define ART_COMPILER_OPTIMIZING_CONTROL_FLOW_SIMPLIFIER_H_ #include "base/macros.h" #include "base/scoped_arena_containers.h" @@ -64,15 +64,15 @@ namespace art HIDDEN { -class HCodeFlowSimplifier : public HOptimization { +class HControlFlowSimplifier : public HOptimization { public: - HCodeFlowSimplifier(HGraph* graph, - OptimizingCompilerStats* stats, - const char* name = kCodeFlowSimplifierPassName); + HControlFlowSimplifier(HGraph* graph, + OptimizingCompilerStats* stats, + const char* name = kControlFlowSimplifierPassName); bool Run() override; - static constexpr const char* kCodeFlowSimplifierPassName = "code_flow_simplifier"; + static constexpr const char* kControlFlowSimplifierPassName = "control_flow_simplifier"; private: bool TryGenerateSelectSimpleDiamondPattern(HBasicBlock* block, @@ -112,9 +112,9 @@ class HCodeFlowSimplifier : public HOptimization { // when that gets resolved we get another one with the outer if. HBasicBlock* TryFixupDoubleDiamondPattern(HBasicBlock* block); - DISALLOW_COPY_AND_ASSIGN(HCodeFlowSimplifier); + DISALLOW_COPY_AND_ASSIGN(HControlFlowSimplifier); }; } // namespace art -#endif // ART_COMPILER_OPTIMIZING_CODE_FLOW_SIMPLIFIER_H_ +#endif // ART_COMPILER_OPTIMIZING_CONTROL_FLOW_SIMPLIFIER_H_ diff --git a/compiler/optimizing/code_flow_simplifier_test.cc b/compiler/optimizing/control_flow_simplifier_test.cc index 8945e03619..2e88c6c77b 100644 --- a/compiler/optimizing/code_flow_simplifier_test.cc +++ b/compiler/optimizing/control_flow_simplifier_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "code_flow_simplifier.h" +#include "control_flow_simplifier.h" #include "base/arena_allocator.h" #include "base/macros.h" @@ -25,7 +25,7 @@ namespace art HIDDEN { -class CodeFlowSimplifierTest : public OptimizingUnitTest { +class ControlFlowSimplifierTest : public OptimizingUnitTest { protected: HPhi* ConstructBasicGraphForSelect(HBasicBlock* return_block, HInstruction* instr) { HParameterValue* bool_param = MakeParam(DataType::Type::kBool); @@ -38,18 +38,18 @@ class CodeFlowSimplifierTest : public OptimizingUnitTest { return phi; } - bool CheckGraphAndTryCodeFlowSimplifier() { + bool CheckGraphAndTryControlFlowSimplifier() { graph_->BuildDominatorTree(); EXPECT_TRUE(CheckGraph()); SideEffectsAnalysis side_effects(graph_); side_effects.Run(); - return HCodeFlowSimplifier(graph_, /*handles*/ nullptr, /*stats*/ nullptr).Run(); + return HControlFlowSimplifier(graph_, /*handles*/ nullptr, /*stats*/ nullptr).Run(); } }; // HDivZeroCheck might throw and should not be hoisted from the conditional to an unconditional. -TEST_F(CodeFlowSimplifierTest, testZeroCheckPreventsSelect) { +TEST_F(ControlFlowSimplifierTest, testZeroCheckPreventsSelect) { HBasicBlock* return_block = InitEntryMainExitGraphWithReturnVoid(); HParameterValue* param = MakeParam(DataType::Type::kInt32); HDivZeroCheck* instr = new (GetAllocator()) HDivZeroCheck(param, 0); @@ -57,22 +57,22 @@ TEST_F(CodeFlowSimplifierTest, testZeroCheckPreventsSelect) { ManuallyBuildEnvFor(instr, {param, graph_->GetIntConstant(1)}); - EXPECT_FALSE(CheckGraphAndTryCodeFlowSimplifier()); + EXPECT_FALSE(CheckGraphAndTryControlFlowSimplifier()); EXPECT_INS_RETAINED(phi); } -// Test that CodeFlowSimplifier succeeds with HAdd. -TEST_F(CodeFlowSimplifierTest, testSelectWithAdd) { +// Test that ControlFlowSimplifier succeeds with HAdd. +TEST_F(ControlFlowSimplifierTest, testSelectWithAdd) { HBasicBlock* return_block = InitEntryMainExitGraphWithReturnVoid(); HParameterValue* param = MakeParam(DataType::Type::kInt32); HAdd* instr = new (GetAllocator()) HAdd(DataType::Type::kInt32, param, param, /*dex_pc=*/ 0); HPhi* phi = ConstructBasicGraphForSelect(return_block, instr); - EXPECT_TRUE(CheckGraphAndTryCodeFlowSimplifier()); + EXPECT_TRUE(CheckGraphAndTryControlFlowSimplifier()); EXPECT_INS_REMOVED(phi); } -// Test that CodeFlowSimplifier succeeds if there is an additional `HPhi` with identical inputs. -TEST_F(CodeFlowSimplifierTest, testSelectWithAddAndExtraPhi) { +// Test that ControlFlowSimplifier succeeds if there is an additional `HPhi` with identical inputs. +TEST_F(ControlFlowSimplifierTest, testSelectWithAddAndExtraPhi) { // Create a graph with three blocks merging to the `return_block`. HBasicBlock* return_block = InitEntryMainExitGraphWithReturnVoid(); HParameterValue* bool_param1 = MakeParam(DataType::Type::kBool); @@ -96,7 +96,7 @@ TEST_F(CodeFlowSimplifierTest, testSelectWithAddAndExtraPhi) { // Prevent second `HSelect` match. Do not rely on the "instructions per branch" limit. MakeInvokeStatic(left, DataType::Type::kVoid, {}, {}); - EXPECT_TRUE(CheckGraphAndTryCodeFlowSimplifier()); + EXPECT_TRUE(CheckGraphAndTryControlFlowSimplifier()); ASSERT_BLOCK_RETAINED(left); ASSERT_BLOCK_REMOVED(mid); @@ -110,7 +110,7 @@ TEST_F(CodeFlowSimplifierTest, testSelectWithAddAndExtraPhi) { } // Test `HSelect` optimization in an irreducible loop. -TEST_F(CodeFlowSimplifierTest, testSelectInIrreducibleLoop) { +TEST_F(ControlFlowSimplifierTest, testSelectInIrreducibleLoop) { HBasicBlock* return_block = InitEntryMainExitGraphWithReturnVoid(); auto [split, left_header, right_header, body] = CreateIrreducibleLoop(return_block); @@ -130,7 +130,7 @@ TEST_F(CodeFlowSimplifierTest, testSelectInIrreducibleLoop) { auto [if_block, then_block, else_block] = CreateDiamondPattern(body, bool_param); HPhi* phi = MakePhi(body, {const1, const0}); - EXPECT_TRUE(CheckGraphAndTryCodeFlowSimplifier()); + EXPECT_TRUE(CheckGraphAndTryControlFlowSimplifier()); HLoopInformation* loop_info = left_header->GetLoopInformation(); ASSERT_TRUE(loop_info != nullptr); ASSERT_TRUE(loop_info->IsIrreducible()); diff --git a/compiler/optimizing/dead_code_elimination.cc b/compiler/optimizing/dead_code_elimination.cc index ede909526d..c5ec0b93b2 100644 --- a/compiler/optimizing/dead_code_elimination.cc +++ b/compiler/optimizing/dead_code_elimination.cc @@ -526,10 +526,10 @@ void HDeadCodeElimination::MaybeAddPhi(HBasicBlock* block) { // | // 8 // `7` (which would be `block` in this example), and `6` will come from both the true path and - // the false path of `1`. We bumped into something similar in `HCodeFlowSimplifier`. See - // `HCodeFlowSimplifier::TryFixupDoubleDiamondPattern()`. + // the false path of `1`. We bumped into something similar in `HControlFlowSimplifier`. See + // `HControlFlowSimplifier::TryFixupDoubleDiamondPattern()`. // TODO(solanes): Figure out if we can fix up the graph into a double diamond in a generic way - // so that `HDeadCodeElimination` and `HCodeFlowSimplifier` can take advantage of it. + // so that `HDeadCodeElimination` and `HControlFlowSimplifier` can take advantage of it. if (!same_input) { // `1` and `7` having the opposite condition is a case we are missing. We could potentially diff --git a/compiler/optimizing/optimization.cc b/compiler/optimizing/optimization.cc index c876254050..31780739bc 100644 --- a/compiler/optimizing/optimization.cc +++ b/compiler/optimizing/optimization.cc @@ -40,10 +40,10 @@ #include "bounds_check_elimination.h" #include "cha_guard_optimization.h" -#include "code_flow_simplifier.h" #include "code_sinking.h" #include "constant_folding.h" #include "constructor_fence_redundancy_elimination.h" +#include "control_flow_simplifier.h" #include "dead_code_elimination.h" #include "dex/code_item_accessors-inl.h" #include "driver/compiler_options.h" @@ -88,8 +88,8 @@ const char* OptimizationPassName(OptimizationPass pass) { return HDeadCodeElimination::kDeadCodeEliminationPassName; case OptimizationPass::kInliner: return HInliner::kInlinerPassName; - case OptimizationPass::kCodeFlowSimplifier: - return HCodeFlowSimplifier::kCodeFlowSimplifierPassName; + case OptimizationPass::kControlFlowSimplifier: + return HControlFlowSimplifier::kControlFlowSimplifierPassName; case OptimizationPass::kAggressiveInstructionSimplifier: case OptimizationPass::kInstructionSimplifier: return InstructionSimplifier::kInstructionSimplifierPassName; @@ -146,10 +146,10 @@ const char* OptimizationPassName(OptimizationPass pass) { OptimizationPass OptimizationPassByName(const std::string& pass_name) { X(OptimizationPass::kBoundsCheckElimination); X(OptimizationPass::kCHAGuardOptimization); - X(OptimizationPass::kCodeFlowSimplifier); X(OptimizationPass::kCodeSinking); X(OptimizationPass::kConstantFolding); X(OptimizationPass::kConstructorFenceRedundancyElimination); + X(OptimizationPass::kControlFlowSimplifier); X(OptimizationPass::kDeadCodeElimination); X(OptimizationPass::kGlobalValueNumbering); X(OptimizationPass::kInductionVarAnalysis); @@ -266,8 +266,8 @@ ArenaVector<HOptimization*> ConstructOptimizations( pass_name); break; } - case OptimizationPass::kCodeFlowSimplifier: - opt = new (allocator) HCodeFlowSimplifier(graph, stats, pass_name); + case OptimizationPass::kControlFlowSimplifier: + opt = new (allocator) HControlFlowSimplifier(graph, stats, pass_name); break; case OptimizationPass::kInstructionSimplifier: opt = new (allocator) InstructionSimplifier(graph, codegen, stats, pass_name); diff --git a/compiler/optimizing/optimization.h b/compiler/optimizing/optimization.h index 395c45e3f7..0f0a15f7c9 100644 --- a/compiler/optimizing/optimization.h +++ b/compiler/optimizing/optimization.h @@ -70,10 +70,10 @@ enum class OptimizationPass { kAggressiveInstructionSimplifier, kBoundsCheckElimination, kCHAGuardOptimization, - kCodeFlowSimplifier, kCodeSinking, kConstantFolding, kConstructorFenceRedundancyElimination, + kControlFlowSimplifier, kDeadCodeElimination, kGlobalValueNumbering, kInductionVarAnalysis, diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 5067872ee4..76c201d6a9 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -666,7 +666,7 @@ void OptimizingCompiler::RunOptimizations(HGraph* graph, "reference_type_propagation$after_gvn", OptimizationPass::kGlobalValueNumbering), // Simplification (TODO: only if GVN occurred). - OptDef(OptimizationPass::kCodeFlowSimplifier), + OptDef(OptimizationPass::kControlFlowSimplifier), OptDef(OptimizationPass::kConstantFolding, "constant_folding$after_gvn"), OptDef(OptimizationPass::kInstructionSimplifier, diff --git a/libartbase/base/arena_allocator.cc b/libartbase/base/arena_allocator.cc index e665ce95c3..6e51402045 100644 --- a/libartbase/base/arena_allocator.cc +++ b/libartbase/base/arena_allocator.cc @@ -77,7 +77,7 @@ const char* const ArenaAllocatorStatsImpl<kCount>::kAllocNames[] = { "SsaLiveness ", "SsaPhiElim ", "RefTypeProp ", - "CodeFlowSimp ", + "CtrlFlowSimp ", "SideEffects ", "RegAllocator ", "RegAllocVldt ", diff --git a/libartbase/base/arena_allocator.h b/libartbase/base/arena_allocator.h index b32921f0e3..e47319c53e 100644 --- a/libartbase/base/arena_allocator.h +++ b/libartbase/base/arena_allocator.h @@ -88,7 +88,7 @@ enum ArenaAllocKind { kArenaAllocSsaLiveness, kArenaAllocSsaPhiElimination, kArenaAllocReferenceTypePropagation, - kArenaAllocCodeFlowSimplifier, + kArenaAllocControlFlowSimplifier, kArenaAllocSideEffectsAnalysis, kArenaAllocRegisterAllocator, kArenaAllocRegisterAllocatorValidate, diff --git a/test/2265-checker-select-binary-unary/src/Main.java b/test/2265-checker-select-binary-unary/src/Main.java index 94c2bf7796..61f4b053aa 100644 --- a/test/2265-checker-select-binary-unary/src/Main.java +++ b/test/2265-checker-select-binary-unary/src/Main.java @@ -31,7 +31,7 @@ public class Main { assertIntEquals(12, $noinline$testLongToInt(1, 0)); } - /// CHECK-START: long Main.$noinline$testIntToLong(int, int) code_flow_simplifier (after) + /// CHECK-START: long Main.$noinline$testIntToLong(int, int) control_flow_simplifier (after) /// CHECK: <<Const10:j\d+>> LongConstant 10 /// CHECK: <<Const1:i\d+>> IntConstant 1 /// CHECK: <<Const2:i\d+>> IntConstant 2 @@ -54,7 +54,7 @@ public class Main { return result + (a < b ? c : d); } - /// CHECK-START: float Main.$noinline$testIntToFloat(int, int) code_flow_simplifier (after) + /// CHECK-START: float Main.$noinline$testIntToFloat(int, int) control_flow_simplifier (after) /// CHECK: <<Const10:f\d+>> FloatConstant 10 /// CHECK: <<Const1:i\d+>> IntConstant 1 /// CHECK: <<Const2:i\d+>> IntConstant 2 @@ -77,7 +77,7 @@ public class Main { return result + (a < b ? c : d); } - /// CHECK-START: byte Main.$noinline$testIntToByte(int, int) code_flow_simplifier (after) + /// CHECK-START: byte Main.$noinline$testIntToByte(int, int) control_flow_simplifier (after) /// CHECK: <<Const10:i\d+>> IntConstant 10 /// CHECK: <<Const257:i\d+>> IntConstant 257 /// CHECK: <<Const258:i\d+>> IntConstant 258 @@ -102,7 +102,7 @@ public class Main { return (byte) (result + (byte) (a < b ? c : d)); } - /// CHECK-START: int Main.$noinline$testLongToInt(int, int) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testLongToInt(int, int) control_flow_simplifier (after) /// CHECK: <<Const10:i\d+>> IntConstant 10 /// CHECK: <<Const1:j\d+>> LongConstant 4294967297 /// CHECK: <<Const2:j\d+>> LongConstant 4294967298 diff --git a/test/458-checker-instruct-simplification/src/Main.java b/test/458-checker-instruct-simplification/src/Main.java index 9600c43028..f65d339dae 100644 --- a/test/458-checker-instruct-simplification/src/Main.java +++ b/test/458-checker-instruct-simplification/src/Main.java @@ -1231,7 +1231,7 @@ public class Main { /// CHECK-DAG: <<Phi:i\d+>> Phi [<<Const13>>,<<Const54>>] /// CHECK-DAG: Return [<<Phi>>] - /// CHECK-START: int Main.$noinline$booleanFieldNotEqualOne() code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$booleanFieldNotEqualOne() control_flow_simplifier (after) /// CHECK-DAG: <<Field:z\d+>> StaticFieldGet /// CHECK-DAG: <<Const13:i\d+>> IntConstant 13 /// CHECK-DAG: <<Const54:i\d+>> IntConstant 54 @@ -1252,7 +1252,7 @@ public class Main { /// CHECK-DAG: <<Phi:i\d+>> Phi [<<Const13>>,<<Const54>>] /// CHECK-DAG: Return [<<Phi>>] - /// CHECK-START: int Main.$noinline$booleanFieldEqualZero() code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$booleanFieldEqualZero() control_flow_simplifier (after) /// CHECK-DAG: <<Field:z\d+>> StaticFieldGet /// CHECK-DAG: <<Const13:i\d+>> IntConstant 13 /// CHECK-DAG: <<Const54:i\d+>> IntConstant 54 @@ -1278,7 +1278,7 @@ public class Main { /// CHECK-DAG: <<Phi2:i\d+>> Phi [<<Const13>>,<<Const54>>] /// CHECK-DAG: Return [<<Phi2>>] - /// CHECK-START: int Main.$noinline$intConditionNotEqualOne(int) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$intConditionNotEqualOne(int) control_flow_simplifier (after) /// CHECK-DAG: <<Arg:i\d+>> ParameterValue /// CHECK-DAG: <<Const13:i\d+>> IntConstant 13 /// CHECK-DAG: <<Const42:i\d+>> IntConstant 42 @@ -1308,7 +1308,7 @@ public class Main { /// CHECK-DAG: <<Phi2:i\d+>> Phi [<<Const13>>,<<Const54>>] /// CHECK-DAG: Return [<<Phi2>>] - /// CHECK-START: int Main.$noinline$intConditionEqualZero(int) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$intConditionEqualZero(int) control_flow_simplifier (after) /// CHECK-DAG: <<Arg:i\d+>> ParameterValue /// CHECK-DAG: <<Const13:i\d+>> IntConstant 13 /// CHECK-DAG: <<Const42:i\d+>> IntConstant 42 diff --git a/test/463-checker-boolean-simplifier/smali/Main2.smali b/test/463-checker-boolean-simplifier/smali/Main2.smali index 9bf0bc1b13..f52700f34c 100644 --- a/test/463-checker-boolean-simplifier/smali/Main2.smali +++ b/test/463-checker-boolean-simplifier/smali/Main2.smali @@ -31,7 +31,7 @@ # Elementary test negating a boolean. Verifies that blocks are merged and # empty branches removed. -## CHECK-START: boolean Main2.BooleanNot(boolean) code_flow_simplifier (before) +## CHECK-START: boolean Main2.BooleanNot(boolean) control_flow_simplifier (before) ## CHECK-DAG: <<Param:z\d+>> ParameterValue ## CHECK-DAG: <<Const0:i\d+>> IntConstant 0 ## CHECK-DAG: <<Const1:i\d+>> IntConstant 1 @@ -39,24 +39,24 @@ ## CHECK-DAG: <<Phi:i\d+>> Phi [<<Const1>>,<<Const0>>] ## CHECK-DAG: Return [<<Phi>>] -## CHECK-START: boolean Main2.BooleanNot(boolean) code_flow_simplifier (before) +## CHECK-START: boolean Main2.BooleanNot(boolean) control_flow_simplifier (before) ## CHECK: Goto ## CHECK: Goto ## CHECK: Goto ## CHECK-NOT: Goto -## CHECK-START: boolean Main2.BooleanNot(boolean) code_flow_simplifier (after) +## CHECK-START: boolean Main2.BooleanNot(boolean) control_flow_simplifier (after) ## CHECK-DAG: <<Param:z\d+>> ParameterValue ## CHECK-DAG: <<Const0:i\d+>> IntConstant 0 ## CHECK-DAG: <<Const1:i\d+>> IntConstant 1 ## CHECK-DAG: <<NotParam:i\d+>> Select [<<Const1>>,<<Const0>>,<<Param>>] ## CHECK-DAG: Return [<<NotParam>>] -## CHECK-START: boolean Main2.BooleanNot(boolean) code_flow_simplifier (after) +## CHECK-START: boolean Main2.BooleanNot(boolean) control_flow_simplifier (after) ## CHECK-NOT: If ## CHECK-NOT: Phi -## CHECK-START: boolean Main2.BooleanNot(boolean) code_flow_simplifier (after) +## CHECK-START: boolean Main2.BooleanNot(boolean) control_flow_simplifier (after) ## CHECK: Goto ## CHECK-NOT: Goto @@ -86,7 +86,7 @@ # Program which further uses negated conditions. # Note that Phis are discovered retrospectively. -## CHECK-START: boolean Main2.ValuesOrdered(int, int, int) code_flow_simplifier (before) +## CHECK-START: boolean Main2.ValuesOrdered(int, int, int) control_flow_simplifier (before) ## CHECK-DAG: <<ParamX:i\d+>> ParameterValue ## CHECK-DAG: <<ParamY:i\d+>> ParameterValue ## CHECK-DAG: <<ParamZ:i\d+>> ParameterValue @@ -103,7 +103,7 @@ ## CHECK-DAG: <<PhiYZ>> Phi [<<Const1>>,<<Const0>>] ## CHECK-DAG: <<PhiXYZ>> Phi [<<Const1>>,<<Const0>>] -## CHECK-START: boolean Main2.ValuesOrdered(int, int, int) code_flow_simplifier (after) +## CHECK-START: boolean Main2.ValuesOrdered(int, int, int) control_flow_simplifier (after) ## CHECK-DAG: <<ParamX:i\d+>> ParameterValue ## CHECK-DAG: <<ParamY:i\d+>> ParameterValue ## CHECK-DAG: <<ParamZ:i\d+>> ParameterValue @@ -164,7 +164,7 @@ goto :goto_a .end method -## CHECK-START: int Main2.NegatedCondition(boolean) code_flow_simplifier (before) +## CHECK-START: int Main2.NegatedCondition(boolean) control_flow_simplifier (before) ## CHECK-DAG: <<Param:z\d+>> ParameterValue ## CHECK-DAG: <<Const42:i\d+>> IntConstant 42 ## CHECK-DAG: <<Const43:i\d+>> IntConstant 43 @@ -172,14 +172,14 @@ ## CHECK-DAG: <<Phi:i\d+>> Phi [<<Const42>>,<<Const43>>] ## CHECK-DAG: Return [<<Phi>>] -## CHECK-START: int Main2.NegatedCondition(boolean) code_flow_simplifier (after) +## CHECK-START: int Main2.NegatedCondition(boolean) control_flow_simplifier (after) ## CHECK-DAG: <<Param:z\d+>> ParameterValue ## CHECK-DAG: <<Const42:i\d+>> IntConstant 42 ## CHECK-DAG: <<Const43:i\d+>> IntConstant 43 ## CHECK-DAG: <<Select:i\d+>> Select [<<Const43>>,<<Const42>>,<<Param>>] ## CHECK-DAG: Return [<<Select>>] -## CHECK-START: int Main2.NegatedCondition(boolean) code_flow_simplifier (after) +## CHECK-START: int Main2.NegatedCondition(boolean) control_flow_simplifier (after) ## CHECK-NOT: BooleanNot # The original java source of this method: @@ -214,7 +214,7 @@ # This test currently checks that we don't perform select generation due to # having multiple phis. -## CHECK-START: int Main2.MultiplePhis() code_flow_simplifier (before) +## CHECK-START: int Main2.MultiplePhis() control_flow_simplifier (before) ## CHECK-DAG: <<Const0:i\d+>> IntConstant 0 ## CHECK-DAG: <<Const1:i\d+>> IntConstant 1 ## CHECK-DAG: <<Const13:i\d+>> IntConstant 13 @@ -226,7 +226,7 @@ ## CHECK-DAG: If [<<Cond>>] ## CHECK-DAG: Return [<<PhiX>>] -## CHECK-START: int Main2.MultiplePhis() code_flow_simplifier (after) +## CHECK-START: int Main2.MultiplePhis() control_flow_simplifier (after) ## CHECK-DAG: <<Const0:i\d+>> IntConstant 0 ## CHECK-DAG: <<Const1:i\d+>> IntConstant 1 ## CHECK-DAG: <<Const13:i\d+>> IntConstant 13 diff --git a/test/463-checker-boolean-simplifier/src-art/Main.java b/test/463-checker-boolean-simplifier/src-art/Main.java index 5105f50a6e..a76966d167 100644 --- a/test/463-checker-boolean-simplifier/src-art/Main.java +++ b/test/463-checker-boolean-simplifier/src-art/Main.java @@ -39,7 +39,7 @@ public class Main { * and 0 when False. */ - /// CHECK-START: boolean Main.GreaterThan(int, int) code_flow_simplifier (before) + /// CHECK-START: boolean Main.GreaterThan(int, int) control_flow_simplifier (before) /// CHECK-DAG: <<ParamX:i\d+>> ParameterValue /// CHECK-DAG: <<ParamY:i\d+>> ParameterValue /// CHECK-DAG: <<Const0:i\d+>> IntConstant 0 @@ -49,7 +49,7 @@ public class Main { /// CHECK-DAG: <<Phi:i\d+>> Phi [<<Const0>>,<<Const1>>] /// CHECK-DAG: Return [<<Phi>>] - /// CHECK-START: boolean Main.GreaterThan(int, int) code_flow_simplifier (after) + /// CHECK-START: boolean Main.GreaterThan(int, int) control_flow_simplifier (after) /// CHECK-DAG: <<ParamX:i\d+>> ParameterValue /// CHECK-DAG: <<ParamY:i\d+>> ParameterValue /// CHECK-DAG: <<Const0:i\d+>> IntConstant 0 @@ -67,7 +67,7 @@ public class Main { * and 1 when False. */ - /// CHECK-START: boolean Main.LessThan(int, int) code_flow_simplifier (before) + /// CHECK-START: boolean Main.LessThan(int, int) control_flow_simplifier (before) /// CHECK-DAG: <<ParamX:i\d+>> ParameterValue /// CHECK-DAG: <<ParamY:i\d+>> ParameterValue /// CHECK-DAG: <<Const0:i\d+>> IntConstant 0 @@ -77,7 +77,7 @@ public class Main { /// CHECK-DAG: <<Phi:i\d+>> Phi [<<Const1>>,<<Const0>>] /// CHECK-DAG: Return [<<Phi>>] - /// CHECK-START: boolean Main.LessThan(int, int) code_flow_simplifier (after) + /// CHECK-START: boolean Main.LessThan(int, int) control_flow_simplifier (after) /// CHECK-DAG: <<ParamX:i\d+>> ParameterValue /// CHECK-DAG: <<ParamY:i\d+>> ParameterValue /// CHECK-DAG: <<Const0:i\d+>> IntConstant 0 @@ -90,7 +90,7 @@ public class Main { return (x < y) ? true : false; } - /// CHECK-START: int Main.SimpleTrueBlock(boolean, int) code_flow_simplifier (after) + /// CHECK-START: int Main.SimpleTrueBlock(boolean, int) control_flow_simplifier (after) /// CHECK-DAG: <<ParamX:z\d+>> ParameterValue /// CHECK-DAG: <<ParamY:i\d+>> ParameterValue /// CHECK-DAG: <<Const42:i\d+>> IntConstant 42 @@ -99,14 +99,14 @@ public class Main { /// CHECK-DAG: <<Select:i\d+>> Select [<<Const43>>,<<Add>>,<<ParamX>>] /// CHECK-DAG: Return [<<Select>>] - /// CHECK-START: int Main.SimpleTrueBlock(boolean, int) code_flow_simplifier (after) + /// CHECK-START: int Main.SimpleTrueBlock(boolean, int) control_flow_simplifier (after) /// CHECK-NOT: If public static int SimpleTrueBlock(boolean x, int y) { return x ? y + 42 : 43; } - /// CHECK-START: int Main.SimpleFalseBlock(boolean, int) code_flow_simplifier (after) + /// CHECK-START: int Main.SimpleFalseBlock(boolean, int) control_flow_simplifier (after) /// CHECK-DAG: <<ParamX:z\d+>> ParameterValue /// CHECK-DAG: <<ParamY:i\d+>> ParameterValue /// CHECK-DAG: <<Const42:i\d+>> IntConstant 42 @@ -115,14 +115,14 @@ public class Main { /// CHECK-DAG: <<Select:i\d+>> Select [<<Add>>,<<Const42>>,<<ParamX>>] /// CHECK-DAG: Return [<<Select>>] - /// CHECK-START: int Main.SimpleFalseBlock(boolean, int) code_flow_simplifier (after) + /// CHECK-START: int Main.SimpleFalseBlock(boolean, int) control_flow_simplifier (after) /// CHECK-NOT: If public static int SimpleFalseBlock(boolean x, int y) { return x ? 42 : y + 43; } - /// CHECK-START: int Main.SimpleBothBlocks(boolean, int, int) code_flow_simplifier (after) + /// CHECK-START: int Main.SimpleBothBlocks(boolean, int, int) control_flow_simplifier (after) /// CHECK-DAG: <<ParamX:z\d+>> ParameterValue /// CHECK-DAG: <<ParamY:i\d+>> ParameterValue /// CHECK-DAG: <<ParamZ:i\d+>> ParameterValue @@ -133,14 +133,14 @@ public class Main { /// CHECK-DAG: <<Select:i\d+>> Select [<<AddFalse>>,<<AddTrue>>,<<ParamX>>] /// CHECK-DAG: Return [<<Select>>] - /// CHECK-START: int Main.SimpleBothBlocks(boolean, int, int) code_flow_simplifier (after) + /// CHECK-START: int Main.SimpleBothBlocks(boolean, int, int) control_flow_simplifier (after) /// CHECK-NOT: If public static int SimpleBothBlocks(boolean x, int y, int z) { return x ? y + 42 : z + 43; } - /// CHECK-START: int Main.ThreeBlocks(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.ThreeBlocks(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<ParamX:z\d+>> ParameterValue /// CHECK-DAG: <<ParamY:z\d+>> ParameterValue /// CHECK-DAG: <<Const1:i\d+>> IntConstant 1 @@ -160,7 +160,7 @@ public class Main { } } - /// CHECK-START: int Main.TrueBlockWithTooManyInstructions(boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.TrueBlockWithTooManyInstructions(boolean) control_flow_simplifier (before) /// CHECK-DAG: <<This:l\d+>> ParameterValue /// CHECK-DAG: <<Cond:z\d+>> ParameterValue /// CHECK-DAG: <<Const2:i\d+>> IntConstant 2 @@ -170,14 +170,14 @@ public class Main { /// CHECK-DAG: <<Add:i\d+>> Add [<<Iget>>,<<Const2>>] /// CHECK-DAG: Phi [<<Add>>,<<Const43>>] - /// CHECK-START: int Main.TrueBlockWithTooManyInstructions(boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.TrueBlockWithTooManyInstructions(boolean) control_flow_simplifier (after) /// CHECK-NOT: Select public int TrueBlockWithTooManyInstructions(boolean x) { return x ? (read_field + 2) : 43; } - /// CHECK-START: int Main.FalseBlockWithTooManyInstructions(boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.FalseBlockWithTooManyInstructions(boolean) control_flow_simplifier (before) /// CHECK-DAG: <<This:l\d+>> ParameterValue /// CHECK-DAG: <<Cond:z\d+>> ParameterValue /// CHECK-DAG: <<Const3:i\d+>> IntConstant 3 @@ -187,14 +187,14 @@ public class Main { /// CHECK-DAG: <<Add:i\d+>> Add [<<Iget>>,<<Const3>>] /// CHECK-DAG: Phi [<<Const42>>,<<Add>>] - /// CHECK-START: int Main.FalseBlockWithTooManyInstructions(boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.FalseBlockWithTooManyInstructions(boolean) control_flow_simplifier (after) /// CHECK-NOT: Select public int FalseBlockWithTooManyInstructions(boolean x) { return x ? 42 : (read_field + 3); } - /// CHECK-START: int Main.TrueBlockWithSideEffects(boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.TrueBlockWithSideEffects(boolean) control_flow_simplifier (before) /// CHECK-DAG: <<This:l\d+>> ParameterValue /// CHECK-DAG: <<Cond:z\d+>> ParameterValue /// CHECK-DAG: <<Const42:i\d+>> IntConstant 42 @@ -203,14 +203,14 @@ public class Main { /// CHECK-DAG: InstanceFieldSet [<<This>>,<<Const42>>] /// CHECK-DAG: Phi [<<Const42>>,<<Const43>>] - /// CHECK-START: int Main.TrueBlockWithSideEffects(boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.TrueBlockWithSideEffects(boolean) control_flow_simplifier (after) /// CHECK-NOT: Select public int TrueBlockWithSideEffects(boolean x) { return x ? (write_field = 42) : 43; } - /// CHECK-START: int Main.FalseBlockWithSideEffects(boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.FalseBlockWithSideEffects(boolean) control_flow_simplifier (before) /// CHECK-DAG: <<This:l\d+>> ParameterValue /// CHECK-DAG: <<Cond:z\d+>> ParameterValue /// CHECK-DAG: <<Const42:i\d+>> IntConstant 42 @@ -219,7 +219,7 @@ public class Main { /// CHECK-DAG: InstanceFieldSet [<<This>>,<<Const43>>] /// CHECK-DAG: Phi [<<Const42>>,<<Const43>>] - /// CHECK-START: int Main.FalseBlockWithSideEffects(boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.FalseBlockWithSideEffects(boolean) control_flow_simplifier (after) /// CHECK-NOT: Select public int FalseBlockWithSideEffects(boolean x) { diff --git a/test/468-checker-bool-simplif-regression/smali/TestCase.smali b/test/468-checker-bool-simplif-regression/smali/TestCase.smali index 965bf2d330..10f2a4abe7 100644 --- a/test/468-checker-bool-simplif-regression/smali/TestCase.smali +++ b/test/468-checker-bool-simplif-regression/smali/TestCase.smali @@ -18,7 +18,7 @@ .field public static value:Z -## CHECK-START: boolean TestCase.testCase() code_flow_simplifier (before) +## CHECK-START: boolean TestCase.testCase() control_flow_simplifier (before) ## CHECK-DAG: <<Const0:i\d+>> IntConstant 0 ## CHECK-DAG: <<Const1:i\d+>> IntConstant 1 ## CHECK-DAG: <<Value:z\d+>> StaticFieldGet @@ -26,7 +26,7 @@ ## CHECK-DAG: <<Phi:i\d+>> Phi [<<Const1>>,<<Const0>>] ## CHECK-DAG: Return [<<Phi>>] -## CHECK-START: boolean TestCase.testCase() code_flow_simplifier (after) +## CHECK-START: boolean TestCase.testCase() control_flow_simplifier (after) ## CHECK-DAG: <<Const0:i\d+>> IntConstant 0 ## CHECK-DAG: <<Const1:i\d+>> IntConstant 1 ## CHECK-DAG: <<Value:z\d+>> StaticFieldGet diff --git a/test/474-checker-boolean-input/src/Main.java b/test/474-checker-boolean-input/src/Main.java index fbffa70473..6799f677bb 100644 --- a/test/474-checker-boolean-input/src/Main.java +++ b/test/474-checker-boolean-input/src/Main.java @@ -27,7 +27,7 @@ public class Main { * we implement a suitable type analysis. */ - /// CHECK-START: boolean Main.TestPhiAsBoolean(int) code_flow_simplifier (after) + /// CHECK-START: boolean Main.TestPhiAsBoolean(int) control_flow_simplifier (after) /// CHECK-DAG: <<Phi:i\d+>> Phi /// CHECK-DAG: Select [{{i\d+}},{{i\d+}},<<Phi>>] @@ -47,7 +47,7 @@ public class Main { * we implement a suitable type analysis. */ - /// CHECK-START: boolean Main.TestAndAsBoolean(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: boolean Main.TestAndAsBoolean(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<And:i\d+>> And /// CHECK-DAG: Select [{{i\d+}},{{i\d+}},<<And>>] @@ -64,7 +64,7 @@ public class Main { * we implement a suitable type analysis. */ - /// CHECK-START: boolean Main.TestOrAsBoolean(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: boolean Main.TestOrAsBoolean(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Or:i\d+>> Or /// CHECK-DAG: Select [{{i\d+}},{{i\d+}},<<Or>>] @@ -81,7 +81,7 @@ public class Main { * we implement a suitable type analysis. */ - /// CHECK-START: boolean Main.TestXorAsBoolean(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: boolean Main.TestXorAsBoolean(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Xor:i\d+>> Xor /// CHECK-DAG: Select [{{i\d+}},{{i\d+}},<<Xor>>] diff --git a/test/485-checker-dce-loop-update/smali/TestCase.smali b/test/485-checker-dce-loop-update/smali/TestCase.smali index 53e352a16a..efc60d5470 100644 --- a/test/485-checker-dce-loop-update/smali/TestCase.smali +++ b/test/485-checker-dce-loop-update/smali/TestCase.smali @@ -162,7 +162,7 @@ ## CHECK-START: int TestCase.testExitPredecessors(int, boolean, boolean) dead_code_elimination$after_inlining (after) ## CHECK-NOT: IntConstant 5 -## CHECK-START: int TestCase.testExitPredecessors(int, boolean, boolean) code_flow_simplifier (after) +## CHECK-START: int TestCase.testExitPredecessors(int, boolean, boolean) control_flow_simplifier (after) ## CHECK-DAG: <<ArgX:i\d+>> ParameterValue ## CHECK-DAG: <<ArgY:z\d+>> ParameterValue ## CHECK-DAG: <<ArgZ:z\d+>> ParameterValue diff --git a/test/567-checker-builder-intrinsics/src/TestCompare.java b/test/567-checker-builder-intrinsics/src/TestCompare.java index 0f4f0bee31..eb51cfe1c2 100644 --- a/test/567-checker-builder-intrinsics/src/TestCompare.java +++ b/test/567-checker-builder-intrinsics/src/TestCompare.java @@ -37,7 +37,7 @@ public class TestCompare { } } - /// CHECK-START: int TestCompare.compareBooleans(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int TestCompare.compareBooleans(boolean, boolean) control_flow_simplifier (after) /// CHECK-NOT: Phi /// CHECK-START: int TestCompare.compareBooleans(boolean, boolean) instruction_simplifier$before_codegen (after) @@ -64,7 +64,7 @@ public class TestCompare { /// CHECK-START: int TestCompare.compareBooleans2(boolean, boolean) builder (after) /// CHECK-NOT: InvokeStaticOrDirect - /// CHECK-START: int TestCompare.compareBooleans2(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int TestCompare.compareBooleans2(boolean, boolean) control_flow_simplifier (after) /// CHECK: <<ArgX:z\d+>> ParameterValue /// CHECK: <<ArgY:z\d+>> ParameterValue /// CHECK-DAG: <<Zero:i\d+>> IntConstant 0 @@ -74,7 +74,7 @@ public class TestCompare { /// CHECK-DAG: <<Result:i\d+>> Compare [<<SelX>>,<<SelY>>] /// CHECK-DAG: Return [<<Result>>] - /// CHECK-START: int TestCompare.compareBooleans2(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int TestCompare.compareBooleans2(boolean, boolean) control_flow_simplifier (after) /// CHECK-NOT: Phi /// CHECK-START: int TestCompare.compareBooleans2(boolean, boolean) instruction_simplifier$before_codegen (after) diff --git a/test/567-checker-builder-intrinsics/src/TestMinMax.java b/test/567-checker-builder-intrinsics/src/TestMinMax.java index 36cd1e6e47..af7c343d55 100644 --- a/test/567-checker-builder-intrinsics/src/TestMinMax.java +++ b/test/567-checker-builder-intrinsics/src/TestMinMax.java @@ -564,7 +564,7 @@ public class TestMinMax { return x; } - /// CHECK-START: int TestMinMax.minmax3(int) code_flow_simplifier (after) + /// CHECK-START: int TestMinMax.minmax3(int) control_flow_simplifier (after) /// CHECK-DAG: <<Par:i\d+>> ParameterValue /// CHECK-DAG: <<P100:i\d+>> IntConstant 100 /// CHECK-DAG: <<M100:i\d+>> IntConstant -100 @@ -588,7 +588,7 @@ public class TestMinMax { return (x > 100) ? 100 : ((x < -100) ? -100 : x); } - /// CHECK-START: int TestMinMax.minmax4(int) code_flow_simplifier (after) + /// CHECK-START: int TestMinMax.minmax4(int) control_flow_simplifier (after) /// CHECK-DAG: <<Par:i\d+>> ParameterValue /// CHECK-DAG: <<P100:i\d+>> IntConstant 100 /// CHECK-DAG: <<M100:i\d+>> IntConstant -100 @@ -612,7 +612,7 @@ public class TestMinMax { return (x < -100) ? -100 : ((x > 100) ? 100 : x); } - /// CHECK-START: int TestMinMax.minmaxCSEScalar(int, int) code_flow_simplifier (after) + /// CHECK-START: int TestMinMax.minmaxCSEScalar(int, int) control_flow_simplifier (after) /// CHECK-DAG: <<Par1:i\d+>> ParameterValue /// CHECK-DAG: <<Par2:i\d+>> ParameterValue /// CHECK-DAG: <<Cnd1:z\d+>> LessThanOrEqual [<<Par1>>,<<Par2>>] @@ -648,7 +648,7 @@ public class TestMinMax { return t1 + t2 + t3 + t4 + t5 + t6; } - /// CHECK-START: int TestMinMax.minmaxCSEArray(int[], int[]) code_flow_simplifier (after) + /// CHECK-START: int TestMinMax.minmaxCSEArray(int[], int[]) control_flow_simplifier (after) /// CHECK-DAG: <<Arr1:i\d+>> ArrayGet /// CHECK-DAG: <<Arr2:i\d+>> ArrayGet /// CHECK-DAG: <<Cnd1:z\d+>> LessThanOrEqual [<<Arr1>>,<<Arr2>>] diff --git a/test/567-checker-builder-intrinsics/src/TestRotate.java b/test/567-checker-builder-intrinsics/src/TestRotate.java index 3a8ffc1335..322c55ac56 100644 --- a/test/567-checker-builder-intrinsics/src/TestRotate.java +++ b/test/567-checker-builder-intrinsics/src/TestRotate.java @@ -281,7 +281,7 @@ public class TestRotate { /// CHECK-START: int TestRotate.$inline$rotateLeftBoolean(boolean, int) builder (after) /// CHECK-NOT: InvokeStaticOrDirect - /// CHECK-START: int TestRotate.$inline$rotateLeftBoolean(boolean, int) code_flow_simplifier (after) + /// CHECK-START: int TestRotate.$inline$rotateLeftBoolean(boolean, int) control_flow_simplifier (after) /// CHECK: <<ArgVal:z\d+>> ParameterValue /// CHECK: <<ArgDist:i\d+>> ParameterValue /// CHECK-DAG: <<Zero:i\d+>> IntConstant 0 @@ -290,7 +290,7 @@ public class TestRotate { /// CHECK-DAG: <<Result:i\d+>> Rol [<<SelVal>>,<<ArgDist>>] /// CHECK-DAG: Return [<<Result>>] - /// CHECK-START: int TestRotate.$inline$rotateLeftBoolean(boolean, int) code_flow_simplifier (after) + /// CHECK-START: int TestRotate.$inline$rotateLeftBoolean(boolean, int) control_flow_simplifier (after) /// CHECK-NOT: Phi /// CHECK-START: int TestRotate.$inline$rotateLeftBoolean(boolean, int) instruction_simplifier$before_codegen (after) @@ -522,7 +522,7 @@ public class TestRotate { /// CHECK-START: int TestRotate.rotateRightBoolean(boolean, int) builder (after) /// CHECK-NOT: InvokeStaticOrDirect - /// CHECK-START: int TestRotate.rotateRightBoolean(boolean, int) code_flow_simplifier (after) + /// CHECK-START: int TestRotate.rotateRightBoolean(boolean, int) control_flow_simplifier (after) /// CHECK: <<ArgVal:z\d+>> ParameterValue /// CHECK: <<ArgDist:i\d+>> ParameterValue /// CHECK-DAG: <<Zero:i\d+>> IntConstant 0 @@ -531,7 +531,7 @@ public class TestRotate { /// CHECK-DAG: <<Result:i\d+>> Ror [<<SelVal>>,<<ArgDist>>] /// CHECK-DAG: Return [<<Result>>] - /// CHECK-START: int TestRotate.rotateRightBoolean(boolean, int) code_flow_simplifier (after) + /// CHECK-START: int TestRotate.rotateRightBoolean(boolean, int) control_flow_simplifier (after) /// CHECK-NOT: Phi /// CHECK-START: int TestRotate.rotateRightBoolean(boolean, int) instruction_simplifier$before_codegen (after) diff --git a/test/567-checker-builder-intrinsics/src/TestSignum.java b/test/567-checker-builder-intrinsics/src/TestSignum.java index 0ec6b3a0a0..bc146beb9d 100644 --- a/test/567-checker-builder-intrinsics/src/TestSignum.java +++ b/test/567-checker-builder-intrinsics/src/TestSignum.java @@ -81,7 +81,7 @@ public class TestSignum { /// CHECK-START: int TestSignum.signBoolean(boolean) builder (after) /// CHECK-NOT: InvokeStaticOrDirect - /// CHECK-START: int TestSignum.signBoolean(boolean) code_flow_simplifier (after) + /// CHECK-START: int TestSignum.signBoolean(boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Arg:z\d+>> ParameterValue /// CHECK-DAG: <<Zero:i\d+>> IntConstant 0 /// CHECK-DAG: <<One:i\d+>> IntConstant 1 @@ -89,7 +89,7 @@ public class TestSignum { /// CHECK-DAG: <<Result:i\d+>> Compare [<<Sel>>,<<Zero>>] /// CHECK-DAG: Return [<<Result>>] - /// CHECK-START: int TestSignum.signBoolean(boolean) code_flow_simplifier (after) + /// CHECK-START: int TestSignum.signBoolean(boolean) control_flow_simplifier (after) /// CHECK-NOT: Phi /// CHECK-START: int TestSignum.signBoolean(boolean) instruction_simplifier$after_gvn (after) diff --git a/test/592-checker-regression-bool-input/smali/TestCase.smali b/test/592-checker-regression-bool-input/smali/TestCase.smali index 29037ab397..8e9ad809c0 100644 --- a/test/592-checker-regression-bool-input/smali/TestCase.smali +++ b/test/592-checker-regression-bool-input/smali/TestCase.smali @@ -16,7 +16,7 @@ .super Ljava/lang/Object; -## CHECK-START: boolean TestCase.testCase() code_flow_simplifier (after) +## CHECK-START: boolean TestCase.testCase() control_flow_simplifier (after) ## CHECK-DAG: <<Select:i\d+>> Select ## CHECK-DAG: Return [<<Select>>] diff --git a/test/593-checker-boolean-2-integral-conv/smali/SmaliTests.smali b/test/593-checker-boolean-2-integral-conv/smali/SmaliTests.smali index dc544bd101..1673fccdd8 100644 --- a/test/593-checker-boolean-2-integral-conv/smali/SmaliTests.smali +++ b/test/593-checker-boolean-2-integral-conv/smali/SmaliTests.smali @@ -40,7 +40,7 @@ ## CHECK-DAG: <<IToS:b\d+>> TypeConversion [<<Phi>>] ## CHECK-DAG: Return [<<IToS>>] -## CHECK-START: byte SmaliTests.booleanToByte(boolean) code_flow_simplifier (after) +## CHECK-START: byte SmaliTests.booleanToByte(boolean) control_flow_simplifier (after) ## CHECK: <<Arg:z\d+>> ParameterValue ## CHECK-DAG: <<Zero:i\d+>> IntConstant 0 ## CHECK-DAG: <<One:i\d+>> IntConstant 1 @@ -75,7 +75,7 @@ ## CHECK-DAG: <<IToS:s\d+>> TypeConversion [<<Phi>>] ## CHECK-DAG: Return [<<IToS>>] -## CHECK-START: short SmaliTests.booleanToShort(boolean) code_flow_simplifier (after) +## CHECK-START: short SmaliTests.booleanToShort(boolean) control_flow_simplifier (after) ## CHECK: <<Arg:z\d+>> ParameterValue ## CHECK-DAG: <<Zero:i\d+>> IntConstant 0 ## CHECK-DAG: <<One:i\d+>> IntConstant 1 @@ -110,7 +110,7 @@ ## CHECK-DAG: <<IToC:c\d+>> TypeConversion [<<Phi>>] ## CHECK-DAG: Return [<<IToC>>] -## CHECK-START: char SmaliTests.booleanToChar(boolean) code_flow_simplifier (after) +## CHECK-START: char SmaliTests.booleanToChar(boolean) control_flow_simplifier (after) ## CHECK: <<Arg:z\d+>> ParameterValue ## CHECK-DAG: <<Zero:i\d+>> IntConstant 0 ## CHECK-DAG: <<One:i\d+>> IntConstant 1 @@ -144,7 +144,7 @@ ## CHECK-DAG: <<Phi:i\d+>> Phi [<<One>>,<<Zero>>] ## CHECK-DAG: Return [<<Phi>>] -## CHECK-START: int SmaliTests.booleanToInt(boolean) code_flow_simplifier (after) +## CHECK-START: int SmaliTests.booleanToInt(boolean) control_flow_simplifier (after) ## CHECK: <<Arg:z\d+>> ParameterValue ## CHECK-DAG: <<Zero:i\d+>> IntConstant 0 ## CHECK-DAG: <<One:i\d+>> IntConstant 1 @@ -177,7 +177,7 @@ ## CHECK-DAG: <<IToJ:j\d+>> TypeConversion [<<Phi>>] ## CHECK-DAG: Return [<<IToJ>>] -## CHECK-START: long SmaliTests.booleanToLong(boolean) code_flow_simplifier (after) +## CHECK-START: long SmaliTests.booleanToLong(boolean) control_flow_simplifier (after) ## CHECK-DAG: <<Arg:z\d+>> ParameterValue ## CHECK-DAG: <<Zero:i\d+>> IntConstant 0 ## CHECK-DAG: <<One:i\d+>> IntConstant 1 @@ -227,7 +227,7 @@ ## CHECK-DAG: <<JToI:i\d+>> TypeConversion [<<IToJ>>] ## CHECK-DAG: Return [<<JToI>>] -## CHECK-START: int SmaliTests.longToIntOfBoolean() code_flow_simplifier (after) +## CHECK-START: int SmaliTests.longToIntOfBoolean() control_flow_simplifier (after) ## CHECK-DAG: <<Zero:i\d+>> IntConstant 0 ## CHECK-DAG: <<One:i\d+>> IntConstant 1 ## CHECK-DAG: <<Sget:z\d+>> StaticFieldGet diff --git a/test/593-checker-boolean-2-integral-conv/src/Main.java b/test/593-checker-boolean-2-integral-conv/src/Main.java index 7a1b83ab23..0911db580c 100644 --- a/test/593-checker-boolean-2-integral-conv/src/Main.java +++ b/test/593-checker-boolean-2-integral-conv/src/Main.java @@ -74,13 +74,13 @@ public class Main { /// CHECK-DAG: <<Phi:j\d+>> Phi [<<One>>,<<Zero>>] /// CHECK-DAG: Return [<<Phi>>] - /// CHECK-START: long Main.booleanToLong(boolean) code_flow_simplifier (after) + /// CHECK-START: long Main.booleanToLong(boolean) control_flow_simplifier (after) /// CHECK-NOT: IntConstant /// CHECK-NOT: Equal /// CHECK-NOT: If /// CHECK-NOT: Phi - /// CHECK-START: long Main.booleanToLong(boolean) code_flow_simplifier (after) + /// CHECK-START: long Main.booleanToLong(boolean) control_flow_simplifier (after) /// CHECK: <<Arg:z\d+>> ParameterValue /// CHECK-DAG: <<Zero:j\d+>> LongConstant 0 /// CHECK-DAG: <<One:j\d+>> LongConstant 1 @@ -114,13 +114,13 @@ public class Main { /// CHECK-DAG: <<JToI:i\d+>> TypeConversion [<<Phi>>] /// CHECK-DAG: Return [<<JToI>>] - /// CHECK-START: long Main.booleanToLong(boolean) code_flow_simplifier (after) + /// CHECK-START: long Main.booleanToLong(boolean) control_flow_simplifier (after) /// CHECK-NOT: IntConstant /// CHECK-NOT: Equal /// CHECK-NOT: If /// CHECK-NOT: Phi - /// CHECK-START: int Main.longToIntOfBoolean() code_flow_simplifier (after) + /// CHECK-START: int Main.longToIntOfBoolean() control_flow_simplifier (after) /// CHECK-DAG: <<Zero:j\d+>> LongConstant 0 /// CHECK-DAG: <<One:j\d+>> LongConstant 1 /// CHECK-DAG: <<Sget:z\d+>> StaticFieldGet diff --git a/test/657-branches/src/Main.java b/test/657-branches/src/Main.java index bb448eb44e..138e507139 100644 --- a/test/657-branches/src/Main.java +++ b/test/657-branches/src/Main.java @@ -19,11 +19,11 @@ public class Main { public static void foo(float f) { // The reason this used to break: // 1) We inline the 'foo' call, so blocks now only contain HLoadClass instructions. - // 2) We then run the code_flow_simplifier pass, which cannot change the + // 2) We then run the control_flow_simplifier pass, which cannot change the // if/else because blocks contain instructions. // 3) We run GVN which will remove the HLoadClass instructions in the blocks. // 4) At code generation, we are in the unlikely situation that a diamond shape - // contains no instruction (usually removed by code_flow_simplifier). This used + // contains no instruction (usually removed by control_flow_simplifier). This used // to trip the ARM code generators. if (f < 1.2f) { foo(Main.class, Object.class); diff --git a/test/663-checker-select-generator/src/Main.java b/test/663-checker-select-generator/src/Main.java index 631210c9bc..baf57e6b22 100644 --- a/test/663-checker-select-generator/src/Main.java +++ b/test/663-checker-select-generator/src/Main.java @@ -21,13 +21,13 @@ public class Main { /// CHECK-START: int Main.$noinline$testSimpleDiamondSameValue(boolean) builder (after) /// CHECK-NOT: Phi - /// CHECK-START: int Main.$noinline$testSimpleDiamondSameValue(boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testSimpleDiamondSameValue(boolean) control_flow_simplifier (before) /// CHECK-NOT: Phi - /// CHECK-START: int Main.$noinline$testSimpleDiamondSameValue(boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testSimpleDiamondSameValue(boolean) control_flow_simplifier (after) /// CHECK-NOT: Phi - /// CHECK-START: int Main.$noinline$testSimpleDiamondSameValue(boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testSimpleDiamondSameValue(boolean) control_flow_simplifier (after) /// CHECK-NOT: Select private static int $noinline$testSimpleDiamondSameValue(boolean bool_param) { int return_value; @@ -41,14 +41,14 @@ public class Main { // Check that we generate a select for a simple diamond pattern, with different values. - /// CHECK-START: int Main.$noinline$testSimpleDiamondDifferentValue(boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testSimpleDiamondDifferentValue(boolean) control_flow_simplifier (before) /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Const20:i\d+>> IntConstant 20 /// CHECK-DAG: <<Phi:i\d+>> Phi [<<Arg1:i\d+>>,<<Arg2:i\d+>>] /// CHECK-DAG: Return [<<Phi>>] /// CHECK-EVAL: set(["<<Arg1>>","<<Arg2>>"]) == set(["<<Const10>>","<<Const20>>"]) - /// CHECK-START: int Main.$noinline$testSimpleDiamondDifferentValue(boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testSimpleDiamondDifferentValue(boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Bool:z\d+>> ParameterValue /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Const20:i\d+>> IntConstant 20 @@ -70,13 +70,13 @@ public class Main { /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValue(boolean, boolean) builder (after) /// CHECK-NOT: Phi - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValue(boolean, boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValue(boolean, boolean) control_flow_simplifier (before) /// CHECK-NOT: Phi - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValue(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValue(boolean, boolean) control_flow_simplifier (after) /// CHECK-NOT: Phi - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValue(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValue(boolean, boolean) control_flow_simplifier (after) /// CHECK-NOT: Select private static int $noinline$testDoubleDiamondSameValue(boolean bool_param_1, boolean bool_param_2) { int return_value; @@ -94,14 +94,14 @@ public class Main { // Check that we generate a select for a double diamond pattern, with a different value in the outer branch. - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllOuter(boolean, boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllOuter(boolean, boolean) control_flow_simplifier (before) /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Const20:i\d+>> IntConstant 20 /// CHECK-DAG: <<Phi:i\d+>> Phi [<<Arg1:i\d+>>,<<Arg2:i\d+>>,<<Arg3:i\d+>>] /// CHECK-DAG: Return [<<Phi>>] /// CHECK-EVAL: set(["<<Arg1>>","<<Arg2>>","<<Arg3>>"]) == set(["<<Const10>>","<<Const20>>","<<Const20>>"]) - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllOuter(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllOuter(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Bool1:z\d+>> ParameterValue /// CHECK-DAG: <<Bool2:z\d+>> ParameterValue /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 @@ -124,14 +124,14 @@ public class Main { // Check that we generate a select for a double diamond pattern, with a different value in the inner branch. - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllInner(boolean, boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllInner(boolean, boolean) control_flow_simplifier (before) /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Const20:i\d+>> IntConstant 20 /// CHECK-DAG: <<Phi:i\d+>> Phi [<<Arg1:i\d+>>,<<Arg2:i\d+>>,<<Arg3:i\d+>>] /// CHECK-DAG: Return [<<Phi>>] /// CHECK-EVAL: set(["<<Arg1>>","<<Arg2>>","<<Arg3>>"]) == set(["<<Const10>>","<<Const20>>","<<Const20>>"]) - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllInner(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllInner(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Bool1:z\d+>> ParameterValue /// CHECK-DAG: <<Bool2:z\d+>> ParameterValue /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 @@ -155,7 +155,7 @@ public class Main { // Check that we generate a select for a double diamond pattern, with a all different values. - /// CHECK-START: int Main.$noinline$testDoubleDiamondDifferentValue(boolean, boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testDoubleDiamondDifferentValue(boolean, boolean) control_flow_simplifier (before) /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Const20:i\d+>> IntConstant 20 /// CHECK-DAG: <<Const30:i\d+>> IntConstant 30 @@ -163,7 +163,7 @@ public class Main { /// CHECK-DAG: Return [<<Phi>>] /// CHECK-EVAL: set(["<<Arg1>>","<<Arg2>>","<<Arg3>>"]) == set(["<<Const10>>","<<Const20>>","<<Const30>>"]) - /// CHECK-START: int Main.$noinline$testDoubleDiamondDifferentValue(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testDoubleDiamondDifferentValue(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Bool1:z\d+>> ParameterValue /// CHECK-DAG: <<Bool2:z\d+>> ParameterValue /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 @@ -199,7 +199,7 @@ public class Main { /// CHECK: Return [<<Const10>>] /// CHECK: Return [<<Const10>>] - /// CHECK-START: int Main.$noinline$testSimpleDiamondSameValueWithReturn(boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testSimpleDiamondSameValueWithReturn(boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Bool:z\d+>> ParameterValue /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Select:i\d+>> Select [<<Const10>>,<<Const10>>,<<Bool>>] @@ -221,13 +221,13 @@ public class Main { // Same as testSimpleDiamondDifferentValue, but branches return. - /// CHECK-START: int Main.$noinline$testSimpleDiamondDifferentValueWithReturn(boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testSimpleDiamondDifferentValueWithReturn(boolean) control_flow_simplifier (before) /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Const20:i\d+>> IntConstant 20 /// CHECK-DAG: Return [<<Const10>>] /// CHECK-DAG: Return [<<Const20>>] - /// CHECK-START: int Main.$noinline$testSimpleDiamondDifferentValueWithReturn(boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testSimpleDiamondDifferentValueWithReturn(boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Bool:z\d+>> ParameterValue /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Const20:i\d+>> IntConstant 20 @@ -248,7 +248,7 @@ public class Main { /// CHECK: Return [<<Const10>>] /// CHECK: Return [<<Const10>>] - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueWithReturn(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueWithReturn(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Bool1:z\d+>> ParameterValue /// CHECK-DAG: <<Bool2:z\d+>> ParameterValue /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 @@ -277,7 +277,7 @@ public class Main { // Same as testDoubleDiamondSameValueButNotAllOuter, but branches return. - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllOuterWithReturn(boolean, boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllOuterWithReturn(boolean, boolean) control_flow_simplifier (before) /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Const20:i\d+>> IntConstant 20 /// CHECK-DAG: Return [<<Const10>>] @@ -285,12 +285,12 @@ public class Main { /// CHECK-DAG: Return [<<Const20>>] // Note that we have 3 returns as D8 only merges when the line positions are equal. - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllOuterWithReturn(boolean, boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllOuterWithReturn(boolean, boolean) control_flow_simplifier (before) /// CHECK: Return /// CHECK: Return /// CHECK: Return - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllOuterWithReturn(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllOuterWithReturn(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Bool1:z\d+>> ParameterValue /// CHECK-DAG: <<Bool2:z\d+>> ParameterValue /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 @@ -312,14 +312,14 @@ public class Main { // Same as testDoubleDiamondSameValueButNotAllInner, but branches return. - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllInnerWithReturn(boolean, boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllInnerWithReturn(boolean, boolean) control_flow_simplifier (before) /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Const20:i\d+>> IntConstant 20 /// CHECK-DAG: Return [<<Const10>>] /// CHECK-DAG: Return [<<Const20>>] /// CHECK-DAG: Return [<<Const20>>] - /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllInnerWithReturn(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testDoubleDiamondSameValueButNotAllInnerWithReturn(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Bool1:z\d+>> ParameterValue /// CHECK-DAG: <<Bool2:z\d+>> ParameterValue /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 @@ -341,7 +341,7 @@ public class Main { // Same as testDoubleDiamondDifferentValue, but branches return. - /// CHECK-START: int Main.$noinline$testDoubleDiamondDifferentValueWithReturn(boolean, boolean) code_flow_simplifier (before) + /// CHECK-START: int Main.$noinline$testDoubleDiamondDifferentValueWithReturn(boolean, boolean) control_flow_simplifier (before) /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 /// CHECK-DAG: <<Const20:i\d+>> IntConstant 20 /// CHECK-DAG: <<Const30:i\d+>> IntConstant 30 @@ -349,7 +349,7 @@ public class Main { /// CHECK-DAG: Return [<<Const20>>] /// CHECK-DAG: Return [<<Const30>>] - /// CHECK-START: int Main.$noinline$testDoubleDiamondDifferentValueWithReturn(boolean, boolean) code_flow_simplifier (after) + /// CHECK-START: int Main.$noinline$testDoubleDiamondDifferentValueWithReturn(boolean, boolean) control_flow_simplifier (after) /// CHECK-DAG: <<Bool1:z\d+>> ParameterValue /// CHECK-DAG: <<Bool2:z\d+>> ParameterValue /// CHECK-DAG: <<Const10:i\d+>> IntConstant 10 diff --git a/test/850-checker-branches/smali/TestCase.smali b/test/850-checker-branches/smali/TestCase.smali index 786b4304f0..8ee82b3ff3 100644 --- a/test/850-checker-branches/smali/TestCase.smali +++ b/test/850-checker-branches/smali/TestCase.smali @@ -16,7 +16,7 @@ .super Ljava/lang/Object; -## CHECK-START: int TestCase.withBranch(boolean) code_flow_simplifier (before) +## CHECK-START: int TestCase.withBranch(boolean) control_flow_simplifier (before) ## CHECK: If true_count:2 false_count:1 .method public static withBranch(Z)I .registers 2 |