[turbofan] Improve interplay of ControlReducer and CommonOperatorReducer.

test/cctest/compiler/test-control-reducer.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 #include "test/cctest/cctest.h"
 
 #include "src/base/bits.h"
 #include "src/compiler/all-nodes.h"
 #include "src/compiler/common-operator.h"
@@ skipping 125 matching lines @@
     }
     return node;
   }
 
   const Operator* op(int count, bool effect) {
     return effect ? common.EffectPhi(count) : common.Phi(kMachAnyTagged, count);
   }
 
   void ReduceGraph() { ControlReducer::ReduceGraph(main_zone(), &jsgraph); }
 
-  // Checks one-step reduction of a phi.
-  void ReducePhi(Node* expect, Node* phi) {
-    Node* result = ControlReducer::ReducePhiForTesting(&jsgraph, phi);
-    CHECK_EQ(expect, result);
-    ReducePhiIterative(expect, phi);  // iterative should give the same result.
-  }
-
-  // Checks one-step reduction of a phi.
-  void ReducePhiNonIterative(Node* expect, Node* phi) {
-    Node* result = ControlReducer::ReducePhiForTesting(&jsgraph, phi);
-    CHECK_EQ(expect, result);
-  }
-
-  void ReducePhiIterative(Node* expect, Node* phi) {
-    p0->ReplaceInput(0, start);  // hack: parameters may be trimmed.
-    Node* ret = graph.NewNode(common.Return(), phi, start, start);
-    Node* end = graph.NewNode(common.End(1), ret);
-    graph.SetEnd(end);
-    ControlReducer::ReduceGraph(main_zone(), &jsgraph);
-    CheckInputs(end, ret);
-    CheckInputs(ret, expect, start, start);
-  }
-
   void ReduceMerge(Node* expect, Node* merge) {
     Node* result = ControlReducer::ReduceMerge(&jsgraph, merge);
     CHECK_EQ(expect, result);
   }
 
   void ReduceMergeIterative(Node* expect, Node* merge) {
     p0->ReplaceInput(0, start);  // hack: parameters may be trimmed.
     Node* end = graph.NewNode(common.End(1), merge);
     graph.SetEnd(end);
     ReduceGraph();
@@ skipping 127 matching lines @@
         CHECK_EQ(3, d.phi->InputCount());
         CHECK_EQ(d.merge, d.phi->InputAt(2));
       } else {
         Check(d.phi);
       }
     }
   }
 };
 
 
-TEST(CReducePhi1) {
-  ControlReducerTester R;
-
-  R.ReducePhi(R.leaf[0], R.Phi(R.leaf[0]));
-  R.ReducePhi(R.leaf[1], R.Phi(R.leaf[1]));
-  R.ReducePhi(R.leaf[2], R.Phi(R.leaf[2]));
-  R.ReducePhi(R.leaf[3], R.Phi(R.leaf[3]));
-}
-
-
-TEST(CReducePhi1_dead) {
-  ControlReducerTester R;
-
-  R.ReducePhi(R.leaf[0], R.Phi(R.leaf[0], R.dead));
-  R.ReducePhi(R.leaf[1], R.Phi(R.leaf[1], R.dead));
-  R.ReducePhi(R.leaf[2], R.Phi(R.leaf[2], R.dead));
-  R.ReducePhi(R.leaf[3], R.Phi(R.leaf[3], R.dead));
-
-  R.ReducePhi(R.leaf[0], R.Phi(R.dead, R.leaf[0]));
-  R.ReducePhi(R.leaf[1], R.Phi(R.dead, R.leaf[1]));
-  R.ReducePhi(R.leaf[2], R.Phi(R.dead, R.leaf[2]));
-  R.ReducePhi(R.leaf[3], R.Phi(R.dead, R.leaf[3]));
-}
-
-
-TEST(CReducePhi1_dead2) {
-  ControlReducerTester R;
-
-  R.ReducePhi(R.leaf[0], R.Phi(R.leaf[0], R.dead, R.dead));
-  R.ReducePhi(R.leaf[0], R.Phi(R.dead, R.leaf[0], R.dead));
-  R.ReducePhi(R.leaf[0], R.Phi(R.dead, R.dead, R.leaf[0]));
-}
-
-
-TEST(CReducePhi2a) {
-  ControlReducerTester R;
-
-  for (size_t i = 0; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i];
-    R.ReducePhi(a, R.Phi(a, a));
-  }
-}
-
-
-TEST(CReducePhi2b) {
-  ControlReducerTester R;
-
-  for (size_t i = 0; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i];
-    R.ReducePhi(a, R.Phi(R.self, a));
-    R.ReducePhi(a, R.Phi(a, R.self));
-  }
-}
-
-
-TEST(CReducePhi2c) {
-  ControlReducerTester R;
-
-  for (size_t i = 1; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i], *b = R.leaf[0];
-    Node* phi1 = R.Phi(b, a);
-    R.ReducePhi(phi1, phi1);
-
-    Node* phi2 = R.Phi(a, b);
-    R.ReducePhi(phi2, phi2);
-  }
-}
-
-
-TEST(CReducePhi2_dead) {
-  ControlReducerTester R;
-
-  for (size_t i = 0; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i];
-    R.ReducePhi(a, R.Phi(a, a, R.dead));
-    R.ReducePhi(a, R.Phi(a, R.dead, a));
-    R.ReducePhi(a, R.Phi(R.dead, a, a));
-  }
-
-  for (size_t i = 0; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i];
-    R.ReducePhi(a, R.Phi(R.self, a));
-    R.ReducePhi(a, R.Phi(a, R.self));
-    R.ReducePhi(a, R.Phi(R.self, a, R.dead));
-    R.ReducePhi(a, R.Phi(a, R.self, R.dead));
-  }
-
-  for (size_t i = 1; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i], *b = R.leaf[0];
-    Node* phi1 = R.Phi(b, a, R.dead);
-    R.ReducePhiNonIterative(phi1, phi1);
-
-    Node* phi2 = R.Phi(a, b, R.dead);
-    R.ReducePhiNonIterative(phi2, phi2);
-  }
-}
-
-
-TEST(CReducePhi3) {
-  ControlReducerTester R;
-
-  for (size_t i = 0; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i];
-    R.ReducePhi(a, R.Phi(a, a, a));
-  }
-
-  for (size_t i = 0; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i];
-    R.ReducePhi(a, R.Phi(R.self, a, a));
-    R.ReducePhi(a, R.Phi(a, R.self, a));
-    R.ReducePhi(a, R.Phi(a, a, R.self));
-  }
-
-  for (size_t i = 1; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i], *b = R.leaf[0];
-    Node* phi1 = R.Phi(b, a, a);
-    R.ReducePhi(phi1, phi1);
-
-    Node* phi2 = R.Phi(a, b, a);
-    R.ReducePhi(phi2, phi2);
-
-    Node* phi3 = R.Phi(a, a, b);
-    R.ReducePhi(phi3, phi3);
-  }
-}
-
-
-TEST(CReducePhi4) {
-  ControlReducerTester R;
-
-  for (size_t i = 0; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i];
-    R.ReducePhi(a, R.Phi(a, a, a, a));
-  }
-
-  for (size_t i = 0; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i];
-    R.ReducePhi(a, R.Phi(R.self, a, a, a));
-    R.ReducePhi(a, R.Phi(a, R.self, a, a));
-    R.ReducePhi(a, R.Phi(a, a, R.self, a));
-    R.ReducePhi(a, R.Phi(a, a, a, R.self));
-
-    R.ReducePhi(a, R.Phi(R.self, R.self, a, a));
-    R.ReducePhi(a, R.Phi(a, R.self, R.self, a));
-    R.ReducePhi(a, R.Phi(a, a, R.self, R.self));
-    R.ReducePhi(a, R.Phi(R.self, a, a, R.self));
-  }
-
-  for (size_t i = 1; i < kNumLeafs; i++) {
-    Node* a = R.leaf[i], *b = R.leaf[0];
-    Node* phi1 = R.Phi(b, a, a, a);
-    R.ReducePhi(phi1, phi1);
-
-    Node* phi2 = R.Phi(a, b, a, a);
-    R.ReducePhi(phi2, phi2);
-
-    Node* phi3 = R.Phi(a, a, b, a);
-    R.ReducePhi(phi3, phi3);
-
-    Node* phi4 = R.Phi(a, a, a, b);
-    R.ReducePhi(phi4, phi4);
-  }
-}
-
-
-TEST(CReducePhi_iterative1) {
-  ControlReducerTester R;
-
-  R.ReducePhiIterative(R.leaf[0], R.Phi(R.leaf[0], R.Phi(R.leaf[0])));
-  R.ReducePhiIterative(R.leaf[0], R.Phi(R.Phi(R.leaf[0]), R.leaf[0]));
-}
-
-
-TEST(CReducePhi_iterative2) {
-  ControlReducerTester R;
-
-  R.ReducePhiIterative(R.leaf[0], R.Phi(R.Phi(R.leaf[0]), R.Phi(R.leaf[0])));
-}
-
-
-TEST(CReducePhi_iterative3) {
-  ControlReducerTester R;
-
-  R.ReducePhiIterative(R.leaf[0],
-                       R.Phi(R.leaf[0], R.Phi(R.leaf[0], R.leaf[0])));
-  R.ReducePhiIterative(R.leaf[0],
-                       R.Phi(R.Phi(R.leaf[0], R.leaf[0]), R.leaf[0]));
-}
-
-
-TEST(CReducePhi_iterative4) {
-  ControlReducerTester R;
-
-  R.ReducePhiIterative(R.leaf[0], R.Phi(R.Phi(R.leaf[0], R.leaf[0]),
-                                        R.Phi(R.leaf[0], R.leaf[0])));
-
-  Node* p1 = R.Phi(R.leaf[0], R.leaf[0]);
-  R.ReducePhiIterative(R.leaf[0], R.Phi(p1, p1));
-
-  Node* p2 = R.Phi(R.leaf[0], R.leaf[0], R.leaf[0]);
-  R.ReducePhiIterative(R.leaf[0], R.Phi(p2, p2, p2));
-
-  Node* p3 = R.Phi(R.leaf[0], R.leaf[0], R.leaf[0]);
-  R.ReducePhiIterative(R.leaf[0], R.Phi(p3, p3, R.leaf[0]));
-}
-
-
-TEST(CReducePhi_iterative_self1) {
-  ControlReducerTester R;
-
-  R.ReducePhiIterative(R.leaf[0], R.Phi(R.leaf[0], R.Phi(R.leaf[0], R.self)));
-  R.ReducePhiIterative(R.leaf[0], R.Phi(R.Phi(R.leaf[0], R.self), R.leaf[0]));
-}
-
-
-TEST(CReducePhi_iterative_self2) {
-  ControlReducerTester R;
-
-  R.ReducePhiIterative(
-      R.leaf[0], R.Phi(R.Phi(R.leaf[0], R.self), R.Phi(R.leaf[0], R.self)));
-  R.ReducePhiIterative(
-      R.leaf[0], R.Phi(R.Phi(R.self, R.leaf[0]), R.Phi(R.self, R.leaf[0])));
-
-  Node* p1 = R.Phi(R.leaf[0], R.self);
-  R.ReducePhiIterative(R.leaf[0], R.Phi(p1, p1));
-
-  Node* p2 = R.Phi(R.self, R.leaf[0]);
-  R.ReducePhiIterative(R.leaf[0], R.Phi(p2, p2));
-}
-
-
-TEST(EReducePhi1) {
-  ControlReducerTester R;
-
-  R.ReducePhi(R.leaf[0], R.EffectPhi(R.leaf[0]));
-  R.ReducePhi(R.leaf[1], R.EffectPhi(R.leaf[1]));
-  R.ReducePhi(R.leaf[2], R.EffectPhi(R.leaf[2]));
-  R.ReducePhi(R.leaf[3], R.EffectPhi(R.leaf[3]));
-}
-
-
-TEST(EReducePhi1_dead) {
-  ControlReducerTester R;
-
-  R.ReducePhi(R.leaf[0], R.EffectPhi(R.leaf[0], R.dead));
-  R.ReducePhi(R.leaf[1], R.EffectPhi(R.leaf[1], R.dead));
-  R.ReducePhi(R.leaf[2], R.EffectPhi(R.leaf[2], R.dead));
-  R.ReducePhi(R.leaf[3], R.EffectPhi(R.leaf[3], R.dead));
-
-  R.ReducePhi(R.leaf[0], R.EffectPhi(R.dead, R.leaf[0]));
-  R.ReducePhi(R.leaf[1], R.EffectPhi(R.dead, R.leaf[1]));
-  R.ReducePhi(R.leaf[2], R.EffectPhi(R.dead, R.leaf[2]));
-  R.ReducePhi(R.leaf[3], R.EffectPhi(R.dead, R.leaf[3]));
-}
-
-
-TEST(EReducePhi1_dead2) {
-  ControlReducerTester R;
-
-  R.ReducePhi(R.leaf[0], R.EffectPhi(R.leaf[0], R.dead, R.dead));
-  R.ReducePhi(R.leaf[0], R.EffectPhi(R.dead, R.leaf[0], R.dead));
-  R.ReducePhi(R.leaf[0], R.EffectPhi(R.dead, R.dead, R.leaf[0]));
-}
-
-
 TEST(CMergeReduce_simple1) {
   ControlReducerTester R;
 
   Node* merge = R.graph.NewNode(R.common.Merge(1), R.start);
   R.ReduceMerge(R.start, merge);
 }
 
 
 TEST(CMergeReduce_simple2) {
   ControlReducerTester R;
@@ skipping 384 matching lines @@
 TEST(CChainedDiamondsReduce_phi1) {
   ControlReducerTester R;
   Diamond d1(R, R.zero, R.one, R.zero);  // foldable branch, phi.
   Diamond d2(R, d1.phi);
   d2.chain(d1);
 
   R.ReduceMergeIterative(R.start, d2.merge);
 }
 
 
-TEST(CChainedDiamondsReduce_phi2) {
-  ControlReducerTester R;
-  Diamond d1(R, R.p0, R.jsgraph.TrueConstant(),
-             R.jsgraph.TrueConstant());  // redundant phi.
-  Diamond d2(R, d1.phi);
-  d2.chain(d1);
-
-  R.ReduceMergeIterative(d1.merge, d2.merge);
-}
-
-
 TEST(CNestedDiamondsReduce_true_true_false) {
   ControlReducerTester R;
   Diamond d1(R, R.jsgraph.TrueConstant());
   Diamond d2(R, R.jsgraph.FalseConstant());
   d2.nest(d1, true);
 
   R.ReduceMergeIterative(R.start, d1.merge);
 }
 
 
@@ skipping 403 matching lines @@
 
   R.ReduceGraph();  // d1 gets folded true.
 
   CheckInputs(ret, y2, R.start, R.start);
 
   DeadChecker dead(&R.graph);
   dead.Check(d1);
   dead.Check(d2);
   dead.Check(d3);
 }