Skip to content

Specialized ops #7322

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

Merged
youknowone merged 12 commits into from
Mar 4, 2026
Merged

Specialized ops #7322

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e77bb5a
Add CALL_ALLOC_AND_ENTER_INIT specialization
youknowone Mar 2, 2026
4ab342d
Invalidate JIT cache when __code__ is reassigned
youknowone Mar 3, 2026
5e9ec26
Atomic operations for specialization cache
youknowone Mar 3, 2026
c9a40ce
Fix slot wrapper override for inherited attributes
youknowone Mar 3, 2026
2bd0d10
Fix StoreAttrSlot cache overflow corrupting next instruction
youknowone Mar 3, 2026
7bd5300
Exclude method_descriptor from has_python_cmp check
youknowone Mar 3, 2026
5c81306
Fix CompareOpFloat NaN handling
youknowone Mar 3, 2026
5a1b29b
Fix invoke_exact_args borrow in CallAllocAndEnterInit
youknowone Mar 3, 2026
f99e95f
Distinguish Python method vs not-found in slot MRO lookup
youknowone Mar 3, 2026
8821456
Extract specialization helper functions to reduce boilerplate
youknowone Mar 3, 2026
dd89151
Improve specialization guards and fix mark_stacks
youknowone Mar 3, 2026
21c29ca
Auto-format: cargo fmt --all
github-actions[bot] Mar 4, 2026
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
Prev Previous commit
Auto-format: cargo fmt --all
  • Loading branch information
@github-actions
github-actions[bot] committed Mar 4, 2026
commit 21c29ca15bc1b8f43ff16a93cacc9ac43c81f31b
123 changes: 87 additions & 36 deletions crates/vm/src/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2891,7 +2891,9 @@ impl ExecutingFrame<'_> {
Ok(None)
} else {
self.deoptimize_at(
Instruction::LoadAttr { namei: Arg::marker() },
Instruction::LoadAttr {
namei: Arg::marker(),
},
instr_idx,
cache_base,
);
Expand All @@ -2918,7 +2920,9 @@ impl ExecutingFrame<'_> {
unsafe {
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr { namei: Arg::marker() },
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
Expand All @@ -2942,7 +2946,9 @@ impl ExecutingFrame<'_> {
}
}
self.deoptimize_at(
Instruction::LoadAttr { namei: Arg::marker() },
Instruction::LoadAttr {
namei: Arg::marker(),
},
instr_idx,
cache_base,
);
Expand Down Expand Up @@ -2970,7 +2976,9 @@ impl ExecutingFrame<'_> {
// Not in instance dict — fall through to class lookup via slow path
}
self.deoptimize_at(
Instruction::LoadAttr { namei: Arg::marker() },
Instruction::LoadAttr {
namei: Arg::marker(),
},
instr_idx,
cache_base,
);
Expand Down Expand Up @@ -3001,9 +3009,12 @@ impl ExecutingFrame<'_> {
}
// Deoptimize
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { namei: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -3032,9 +3043,12 @@ impl ExecutingFrame<'_> {
return Ok(None);
}
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { namei: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -3077,9 +3091,12 @@ impl ExecutingFrame<'_> {
return Ok(None);
}
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { namei: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -3110,9 +3127,12 @@ impl ExecutingFrame<'_> {
return Ok(None);
}
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { namei: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -3143,9 +3163,12 @@ impl ExecutingFrame<'_> {
// Slot is None → AttributeError (fall through to slow path)
}
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { namei: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -3175,9 +3198,12 @@ impl ExecutingFrame<'_> {
}
}
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::LoadAttr { namei: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::LoadAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand All @@ -3202,7 +3228,9 @@ impl ExecutingFrame<'_> {
return Ok(None);
}
self.deoptimize_at(
Instruction::StoreAttr { namei: Arg::marker() },
Instruction::StoreAttr {
namei: Arg::marker(),
},
instr_idx,
cache_base,
);
Expand All @@ -3228,9 +3256,12 @@ impl ExecutingFrame<'_> {
// Deoptimize
let attr_idx = u32::from(arg);
unsafe {
self.code
.instructions
.replace_op(instr_idx, Instruction::StoreAttr { namei: Arg::marker() });
self.code.instructions.replace_op(
instr_idx,
Instruction::StoreAttr {
namei: Arg::marker(),
},
);
self.code
.instructions
.write_adaptive_counter(cache_base, ADAPTIVE_BACKOFF_VALUE);
Expand Down Expand Up @@ -4230,7 +4261,9 @@ impl ExecutingFrame<'_> {
unsafe {
self.code.instructions.replace_op(
self.lasti() as usize - 1,
Instruction::LoadSuperAttr { namei: Arg::marker() },
Instruction::LoadSuperAttr {
namei: Arg::marker(),
},
);
let cache_base = self.lasti() as usize;
self.code
Expand Down Expand Up @@ -4308,7 +4341,9 @@ impl ExecutingFrame<'_> {
unsafe {
self.code.instructions.replace_op(
self.lasti() as usize - 1,
Instruction::LoadSuperAttr { namei: Arg::marker() },
Instruction::LoadSuperAttr {
namei: Arg::marker(),
},
);
let cache_base = self.lasti() as usize;
self.code
Expand All @@ -4332,7 +4367,9 @@ impl ExecutingFrame<'_> {
self.push_value(vm.ctx.new_bool(result).into());
Ok(None)
} else {
self.deoptimize(Instruction::CompareOp { opname: Arg::marker() });
self.deoptimize(Instruction::CompareOp {
opname: Arg::marker(),
});
let op = bytecode::ComparisonOperator::try_from(u32::from(arg))
.unwrap_or(bytecode::ComparisonOperator::Equal);
self.execute_compare(vm, op)
Expand All @@ -4357,7 +4394,9 @@ impl ExecutingFrame<'_> {
self.push_value(vm.ctx.new_bool(result).into());
Ok(None)
} else {
self.deoptimize(Instruction::CompareOp { opname: Arg::marker() });
self.deoptimize(Instruction::CompareOp {
opname: Arg::marker(),
});
let op = bytecode::ComparisonOperator::try_from(u32::from(arg))
.unwrap_or(bytecode::ComparisonOperator::Equal);
self.execute_compare(vm, op)
Expand All @@ -4377,7 +4416,9 @@ impl ExecutingFrame<'_> {
self.push_value(vm.ctx.new_bool(result).into());
Ok(None)
} else {
self.deoptimize(Instruction::CompareOp { opname: Arg::marker() });
self.deoptimize(Instruction::CompareOp {
opname: Arg::marker(),
});
let op = bytecode::ComparisonOperator::try_from(u32::from(arg))
.unwrap_or(bytecode::ComparisonOperator::Equal);
self.execute_compare(vm, op)
Expand Down Expand Up @@ -4491,7 +4532,9 @@ impl ExecutingFrame<'_> {
self.push_value(vm.ctx.new_bool(value).into());
Ok(None)
} else {
self.deoptimize(Instruction::ContainsOp { invert: Arg::marker() });
self.deoptimize(Instruction::ContainsOp {
invert: Arg::marker(),
});
let b = self.pop_value();
let a = self.pop_value();
let invert = bytecode::Invert::try_from(u32::from(arg) as u8)
Expand Down Expand Up @@ -4522,7 +4565,9 @@ impl ExecutingFrame<'_> {
self.push_value(vm.ctx.new_bool(value).into());
Ok(None)
} else {
self.deoptimize(Instruction::ContainsOp { invert: Arg::marker() });
self.deoptimize(Instruction::ContainsOp {
invert: Arg::marker(),
});
let b = self.pop_value();
let a = self.pop_value();
let invert = bytecode::Invert::try_from(u32::from(arg) as u8)
Expand Down Expand Up @@ -4686,7 +4731,9 @@ impl ExecutingFrame<'_> {
Ok(None)
} else {
// Name was removed from globals
self.deoptimize(Instruction::LoadGlobal { namei: Arg::marker() });
self.deoptimize(Instruction::LoadGlobal {
namei: Arg::marker(),
});
let x = self.load_global_or_builtin(name, vm)?;
self.push_value(x);
if (oparg & 1) != 0 {
Expand All @@ -4695,7 +4742,9 @@ impl ExecutingFrame<'_> {
Ok(None)
}
} else {
self.deoptimize(Instruction::LoadGlobal { namei: Arg::marker() });
self.deoptimize(Instruction::LoadGlobal {
namei: Arg::marker(),
});
let name = self.code.names[(oparg >> 1) as usize];
let x = self.load_global_or_builtin(name, vm)?;
self.push_value(x);
Expand Down Expand Up @@ -4731,7 +4780,9 @@ impl ExecutingFrame<'_> {
}
// Version mismatch or lookup failed — deoptimize
self.deoptimize_at(
Instruction::LoadGlobal { namei: Arg::marker() },
Instruction::LoadGlobal {
namei: Arg::marker(),
},
instr_idx,
cache_base,
);
Expand Down
Loading