c3a6ca68d0
SourcePosition::InliningId() refers to a the new table DeoptimizationInputData::InliningPositions(), which provides the following data for every inlining id:
- The inlined SharedFunctionInfo as an offset into DeoptimizationInfo::LiteralArray
- The SourcePosition of the inlining. Recursively, this yields the full inlining stack.
Before the Code object is created, the same information can be found in CompilationInfo::inlined_functions().
If SourcePosition::InliningId() is SourcePosition::kNotInlined, it refers to the outer (non-inlined) function.
So every SourcePosition has full information about its inlining stack, as long as the corresponding Code object is known. The internal represenation of a source position is a positive 64bit integer.
All compilers create now appropriate source positions for inlined functions. In the case of Turbofan, this required using AstGraphBuilderWithPositions for inlined functions too. So this class is now moved to a header file.
At the moment, the additional information in source positions is only used in --trace-deopt and --code-comments. The profiler needs to be updated, at the moment it gets the correct script offsets from the deopt info, but the wrong script id from the reconstructed deopt stack, which can lead to wrong outputs. This should be resolved by making the profiler use the new inlining information for deopts.
I activated the inlined deoptimization tests in test-cpu-profiler.cc for Turbofan, changing them to a case where the deopt stack and the inlining position agree. It is currently still broken for other cases.
The following additional changes were necessary:
- The source position table (internal::SourcePositionTableBuilder etc.) supports now 64bit source positions. Encoding source positions in a single 64bit int together with the difference encoding in the source position table results in very little overhead for the inlining id, since only 12% of the source positions in Octane have a changed inlining id.
- The class HPositionInfo was effectively dead code and is now removed.
- SourcePosition has new printing and information facilities, including computing a full inlining stack.
- I had to rename compiler/source-position.{h,cc} to compiler/compiler-source-position-table.{h,cc} to avoid clashes with the new src/source-position.cc file.
- I wrote the new wrapper PodArray for ByteArray. It is a template working with any POD-type. This is used in DeoptimizationInputData::InliningPositions().
- I removed HInlinedFunctionInfo and HGraph::inlined_function_infos, because they were only used for the now obsolete Crankshaft inlining ids.
- Crankshaft managed a list of inlined functions in Lithium: LChunk::inlined_functions. This is an analog structure to CompilationInfo::inlined_functions. So I removed LChunk::inlined_functions and made Crankshaft use CompilationInfo::inlined_functions instead, because this was necessary to register the offsets into the literal array in a uniform way. This is a safe change because LChunk::inlined_functions has no other uses and the functions in CompilationInfo::inlined_functions have a strictly longer lifespan, being created earlier (in Hydrogen already).
BUG=v8:5432
Review-Url: https://codereview.chromium.org/2451853002
Cr-Commit-Position: refs/heads/master@{#40975}
94 lines
2.4 KiB
C++
94 lines
2.4 KiB
C++
// Copyright 2016 the V8 project authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef V8_SOURCE_POSITION_TABLE_H_
|
|
#define V8_SOURCE_POSITION_TABLE_H_
|
|
|
|
#include "src/assert-scope.h"
|
|
#include "src/checks.h"
|
|
#include "src/globals.h"
|
|
#include "src/handles.h"
|
|
#include "src/source-position.h"
|
|
#include "src/zone/zone-containers.h"
|
|
|
|
namespace v8 {
|
|
namespace internal {
|
|
|
|
class AbstractCode;
|
|
class BytecodeArray;
|
|
class ByteArray;
|
|
class Isolate;
|
|
class Zone;
|
|
|
|
struct PositionTableEntry {
|
|
PositionTableEntry()
|
|
: code_offset(0), source_position(0), is_statement(false) {}
|
|
PositionTableEntry(int offset, int64_t source, bool statement)
|
|
: code_offset(offset), source_position(source), is_statement(statement) {}
|
|
|
|
int code_offset;
|
|
int64_t source_position;
|
|
bool is_statement;
|
|
};
|
|
|
|
class V8_EXPORT_PRIVATE SourcePositionTableBuilder {
|
|
public:
|
|
enum RecordingMode { OMIT_SOURCE_POSITIONS, RECORD_SOURCE_POSITIONS };
|
|
|
|
SourcePositionTableBuilder(Zone* zone,
|
|
RecordingMode mode = RECORD_SOURCE_POSITIONS);
|
|
|
|
void AddPosition(size_t code_offset, SourcePosition source_position,
|
|
bool is_statement);
|
|
|
|
Handle<ByteArray> ToSourcePositionTable(Isolate* isolate,
|
|
Handle<AbstractCode> code);
|
|
|
|
private:
|
|
void AddEntry(const PositionTableEntry& entry);
|
|
|
|
inline bool Omit() const { return mode_ == OMIT_SOURCE_POSITIONS; }
|
|
|
|
RecordingMode mode_;
|
|
ZoneVector<byte> bytes_;
|
|
#ifdef ENABLE_SLOW_DCHECKS
|
|
ZoneVector<PositionTableEntry> raw_entries_;
|
|
#endif
|
|
PositionTableEntry previous_; // Previously written entry, to compute delta.
|
|
};
|
|
|
|
class V8_EXPORT_PRIVATE SourcePositionTableIterator {
|
|
public:
|
|
explicit SourcePositionTableIterator(ByteArray* byte_array);
|
|
|
|
void Advance();
|
|
|
|
int code_offset() const {
|
|
DCHECK(!done());
|
|
return current_.code_offset;
|
|
}
|
|
SourcePosition source_position() const {
|
|
DCHECK(!done());
|
|
return SourcePosition::FromRaw(current_.source_position);
|
|
}
|
|
bool is_statement() const {
|
|
DCHECK(!done());
|
|
return current_.is_statement;
|
|
}
|
|
bool done() const { return index_ == kDone; }
|
|
|
|
private:
|
|
static const int kDone = -1;
|
|
|
|
ByteArray* table_;
|
|
int index_;
|
|
PositionTableEntry current_;
|
|
DisallowHeapAllocation no_gc;
|
|
};
|
|
|
|
} // namespace internal
|
|
} // namespace v8
|
|
|
|
#endif // V8_SOURCE_POSITION_TABLE_H_
|