Revert "Simplify TurboFan's c1visualizer file handling."

This reverts r24819, it broke the build on Mac due to header incompatibilities.

TBR=bmeurer@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24821 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 6d5f6914
......@@ -4,7 +4,6 @@
#include "src/compiler/pipeline.h"
#include <fstream> // NOLINT(readability/streams)
#include <sstream>
#include "src/base/platform/elapsed-timer.h"
......@@ -98,10 +97,19 @@ static inline bool VerifyGraphs() {
}
struct TurboCfgFile : public std::ofstream {
explicit TurboCfgFile(Isolate* isolate)
: std::ofstream(isolate->GetTurboCfgFileName(), std::ios_base::app) {}
};
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);
}
void Pipeline::VerifyAndPrintGraph(
......@@ -150,6 +158,24 @@ 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,
......@@ -208,7 +234,7 @@ Handle<Code> Pipeline::GenerateCode() {
<< "Begin compiling method "
<< info()->function()->debug_name()->ToCString().get()
<< " using Turbofan" << std::endl;
TurboCfgFile(isolate()) << AsC1VCompilation(info());
PrintCompilationStart();
}
ZonePool zone_pool(isolate());
......@@ -461,8 +487,8 @@ Handle<Code> Pipeline::GenerateCode(ZonePool* zone_pool, Linkage* linkage,
OFStream os(stdout);
os << "----- Instruction sequence before register allocation -----\n"
<< sequence;
TurboCfgFile(isolate())
<< AsC1V("CodeGen", schedule, source_positions, &sequence);
PrintScheduleAndInstructions("CodeGen", schedule, source_positions,
&sequence);
}
// Allocate registers.
......@@ -481,7 +507,7 @@ Handle<Code> Pipeline::GenerateCode(ZonePool* zone_pool, Linkage* linkage,
return Handle<Code>::null();
}
if (FLAG_trace_turbo) {
TurboCfgFile(isolate()) << AsC1VAllocator("CodeGen", &allocator);
PrintAllocator("CodeGen", &allocator);
}
}
......
......@@ -5,6 +5,8 @@
#ifndef V8_COMPILER_PIPELINE_H_
#define V8_COMPILER_PIPELINE_H_
#include <fstream> // NOLINT(readability/streams)
#include "src/v8.h"
#include "src/compiler.h"
......@@ -51,6 +53,12 @@ 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,
......
......@@ -1951,8 +1951,12 @@ bool Isolate::Init(Deserializer* des) {
if (!create_heap_objects) Assembler::QuietNaN(heap_.nan_value());
if (FLAG_trace_turbo) {
// Create an empty file.
std::ofstream(GetTurboCfgFileName(), std::ios_base::trunc);
// 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);
}
// If we are deserializing, log non-function code objects and compiled
......@@ -2368,11 +2372,13 @@ BasicBlockProfiler* Isolate::GetOrCreateBasicBlockProfiler() {
}
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;
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());
}
}
......
......@@ -1098,7 +1098,7 @@ class Isolate {
static Isolate* NewForTesting() { return new Isolate(false); }
std::string GetTurboCfgFileName();
void GetTurboCfgFileName(Vector<char> buffer);
private:
explicit Isolate(bool enable_serializer);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment