Remove duplication in Scheduler and simplify interface. Make ComputeSchedule() and ComputeSpecialRP…

test/cctest/compiler/test-scheduler.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/compiler/common-operator.h"
 #include "src/compiler/generic-node-inl.h"
 #include "src/compiler/generic-node.h"
@@ skipping 50 matching lines @@
     CHECK(num >= header->rpo_number_ && num < header->loop_end_);
     CHECK(header->LoopContains(blocks[i]));
     CHECK(header->IsLoopHeader() || blocks[i]->loop_header_ == header);
   }
 }
 
 
 TEST(RPODegenerate1) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 1, false);
   CHECK_EQ(schedule.entry(), order->at(0));
 }
 
 
 TEST(RPODegenerate2) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
   schedule.AddGoto(schedule.entry(), schedule.exit());
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 2, false);
   CHECK_EQ(schedule.entry(), order->at(0));
   CHECK_EQ(schedule.exit(), order->at(1));
 }
 
 
 TEST(RPOLine) {
   HandleAndZoneScope scope;
 
   for (int i = 0; i < 10; i++) {
     Schedule schedule(scope.main_zone());
-    Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
     BasicBlock* last = schedule.entry();
     for (int j = 0; j < i; j++) {
       BasicBlock* block = schedule.NewBasicBlock();
       schedule.AddGoto(last, block);
       last = block;
     }
-    BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+    BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
     CheckRPONumbers(order, 1 + i, false);
 
     Schedule::BasicBlocks blocks(schedule.all_blocks());
     for (Schedule::BasicBlocks::iterator iter = blocks.begin();
          iter != blocks.end(); ++iter) {
       BasicBlock* block = *iter;
       if (block->rpo_number_ >= 0 && block->SuccessorCount() == 1) {
         CHECK(block->rpo_number_ + 1 == block->SuccessorAt(0)->rpo_number_);
       }
     }
   }
 }
 
 
 TEST(RPOSelfLoop) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
   schedule.AddSuccessor(schedule.entry(), schedule.entry());
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 1, true);
   BasicBlock* loop[] = {schedule.entry()};
   CheckLoopContains(loop, 1);
 }
 
 
 TEST(RPOEntryLoop) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
   schedule.AddSuccessor(schedule.entry(), schedule.exit());
   schedule.AddSuccessor(schedule.exit(), schedule.entry());
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 2, true);
   BasicBlock* loop[] = {schedule.entry(), schedule.exit()};
   CheckLoopContains(loop, 2);
 }
 
 
 TEST(RPOEndLoop) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 2));
   schedule.AddSuccessor(schedule.entry(), loop1->header());
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 3, true);
   CheckLoopContains(loop1->nodes, loop1->count);
 }
 
 
 TEST(RPOEndLoopNested) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 2));
   schedule.AddSuccessor(schedule.entry(), loop1->header());
   schedule.AddSuccessor(loop1->last(), schedule.entry());
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 3, true);
   CheckLoopContains(loop1->nodes, loop1->count);
 }
 
 
 TEST(RPODiamond) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
   BasicBlock* A = schedule.entry();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.exit();
 
   schedule.AddSuccessor(A, B);
   schedule.AddSuccessor(A, C);
   schedule.AddSuccessor(B, D);
   schedule.AddSuccessor(C, D);
 
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 4, false);
 
   CHECK_EQ(0, A->rpo_number_);
   CHECK((B->rpo_number_ == 1 && C->rpo_number_ == 2) ||
         (B->rpo_number_ == 2 && C->rpo_number_ == 1));
   CHECK_EQ(3, D->rpo_number_);
 }
 
 
 TEST(RPOLoop1) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
   BasicBlock* A = schedule.entry();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.exit();
 
   schedule.AddSuccessor(A, B);
   schedule.AddSuccessor(B, C);
   schedule.AddSuccessor(C, B);
   schedule.AddSuccessor(C, D);
 
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 4, true);
   BasicBlock* loop[] = {B, C};
   CheckLoopContains(loop, 2);
 }
 
 
 TEST(RPOLoop2) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
   BasicBlock* A = schedule.entry();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.exit();
 
   schedule.AddSuccessor(A, B);
   schedule.AddSuccessor(B, C);
   schedule.AddSuccessor(C, B);
   schedule.AddSuccessor(B, D);
 
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 4, true);
   BasicBlock* loop[] = {B, C};
   CheckLoopContains(loop, 2);
 }
 
 
 TEST(RPOLoopN) {
   HandleAndZoneScope scope;
 
   for (int i = 0; i < 11; i++) {
     Schedule schedule(scope.main_zone());
-    Scheduler scheduler(scope.main_zone(), NULL, &schedule);
     BasicBlock* A = schedule.entry();
     BasicBlock* B = schedule.NewBasicBlock();
     BasicBlock* C = schedule.NewBasicBlock();
     BasicBlock* D = schedule.NewBasicBlock();
     BasicBlock* E = schedule.NewBasicBlock();
     BasicBlock* F = schedule.NewBasicBlock();
     BasicBlock* G = schedule.exit();
 
     schedule.AddSuccessor(A, B);
     schedule.AddSuccessor(B, C);
@@ skipping 10 matching lines @@
     if (i == 4) schedule.AddSuccessor(E, B);
     if (i == 5) schedule.AddSuccessor(F, B);
 
     // Throw in extra loop exits from time to time.
     if (i == 6) schedule.AddSuccessor(B, G);
     if (i == 7) schedule.AddSuccessor(C, G);
     if (i == 8) schedule.AddSuccessor(D, G);
     if (i == 9) schedule.AddSuccessor(E, G);
     if (i == 10) schedule.AddSuccessor(F, G);
 
-    BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+    BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
     CheckRPONumbers(order, 7, true);
     BasicBlock* loop[] = {B, C, D, E, F};
     CheckLoopContains(loop, 5);
   }
 }
 
 
 TEST(RPOLoopNest1) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
   BasicBlock* A = schedule.entry();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.NewBasicBlock();
   BasicBlock* E = schedule.NewBasicBlock();
   BasicBlock* F = schedule.exit();
 
   schedule.AddSuccessor(A, B);
   schedule.AddSuccessor(B, C);
   schedule.AddSuccessor(C, D);
   schedule.AddSuccessor(D, C);
   schedule.AddSuccessor(D, E);
   schedule.AddSuccessor(E, B);
   schedule.AddSuccessor(E, F);
 
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 6, true);
   BasicBlock* loop1[] = {B, C, D, E};
   CheckLoopContains(loop1, 4);
 
   BasicBlock* loop2[] = {C, D};
   CheckLoopContains(loop2, 2);
 }
 
 
 TEST(RPOLoopNest2) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
   BasicBlock* A = schedule.entry();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.NewBasicBlock();
   BasicBlock* E = schedule.NewBasicBlock();
   BasicBlock* F = schedule.NewBasicBlock();
   BasicBlock* G = schedule.NewBasicBlock();
   BasicBlock* H = schedule.exit();
 
   schedule.AddSuccessor(A, B);
   schedule.AddSuccessor(B, C);
   schedule.AddSuccessor(C, D);
   schedule.AddSuccessor(D, E);
   schedule.AddSuccessor(E, F);
   schedule.AddSuccessor(F, G);
   schedule.AddSuccessor(G, H);
 
   schedule.AddSuccessor(E, D);
   schedule.AddSuccessor(F, C);
   schedule.AddSuccessor(G, B);
 
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 8, true);
   BasicBlock* loop1[] = {B, C, D, E, F, G};
   CheckLoopContains(loop1, 6);
 
   BasicBlock* loop2[] = {C, D, E, F};
   CheckLoopContains(loop2, 4);
 
   BasicBlock* loop3[] = {D, E};
   CheckLoopContains(loop3, 2);
 }
 
 
 TEST(RPOLoopFollow1) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
   SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
 
   BasicBlock* A = schedule.entry();
   BasicBlock* E = schedule.exit();
 
   schedule.AddSuccessor(A, loop1->header());
   schedule.AddSuccessor(loop1->header(), loop2->header());
   schedule.AddSuccessor(loop2->last(), E);
 
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
 
   CheckLoopContains(loop1->nodes, loop1->count);
 
   CHECK_EQ(schedule.BasicBlockCount(), static_cast<int>(order->size()));
   CheckLoopContains(loop1->nodes, loop1->count);
   CheckLoopContains(loop2->nodes, loop2->count);
 }
 
 
 TEST(RPOLoopFollow2) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
   SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
 
   BasicBlock* A = schedule.entry();
   BasicBlock* S = schedule.NewBasicBlock();
   BasicBlock* E = schedule.exit();
 
   schedule.AddSuccessor(A, loop1->header());
   schedule.AddSuccessor(loop1->header(), S);
   schedule.AddSuccessor(S, loop2->header());
   schedule.AddSuccessor(loop2->last(), E);
 
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
 
   CheckLoopContains(loop1->nodes, loop1->count);
 
   CHECK_EQ(schedule.BasicBlockCount(), static_cast<int>(order->size()));
   CheckLoopContains(loop1->nodes, loop1->count);
   CheckLoopContains(loop2->nodes, loop2->count);
 }
 
 
 TEST(RPOLoopFollowN) {
   HandleAndZoneScope scope;
 
   for (int size = 1; size < 5; size++) {
     for (int exit = 0; exit < size; exit++) {
       Schedule schedule(scope.main_zone());
-      Scheduler scheduler(scope.main_zone(), NULL, &schedule);
       SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
       SmartPointer<TestLoop> loop2(CreateLoop(&schedule, size));
       BasicBlock* A = schedule.entry();
       BasicBlock* E = schedule.exit();
 
       schedule.AddSuccessor(A, loop1->header());
       schedule.AddSuccessor(loop1->nodes[exit], loop2->header());
       schedule.AddSuccessor(loop2->nodes[exit], E);
-      BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+      BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
       CheckLoopContains(loop1->nodes, loop1->count);
 
       CHECK_EQ(schedule.BasicBlockCount(), static_cast<int>(order->size()));
       CheckLoopContains(loop1->nodes, loop1->count);
       CheckLoopContains(loop2->nodes, loop2->count);
     }
   }
 }
 
 
 TEST(RPONestedLoopFollow1) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
   SmartPointer<TestLoop> loop1(CreateLoop(&schedule, 1));
   SmartPointer<TestLoop> loop2(CreateLoop(&schedule, 1));
 
   BasicBlock* A = schedule.entry();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* E = schedule.exit();
 
   schedule.AddSuccessor(A, B);
   schedule.AddSuccessor(B, loop1->header());
   schedule.AddSuccessor(loop1->header(), loop2->header());
   schedule.AddSuccessor(loop2->last(), C);
   schedule.AddSuccessor(C, E);
   schedule.AddSuccessor(C, B);
 
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
 
   CheckLoopContains(loop1->nodes, loop1->count);
 
   CHECK_EQ(schedule.BasicBlockCount(), static_cast<int>(order->size()));
   CheckLoopContains(loop1->nodes, loop1->count);
   CheckLoopContains(loop2->nodes, loop2->count);
 
   BasicBlock* loop3[] = {B, loop1->nodes[0], loop2->nodes[0], C};
   CheckLoopContains(loop3, 4);
 }
 
 
 TEST(RPOLoopBackedges1) {
   HandleAndZoneScope scope;
 
   int size = 8;
   for (int i = 0; i < size; i++) {
     for (int j = 0; j < size; j++) {
       Schedule schedule(scope.main_zone());
-      Scheduler scheduler(scope.main_zone(), NULL, &schedule);
       BasicBlock* A = schedule.entry();
       BasicBlock* E = schedule.exit();
 
       SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
       schedule.AddSuccessor(A, loop1->header());
       schedule.AddSuccessor(loop1->last(), E);
 
       schedule.AddSuccessor(loop1->nodes[i], loop1->header());
       schedule.AddSuccessor(loop1->nodes[j], E);
 
-      BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+      BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
       CheckRPONumbers(order, schedule.BasicBlockCount(), true);
       CheckLoopContains(loop1->nodes, loop1->count);
     }
   }
 }
 
 
 TEST(RPOLoopOutedges1) {
   HandleAndZoneScope scope;
 
   int size = 8;
   for (int i = 0; i < size; i++) {
     for (int j = 0; j < size; j++) {
       Schedule schedule(scope.main_zone());
-      Scheduler scheduler(scope.main_zone(), NULL, &schedule);
       BasicBlock* A = schedule.entry();
       BasicBlock* D = schedule.NewBasicBlock();
       BasicBlock* E = schedule.exit();
 
       SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
       schedule.AddSuccessor(A, loop1->header());
       schedule.AddSuccessor(loop1->last(), E);
 
       schedule.AddSuccessor(loop1->nodes[i], loop1->header());
       schedule.AddSuccessor(loop1->nodes[j], D);
       schedule.AddSuccessor(D, E);
 
-      BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+      BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
       CheckRPONumbers(order, schedule.BasicBlockCount(), true);
       CheckLoopContains(loop1->nodes, loop1->count);
     }
   }
 }
 
 
 TEST(RPOLoopOutedges2) {
   HandleAndZoneScope scope;
 
   int size = 8;
   for (int i = 0; i < size; i++) {
     Schedule schedule(scope.main_zone());
-    Scheduler scheduler(scope.main_zone(), NULL, &schedule);
     BasicBlock* A = schedule.entry();
     BasicBlock* E = schedule.exit();
 
     SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
     schedule.AddSuccessor(A, loop1->header());
     schedule.AddSuccessor(loop1->last(), E);
 
     for (int j = 0; j < size; j++) {
       BasicBlock* O = schedule.NewBasicBlock();
       schedule.AddSuccessor(loop1->nodes[j], O);
       schedule.AddSuccessor(O, E);
     }
 
-    BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+    BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
     CheckRPONumbers(order, schedule.BasicBlockCount(), true);
     CheckLoopContains(loop1->nodes, loop1->count);
   }
 }
 
 
 TEST(RPOLoopOutloops1) {
   HandleAndZoneScope scope;
 
   int size = 8;
   for (int i = 0; i < size; i++) {
     Schedule schedule(scope.main_zone());
-    Scheduler scheduler(scope.main_zone(), NULL, &schedule);
     BasicBlock* A = schedule.entry();
     BasicBlock* E = schedule.exit();
     SmartPointer<TestLoop> loop1(CreateLoop(&schedule, size));
     schedule.AddSuccessor(A, loop1->header());
     schedule.AddSuccessor(loop1->last(), E);
 
     TestLoop** loopN = new TestLoop* [size];
     for (int j = 0; j < size; j++) {
       loopN[j] = CreateLoop(&schedule, 2);
       schedule.AddSuccessor(loop1->nodes[j], loopN[j]->header());
       schedule.AddSuccessor(loopN[j]->last(), E);
     }
 
-    BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+    BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
     CheckRPONumbers(order, schedule.BasicBlockCount(), true);
     CheckLoopContains(loop1->nodes, loop1->count);
 
     for (int j = 0; j < size; j++) {
       CheckLoopContains(loopN[j]->nodes, loopN[j]->count);
       delete loopN[j];
     }
     delete[] loopN;
   }
 }
 
 
 TEST(RPOLoopMultibackedge) {
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());
-  Scheduler scheduler(scope.main_zone(), NULL, &schedule);
 
   BasicBlock* A = schedule.entry();
   BasicBlock* B = schedule.NewBasicBlock();
   BasicBlock* C = schedule.NewBasicBlock();
   BasicBlock* D = schedule.exit();
   BasicBlock* E = schedule.NewBasicBlock();
 
   schedule.AddSuccessor(A, B);
   schedule.AddSuccessor(B, C);
   schedule.AddSuccessor(B, D);
   schedule.AddSuccessor(B, E);
   schedule.AddSuccessor(C, B);
   schedule.AddSuccessor(D, B);
   schedule.AddSuccessor(E, B);
 
-  BasicBlockVector* order = scheduler.ComputeSpecialRPO();
+  BasicBlockVector* order = Scheduler::ComputeSpecialRPO(&schedule);
   CheckRPONumbers(order, 5, true);
 
   BasicBlock* loop1[] = {B, C, D, E};
   CheckLoopContains(loop1, 4);
 }
 
 
 TEST(BuildScheduleEmpty) {
   HandleAndZoneScope scope;
   Graph graph(scope.main_zone());
   CommonOperatorBuilder builder(scope.main_zone());
   graph.SetStart(graph.NewNode(builder.Start(0)));
   graph.SetEnd(graph.NewNode(builder.End(), graph.start()));
 
-  Scheduler scheduler(scope.main_zone());
-  USE(scheduler.NewSchedule(&graph));
+  USE(Scheduler::ComputeSchedule(&graph));
 }
 
 
 TEST(BuildScheduleOneParameter) {
   HandleAndZoneScope scope;
   Graph graph(scope.main_zone());
   CommonOperatorBuilder builder(scope.main_zone());
   graph.SetStart(graph.NewNode(builder.Start(0)));
 
   Node* p1 = graph.NewNode(builder.Parameter(0), graph.start());
   Node* ret = graph.NewNode(builder.Return(), p1, graph.start(), graph.start());
 
   graph.SetEnd(graph.NewNode(builder.End(), ret));
 
-  Scheduler scheduler(scope.main_zone());
-  USE(scheduler.NewSchedule(&graph));
+  USE(Scheduler::ComputeSchedule(&graph));
 }
 
 
 static int GetScheduledNodeCount(Schedule* schedule) {
   int node_count = 0;
   for (BasicBlockVectorIter i = schedule->rpo_order()->begin();
        i != schedule->rpo_order()->end(); ++i) {
     BasicBlock* block = *i;
     for (BasicBlock::const_iterator j = block->begin(); j != block->end();
          ++j) {
@@ skipping 38 matching lines @@
   Node* true_branch = graph.NewNode(builder.IfTrue(), branch);
   Node* false_branch = graph.NewNode(builder.IfFalse(), branch);
 
   Node* ret1 = graph.NewNode(builder.Return(), p4, graph.start(), true_branch);
   Node* ret2 = graph.NewNode(builder.Return(), p5, graph.start(), false_branch);
   Node* merge = graph.NewNode(builder.Merge(2), ret1, ret2);
   graph.SetEnd(graph.NewNode(builder.End(), merge));
 
   PrintGraph(&graph);
 
-  Scheduler scheduler(scope.main_zone());
-  Schedule* schedule = scheduler.NewSchedule(&graph);
+  Schedule* schedule = Scheduler::ComputeSchedule(&graph);
 
   PrintSchedule(schedule);
 
 
   CHECK_EQ(13, GetScheduledNodeCount(schedule));
 }
 
 
 TEST(BuildScheduleIfSplitWithEffects) {
   HandleAndZoneScope scope;
@@ skipping 132 matching lines @@
   n21->ReplaceInput(1, n20);
   n21->ReplaceInput(2, n18);
   n22->ReplaceInput(1, n21);
   n23->ReplaceInput(0, n22);
 
   graph.SetStart(n0);
   graph.SetEnd(n23);
 
   PrintGraph(&graph);
 
-  Scheduler scheduler(scope.main_zone());
-  Schedule* schedule = scheduler.NewSchedule(&graph);
+  Schedule* schedule = Scheduler::ComputeSchedule(&graph);
 
   PrintSchedule(schedule);
 
   CHECK_EQ(20, GetScheduledNodeCount(schedule));
 }
 
 
 TEST(BuildScheduleSimpleLoop) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
@@ skipping 98 matching lines @@
   USE(n15);
   n15->ReplaceInput(0, n13);
   n19->ReplaceInput(2, n15);
   n20->ReplaceInput(0, n19);
 
   graph.SetStart(n0);
   graph.SetEnd(n20);
 
   PrintGraph(&graph);
 
-  Scheduler scheduler(scope.main_zone());
-  Schedule* schedule = scheduler.NewSchedule(&graph);
+  Schedule* schedule = Scheduler::ComputeSchedule(&graph);
 
   PrintSchedule(schedule);
 
   CHECK_EQ(19, GetScheduledNodeCount(schedule));
 }
 
 
 TEST(BuildScheduleComplexLoops) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
@@ skipping 233 matching lines @@
   USE(n42);
   n42->ReplaceInput(0, n40);
   n45->ReplaceInput(2, n42);
   n46->ReplaceInput(0, n45);
 
   graph.SetStart(n0);
   graph.SetEnd(n46);
 
   PrintGraph(&graph);
 
-  Scheduler scheduler(scope.main_zone());
-  Schedule* schedule = scheduler.NewSchedule(&graph);
+  Schedule* schedule = Scheduler::ComputeSchedule(&graph);
 
   PrintSchedule(schedule);
 
   CHECK_EQ(46, GetScheduledNodeCount(schedule));
 }
 
 
 TEST(BuildScheduleBreakAndContinue) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
@@ skipping 315 matching lines @@
   n57->ReplaceInput(0, n56);
   n57->ReplaceInput(1, n56);
   n57->ReplaceInput(2, n19);
   n58->ReplaceInput(0, n57);
 
   graph.SetStart(n0);
   graph.SetEnd(n58);
 
   PrintGraph(&graph);
 
-  Scheduler scheduler(scope.main_zone());
-  Schedule* schedule = scheduler.NewSchedule(&graph);
+  Schedule* schedule = Scheduler::ComputeSchedule(&graph);
 
   PrintSchedule(schedule);
 
   CHECK_EQ(62, GetScheduledNodeCount(schedule));
 }
 
 
 TEST(BuildScheduleSimpleLoopWithCodeMotion) {
   HandleAndZoneScope scope;
   Isolate* isolate = scope.main_isolate();
@@ skipping 110 matching lines @@
   USE(n18);
   n18->ReplaceInput(0, n16);
   n21->ReplaceInput(2, n18);
   n22->ReplaceInput(0, n21);
 
   graph.SetStart(n0);
   graph.SetEnd(n22);
 
   PrintGraph(&graph);
 
-  Scheduler scheduler(scope.main_zone());
-  Schedule* schedule = scheduler.NewSchedule(&graph);
+  Schedule* schedule = Scheduler::ComputeSchedule(&graph);
 
   PrintSchedule(schedule);
 
   CHECK_EQ(19, GetScheduledNodeCount(schedule));
 
   // Make sure the integer-only add gets hoisted to a different block that the
   // JSAdd.
   CHECK(schedule->block(n19) != schedule->block(n20));
 }
 
@@ skipping 99 matching lines @@
   Node* merge_node =
       graph.NewNode(common.Merge(2), return_node, deoptimization_node);
 
   Node* end_node = graph.NewNode(common.End(), merge_node);
 
   graph.SetStart(start_node);
   graph.SetEnd(end_node);
 
   PrintGraph(&graph);
 
-  Scheduler scheduler(scope.main_zone());
-  Schedule* schedule = scheduler.NewSchedule(&graph);
+  Schedule* schedule = Scheduler::ComputeSchedule(&graph);
 
   PrintSchedule(schedule);
 
   // Tests:
   // Continuation and deopt have basic blocks.
   BasicBlock* cont_block = schedule->block(cont_node);
   BasicBlock* deopt_block = schedule->block(lazy_deopt_node);
   BasicBlock* call_block = schedule->block(call_node);
   CHECK_NE(NULL, cont_block);
   CHECK_NE(NULL, deopt_block);
@@ skipping 13 matching lines @@
   CHECK_EQ(deoptimization_node, deopt_block->control_input_);
   CHECK_EQ(5, static_cast<int>(deopt_block->nodes_.size()));
   CHECK_EQ(lazy_deopt_node, deopt_block->nodes_[0]);
   CHECK_EQ(IrOpcode::kStateValues, deopt_block->nodes_[1]->op()->opcode());
   CHECK_EQ(IrOpcode::kStateValues, deopt_block->nodes_[2]->op()->opcode());
   CHECK_EQ(IrOpcode::kStateValues, deopt_block->nodes_[3]->op()->opcode());
   CHECK_EQ(state_node, deopt_block->nodes_[4]);
 }
 
 #endif