Wasm jiterpreter cleanup and bug fixes pt. 4 #79324
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,8 @@ import cwraps from "./cwraps"; | |
| import { | ||
| WasmValtype, WasmBuilder, addWasmFunctionPointer, | ||
| _now, elapsedTimes, counters, getRawCwrap, importDef, | ||
| getWasmFunctionTable, recordFailure, getOptions, | ||
| JiterpreterOptions, shortNameBase | ||
| } from "./jiterpreter-support"; | ||
|
|
||
| // Controls miscellaneous diagnostic output. | ||
|
|
@@ -45,6 +46,7 @@ let trampImports : Array<[string, string, Function]> | undefined; | |
| let fnTable : WebAssembly.Table; | ||
| let jitQueueTimeout = 0; | ||
| const jitQueue : TrampolineInfo[] = []; | ||
| const infoTable : { [ptr: number] : TrampolineInfo } = {}; | ||
|
|
||
| /* | ||
| const enum WasmReftype { | ||
|
|
@@ -81,6 +83,7 @@ class TrampolineInfo { | |
|
|
||
| defaultImplementation: number; | ||
| result: number; | ||
| hitCount: number; | ||
|
|
||
| constructor ( | ||
| imethod: number, method: MonoMethod, argumentCount: number, pParamTypes: NativePointer, | ||
|
|
@@ -112,9 +115,37 @@ class TrampolineInfo { | |
| subName = `${this.imethod.toString(16)}_${subName}`; | ||
| } | ||
| this.traceName = subName; | ||
| this.hitCount = 0; | ||
| } | ||
| } | ||
|
|
||
| let mostRecentOptions : JiterpreterOptions | undefined = undefined; | ||
|
|
||
| export function mono_interp_record_interp_entry (imethod: number) { | ||
| // clear the unbox bit | ||
| imethod = imethod & ~0x1; | ||
|
|
||
| const info = infoTable[imethod]; | ||
| // This shouldn't happen but it's not worth crashing over | ||
| if (!info) | ||
| return; | ||
|
|
||
| if (!mostRecentOptions) | ||
| mostRecentOptions = getOptions(); | ||
|
|
||
| info.hitCount++; | ||
| if (info.hitCount === mostRecentOptions!.interpEntryFlushThreshold) | ||
| flush_wasm_entry_trampoline_jit_queue(); | ||
| else if (info.hitCount !== mostRecentOptions!.interpEntryHitCount) | ||
| return; | ||
|
|
||
| jitQueue.push(info); | ||
| if (jitQueue.length >= maxJitQueueLength) | ||
| flush_wasm_entry_trampoline_jit_queue(); | ||
| else | ||
| ensure_jit_is_scheduled(); | ||
| } | ||
|
|
||
| // returns function pointer | ||
| export function mono_interp_jit_wasm_entry_trampoline ( | ||
| imethod: number, method: MonoMethod, argumentCount: number, pParamTypes: NativePointer, | ||
|
|
@@ -133,19 +164,15 @@ export function mono_interp_jit_wasm_entry_trampoline ( | |
| if (!fnTable) | ||
| fnTable = getWasmFunctionTable(); | ||
|
|
||
| // We start by creating a function pointer for this interp_entry trampoline, but instead of | ||
| // compiling it right away, we make it point to the default implementation for that signature | ||
| // This gives us time to wait before jitting it so we can jit multiple trampolines at once. | ||
| // Some entry wrappers are also only called a few dozen times, so it's valuable to wait | ||
| // until a wrapper is called a lot before wasting time/memory jitting it. | ||
| const defaultImplementationFn = fnTable.get(defaultImplementation); | ||
| info.result = addWasmFunctionPointer(defaultImplementationFn); | ||
|
|
||
| infoTable[imethod] = info; | ||
| return info.result; | ||
| } | ||
|
|
||
|
|
@@ -172,11 +199,14 @@ function flush_wasm_entry_trampoline_jit_queue () { | |
| if (jitQueue.length <= 0) | ||
| return; | ||
|
|
||
| // If the function signature contains types that need stackval_from_data, that'll use | ||
| // some constant slots, so make some extra space | ||
| const constantSlots = (4 * jitQueue.length) + 1; | ||
| let builder = trampBuilder; | ||
| if (!builder) | ||
| trampBuilder = builder = new WasmBuilder(constantSlots); | ||
| else | ||
| builder.clear(constantSlots); | ||
| const started = _now(); | ||
| let compileStarted = 0; | ||
| let rejected = true, threw = false; | ||
|
|
@@ -239,7 +269,7 @@ function flush_wasm_entry_trampoline_jit_queue () { | |
| // Emit function imports | ||
| for (let i = 0; i < trampImports.length; i++) { | ||
| mono_assert(trampImports[i], () => `trace #${i} missing`); | ||
| const wasmName = compress ? i.toString(shortNameBase) : undefined; | ||
| builder.defineImportedFunction("i", trampImports[i][0], trampImports[i][1], wasmName); | ||
| } | ||
|
|
||
|
|
@@ -275,6 +305,7 @@ function flush_wasm_entry_trampoline_jit_queue () { | |
| builder.beginFunction(info.traceName, { | ||
| "sp_args": WasmValtype.i32, | ||
| "need_unbox": WasmValtype.i32, | ||
| "scratchBuffer": WasmValtype.i32, | ||
| }); | ||
|
|
||
| const ok = generate_wasm_body(builder, info); | ||
|
|
@@ -293,16 +324,17 @@ function flush_wasm_entry_trampoline_jit_queue () { | |
| const traceModule = new WebAssembly.Module(buffer); | ||
|
|
||
| const imports : any = { | ||
| }; | ||
| // Place our function imports into the import dictionary | ||
| for (let i = 0; i < trampImports.length; i++) { | ||
| const wasmName = compress ? i.toString(36) : trampImports[i][0]; | ||
kg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| imports[wasmName] = trampImports[i][2]; | ||
| } | ||
|
|
||
| const traceInstance = new WebAssembly.Instance(traceModule, { | ||
| i: imports, | ||
| c: <any>builder.getConstants(), | ||
| m: { h: (<any>Module).asm.memory }, | ||
| }); | ||
|
|
||
| // Now that we've jitted the trampolines, go through and fix up the function pointers | ||
|
|
@@ -432,7 +464,7 @@ function append_stackval_from_data ( | |
|
|
||
| default: { | ||
| // Call stackval_from_data to copy the value and get its size | ||
| builder.ptr_const(type); | ||
| // result | ||
| builder.local("sp_args"); | ||
| // value | ||
|
|
@@ -454,6 +486,12 @@ function generate_wasm_body ( | |
| ) : boolean { | ||
| // FIXME: This is not thread-safe, but the alternative of alloca makes the trampoline | ||
| // more expensive | ||
| // The solution is likely to put the address of the scratch buffer in a global that we provide | ||
| // at module instantiation time, so each thread can malloc its own copy of the buffer | ||
| // and then pass it in when instantiating instead of compiling the constant into the module | ||
| // FIXME: Pre-allocate these buffers and their constant slots at the start before we | ||
|
There was a problem hiding this comment. it would have to be dealocated when the worker shuts down, otherwise it would leak memory long term. There was a problem hiding this comment. Is worker shutdown a common occurrence? There was a problem hiding this comment. @lambdageek could tell you more, but I think yes. |
||
| // generate function bodies, so that even if we run out of constant slots for MonoType we | ||
| // will always have put the buffers in a constant slot. This will be necessary for thread safety | ||
| const scratchBuffer = <any>Module._malloc(sizeOfJiterpEntryData); | ||
| _zero_region(scratchBuffer, sizeOfJiterpEntryData); | ||
|
|
||
|
|
@@ -479,7 +517,8 @@ function generate_wasm_body ( | |
| } | ||
|
|
||
| // Populate the scratch buffer containing call data | ||
| builder.ptr_const(scratchBuffer); | ||
| builder.local("scratchBuffer", WasmOpcode.tee_local); | ||
|
|
||
| builder.local("rmethod"); | ||
| // Clear the unbox-this-reference flag if present (see above) so that rmethod is a valid ptr | ||
|
|
@@ -492,7 +531,7 @@ function generate_wasm_body ( | |
|
|
||
| // prologue takes data->rmethod and initializes data->context, then returns a value for sp_args | ||
| // prologue also performs thread attach | ||
| builder.local("scratchBuffer"); | ||
| // prologue takes this_arg so it can handle delegates | ||
| if (info.hasThisReference) | ||
| builder.local("this_arg"); | ||
|
|
@@ -530,7 +569,7 @@ function generate_wasm_body ( | |
| append_stackval_from_data(builder, type, `arg${i}`); | ||
| } | ||
|
|
||
| builder.local("scratchBuffer"); | ||
| builder.local("sp_args"); | ||
| if (info.hasReturnValue) | ||
| builder.local("res"); | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will this call into js for every interp entry ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only until it gets jitted, I can move some of this tracking into C if necessary
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should have some kind of fastpath like if (jiterpreter_enabled) etc. Also, shouldn't this be in interp_entry () ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Putting it in the generic entry is bad since those never get jitted, no point. Will put in a fast path, good point