Reviewers: Vyacheslav Egorov,

Description:
Make trace-hydrogen output more visualizer-friendly.

Please review this at https://chromiumcodereview.appspot.com/9580005/

SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/

Affected files:
  M     src/arm/lithium-arm.cc
  M     src/arm/lithium-codegen-arm.cc
  M     src/hydrogen.cc
  M     src/ia32/lithium-codegen-ia32.cc
  M     src/ia32/lithium-ia32.cc
  M     src/lithium-allocator.cc
  M     src/mips/lithium-codegen-mips.cc
  M     src/mips/lithium-mips.cc
  M     src/x64/lithium-codegen-x64.cc
  M     src/x64/lithium-x64.cc


Index: src/arm/lithium-arm.cc
===================================================================
--- src/arm/lithium-arm.cc      (revision 10902)
+++ src/arm/lithium-arm.cc      (working copy)
@@ -440,7 +440,7 @@


 void LChunk::MarkEmptyBlocks() {
-  HPhase phase("L Mark empty blocks", this);
+  HPhase phase("L_Mark empty blocks", this);
   for (int i = 0; i < graph()->blocks()->length(); ++i) {
     HBasicBlock* block = graph()->blocks()->at(i);
     int first = block->first_instruction_index();
@@ -552,7 +552,7 @@
 LChunk* LChunkBuilder::Build() {
   ASSERT(is_unused());
   chunk_ = new(zone()) LChunk(info(), graph());
-  HPhase phase("L Building chunk", chunk_);
+  HPhase phase("L_Building chunk", chunk_);
   status_ = BUILDING;
   const ZoneList<HBasicBlock*>* blocks = graph()->blocks();
   for (int i = 0; i < blocks->length(); i++) {
Index: src/arm/lithium-codegen-arm.cc
===================================================================
--- src/arm/lithium-codegen-arm.cc      (revision 10902)
+++ src/arm/lithium-codegen-arm.cc      (working copy)
@@ -62,7 +62,7 @@
 #define __ masm()->

 bool LCodeGen::GenerateCode() {
-  HPhase phase("Z Code generation", chunk());
+  HPhase phase("Z_Code generation", chunk());
   ASSERT(is_unused());
   status_ = GENERATING;
   CpuFeatures::Scope scope1(VFP3);
Index: src/hydrogen.cc
===================================================================
--- src/hydrogen.cc     (revision 10902)
+++ src/hydrogen.cc     (working copy)
@@ -730,7 +730,7 @@

 void HGraph::Canonicalize() {
   if (!FLAG_use_canonicalizing) return;
-  HPhase phase("H Canonicalize", this);
+  HPhase phase("H_Canonicalize", this);
   for (int i = 0; i < blocks()->length(); ++i) {
     HInstruction* instr = blocks()->at(i)->first();
     while (instr != NULL) {
@@ -743,7 +743,7 @@


 void HGraph::OrderBlocks() {
-  HPhase phase("H Block ordering");
+  HPhase phase("H_Block ordering");
   BitVector visited(blocks_.length(), zone());

   ZoneList<HBasicBlock*> reverse_result(8);
@@ -805,7 +805,7 @@


 void HGraph::AssignDominators() {
-  HPhase phase("H Assign dominators", this);
+  HPhase phase("H_Assign dominators", this);
   for (int i = 0; i < blocks_.length(); ++i) {
     HBasicBlock* block = blocks_[i];
     if (block->IsLoopHeader()) {
@@ -824,7 +824,7 @@
// Mark all blocks that are dominated by an unconditional soft deoptimize to
 // prevent code motion across those blocks.
 void HGraph::PropagateDeoptimizingMark() {
-  HPhase phase("H Propagate deoptimizing mark", this);
+  HPhase phase("H_Propagate deoptimizing mark", this);
   MarkAsDeoptimizingRecursively(entry_block());
 }

@@ -837,7 +837,7 @@
 }

 void HGraph::EliminateRedundantPhis() {
-  HPhase phase("H Redundant phi elimination", this);
+  HPhase phase("H_Redundant phi elimination", this);

   // Worklist of phis that can potentially be eliminated. Initialized with
// all phi nodes. When elimination of a phi node modifies another phi node
@@ -871,7 +871,7 @@


 void HGraph::EliminateUnreachablePhis() {
-  HPhase phase("H Unreachable phi elimination", this);
+  HPhase phase("H_Unreachable phi elimination", this);

   // Initialize worklist.
   ZoneList<HPhi*> phi_list(blocks_.length());
@@ -1010,7 +1010,7 @@


 void HRangeAnalysis::Analyze() {
-  HPhase phase("H Range analysis", graph_);
+  HPhase phase("H_Range analysis", graph_);
   Analyze(graph_->entry_block());
 }

@@ -1831,7 +1831,7 @@


 void HInferRepresentation::Analyze() {
-  HPhase phase("H Infer representations", graph_);
+  HPhase phase("H_Infer representations", graph_);

   // (1) Initialize bit vectors and count real uses. Each phi gets a
   // bit-vector of length <number of phis>.
@@ -1910,7 +1910,7 @@


 void HGraph::InitializeInferredTypes() {
-  HPhase phase("H Inferring types", this);
+  HPhase phase("H_Inferring types", this);
   InitializeInferredTypes(0, this->blocks_.length() - 1);
 }

@@ -2047,7 +2047,7 @@


 void HGraph::InsertRepresentationChanges() {
-  HPhase phase("H Insert representation changes", this);
+  HPhase phase("H_Insert representation changes", this);


   // Compute truncation flag for phis: Initially assume that all
@@ -2104,7 +2104,7 @@


 void HGraph::MarkDeoptimizeOnUndefined() {
-  HPhase phase("H MarkDeoptimizeOnUndefined", this);
+  HPhase phase("H_MarkDeoptimizeOnUndefined", this);
   // Compute DeoptimizeOnUndefined flag for phis.
   // Any phi that can reach a use with DeoptimizeOnUndefined set must
// have DeoptimizeOnUndefined set. Currently only HCompareIDAndBranch, with
@@ -2430,7 +2430,7 @@
   if (FLAG_hydrogen_stats) HStatistics::Instance()->Initialize(info());

   {
-    HPhase phase("H Block building");
+    HPhase phase("H_Block building");
     current_block_ = graph()->entry_block();

     Scope* scope = info()->scope();
@@ -2515,7 +2515,7 @@

// Perform common subexpression elimination and loop-invariant code motion.
   if (FLAG_use_gvn) {
-    HPhase phase("H Global value numbering", graph());
+    HPhase phase("H_Global value numbering", graph());
     HGlobalValueNumberer gvn(graph(), info());
     bool removed_side_effects = gvn.Analyze();
// Trigger a second analysis pass to further eliminate duplicate values that
@@ -2548,7 +2548,7 @@


 void HGraph::ReplaceCheckedValues() {
-  HPhase phase("H Replace checked values", this);
+  HPhase phase("H_Replace checked values", this);
   for (int i = 0; i < blocks()->length(); ++i) {
     HInstruction* instr = blocks()->at(i)->first();
     while (instr != NULL) {
Index: src/ia32/lithium-codegen-ia32.cc
===================================================================
--- src/ia32/lithium-codegen-ia32.cc    (revision 10902)
+++ src/ia32/lithium-codegen-ia32.cc    (working copy)
@@ -67,7 +67,7 @@
 #define __ masm()->

 bool LCodeGen::GenerateCode() {
-  HPhase phase("Z Code generation", chunk());
+  HPhase phase("Z_Code generation", chunk());
   ASSERT(is_unused());
   status_ = GENERATING;
   CpuFeatures::Scope scope(SSE2);
Index: src/ia32/lithium-ia32.cc
===================================================================
--- src/ia32/lithium-ia32.cc    (revision 10902)
+++ src/ia32/lithium-ia32.cc    (working copy)
@@ -388,7 +388,7 @@


 void LChunk::MarkEmptyBlocks() {
-  HPhase phase("L Mark empty blocks", this);
+  HPhase phase("L_Mark empty blocks", this);
   for (int i = 0; i < graph()->blocks()->length(); ++i) {
     HBasicBlock* block = graph()->blocks()->at(i);
     int first = block->first_instruction_index();
@@ -551,7 +551,7 @@
 LChunk* LChunkBuilder::Build() {
   ASSERT(is_unused());
   chunk_ = new(zone()) LChunk(info(), graph());
-  HPhase phase("L Building chunk", chunk_);
+  HPhase phase("L_Building chunk", chunk_);
   status_ = BUILDING;
   const ZoneList<HBasicBlock*>* blocks = graph()->blocks();
   for (int i = 0; i < blocks->length(); i++) {
Index: src/lithium-allocator.cc
===================================================================
--- src/lithium-allocator.cc    (revision 10902)
+++ src/lithium-allocator.cc    (working copy)
@@ -1105,7 +1105,7 @@


 void LAllocator::MeetRegisterConstraints() {
-  HPhase phase("L Register constraints", chunk_);
+  HPhase phase("L_Register constraints", chunk_);
   first_artificial_register_ = next_virtual_register_;
   const ZoneList<HBasicBlock*>* blocks = graph_->blocks();
   for (int i = 0; i < blocks->length(); ++i) {
@@ -1117,7 +1117,7 @@


 void LAllocator::ResolvePhis() {
-  HPhase phase("L Resolve phis", chunk_);
+  HPhase phase("L_Resolve phis", chunk_);

   // Process the blocks in reverse order.
   const ZoneList<HBasicBlock*>* blocks = graph_->blocks();
@@ -1207,7 +1207,7 @@


 void LAllocator::ConnectRanges() {
-  HPhase phase("L Connect ranges", this);
+  HPhase phase("L_Connect ranges", this);
   for (int i = 0; i < live_ranges()->length(); ++i) {
     LiveRange* first_range = live_ranges()->at(i);
     if (first_range == NULL || first_range->parent() != NULL) continue;
@@ -1247,7 +1247,7 @@


 void LAllocator::ResolveControlFlow() {
-  HPhase phase("L Resolve control flow", this);
+  HPhase phase("L_Resolve control flow", this);
   const ZoneList<HBasicBlock*>* blocks = graph_->blocks();
   for (int block_id = 1; block_id < blocks->length(); ++block_id) {
     HBasicBlock* block = blocks->at(block_id);
@@ -1268,7 +1268,7 @@


 void LAllocator::BuildLiveRanges() {
-  HPhase phase("L Build live ranges", this);
+  HPhase phase("L_Build live ranges", this);
   InitializeLivenessAnalysis();
   // Process the blocks in reverse order.
   const ZoneList<HBasicBlock*>* blocks = graph_->blocks();
@@ -1373,7 +1373,7 @@


 void LAllocator::PopulatePointerMaps() {
-  HPhase phase("L Populate pointer maps", this);
+  HPhase phase("L_Populate pointer maps", this);
   const ZoneList<LPointerMap*>* pointer_maps = chunk_->pointer_maps();

   ASSERT(SafePointsAreInOrder());
@@ -1492,14 +1492,14 @@


 void LAllocator::AllocateGeneralRegisters() {
-  HPhase phase("L Allocate general registers", this);
+  HPhase phase("L_Allocate general registers", this);
   num_registers_ = Register::kNumAllocatableRegisters;
   AllocateRegisters();
 }


 void LAllocator::AllocateDoubleRegisters() {
-  HPhase phase("L Allocate double registers", this);
+  HPhase phase("L_Allocate double registers", this);
   num_registers_ = DoubleRegister::kNumAllocatableRegisters;
   mode_ = DOUBLE_REGISTERS;
   AllocateRegisters();
Index: src/mips/lithium-codegen-mips.cc
===================================================================
--- src/mips/lithium-codegen-mips.cc    (revision 10902)
+++ src/mips/lithium-codegen-mips.cc    (working copy)
@@ -62,7 +62,7 @@
 #define __ masm()->

 bool LCodeGen::GenerateCode() {
-  HPhase phase("Z Code generation", chunk());
+  HPhase phase("Z_Code generation", chunk());
   ASSERT(is_unused());
   status_ = GENERATING;
   CpuFeatures::Scope scope(FPU);
Index: src/mips/lithium-mips.cc
===================================================================
--- src/mips/lithium-mips.cc    (revision 10902)
+++ src/mips/lithium-mips.cc    (working copy)
@@ -440,7 +440,7 @@


 void LChunk::MarkEmptyBlocks() {
-  HPhase phase("L Mark empty blocks", this);
+  HPhase phase("L_Mark empty blocks", this);
   for (int i = 0; i < graph()->blocks()->length(); ++i) {
     HBasicBlock* block = graph()->blocks()->at(i);
     int first = block->first_instruction_index();
@@ -552,7 +552,7 @@
 LChunk* LChunkBuilder::Build() {
   ASSERT(is_unused());
   chunk_ = new(zone()) LChunk(info(), graph());
-  HPhase phase("L Building chunk", chunk_);
+  HPhase phase("L_Building chunk", chunk_);
   status_ = BUILDING;
   const ZoneList<HBasicBlock*>* blocks = graph()->blocks();
   for (int i = 0; i < blocks->length(); i++) {
Index: src/x64/lithium-codegen-x64.cc
===================================================================
--- src/x64/lithium-codegen-x64.cc      (revision 10902)
+++ src/x64/lithium-codegen-x64.cc      (working copy)
@@ -67,7 +67,7 @@
 #define __ masm()->

 bool LCodeGen::GenerateCode() {
-  HPhase phase("Z Code generation", chunk());
+  HPhase phase("Z_Code generation", chunk());
   ASSERT(is_unused());
   status_ = GENERATING;

Index: src/x64/lithium-x64.cc
===================================================================
--- src/x64/lithium-x64.cc      (revision 10902)
+++ src/x64/lithium-x64.cc      (working copy)
@@ -382,7 +382,7 @@


 void LChunk::MarkEmptyBlocks() {
-  HPhase phase("L Mark empty blocks", this);
+  HPhase phase("L_Mark empty blocks", this);
   for (int i = 0; i < graph()->blocks()->length(); ++i) {
     HBasicBlock* block = graph()->blocks()->at(i);
     int first = block->first_instruction_index();
@@ -545,7 +545,7 @@
 LChunk* LChunkBuilder::Build() {
   ASSERT(is_unused());
   chunk_ = new(zone()) LChunk(info(), graph());
-  HPhase phase("L Building chunk", chunk_);
+  HPhase phase("L_Building chunk", chunk_);
   status_ = BUILDING;
   const ZoneList<HBasicBlock*>* blocks = graph()->blocks();
   for (int i = 0; i < blocks->length(); i++) {


--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to