Reviewers: Benedikt Meurer,
Message:
Committed patchset #1 (id:1) manually as
fb1795c4429eecc3af14f51417664aeba15fb0de (presubmit successful).
Description:
[turbofan] small cleanups to aid register allocator debugging
BUG=
[email protected]
Committed:
https://chromium.googlesource.com/v8/v8/+/fb1795c4429eecc3af14f51417664aeba15fb0de
Please review this at https://codereview.chromium.org/727693002/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+34, -30 lines):
M src/compiler/pipeline.cc
M src/compiler/register-allocator.h
M src/compiler/register-allocator.cc
Index: src/compiler/pipeline.cc
diff --git a/src/compiler/pipeline.cc b/src/compiler/pipeline.cc
index
3fdf826543557d2ed745635e0fe91740e6719f12..c5de2882fcf29d5d302f432a6bb7bfc5f4e4a8ec
100644
--- a/src/compiler/pipeline.cc
+++ b/src/compiler/pipeline.cc
@@ -110,6 +110,8 @@ class PipelineData {
}
Zone* instruction_zone() const { return instruction_zone_; }
+ // RawMachineAssembler generally produces graphs which cannot be
verified.
+ bool MayHaveUnverifiableGraph() { return outer_zone_ == nullptr; }
void DeleteGraphZone() {
// Destroy objects with destructors first.
@@ -559,12 +561,7 @@ Handle<Code> Pipeline::GenerateCode(Linkage* linkage,
PipelineData* data) {
selector.SelectInstructions();
}
- if (FLAG_trace_turbo) {
- OFStream os(stdout);
- PrintableInstructionSequence printable = {
- RegisterConfiguration::ArchDefault(), &sequence};
- os << "----- Instruction sequence before register allocation -----\n"
- << printable;
+ if (FLAG_trace_turbo && !data->MayHaveUnverifiableGraph()) {
TurboCfgFile tcf(isolate());
tcf << AsC1V("CodeGen", data->schedule(), data->source_positions(),
&sequence);
@@ -605,7 +602,7 @@ Handle<Code> Pipeline::GenerateCode(Linkage* linkage,
PipelineData* data) {
info()->AbortOptimization(kNotEnoughVirtualRegistersRegalloc);
return Handle<Code>::null();
}
- if (FLAG_trace_turbo) {
+ if (FLAG_trace_turbo && !data->MayHaveUnverifiableGraph()) {
TurboCfgFile tcf(isolate());
tcf << AsC1VAllocator("CodeGen", &allocator);
}
Index: src/compiler/register-allocator.cc
diff --git a/src/compiler/register-allocator.cc
b/src/compiler/register-allocator.cc
index
23a7df6e9c0b839654a85aab18e455466e555c85..c3145091b075ef03d964eed1ce2f14cfb2c0728b
100644
--- a/src/compiler/register-allocator.cc
+++ b/src/compiler/register-allocator.cc
@@ -1125,7 +1125,6 @@ bool RegisterAllocator::Allocate(PipelineStatistics*
stats) {
PhaseScope phase_scope(stats, "meet register constraints");
MeetRegisterConstraints();
}
- if (!AllocationOk()) return false;
{
PhaseScope phase_scope(stats, "resolve phis");
ResolvePhis();
@@ -1134,6 +1133,14 @@ bool RegisterAllocator::Allocate(PipelineStatistics*
stats) {
PhaseScope phase_scope(stats, "build live ranges");
BuildLiveRanges();
}
+ if (FLAG_trace_turbo) {
+ OFStream os(stdout);
+ PrintableInstructionSequence printable = {config(), code()};
+ os << "----- Instruction sequence before register allocation -----\n"
+ << printable;
+ }
+ // This can be triggered in debug mode.
+ DCHECK(!ExistsUseWithoutDefinition());
{
PhaseScope phase_scope(stats, "allocate general registers");
AllocateGeneralRegisters();
@@ -1487,28 +1494,6 @@ void RegisterAllocator::BuildLiveRanges() {
live_in_sets_[i]->Union(*live);
}
}
-
-#ifdef DEBUG
- if (block_id == 0) {
- BitVector::Iterator iterator(live);
- bool found = false;
- while (!iterator.Done()) {
- found = true;
- int operand_index = iterator.Current();
- PrintF("Register allocator error: live v%d reached first block.\n",
- operand_index);
- LiveRange* range = LiveRangeFor(operand_index);
- PrintF(" (first use is at %d)\n",
range->first_pos()->pos().Value());
- if (debug_name() == nullptr) {
- PrintF("\n");
- } else {
- PrintF(" (function: %s)\n", debug_name());
- }
- iterator.Advance();
- }
- DCHECK(!found);
- }
-#endif
}
for (int i = 0; i < live_ranges_.length(); ++i) {
@@ -1539,6 +1524,27 @@ void RegisterAllocator::BuildLiveRanges() {
}
+bool RegisterAllocator::ExistsUseWithoutDefinition() {
+ bool found = false;
+ BitVector::Iterator iterator(live_in_sets_[0]);
+ while (!iterator.Done()) {
+ found = true;
+ int operand_index = iterator.Current();
+ PrintF("Register allocator error: live v%d reached first block.\n",
+ operand_index);
+ LiveRange* range = LiveRangeFor(operand_index);
+ PrintF(" (first use is at %d)\n", range->first_pos()->pos().Value());
+ if (debug_name() == nullptr) {
+ PrintF("\n");
+ } else {
+ PrintF(" (function: %s)\n", debug_name());
+ }
+ iterator.Advance();
+ }
+ return found;
+}
+
+
bool RegisterAllocator::SafePointsAreInOrder() const {
int safe_point = 0;
const PointerMapDeque* pointer_maps = code()->pointer_maps();
Index: src/compiler/register-allocator.h
diff --git a/src/compiler/register-allocator.h
b/src/compiler/register-allocator.h
index
a6578af7ecb727894f7e290f1cbbc2c28e8d1460..067ed871c43b7c64cade3616518ea8bc9787d56e
100644
--- a/src/compiler/register-allocator.h
+++ b/src/compiler/register-allocator.h
@@ -388,6 +388,7 @@ class RegisterAllocator FINAL {
bool IsOutputRegisterOf(Instruction* instr, int index);
bool IsOutputDoubleRegisterOf(Instruction* instr, int index);
void ProcessInstructions(const InstructionBlock* block, BitVector* live);
+ bool ExistsUseWithoutDefinition();
void MeetRegisterConstraints(const InstructionBlock* block);
void MeetConstraintsBetween(Instruction* first, Instruction* second,
int gap_index);
--
--
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.
