Make (most of) --trace-codegen available in release mode. Better output.

R=mstarzinger@chromium.org

Review URL: https://codereview.chromium.org/15941004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14796 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/arm/codegen-arm.h b/src/arm/codegen-arm.h
index 75899a948e7dcec3a56737a28a6c1f235463c0d0..c020ab601c8e968ca492f02f30e9956ac63a2134 100644 (file)
--- a/src/arm/codegen-arm.h
+++ b/src/arm/codegen-arm.h
@@ -51,7 +51,7 @@ class CodeGenerator: public AstVisitor {
   static bool MakeCode(CompilationInfo* info);
 
   // Printing of AST, etc. as requested by flags.
-  static void MakeCodePrologue(CompilationInfo* info);
+  static void MakeCodePrologue(CompilationInfo* info, const char* kind);
 
   // Allocate and install the code.
   static Handle<Code> MakeCodeEpilogue(MacroAssembler* masm,

diff --git a/src/codegen.cc b/src/codegen.cc
index ff4003c1eff09b5a76d9c60e802b3c2575620469..af2f1f667ba4ca4f22c779cd98b5001e8817fc98 100644 (file)
--- a/src/codegen.cc
+++ b/src/codegen.cc
@@ -58,13 +58,12 @@ Comment::~Comment() {
 #undef __
 
 
-void CodeGenerator::MakeCodePrologue(CompilationInfo* info) {
-#ifdef DEBUG
+void CodeGenerator::MakeCodePrologue(CompilationInfo* info, const char* kind) {
   bool print_source = false;
   bool print_ast = false;
   const char* ftype;
 
-  if (Isolate::Current()->bootstrapper()->IsActive()) {
+  if (info->isolate()->bootstrapper()->IsActive()) {
     print_source = FLAG_print_builtin_source;
     print_ast = FLAG_print_builtin_ast;
     ftype = "builtin";
@@ -75,17 +74,18 @@ void CodeGenerator::MakeCodePrologue(CompilationInfo* info) {
   }
 
   if (FLAG_trace_codegen || print_source || print_ast) {
-    PrintF("*** Generate code for %s function: ", ftype);
+    PrintF("[generating %s code for %s function: ", kind, ftype);
     if (info->IsStub()) {
       const char* name =
           CodeStub::MajorName(info->code_stub()->MajorKey(), true);
       PrintF("%s", name == NULL ? "<unknown>" : name);
     } else {
-      info->function()->name()->ShortPrint();
+      PrintF("%s", *info->function()->debug_name()->ToCString());
     }
-    PrintF(" ***\n");
+    PrintF("]\n");
   }
 
+#ifdef DEBUG
   if (!info->IsStub() && print_source) {
     PrintF("--- Source from AST ---\n%s\n",
            PrettyPrinter().PrintProgram(info->function()));

diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index 859487a6f8d3f97b9187a18690f41d7c0ad55b25..8fe6778e67cc26093d8079594351d2c040fa0529 100644 (file)
--- a/src/flag-definitions.h
+++ b/src/flag-definitions.h
@@ -377,6 +377,8 @@ DEFINE_bool(stack_trace_on_abort, true,
             "print a stack trace if an assertion failure occurs")
 
 // codegen-ia32.cc / codegen-arm.cc
+DEFINE_bool(trace_codegen, false,
+            "print name of functions for which code is generated")
 DEFINE_bool(trace, false, "trace function calls")
 DEFINE_bool(mask_constants_with_cookie,
             true,
@@ -636,8 +638,6 @@ DEFINE_bool(enable_slow_asserts, false,
             "enable asserts that are slow to execute")
 
 // codegen-ia32.cc / codegen-arm.cc
-DEFINE_bool(trace_codegen, false,
-            "print name of functions for which code is generated")
 DEFINE_bool(print_source, false, "pretty print source code")
 DEFINE_bool(print_builtin_source, false,
             "pretty print source code for builtins")

diff --git a/src/full-codegen.cc b/src/full-codegen.cc
index dc646b1a98c88c1192730be5b2d6e9e6d7e36d14..ad2a9947f3d89a1f5363258d059151b2def093df 100644 (file)
--- a/src/full-codegen.cc
+++ b/src/full-codegen.cc
@@ -304,10 +304,7 @@ bool FullCodeGenerator::MakeCode(CompilationInfo* info) {
     int len = String::cast(script->source())->length();
     isolate->counters()->total_full_codegen_source_size()->Increment(len);
   }
-  if (FLAG_trace_codegen) {
-    PrintF("Full Compiler - ");
-  }
-  CodeGenerator::MakeCodePrologue(info);
+  CodeGenerator::MakeCodePrologue(info, "full");
   const int kInitialBufferSize = 4 * KB;
   MacroAssembler masm(info->isolate(), NULL, kInitialBufferSize);
 #ifdef ENABLE_GDB_JIT_INTERFACE

diff --git a/src/ia32/codegen-ia32.h b/src/ia32/codegen-ia32.h
index 51372741458d6775bad346cc9015ec65b292d132..6db381e47e58934e44916ea8ec550a70feece76c 100644 (file)
--- a/src/ia32/codegen-ia32.h
+++ b/src/ia32/codegen-ia32.h
@@ -43,7 +43,7 @@ class CompilationInfo;
 class CodeGenerator {
  public:
   // Printing of AST, etc. as requested by flags.
-  static void MakeCodePrologue(CompilationInfo* info);
+  static void MakeCodePrologue(CompilationInfo* info, const char* kind);
 
   // Allocate and install the code.
   static Handle<Code> MakeCodeEpilogue(MacroAssembler* masm,

diff --git a/src/lithium.cc b/src/lithium.cc
index 539f4eefba5bd635d2a41b2a64193c570b1ca181..9f44b7ef5a686f833b7665c26c35df67abd1b3d4 100644 (file)
--- a/src/lithium.cc
+++ b/src/lithium.cc
@@ -455,10 +455,7 @@ Handle<Code> LChunk::Codegen() {
   MarkEmptyBlocks();
 
   if (generator.GenerateCode()) {
-    if (FLAG_trace_codegen) {
-      PrintF("Crankshaft Compiler - ");
-    }
-    CodeGenerator::MakeCodePrologue(info());
+    CodeGenerator::MakeCodePrologue(info(), "optimized");
     Code::Flags flags = info()->flags();
     Handle<Code> code =
         CodeGenerator::MakeCodeEpilogue(&assembler, flags, info());

diff --git a/src/mips/codegen-mips.h b/src/mips/codegen-mips.h
index d429443a8801a1285e6ab7087f16ad1dcce9ec2c..240b02ce44ba4e77d84d1b3c5bc800f347bea83f 100644 (file)
--- a/src/mips/codegen-mips.h
+++ b/src/mips/codegen-mips.h
@@ -53,7 +53,7 @@ class CodeGenerator: public AstVisitor {
   static bool MakeCode(CompilationInfo* info);
 
   // Printing of AST, etc. as requested by flags.
-  static void MakeCodePrologue(CompilationInfo* info);
+  static void MakeCodePrologue(CompilationInfo* info, const char* kind);
 
   // Allocate and install the code.
   static Handle<Code> MakeCodeEpilogue(MacroAssembler* masm,

diff --git a/src/x64/codegen-x64.h b/src/x64/codegen-x64.h
index 3a7646bd1bb7ff68b959509f6a6acacf02fadd9e..5747e0bc6f0d19c3bbec0f654a4e2fb2ab052a93 100644 (file)
--- a/src/x64/codegen-x64.h
+++ b/src/x64/codegen-x64.h
@@ -51,7 +51,7 @@ class CodeGenerator: public AstVisitor {
   static bool MakeCode(CompilationInfo* info);
 
   // Printing of AST, etc. as requested by flags.
-  static void MakeCodePrologue(CompilationInfo* info);
+  static void MakeCodePrologue(CompilationInfo* info, const char* kind);
 
   // Allocate and install the code.
   static Handle<Code> MakeCodeEpilogue(MacroAssembler* masm,