AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Only do a full verify after computing dominators.

Browse Source 
We don't modify the graph in later phases. This speeds up debug tests
by a lot.
Review URL: http://codereview.chromium.org/7942001

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@9325 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
fschneider@chromium.org 2011-09-19 15:09:30 +00:00
parent cf63503cad
commit b77a69f22c
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/hydrogen.cc
View File

@ -422,7 +422,7 @@ class ReachabilityAnalyzer BASE_EMBEDDED {
}; };
void HGraph::Verify() const { void HGraph::Verify(bool do_full_verify) const {
for (int i = 0; i < blocks_.length(); i++) { for (int i = 0; i < blocks_.length(); i++) {
HBasicBlock* block = blocks_.at(i); HBasicBlock* block = blocks_.at(i);
@ -473,25 +473,27 @@ void HGraph::Verify() const {
// Check special property of first block to have no predecessors. // Check special property of first block to have no predecessors.
ASSERT(blocks_.at(0)->predecessors()->is_empty()); ASSERT(blocks_.at(0)->predecessors()->is_empty());
// Check that the graph is fully connected. if (do_full_verify) {
ReachabilityAnalyzer analyzer(entry_block_, blocks_.length(), NULL); // Check that the graph is fully connected.
ASSERT(analyzer.visited_count() == blocks_.length()); ReachabilityAnalyzer analyzer(entry_block_, blocks_.length(), NULL);
ASSERT(analyzer.visited_count() == blocks_.length());
// Check that entry block dominator is NULL. // Check that entry block dominator is NULL.
ASSERT(entry_block_->dominator() == NULL); ASSERT(entry_block_->dominator() == NULL);
// Check dominators. // Check dominators.
for (int i = 0; i < blocks_.length(); ++i) { for (int i = 0; i < blocks_.length(); ++i) {
HBasicBlock* block = blocks_.at(i); HBasicBlock* block = blocks_.at(i);
if (block->dominator() == NULL) { if (block->dominator() == NULL) {
// Only start block may have no dominator assigned to. // Only start block may have no dominator assigned to.
ASSERT(i == 0); ASSERT(i == 0);
} else { } else {
// Assert that block is unreachable if dominator must not be visited. // Assert that block is unreachable if dominator must not be visited.
ReachabilityAnalyzer dominator_analyzer(entry_block_, ReachabilityAnalyzer dominator_analyzer(entry_block_,
blocks_.length(), blocks_.length(),
block->dominator()); block->dominator());
ASSERT(!dominator_analyzer.reachable()->Contains(block->block_id())); ASSERT(!dominator_analyzer.reachable()->Contains(block->block_id()));
}
} }
} }
} }
@ -2320,6 +2322,12 @@ HGraph* HGraphBuilder::CreateGraph() {
graph()->OrderBlocks(); graph()->OrderBlocks();
graph()->AssignDominators(); graph()->AssignDominators();
#ifdef DEBUG
// Do a full verify after building the graph and computing dominators.
graph()->Verify(true);
#endif
graph()->PropagateDeoptimizingMark(); graph()->PropagateDeoptimizingMark();
graph()->EliminateRedundantPhis(); graph()->EliminateRedundantPhis();
if (!graph()->CheckPhis()) { if (!graph()->CheckPhis()) {
@ -6820,7 +6828,7 @@ void HPhase::End() const {
} }
#ifdef DEBUG #ifdef DEBUG
if (graph_ != NULL) graph_->Verify(); if (graph_ != NULL) graph_->Verify(false); // No full verify.
if (allocator_ != NULL) allocator_->Verify(); if (allocator_ != NULL) allocator_->Verify();
#endif #endif
} }

2
src/hydrogen.h
View File

@ -283,7 +283,7 @@ class HGraph: public ZoneObject {
} }
#ifdef DEBUG #ifdef DEBUG
void Verify() const; void Verify(bool do_full_verify) const;
#endif #endif
private: private: