[v8-dev] [v8] r25265 committed - Simplify scheduler API by removing zone scopes....

codesite-noreply via v8-dev Tue, 11 Nov 2014 07:30:06 -0800

Revision: 25265
Author:   [email protected]
Date:     Tue Nov 11 15:29:12 2014 UTC
Log:      Simplify scheduler API by removing zone scopes.


[email protected]

Review URL: https://codereview.chromium.org/711413002
https://code.google.com/p/v8/source/detail?r=25265

Modified:
 /branches/bleeding_edge/src/compiler/pipeline.cc
 /branches/bleeding_edge/src/compiler/raw-machine-assembler.cc
 /branches/bleeding_edge/src/compiler/scheduler.cc
 /branches/bleeding_edge/src/compiler/scheduler.h
 /branches/bleeding_edge/test/cctest/compiler/test-instruction.cc
 /branches/bleeding_edge/test/cctest/compiler/test-scheduler.cc

=======================================

--- /branches/bleeding_edge/src/compiler/pipeline.cc Mon Nov 10 14:28:092014 UTC+++ /branches/bleeding_edge/src/compiler/pipeline.cc Tue Nov 11 15:29:122014 UTC

@@ -496,8 +496,9 @@

 void Pipeline::ComputeSchedule(PipelineData* data) {
   PhaseScope phase_scope(data->pipeline_statistics(), "scheduling");
+  ZonePool::Scope zone_scope(data->zone_pool());
   Schedule* schedule =
-      Scheduler::ComputeSchedule(data->zone_pool(), data->graph());
+      Scheduler::ComputeSchedule(zone_scope.zone(), data->graph());
   TraceSchedule(schedule);
   if (VerifyGraphs()) ScheduleVerifier::Run(schedule);
   data->set_schedule(schedule);
=======================================

--- /branches/bleeding_edge/src/compiler/raw-machine-assembler.cc Mon Nov10 14:28:09 2014 UTC+++ /branches/bleeding_edge/src/compiler/raw-machine-assembler.cc Tue Nov11 15:29:12 2014 UTC

@@ -40,8 +40,7 @@
 Schedule* RawMachineAssembler::Export() {
   // Compute the correct codegen order.
   DCHECK(schedule_->rpo_order()->empty());
-  ZonePool zone_pool(isolate());
-  Scheduler::ComputeSpecialRPO(&zone_pool, schedule_);
+  Scheduler::ComputeSpecialRPO(zone(), schedule_);
   // Invalidate MachineAssembler.
   Schedule* schedule = schedule_;
   schedule_ = NULL;
=======================================

--- /branches/bleeding_edge/src/compiler/scheduler.cc Fri Nov 7 16:01:172014 UTC+++ /branches/bleeding_edge/src/compiler/scheduler.cc Tue Nov 11 15:29:122014 UTC

@@ -38,11 +38,10 @@
       node_data_(graph_->NodeCount(), DefaultSchedulerData(), zone) {}


-Schedule* Scheduler::ComputeSchedule(ZonePool* zone_pool, Graph* graph) {
-  ZonePool::Scope zone_scope(zone_pool);
+Schedule* Scheduler::ComputeSchedule(Zone* zone, Graph* graph) {
   Schedule* schedule = new (graph->zone())
       Schedule(graph->zone(), static_cast<size_t>(graph->NodeCount()));
-  Scheduler scheduler(zone_scope.zone(), graph, schedule);
+  Scheduler scheduler(zone, graph, schedule);

   scheduler.BuildCFG();
   scheduler.ComputeSpecialRPONumbering();
@@ -1025,11 +1024,7 @@
 };


-BasicBlockVector* Scheduler::ComputeSpecialRPO(ZonePool* zone_pool,
-                                               Schedule* schedule) {
-  ZonePool::Scope zone_scope(zone_pool);
-  Zone* zone = zone_scope.zone();
-

+BasicBlockVector* Scheduler::ComputeSpecialRPO(Zone* zone, Schedule*schedule) {

   SpecialRPONumberer numberer(zone, schedule);
   numberer.ComputeSpecialRPO();
   numberer.SerializeAOIntoSchedule();
=======================================

--- /branches/bleeding_edge/src/compiler/scheduler.h Wed Nov 5 10:10:282014 UTC+++ /branches/bleeding_edge/src/compiler/scheduler.h Tue Nov 11 15:29:122014 UTC

@@ -24,11 +24,10 @@
  public:

// The complete scheduling algorithm. Creates a new schedule and placesall

   // nodes from the graph into it.
-  static Schedule* ComputeSchedule(ZonePool* zone_pool, Graph* graph);
+  static Schedule* ComputeSchedule(Zone* zone, Graph* graph);

   // Compute the RPO of blocks in an existing schedule.
-  static BasicBlockVector* ComputeSpecialRPO(ZonePool* zone_pool,
-                                             Schedule* schedule);

+ static BasicBlockVector* ComputeSpecialRPO(Zone* zone, Schedule*schedule);


  private:
   // Placement of a node changes during scheduling. The placement state
=======================================

--- /branches/bleeding_edge/test/cctest/compiler/test-instruction.cc MonNov 10 14:28:09 2014 UTC+++ /branches/bleeding_edge/test/cctest/compiler/test-instruction.cc TueNov 11 15:29:12 2014 UTC

@@ -52,8 +52,7 @@
   void allocCode() {
     if (schedule.rpo_order()->size() == 0) {
       // Compute the RPO order.
-      ZonePool zone_pool(isolate);
-      Scheduler::ComputeSpecialRPO(&zone_pool, &schedule);
+      Scheduler::ComputeSpecialRPO(main_zone(), &schedule);
       DCHECK(schedule.rpo_order()->size() > 0);
     }
     InstructionBlocks* instruction_blocks =
=======================================

--- /branches/bleeding_edge/test/cctest/compiler/test-scheduler.cc Mon Nov10 14:28:09 2014 UTC+++ /branches/bleeding_edge/test/cctest/compiler/test-scheduler.cc Tue Nov11 15:29:12 2014 UTC

@@ -123,8 +123,7 @@
     os << AsDOT(*graph);
   }

-  ZonePool zone_pool(graph->zone()->isolate());
-  Schedule* schedule = Scheduler::ComputeSchedule(&zone_pool, graph);
+  Schedule* schedule = Scheduler::ComputeSchedule(graph->zone(), graph);

   if (FLAG_trace_turbo_scheduler) {
     OFStream os(stdout);
@@ -140,8 +139,8 @@
   HandleAndZoneScope scope;
   Schedule schedule(scope.main_zone());

-  ZonePool zone_pool(scope.main_isolate());