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

[wasm] Fix long branches in jiterpreter #106030

Merged
merged 4 commits into from
Aug 7, 2024
Merged

[wasm] Fix long branches in jiterpreter #106030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85e05aa
Can't build locally, so let's see if this works. Who knows
kg Aug 6, 2024
7b5b0c7
Fix long branches with immediates
kg Aug 6, 2024
6e23591
Add comment
kg Aug 6, 2024
f80726d
Fix handling of unsigned branch immediates
kg Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/mono/browser/runtime/jiterpreter-opcodes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export const enum MintOpArgType {
MintOpFloat,
MintOpDouble,
MintOpBranch,
MintOpShortBranch,
MintOpSwitch,
MintOpMethodToken,
MintOpFieldToken,
Expand Down
34 changes: 27 additions & 7 deletions src/mono/browser/runtime/jiterpreter-trace-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2752,6 +2752,21 @@ function append_call_handler_store_ret_ip (
builder.callHandlerReturnAddresses.push(retIp);
}

function getBranchImmediate (
ip: MintOpcodePtr, opcode: MintOpcode
): number | undefined {
const opArgType = cwraps.mono_jiterp_get_opcode_info(opcode, OpcodeInfoType.OpArgType),
payloadOffset = cwraps.mono_jiterp_get_opcode_info(opcode, OpcodeInfoType.Sregs),
payloadAddress = <any>ip + 2 + (payloadOffset * 2);

switch (opArgType) {
case MintOpArgType.MintOpShortAndBranch:
return getI16(payloadAddress);
default:
return undefined;
}
}

function getBranchDisplacement (
ip: MintOpcodePtr, opcode: MintOpcode
): number | undefined {
Expand Down Expand Up @@ -2785,8 +2800,10 @@ function emit_branch (
(opcode <= MintOpcode.MINT_BLT_UN_I8_IMM_SP);

const displacement = getBranchDisplacement(ip, opcode);
if (typeof (displacement) !== "number")
if (typeof (displacement) !== "number") {
// mono_log_info(`Failed to decode branch displacement for ${getOpcodeName(opcode)}`);
return false;
}

// If the branch is taken we bail out to allow the interpreter to do it.
// So for brtrue, we want to do 'cond == 0' to produce a bailout only
Expand Down Expand Up @@ -2874,9 +2891,6 @@ function emit_branch (
if (relopbranchTable[opcode] === undefined)
throw new Error(`Unsupported relop branch opcode: ${getOpcodeName(opcode)}`);

if (cwraps.mono_jiterp_get_opcode_info(opcode, OpcodeInfoType.Length) !== 4)
throw new Error(`Unsupported long branch opcode: ${getOpcodeName(opcode)}`);

break;
}
}
Expand Down Expand Up @@ -2920,8 +2934,10 @@ function emit_relop_branch (
frame: NativePointer, opcode: MintOpcode
): boolean {
const relopBranchInfo = relopbranchTable[opcode];
if (!relopBranchInfo)
if (!relopBranchInfo) {
// mono_log_info(`No info for relop branch ${getOpcodeName(opcode)}`);
return false;
}

const relop = Array.isArray(relopBranchInfo)
? relopBranchInfo[0]
Expand All @@ -2930,8 +2946,10 @@ function emit_relop_branch (
const relopInfo = binopTable[relop];
const intrinsicFpBinop = intrinsicFpBinops[relop];

if (!relopInfo && !intrinsicFpBinop)
if (!relopInfo && !intrinsicFpBinop) {
// mono_log_info(`No info for relop ${getOpcodeName(opcode)} -> ${getOpcodeName(relop)}`);
return false;
}

const operandLoadOp = relopInfo
? relopInfo[1]
Expand All @@ -2948,11 +2966,13 @@ function emit_relop_branch (

// Compare with immediate
if (Array.isArray(relopBranchInfo) && relopBranchInfo[1]) {
const immediate = getBranchImmediate(ip, opcode);
mono_assert(immediate !== undefined, `Failed to decode immediate for branch opcode ${getOpcodeName(opcode)}`);
// For i8 immediates we need to generate an i64.const even though
// the immediate is 16 bits, so we store the relevant opcode
// in the relop branch info table
builder.appendU8(relopBranchInfo[1]);
builder.appendLeb(getArgI16(ip, 2));
builder.appendLeb(immediate);
} else
append_ldloc(builder, getArgU16(ip, 2), operandLoadOp);

Expand Down
Loading