Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reduce repetitive logging in B3 disassembly #15114

Merged
merged 1 commit into from
Jun 20, 2023
Merged

Reduce repetitive logging in B3 disassembly #15114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion Source/JavaScriptCore/ftl/FTLState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,12 @@ void State::dumpDisassembly(PrintStream& out, const ScopedLambda<void(DFG::Node*
printedValues.add(value);
};

B3::Value* prevOrigin = nullptr;
auto forEachInst = scopedLambda<void(B3::Air::Inst&)>([&] (B3::Air::Inst& inst) {
printB3Value(inst.origin);
if (inst.origin != prevOrigin) {
printB3Value(inst.origin);
prevOrigin = inst.origin;
}
});

disassembler->dump(proc->code(), out, linkBuffer, airPrefix, asmPrefix, forEachInst);
Expand Down
4 changes: 3 additions & 1 deletion Source/JavaScriptCore/wasm/WasmBBQPlan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,15 @@ bool BBQPlan::dumpDisassembly(CompilationContext& context, LinkBuffer& linkBuffe
const char* airPrefix = "Air ";
const char* asmPrefix = "asm ";

B3::Value* prevOrigin = nullptr;
auto forEachInst = scopedLambda<void(B3::Air::Inst&)>([&] (B3::Air::Inst& inst) {
if (inst.origin && context.procedure->code().shouldPreserveB3Origins()) {
if (inst.origin && inst.origin != prevOrigin && context.procedure->code().shouldPreserveB3Origins()) {
if (String string = inst.origin->compilerConstructionSite(); !string.isNull())
dataLogLn("\033[1;37m", string, "\033[0m");
dataLog(b3Prefix);
inst.origin->deepDump(context.procedure.get(), WTF::dataFile());
dataLogLn();
prevOrigin = inst.origin;
}
});

Expand Down
4 changes: 3 additions & 1 deletion Source/JavaScriptCore/wasm/WasmOMGPlan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,15 @@ void OMGPlan::dumpDisassembly(CompilationContext& context, LinkBuffer& linkBuffe
const char* airPrefix = "Air ";
const char* asmPrefix = "asm ";

B3::Value* prevOrigin = nullptr;
auto forEachInst = scopedLambda<void(B3::Air::Inst&)>([&] (B3::Air::Inst& inst) {
if (inst.origin && context.procedure->code().shouldPreserveB3Origins()) {
if (inst.origin && inst.origin != prevOrigin && context.procedure->code().shouldPreserveB3Origins()) {
if (String string = inst.origin->compilerConstructionSite(); !string.isNull())
dataLogLn("\033[1;37m", string, "\033[0m");
dataLog(b3Prefix);
inst.origin->deepDump(context.procedure.get(), WTF::dataFile());
dataLogLn();
prevOrigin = inst.origin;
}
});

Expand Down
4 changes: 3 additions & 1 deletion Source/JavaScriptCore/wasm/WasmOSREntryPlan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,15 @@ void OSREntryPlan::dumpDisassembly(CompilationContext& context, LinkBuffer& link
const char* airPrefix = "Air ";
const char* asmPrefix = "asm ";

B3::Value* prevOrigin = nullptr;
auto forEachInst = scopedLambda<void(B3::Air::Inst&)>([&] (B3::Air::Inst& inst) {
if (inst.origin && context.procedure->code().shouldPreserveB3Origins()) {
if (inst.origin && inst.origin != prevOrigin && context.procedure->code().shouldPreserveB3Origins()) {
if (String string = inst.origin->compilerConstructionSite(); !string.isNull())
dataLogLn("\033[1;37m", string, "\033[0m");
dataLog(b3Prefix);
inst.origin->deepDump(context.procedure.get(), WTF::dataFile());
dataLogLn();
prevOrigin = inst.origin;
}
});

Expand Down