[turbofan] Change End to take a variable number of inputs.

test/unittests/compiler/scheduler-unittest.cc

 // Copyright 2015 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/compiler/access-builder.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph.h"
 #include "src/compiler/graph-visualizer.h"
 #include "src/compiler/js-operator.h"
 #include "src/compiler/node.h"
@@ skipping 613 matching lines @@
   CheckLoop(order, loop1, 4);
 }
 
 
 // -----------------------------------------------------------------------------
 // Graph end-to-end scheduling.
 
 
 TEST_F(SchedulerTest, BuildScheduleEmpty) {
   graph()->SetStart(graph()->NewNode(common()->Start(0)));
-  graph()->SetEnd(graph()->NewNode(common()->End(), graph()->start()));
+  graph()->SetEnd(graph()->NewNode(common()->End(1), graph()->start()));
   USE(Scheduler::ComputeSchedule(zone(), graph(), Scheduler::kNoFlags));
 }
 
 
 TEST_F(SchedulerTest, BuildScheduleOneParameter) {
   graph()->SetStart(graph()->NewNode(common()->Start(0)));
 
   Node* p1 = graph()->NewNode(common()->Parameter(0), graph()->start());
   Node* ret = graph()->NewNode(common()->Return(), p1, graph()->start(),
                                graph()->start());
 
-  graph()->SetEnd(graph()->NewNode(common()->End(), ret));
+  graph()->SetEnd(graph()->NewNode(common()->End(1), ret));
 
   USE(Scheduler::ComputeSchedule(zone(), graph(), Scheduler::kNoFlags));
 }
 
 
 TEST_F(SchedulerTest, BuildScheduleIfSplit) {
   graph()->SetStart(graph()->NewNode(common()->Start(5)));
 
   Node* p1 = graph()->NewNode(common()->Parameter(0), graph()->start());
   Node* p2 = graph()->NewNode(common()->Parameter(1), graph()->start());
   Node* p3 = graph()->NewNode(common()->Parameter(2), graph()->start());
   Node* p4 = graph()->NewNode(common()->Parameter(3), graph()->start());
   Node* p5 = graph()->NewNode(common()->Parameter(4), graph()->start());
   Node* cmp =
       graph()->NewNode(js()->LessThanOrEqual(LanguageMode::SLOPPY), p1, p2, p3,
                        p4, p5, graph()->start(), graph()->start());
   Node* branch = graph()->NewNode(common()->Branch(), cmp, graph()->start());
   Node* true_branch = graph()->NewNode(common()->IfTrue(), branch);
   Node* false_branch = graph()->NewNode(common()->IfFalse(), branch);
 
   Node* ret1 =
       graph()->NewNode(common()->Return(), p4, graph()->start(), true_branch);
   Node* ret2 =
       graph()->NewNode(common()->Return(), p5, graph()->start(), false_branch);
-  Node* merge = graph()->NewNode(common()->Merge(2), ret1, ret2);
-  graph()->SetEnd(graph()->NewNode(common()->End(), merge));
+  graph()->SetEnd(graph()->NewNode(common()->End(2), ret1, ret2));
 
   ComputeAndVerifySchedule(13);
 }
 
 
 namespace {
 
 Node* CreateDiamond(Graph* graph, CommonOperatorBuilder* common, Node* cond) {
   Node* tv = graph->NewNode(common->Int32Constant(6));
   Node* fv = graph->NewNode(common->Int32Constant(7));
   Node* br = graph->NewNode(common->Branch(), cond, graph->start());
   Node* t = graph->NewNode(common->IfTrue(), br);
   Node* f = graph->NewNode(common->IfFalse(), br);
   Node* m = graph->NewNode(common->Merge(2), t, f);
   Node* phi = graph->NewNode(common->Phi(kMachAnyTagged, 2), tv, fv, m);
   return phi;
 }
 
 }  // namespace
 
 
 TARGET_TEST_F(SchedulerTest, FloatingDiamond1) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* d1 = CreateDiamond(graph(), common(), p0);
   Node* ret = graph()->NewNode(common()->Return(), d1, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(13);
 }
 
 
 TARGET_TEST_F(SchedulerTest, FloatingDiamond2) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* p1 = graph()->NewNode(common()->Parameter(1), start);
   Node* d1 = CreateDiamond(graph(), common(), p0);
   Node* d2 = CreateDiamond(graph(), common(), p1);
   Node* add = graph()->NewNode(&kIntAdd, d1, d2);
   Node* ret = graph()->NewNode(common()->Return(), add, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(24);
 }
 
 
 TARGET_TEST_F(SchedulerTest, FloatingDiamond3) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* p1 = graph()->NewNode(common()->Parameter(1), start);
   Node* d1 = CreateDiamond(graph(), common(), p0);
   Node* d2 = CreateDiamond(graph(), common(), p1);
   Node* add = graph()->NewNode(&kIntAdd, d1, d2);
   Node* d3 = CreateDiamond(graph(), common(), add);
   Node* ret = graph()->NewNode(common()->Return(), d3, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(33);
 }
 
 
 TARGET_TEST_F(SchedulerTest, NestedFloatingDiamonds) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
@@ skipping 16 matching lines @@
   Node* ffalse = graph()->NewNode(common()->Int32Constant(0));
   Node* phi1 =
       graph()->NewNode(common()->Phi(kMachAnyTagged, 2), ttrue, ffalse, m1);
 
 
   Node* m = graph()->NewNode(common()->Merge(2), t, f);
   Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), fv, phi1, m);
   Node* ephi1 = graph()->NewNode(common()->EffectPhi(2), start, map, m);
 
   Node* ret = graph()->NewNode(common()->Return(), phi, ephi1, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(23);
 }
 
 
 TARGET_TEST_F(SchedulerTest, NestedFloatingDiamondWithChain) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
@@ skipping 23 matching lines @@
 
   Node* brB2 = graph()->NewNode(common()->Branch(), phiA1, mB1);
   Node* tB2 = graph()->NewNode(common()->IfTrue(), brB2);
   Node* fB2 = graph()->NewNode(common()->IfFalse(), brB2);
   Node* mB2 = graph()->NewNode(common()->Merge(2), tB2, fB2);
   Node* phiB2 =
       graph()->NewNode(common()->Phi(kMachAnyTagged, 2), phiA1, c, mB2);
 
   Node* add = graph()->NewNode(&kIntAdd, phiA2, phiB2);
   Node* ret = graph()->NewNode(common()->Return(), add, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(36);
 }
 
 
 TARGET_TEST_F(SchedulerTest, NestedFloatingDiamondWithLoop) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
@@ skipping 13 matching lines @@
   Node* t1 = graph()->NewNode(common()->IfTrue(), br1);
   Node* f1 = graph()->NewNode(common()->IfFalse(), br1);
 
   loop->ReplaceInput(1, t1);  // close loop.
   ind->ReplaceInput(1, ind);  // close induction variable.
 
   Node* m = graph()->NewNode(common()->Merge(2), t, f1);
   Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), fv, ind, m);
 
   Node* ret = graph()->NewNode(common()->Return(), phi, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(20);
 }
 
 
 TARGET_TEST_F(SchedulerTest, LoopedFloatingDiamond1) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
@@ skipping 12 matching lines @@
   Node* br1 = graph()->NewNode(common()->Branch(), p0, graph()->start());
   Node* t1 = graph()->NewNode(common()->IfTrue(), br1);
   Node* f1 = graph()->NewNode(common()->IfFalse(), br1);
   Node* m1 = graph()->NewNode(common()->Merge(2), t1, f1);
   Node* phi1 = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), add, p0, m1);
 
   loop->ReplaceInput(1, t);    // close loop.
   ind->ReplaceInput(1, phi1);  // close induction variable.
 
   Node* ret = graph()->NewNode(common()->Return(), ind, start, f);
-  Node* end = graph()->NewNode(common()->End(), ret, f);
+  Node* end = graph()->NewNode(common()->End(2), ret, f);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(20);
 }
 
 
 TARGET_TEST_F(SchedulerTest, LoopedFloatingDiamond2) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
@@ skipping 13 matching lines @@
   Node* add = graph()->NewNode(&kIntAdd, ind, phi1);
 
   Node* br = graph()->NewNode(common()->Branch(), add, loop);
   Node* t = graph()->NewNode(common()->IfTrue(), br);
   Node* f = graph()->NewNode(common()->IfFalse(), br);
 
   loop->ReplaceInput(1, t);   // close loop.
   ind->ReplaceInput(1, add);  // close induction variable.
 
   Node* ret = graph()->NewNode(common()->Return(), ind, start, f);
-  Node* end = graph()->NewNode(common()->End(), ret, f);
+  Node* end = graph()->NewNode(common()->End(2), ret, f);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(20);
 }
 
 
 TARGET_TEST_F(SchedulerTest, LoopedFloatingDiamond3) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
@@ skipping 25 matching lines @@
   Node* add = graph()->NewNode(&kIntAdd, ind, phi1);
 
   Node* br = graph()->NewNode(common()->Branch(), add, loop);
   Node* t = graph()->NewNode(common()->IfTrue(), br);
   Node* f = graph()->NewNode(common()->IfFalse(), br);
 
   loop->ReplaceInput(1, t);   // close loop.
   ind->ReplaceInput(1, add);  // close induction variable.
 
   Node* ret = graph()->NewNode(common()->Return(), ind, start, f);
-  Node* end = graph()->NewNode(common()->End(), ret, f);
+  Node* end = graph()->NewNode(common()->End(2), ret, f);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(28);
 }
 
 
 TARGET_TEST_F(SchedulerTest, PhisPushedDownToDifferentBranches) {
   Node* start = graph()->NewNode(common()->Start(2));
   graph()->SetStart(start);
@@ skipping 13 matching lines @@
   Node* phi2 = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), v3, v4, m);
 
   Node* br2 = graph()->NewNode(common()->Branch(), p1, graph()->start());
   Node* t2 = graph()->NewNode(common()->IfTrue(), br2);
   Node* f2 = graph()->NewNode(common()->IfFalse(), br2);
   Node* m2 = graph()->NewNode(common()->Merge(2), t2, f2);
   Node* phi3 =
       graph()->NewNode(common()->Phi(kMachAnyTagged, 2), phi, phi2, m2);
 
   Node* ret = graph()->NewNode(common()->Return(), phi3, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(24);
 }
 
 
 TARGET_TEST_F(SchedulerTest, BranchHintTrue) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* tv = graph()->NewNode(common()->Int32Constant(6));
   Node* fv = graph()->NewNode(common()->Int32Constant(7));
   Node* br = graph()->NewNode(common()->Branch(BranchHint::kTrue), p0, start);
   Node* t = graph()->NewNode(common()->IfTrue(), br);
   Node* f = graph()->NewNode(common()->IfFalse(), br);
   Node* m = graph()->NewNode(common()->Merge(2), t, f);
   Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), tv, fv, m);
   Node* ret = graph()->NewNode(common()->Return(), phi, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   Schedule* schedule = ComputeAndVerifySchedule(13);
   // Make sure the false block is marked as deferred.
   EXPECT_FALSE(schedule->block(t)->deferred());
   EXPECT_TRUE(schedule->block(f)->deferred());
 }
 
 
 TARGET_TEST_F(SchedulerTest, BranchHintFalse) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* tv = graph()->NewNode(common()->Int32Constant(6));
   Node* fv = graph()->NewNode(common()->Int32Constant(7));
   Node* br = graph()->NewNode(common()->Branch(BranchHint::kFalse), p0, start);
   Node* t = graph()->NewNode(common()->IfTrue(), br);
   Node* f = graph()->NewNode(common()->IfFalse(), br);
   Node* m = graph()->NewNode(common()->Merge(2), t, f);
   Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), tv, fv, m);
   Node* ret = graph()->NewNode(common()->Return(), phi, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret, start);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   Schedule* schedule = ComputeAndVerifySchedule(13);
   // Make sure the true block is marked as deferred.
   EXPECT_TRUE(schedule->block(t)->deferred());
   EXPECT_FALSE(schedule->block(f)->deferred());
 }
 
 
 TARGET_TEST_F(SchedulerTest, CallException) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* c1 = graph()->NewNode(&kMockCall, start);
   Node* ok1 = graph()->NewNode(common()->IfSuccess(), c1);
   Node* ex1 = graph()->NewNode(common()->IfException(), c1);
   Node* c2 = graph()->NewNode(&kMockCall, ok1);
   Node* ok2 = graph()->NewNode(common()->IfSuccess(), c2);
   Node* ex2 = graph()->NewNode(common()->IfException(), c2);
   Node* hdl = graph()->NewNode(common()->Merge(2), ex1, ex2);
   Node* m = graph()->NewNode(common()->Merge(2), ok2, hdl);
   Node* phi = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), c2, p0, m);
   Node* ret = graph()->NewNode(common()->Return(), phi, start, m);
-  Node* end = graph()->NewNode(common()->End(), ret);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   Schedule* schedule = ComputeAndVerifySchedule(17);
   // Make sure the exception blocks as well as the handler are deferred.
   EXPECT_TRUE(schedule->block(ex1)->deferred());
   EXPECT_TRUE(schedule->block(ex2)->deferred());
   EXPECT_TRUE(schedule->block(hdl)->deferred());
   EXPECT_FALSE(schedule->block(m)->deferred());
 }
 
 
 TARGET_TEST_F(SchedulerTest, TailCall) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* call = graph()->NewNode(&kMockTailCall, p0, start, start);
-  Node* end = graph()->NewNode(common()->End(), call);
+  Node* end = graph()->NewNode(common()->End(1), call);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(4);
 }
 
 
 TARGET_TEST_F(SchedulerTest, Switch) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* sw = graph()->NewNode(common()->Switch(3), p0, start);
   Node* c0 = graph()->NewNode(common()->IfValue(0), sw);
   Node* v0 = graph()->NewNode(common()->Int32Constant(11));
   Node* c1 = graph()->NewNode(common()->IfValue(1), sw);
   Node* v1 = graph()->NewNode(common()->Int32Constant(22));
   Node* d = graph()->NewNode(common()->IfDefault(), sw);
   Node* vd = graph()->NewNode(common()->Int32Constant(33));
   Node* m = graph()->NewNode(common()->Merge(3), c0, c1, d);
   Node* phi = graph()->NewNode(common()->Phi(kMachInt32, 3), v0, v1, vd, m);
   Node* ret = graph()->NewNode(common()->Return(), phi, start, m);
-  Node* end = graph()->NewNode(common()->End(), ret);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(16);
 }
 
 
 TARGET_TEST_F(SchedulerTest, FloatingSwitch) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* p0 = graph()->NewNode(common()->Parameter(0), start);
   Node* sw = graph()->NewNode(common()->Switch(3), p0, start);
   Node* c0 = graph()->NewNode(common()->IfValue(0), sw);
   Node* v0 = graph()->NewNode(common()->Int32Constant(11));
   Node* c1 = graph()->NewNode(common()->IfValue(1), sw);
   Node* v1 = graph()->NewNode(common()->Int32Constant(22));
   Node* d = graph()->NewNode(common()->IfDefault(), sw);
   Node* vd = graph()->NewNode(common()->Int32Constant(33));
   Node* m = graph()->NewNode(common()->Merge(3), c0, c1, d);
   Node* phi = graph()->NewNode(common()->Phi(kMachInt32, 3), v0, v1, vd, m);
   Node* ret = graph()->NewNode(common()->Return(), phi, start, start);
-  Node* end = graph()->NewNode(common()->End(), ret);
+  Node* end = graph()->NewNode(common()->End(1), ret);
 
   graph()->SetEnd(end);
 
   ComputeAndVerifySchedule(16);
 }
 
 
 TARGET_TEST_F(SchedulerTest, Terminate) {
   Node* start = graph()->NewNode(common()->Start(1));
   graph()->SetStart(start);
 
   Node* loop = graph()->NewNode(common()->Loop(2), start, start);
   loop->ReplaceInput(1, loop);  // self loop, NTL.
 
   Node* effect = graph()->NewNode(common()->EffectPhi(1), start, loop);
 
   Node* terminate = graph()->NewNode(common()->Terminate(), effect, loop);
   effect->ReplaceInput(1, terminate);
 
-  Node* end = graph()->NewNode(common()->End(), terminate);
+  Node* end = graph()->NewNode(common()->End(1), terminate);
 
   graph()->SetEnd(end);
 
   Schedule* schedule = ComputeAndVerifySchedule(6);
   BasicBlock* block = schedule->block(loop);
   EXPECT_EQ(block, schedule->block(effect));
   EXPECT_GE(block->rpo_number(), 0);
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8