Reviewers: Benedikt Meurer,
Description:
Simplify TurboFan's c1visualizer file handling.
Still having GetTurboCfgFileName in Isolate is ugly, but if we decide that
we
don't want to truncate the output file (which would be consistent with
--trace-hydrogen), this could be moved to TurboCfgFile where it actually
belongs.
Please review this at https://codereview.chromium.org/666223003/
Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+17, -57 lines):
M src/compiler/pipeline.h
M src/compiler/pipeline.cc
M src/isolate.h
M src/isolate.cc
Index: src/compiler/pipeline.cc
diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc
index
438f10459524b33113a439c942e0434097f1fdc2..f050c9b4c0825b163eabf07b7a40adbdac399b4d
100644
--- a/src/compiler/pipeline.cc
+++ b/src/compiler/pipeline.cc
@@ -4,6 +4,7 @@
#include "src/compiler/pipeline.h"
+#include <fstream> // NOLINT(readability/streams)
#include <sstream>
#include "src/base/platform/elapsed-timer.h"
@@ -97,19 +98,10 @@ static inline bool VerifyGraphs() {
}
-void Pipeline::PrintCompilationStart() {
- std::ofstream turbo_cfg_stream;
- OpenTurboCfgFile(&turbo_cfg_stream);
- turbo_cfg_stream << AsC1VCompilation(info());
-}
-
-
-void Pipeline::OpenTurboCfgFile(std::ofstream* stream) {
- char buffer[512];
- Vector<char> filename(buffer, sizeof(buffer));
- isolate()->GetTurboCfgFileName(filename);
- stream->open(filename.start(), std::fstream::out | std::fstream::app);
-}
+struct TurboCfgFile : public std::ofstream {
+ explicit TurboCfgFile(Isolate* isolate)
+ : std::ofstream(isolate->GetTurboCfgFileName(), std::ios_base::app)
{}
+};
void Pipeline::VerifyAndPrintGraph(
@@ -158,24 +150,6 @@ void Pipeline::VerifyAndPrintGraph(
}
-void Pipeline::PrintScheduleAndInstructions(
- const char* phase, const Schedule* schedule,
- const SourcePositionTable* positions,
- const InstructionSequence* instructions) {
- std::ofstream turbo_cfg_stream;
- OpenTurboCfgFile(&turbo_cfg_stream);
- turbo_cfg_stream << AsC1V(phase, schedule, positions, instructions);
-}
-
-
-void Pipeline::PrintAllocator(const char* phase,
- const RegisterAllocator* allocator) {
- std::ofstream turbo_cfg_stream;
- OpenTurboCfgFile(&turbo_cfg_stream);
- turbo_cfg_stream << AsC1VAllocator(phase, allocator);
-}
-
-
class AstGraphBuilderWithPositions : public AstGraphBuilder {
public:
explicit AstGraphBuilderWithPositions(Zone* local_zone, CompilationInfo*
info,
@@ -234,7 +208,7 @@ Handle<Code> Pipeline::GenerateCode() {
<< "Begin compiling method "
<< info()->function()->debug_name()->ToCString().get()
<< " using Turbofan" << std::endl;
- PrintCompilationStart();
+ TurboCfgFile(isolate()) << AsC1VCompilation(info());
}
ZonePool zone_pool(isolate());
@@ -487,8 +461,8 @@ Handle<Code> Pipeline::GenerateCode(ZonePool*
zone_pool, Linkage* linkage,
OFStream os(stdout);
os << "----- Instruction sequence before register allocation -----\n"
<< sequence;
- PrintScheduleAndInstructions("CodeGen", schedule, source_positions,
- &sequence);
+ TurboCfgFile(isolate())
+ << AsC1V("CodeGen", schedule, source_positions, &sequence);
}
// Allocate registers.
@@ -507,7 +481,7 @@ Handle<Code> Pipeline::GenerateCode(ZonePool*
zone_pool, Linkage* linkage,
return Handle<Code>::null();
}
if (FLAG_trace_turbo) {
- PrintAllocator("CodeGen", &allocator);
+ TurboCfgFile(isolate()) << AsC1VAllocator("CodeGen", &allocator);
}
}
Index: src/compiler/pipeline.h
diff --git a/src/compiler/pipeline.h b/src/compiler/pipeline.h
index
87c22a6aeba25fbc5e481a7e218efb9f4f2d6ad8..cf4fa5e1d74cd93d62bd1c5355a280f34decef3a
100644
--- a/src/compiler/pipeline.h
+++ b/src/compiler/pipeline.h
@@ -5,8 +5,6 @@
#ifndef V8_COMPILER_PIPELINE_H_
#define V8_COMPILER_PIPELINE_H_
-#include <fstream> // NOLINT(readability/streams)
-
#include "src/v8.h"
#include "src/compiler.h"
@@ -53,12 +51,6 @@ class Pipeline {
Zone* zone() { return info_->zone(); }
Schedule* ComputeSchedule(ZonePool* zone_pool, Graph* graph);
- void OpenTurboCfgFile(std::ofstream* stream);
- void PrintCompilationStart();
- void PrintScheduleAndInstructions(const char* phase, const Schedule*
schedule,
- const SourcePositionTable* positions,
- const InstructionSequence*
instructions);
- void PrintAllocator(const char* phase, const RegisterAllocator*
allocator);
void VerifyAndPrintGraph(Graph* graph, const char* phase,
bool untyped = false);
Handle<Code> GenerateCode(ZonePool* zone_pool, Linkage* linkage, Graph*
graph,
Index: src/isolate.cc
diff --git a/src/isolate.cc b/src/isolate.cc
index
51c640902e891c06ad2821c2116eda257e598567..163bc645c67bfd0c7e69cc836c1efc2ed66d2f48
100644
--- a/src/isolate.cc
+++ b/src/isolate.cc
@@ -1955,12 +1955,8 @@ bool Isolate::Init(Deserializer* des) {
if (!create_heap_objects) Assembler::QuietNaN(heap_.nan_value());
if (FLAG_trace_turbo) {
- // Erase the file.
- char buffer[512];
- Vector<char> filename(buffer, sizeof(buffer));
- GetTurboCfgFileName(filename);
- std::ofstream turbo_cfg_stream(filename.start(),
- std::fstream::out |
std::fstream::trunc);
+ // Create an empty file.
+ std::ofstream(GetTurboCfgFileName(), std::ios_base::trunc);
}
// If we are deserializing, log non-function code objects and compiled
@@ -2376,13 +2372,11 @@ BasicBlockProfiler*
Isolate::GetOrCreateBasicBlockProfiler() {
}
-void Isolate::GetTurboCfgFileName(Vector<char> filename) {
- if (FLAG_trace_turbo_cfg_file == NULL) {
- SNPrintF(filename, "turbo-%d-%d.cfg", base::OS::GetCurrentProcessId(),
- id());
- } else {
- StrNCpy(filename, FLAG_trace_turbo_cfg_file, filename.length());
- }
+std::string Isolate::GetTurboCfgFileName() {
+ return FLAG_trace_turbo_cfg_file == NULL
+ ? "turbo-" + std::to_string(base::OS::GetCurrentProcessId()) +
+ "-" + std::to_string(id()) + ".cfg"
+ : FLAG_trace_turbo_cfg_file;
}
Index: src/isolate.h
diff --git a/src/isolate.h b/src/isolate.h
index
2e7f45971ec3e8330540488d88279a93bd7628d1..96585ef7da9dbeadb3bf061ac346720d2abae3e7
100644
--- a/src/isolate.h
+++ b/src/isolate.h
@@ -1113,7 +1113,7 @@ class Isolate {
static Isolate* NewForTesting() { return new Isolate(false); }
- void GetTurboCfgFileName(Vector<char> buffer);
+ std::string GetTurboCfgFileName();
private:
explicit Isolate(bool enable_serializer);
--
--
v8-dev mailing list
[email protected]
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 [email protected].
For more options, visit https://groups.google.com/d/optout.
