Revision: 25283
Author: mstarzin...@chromium.org
Date: Wed Nov 12 09:38:33 2014 UTC
Log: Fix scheduler for floating non-naked non-empty loops.
R=ja...@chromium.org
TEST=cctest/test-scheduler/NestedFloatingDiamondWithLoop
Review URL: https://codereview.chromium.org/709753002
https://code.google.com/p/v8/source/detail?r=25283
Modified:
/branches/bleeding_edge/src/compiler/scheduler.cc
/branches/bleeding_edge/test/cctest/compiler/test-scheduler.cc
=======================================
--- /branches/bleeding_edge/src/compiler/scheduler.cc Wed Nov 12 09:19:35
2014 UTC
+++ /branches/bleeding_edge/src/compiler/scheduler.cc Wed Nov 12 09:38:33
2014 UTC
@@ -295,6 +295,9 @@
}
private:
+ // TODO(mstarzinger): Only for Scheduler::FuseFloatingControl.
+ friend class Scheduler;
+
void FixNode(BasicBlock* block, Node* node) {
schedule_->AddNode(block, node);
scheduler_->UpdatePlacement(node, Scheduler::kFixed);
@@ -1158,7 +1161,6 @@
// Fixed nodes already know their schedule early position.
if (scheduler_->GetPlacement(node) == Scheduler::kFixed) {
- DCHECK_EQ(schedule_->start(), data->minimum_block_);
data->minimum_block_ = schedule_->block(node);
Trace("Fixing #%d:%s minimum_block = B%d, dominator_depth = %d\n",
node->id(), node->op()->mnemonic(),
@@ -1450,6 +1452,29 @@
}
GenerateImmediateDominatorTree();
+ // Iterate on phase 4: Schedule nodes early.
+ // TODO(mstarzinger): The following loop gathering the propagation roots
is a
+ // temporary solution and should be merged into the rest of the
scheduler as
+ // soon as the approach settled for all floating loops.
+ NodeVector propagation_roots(cfg_builder.control_);
+ for (Node* node : cfg_builder.control_) {
+ for (Node* use : node->uses()) {
+ if (use->opcode() == IrOpcode::kPhi ||
+ use->opcode() == IrOpcode::kEffectPhi) {
+ propagation_roots.push_back(use);
+ }
+ }
+ }
+ if (FLAG_trace_turbo_scheduler) {
+ Trace("propagation roots: ");
+ for (Node* node : propagation_roots) {
+ Trace("#%d:%s ", node->id(), node->op()->mnemonic());
+ }
+ Trace("\n");
+ }
+ ScheduleEarlyNodeVisitor schedule_early_visitor(zone_, this);
+ schedule_early_visitor.Run(&propagation_roots);
+
// Move previously planned nodes.
// TODO(mstarzinger): Improve that by supporting bulk moves.
scheduled_nodes_.resize(schedule_->BasicBlockCount(), NodeVector(zone_));
=======================================
--- /branches/bleeding_edge/test/cctest/compiler/test-scheduler.cc Wed Nov
12 09:19:35 2014 UTC
+++ /branches/bleeding_edge/test/cctest/compiler/test-scheduler.cc Wed Nov
12 09:38:33 2014 UTC
@@ -1825,10 +1825,8 @@
Node* loop = graph.NewNode(common.Loop(2), f, start);
Node* ind = graph.NewNode(common.Phi(kMachAnyTagged, 2), p0, p0, loop);
- // TODO(mstarzinger): Make scheduler deal with non-empty loops here.
- // Node* add = graph.NewNode(&kIntAdd, ind, fv);
-
- Node* br1 = graph.NewNode(common.Branch(), ind, loop);
+ Node* add = graph.NewNode(&kIntAdd, ind, fv);
+ Node* br1 = graph.NewNode(common.Branch(), add, loop);
Node* t1 = graph.NewNode(common.IfTrue(), br1);
Node* f1 = graph.NewNode(common.IfFalse(), br1);
@@ -1843,7 +1841,7 @@
graph.SetEnd(end);
- ComputeAndVerifySchedule(19, &graph);
+ ComputeAndVerifySchedule(20, &graph);
}
--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
