CodeBlock::m_instructionCount is wrong

• Component: JavaScriptCore
• Status: RESOLVED FIXED

[Saam Barati]

The calculation gets op_wide wrong.

[Saam Barati]

Created attachment 368605 [details]
patch

[Yusuke Suzuki]

Comment on attachment 368605 [details]
patch

r=me. Let's watch the bots, and adjust threshold later if needed!

[Saam Barati]

Created attachment 368623 [details]
patch

[Yusuke Suzuki]

Comment on attachment 368623 [details]
patch

View in context: https://bugs.webkit.org/attachment.cgi?id=368623&action=review

r=me

> Source/JavaScriptCore/dfg/DFGDisassembler.cpp:77
> +    out.print("Generated DFG JIT code for ", CodeBlockWithJITType(m_graph.m_codeBlock, JITType::DFGJIT), ", instruction count = ", m_graph.m_codeBlock->instructionsSize(), ":\n");

It would be nice if we can consistently use `instructions size` instead of `instruction count` in the log too.

> Source/JavaScriptCore/dfg/DFGDriver.cpp:88
> +        dataLog("DFG(Driver) compiling ", *codeBlock, " with ", mode, ", number of instructions = ", codeBlock->instructionsSize(), "\n");

Ditto.

> Source/JavaScriptCore/dfg/DFGPlan.cpp:187
> +        dataLog("DFG(Plan) compiling ", *m_codeBlock, " with ", m_mode, ", number of instructions = ", m_codeBlock->instructionsSize(), "\n");

Ditto.

> Source/JavaScriptCore/ftl/FTLCompile.cpp:171
> +        out.print("Generated ", state.graph.m_plan.mode(), " code for ", CodeBlockWithJITType(state.graph.m_codeBlock, JITType::FTLJIT), ", instruction count = ", state.graph.m_codeBlock->instructionsSize(), ":\n");

Ditto.

> Source/JavaScriptCore/ftl/FTLLink.cpp:74
> +            toCString("Generated FTL JIT code for ", CodeBlockWithJITType(codeBlock, JITType::FTLJIT), ", instruction count = ", graph.m_codeBlock->instructionsSize(), ":\n"));

Ditto.

> Source/JavaScriptCore/jit/JIT.cpp:908
>      m_vm->machineCodeBytesPerBytecodeWordForBaselineJIT->add(

I think `machineCodeBytesPerBytecodeWordForBaselineJIT` name becomes wrong now.

> Source/JavaScriptCore/jit/JITDisassembler.cpp:92
> +    out.print("Generated Baseline JIT code for ", CodeBlockWithJITType(m_codeBlock, JITType::BaselineJIT), ", instruction count = ", m_codeBlock->instructionsSize(), "\n");

Ditto.

> Source/JavaScriptCore/profiler/ProfilerBytecodes.cpp:43
> +    , m_instructionCount(codeBlock->instructionsSize())

Should we rename this to `m_instructionsSize` too?

[Saam Barati]

landed in:
https://trac.webkit.org/changeset/244811/webkit

[Radar WebKit Bug Importer]

<rdar://problem/50355305>

[Saam Barati]

Comment on attachment 368623 [details]
patch

Thanks for the review. I made you suggested changes except renaming m_instructionCount in the profiler. For that, if we rename it, we should also go through with changing the name throughout the ruby tool