Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 18:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1552154 part 1 - Use mozilla::Span<> in BaselineScript, clean up RetAddrEntry code a bit. r=tcampbell

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D40944

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jan de Mooij 2019-08-10 10:20:08 +00:00
parent 71a8b7c3cb
commit d870ef9328
5 changed files with 76 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jit/BaselineCodeGen.cpp
View File

@ -318,11 +318,7 @@ MethodStatus BaselineCompiler::compile() {
MOZ_ASSERT(pcEntries.length() > 0);
baselineScript->copyPCMappingEntries(pcEntries);
// Copy RetAddrEntries.
if (handler.retAddrEntries().length() > 0) {
baselineScript->copyRetAddrEntries(script,
handler.retAddrEntries().begin());
}
baselineScript->copyRetAddrEntries(handler.retAddrEntries().begin());
// If profiler instrumentation is enabled, toggle instrumentation on.
if (cx->runtime()->jitRuntime()->isProfilerInstrumentationEnabled(

4
js/src/jit/BaselineDebugModeOSR.cpp
View File

@ -115,7 +115,7 @@ static bool CollectJitStackScripts(JSContext* cx,
} else {
// The frame must be settled on a pc with a RetAddrEntry.
uint8_t* retAddr = frame.resumePCinCurrentFrame();
RetAddrEntry& retAddrEntry =
const RetAddrEntry& retAddrEntry =
script->baselineScript()->retAddrEntryFromReturnAddress(retAddr);
if (!entries.append(DebugModeOSREntry(script, retAddrEntry))) {
return false;
@ -294,7 +294,7 @@ static void PatchBaselineFramesForDebugMode(
// For CallVM (case B) the assumption is that all callVMs which can
// trigger debug mode OSR are the *only* callVMs generated for their
// respective pc locations in the Baseline JIT code.
RetAddrEntry* retAddrEntry = nullptr;
const RetAddrEntry* retAddrEntry = nullptr;
switch (kind) {
case RetAddrEntry::Kind::IC:
case RetAddrEntry::Kind::CallVM:

90
js/src/jit/BaselineJIT.cpp
View File

@ -531,11 +531,6 @@ void JS::DeletePolicy<js::jit::BaselineScript>::operator()(
const_cast<BaselineScript*>(script));
}
RetAddrEntry& BaselineScript::retAddrEntry(size_t index) {
MOZ_ASSERT(index < numRetAddrEntries());
return retAddrEntryList()[index];
}
PCMappingIndexEntry& BaselineScript::pcMappingIndexEntry(size_t index) {
MOZ_ASSERT(index < numPCMappingIndexEntries());
return pcMappingIndexEntryList()[index];
@ -553,25 +548,15 @@ CompactBufferReader BaselineScript::pcMappingReader(size_t indexEntry) {
return CompactBufferReader(dataStart, dataEnd);
}
struct RetAddrEntries {
BaselineScript* const baseline_;
explicit RetAddrEntries(BaselineScript* baseline) : baseline_(baseline) {}
size_t numEntries() const { return baseline_->numRetAddrEntries(); }
RetAddrEntry& operator[](size_t index) const {
return baseline_->retAddrEntry(index);
}
};
RetAddrEntry& BaselineScript::retAddrEntryFromReturnOffset(
const RetAddrEntry& BaselineScript::retAddrEntryFromReturnOffset(
CodeOffset returnOffset) {
mozilla::Span<RetAddrEntry> entries = retAddrEntries();
size_t loc;
#ifdef DEBUG
bool found =
#endif
BinarySearchIf(
RetAddrEntries(this), 0, numRetAddrEntries(),
entries.data(), 0, entries.size(),
[&returnOffset](const RetAddrEntry& entry) {
size_t roffset = returnOffset.offset();
size_t entryRoffset = entry.returnOffset().offset();
@ -586,16 +571,14 @@ RetAddrEntry& BaselineScript::retAddrEntryFromReturnOffset(
&loc);
MOZ_ASSERT(found);
MOZ_ASSERT(loc < numRetAddrEntries());
MOZ_ASSERT(retAddrEntry(loc).returnOffset().offset() ==
returnOffset.offset());
return retAddrEntry(loc);
MOZ_ASSERT(entries[loc].returnOffset().offset() == returnOffset.offset());
return entries[loc];
}
static bool ComputeBinarySearchMid(RetAddrEntries entries, uint32_t pcOffset,
size_t* loc) {
static bool ComputeBinarySearchMid(mozilla::Span<RetAddrEntry> entries,
uint32_t pcOffset, size_t* loc) {
return BinarySearchIf(
entries, 0, entries.numEntries(),
entries.data(), 0, entries.size(),
[pcOffset](const RetAddrEntry& entry) {
uint32_t entryOffset = entry.pcOffset();
if (pcOffset < entryOffset) {
@ -613,31 +596,32 @@ uint8_t* BaselineScript::returnAddressForEntry(const RetAddrEntry& ent) {
return method()->raw() + ent.returnOffset().offset();
}
RetAddrEntry& BaselineScript::retAddrEntryFromPCOffset(
const RetAddrEntry& BaselineScript::retAddrEntryFromPCOffset(
uint32_t pcOffset, RetAddrEntry::Kind kind) {
mozilla::Span<RetAddrEntry> entries = retAddrEntries();
size_t mid;
MOZ_ALWAYS_TRUE(ComputeBinarySearchMid(RetAddrEntries(this), pcOffset, &mid));
MOZ_ASSERT(mid < numRetAddrEntries());
MOZ_ALWAYS_TRUE(ComputeBinarySearchMid(entries, pcOffset, &mid));
MOZ_ASSERT(mid < entries.size());
// Search for the first entry for this pc.
size_t first = mid;
while (first > 0 && retAddrEntry(first - 1).pcOffset() == pcOffset) {
while (first > 0 && entries[first - 1].pcOffset() == pcOffset) {
first--;
}
// Search for the last entry for this pc.
size_t last = mid;
while (last + 1 < numRetAddrEntries() &&
retAddrEntry(last + 1).pcOffset() == pcOffset) {
while (last + 1 < entries.size() &&
entries[last + 1].pcOffset() == pcOffset) {
last++;
}
MOZ_ASSERT(first <= last);
MOZ_ASSERT(retAddrEntry(first).pcOffset() == pcOffset);
MOZ_ASSERT(retAddrEntry(last).pcOffset() == pcOffset);
MOZ_ASSERT(entries[first].pcOffset() == pcOffset);
MOZ_ASSERT(entries[last].pcOffset() == pcOffset);
for (size_t i = first; i <= last; i++) {
RetAddrEntry& entry = retAddrEntry(i);
const RetAddrEntry& entry = entries[i];
if (entry.kind() != kind) {
continue;
}
@ -646,7 +630,7 @@ RetAddrEntry& BaselineScript::retAddrEntryFromPCOffset(
// There must be a unique entry for this pcOffset and Kind to ensure our
// return value is well-defined.
for (size_t j = i + 1; j <= last; j++) {
MOZ_ASSERT(retAddrEntry(j).kind() != kind);
MOZ_ASSERT(entries[j].kind() != kind);
}
#endif
@ -656,24 +640,25 @@ RetAddrEntry& BaselineScript::retAddrEntryFromPCOffset(
MOZ_CRASH("Didn't find RetAddrEntry.");
}
RetAddrEntry& BaselineScript::prologueRetAddrEntry(RetAddrEntry::Kind kind) {
const RetAddrEntry& BaselineScript::prologueRetAddrEntry(
RetAddrEntry::Kind kind) {
MOZ_ASSERT(kind == RetAddrEntry::Kind::StackCheck ||
kind == RetAddrEntry::Kind::WarmupCounter);
// The prologue entries will always be at a very low offset, so just do a
// linear search from the beginning.
for (size_t i = 0; i < numRetAddrEntries(); i++) {
if (retAddrEntry(i).pcOffset() != 0) {
for (const RetAddrEntry& entry : retAddrEntries()) {
if (entry.pcOffset() != 0) {
break;
}
if (retAddrEntry(i).kind() == kind) {
return retAddrEntry(i);
if (entry.kind() == kind) {
return entry;
}
}
MOZ_CRASH("Didn't find prologue RetAddrEntry.");
}
RetAddrEntry& BaselineScript::retAddrEntryFromReturnAddress(
const RetAddrEntry& BaselineScript::retAddrEntryFromReturnAddress(
uint8_t* returnAddr) {
MOZ_ASSERT(returnAddr > method_->raw());
MOZ_ASSERT(returnAddr < method_->raw() + method_->instructionsSize());
@ -699,11 +684,8 @@ void BaselineScript::computeResumeNativeOffsets(JSScript* script) {
computeNative);
}
void BaselineScript::copyRetAddrEntries(JSScript* script,
const RetAddrEntry* entries) {
for (uint32_t i = 0; i < numRetAddrEntries(); i++) {
retAddrEntry(i) = entries[i];
}
void BaselineScript::copyRetAddrEntries(const RetAddrEntry* entries) {
std::copy_n(entries, retAddrEntries().size(), retAddrEntries().data());
}
void BaselineScript::copyPCMappingEntries(const CompactBufferWriter& entries) {
@ -874,17 +856,19 @@ void BaselineScript::initTraceLogger(JSScript* script,
traceLoggerEngineEnabled_ = TraceLogTextIdEnabled(TraceLogger_Engine);
# endif
MOZ_ASSERT(offsets.length() == numTraceLoggerToggleOffsets_);
mozilla::Span<uint32_t> scriptOffsets = traceLoggerToggleOffsets();
MOZ_ASSERT(offsets.length() == scriptOffsets.size());
for (size_t i = 0; i < offsets.length(); i++) {
traceLoggerToggleOffsets()[i] = offsets[i].offset();
scriptOffsets[i] = offsets[i].offset();
}
if (TraceLogTextIdEnabled(TraceLogger_Engine) ||
TraceLogTextIdEnabled(TraceLogger_Scripts)) {
traceLoggerScriptEvent_ = TraceLoggerEvent(TraceLogger_Scripts, script);
for (size_t i = 0; i < numTraceLoggerToggleOffsets_; i++) {
CodeLocationLabel label(method_,
CodeOffset(traceLoggerToggleOffsets()[i]));
for (uint32_t offset : scriptOffsets) {
CodeLocationLabel label(method_, CodeOffset(offset));
Assembler::ToggleToCmp(label);
}
}
@ -904,8 +888,8 @@ void BaselineScript::toggleTraceLoggerScripts(JSScript* script, bool enable) {
AutoWritableJitCode awjc(method());
// Enable/Disable the traceLogger.
for (size_t i = 0; i < numTraceLoggerToggleOffsets_; i++) {
CodeLocationLabel label(method_, CodeOffset(traceLoggerToggleOffsets()[i]));
for (uint32_t offset : traceLoggerToggleOffsets()) {
CodeLocationLabel label(method_, CodeOffset(offset));
if (enable) {
Assembler::ToggleToCmp(label);
} else {

57
js/src/jit/BaselineJIT.h
View File

@ -9,6 +9,7 @@
#include "mozilla/Maybe.h"
#include "mozilla/MemoryReporting.h"
#include "mozilla/Span.h"
#include "ds/LifoAlloc.h"
#include "jit/Bailouts.h"
@ -268,6 +269,34 @@ struct BaselineScript final {
profilerEnterToggleOffset_(profilerEnterToggleOffset),
profilerExitToggleOffset_(profilerExitToggleOffset) {}
// Translate an offset into a concrete pointer.
template <typename T>
T* offsetToPointer(size_t offset) const {
uintptr_t base = reinterpret_cast<uintptr_t>(this);
uintptr_t elem = base + offset;
return reinterpret_cast<T*>(elem);
}
mozilla::Span<RetAddrEntry> retAddrEntries() const {
return mozilla::MakeSpan(
offsetToPointer<RetAddrEntry>(retAddrEntriesOffset_), retAddrEntries_);
}
#ifdef JS_TRACE_LOGGING
mozilla::Span<uint32_t> traceLoggerToggleOffsets() const {
MOZ_ASSERT(traceLoggerToggleOffsetsOffset_);
return mozilla::MakeSpan(
offsetToPointer<uint32_t>(traceLoggerToggleOffsetsOffset_),
numTraceLoggerToggleOffsets_);
}
#endif
// Note: this doesn't return a Span<> because BaselineScript does not store
// the number of entries.
uint8_t** resumeEntryList() const {
return offsetToPointer<uint8_t*>(resumeEntriesOffset_);
}
public:
static BaselineScript* New(
JSScript* jsscript, uint32_t warmUpCheckPrologueOffset,
@ -296,13 +325,6 @@ struct BaselineScript final {
return method_->raw() + warmUpCheckPrologueOffset_;
}
RetAddrEntry* retAddrEntryList() {
return (RetAddrEntry*)(reinterpret_cast<uint8_t*>(this) +
retAddrEntriesOffset_);
}
uint8_t** resumeEntryList() {
return (uint8_t**)(reinterpret_cast<uint8_t*>(this) + resumeEntriesOffset_);
}
PCMappingIndexEntry* pcMappingIndexEntryList() {
return (PCMappingIndexEntry*)(reinterpret_cast<uint8_t*>(this) +
pcMappingIndexOffset_);
@ -324,16 +346,13 @@ struct BaselineScript final {
uint8_t* returnAddressForEntry(const RetAddrEntry& ent);
RetAddrEntry& retAddrEntry(size_t index);
RetAddrEntry& retAddrEntryFromPCOffset(uint32_t pcOffset,
RetAddrEntry::Kind kind);
RetAddrEntry& prologueRetAddrEntry(RetAddrEntry::Kind kind);
RetAddrEntry& retAddrEntryFromReturnOffset(CodeOffset returnOffset);
RetAddrEntry& retAddrEntryFromReturnAddress(uint8_t* returnAddr);
const RetAddrEntry& retAddrEntryFromPCOffset(uint32_t pcOffset,
RetAddrEntry::Kind kind);
const RetAddrEntry& prologueRetAddrEntry(RetAddrEntry::Kind kind);
const RetAddrEntry& retAddrEntryFromReturnOffset(CodeOffset returnOffset);
const RetAddrEntry& retAddrEntryFromReturnAddress(uint8_t* returnAddr);
size_t numRetAddrEntries() const { return retAddrEntries_; }
void copyRetAddrEntries(JSScript* script, const RetAddrEntry* entries);
void copyRetAddrEntries(const RetAddrEntry* entries);
// Copy resumeOffsets list from |script| and convert the pcOffsets
// to native addresses in the Baseline code.
@ -382,12 +401,6 @@ struct BaselineScript final {
static size_t offsetOfTraceLoggerScriptEvent() {
return offsetof(BaselineScript, traceLoggerScriptEvent_);
}
uint32_t* traceLoggerToggleOffsets() {
MOZ_ASSERT(traceLoggerToggleOffsetsOffset_);
return reinterpret_cast<uint32_t*>(reinterpret_cast<uint8_t*>(this) +
traceLoggerToggleOffsetsOffset_);
}
#endif
static size_t offsetOfResumeEntriesOffset() {

2
js/src/jit/JSJitFrameIter.cpp
View File

@ -132,7 +132,7 @@ void JSJitFrameIter::baselineScriptAndPc(JSScript** scriptRes,
// There must be a BaselineScript with a RetAddrEntry for the current return
// address.
uint8_t* retAddr = resumePCinCurrentFrame();
RetAddrEntry& entry =
const RetAddrEntry& entry =
script->baselineScript()->retAddrEntryFromReturnAddress(retAddr);
*pcRes = entry.pc(script);
}