Visitar URL original
Bytecode oparg optimization by ShaharNaveh · Pull Request #7032 · RustPython/RustPython · GitHub
Skip to content

Bytecode oparg optimization #7032

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 19 commits into from
Feb 7, 2026
Merged

Bytecode oparg optimization #7032

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
deefe91
Generate optimized oparg enums
ShaharNaveh Feb 6, 2026
b7794a5
No need to match on 255
ShaharNaveh Feb 6, 2026
ebabd58
Remove `num_enum` crate from `compiler-core`
ShaharNaveh Feb 6, 2026
a8b581c
Update `Cargo.lock`
ShaharNaveh Feb 6, 2026
e48fdeb
macro fmt
ShaharNaveh Feb 6, 2026
badcd5f
Rename macro vars
ShaharNaveh Feb 6, 2026
56e23ef
Match without `,`
ShaharNaveh Feb 6, 2026
5f3eb51
Support alternative values
ShaharNaveh Feb 6, 2026
a371d16
Fix alternatives
ShaharNaveh Feb 6, 2026
1035006
Improve docs
ShaharNaveh Feb 6, 2026
14f3030
Add const assert
ShaharNaveh Feb 6, 2026
d2c98f0
Don't use `as u32`
ShaharNaveh Feb 6, 2026
e3b9efa
Merge remote-tracking branch 'upstream/main' into bytecode-oparg-opti…
ShaharNaveh Feb 6, 2026
4fcc241
Make only ComparisonOperator unoptimized
ShaharNaveh Feb 6, 2026
4a06d52
Fix test
ShaharNaveh Feb 6, 2026
2a9ef82
cleanup
ShaharNaveh Feb 6, 2026
71be956
Merge remote-tracking branch 'upstream/main' into bytecode-oparg-opti…
ShaharNaveh Feb 7, 2026
bb5677c
All opargs are optimized
ShaharNaveh Feb 7, 2026
9795123
Remove comment
ShaharNaveh Feb 7, 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
Next Next commit
Don't use as u32
  • Loading branch information
@ShaharNaveh
ShaharNaveh committed Feb 6, 2026
commit d2c98f0991015ba54803dca32a883bf197c53d80
12 changes: 6 additions & 6 deletions crates/codegen/src/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1175,7 +1175,7 @@ impl Compiler {
arg: OpArgMarker::marker(),
}
.into(),
arg: OpArg(bytecode::ResumeType::AtFuncStart as u32),
arg: OpArg(u32::from(bytecode::ResumeType::AtFuncStart)),
target: BlockIdx::NULL,
location,
end_location,
Expand Down Expand Up @@ -6555,9 +6555,9 @@ impl Compiler {
self,
Instruction::Resume {
arg: if is_await {
bytecode::ResumeType::AfterAwait as u32
u32::from(bytecode::ResumeType::AfterAwait)
} else {
bytecode::ResumeType::AfterYieldFrom as u32
u32::from(bytecode::ResumeType::AfterYieldFrom)
}
}
);
Expand Down Expand Up @@ -6710,7 +6710,7 @@ impl Compiler {
emit!(
self,
Instruction::Resume {
arg: bytecode::ResumeType::AfterYield as u32
arg: u32::from(bytecode::ResumeType::AfterYield)
}
);
}
Expand Down Expand Up @@ -6932,7 +6932,7 @@ impl Compiler {
emit!(
compiler,
Instruction::Resume {
arg: bytecode::ResumeType::AfterYield as u32
arg: u32::from(bytecode::ResumeType::AfterYield)
}
);
emit!(compiler, Instruction::PopTop);
Expand Down Expand Up @@ -8420,7 +8420,7 @@ impl Compiler {

// Emit BUILD_INTERPOLATION
// oparg encoding: (conversion << 2) | has_format_spec
let oparg = (conversion << 2) | (has_format_spec as u32);
let oparg = (conversion << 2) | u32::from(has_format_spec);
emit!(self, Instruction::BuildInterpolation { oparg });

*interp_count += 1;
Expand Down
4 changes: 2 additions & 2 deletions crates/compiler-core/src/bytecode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ bitflags! {
}
}

#[derive(Copy, Clone)]
#[repr(C)]
#[derive(Copy, Clone, Debug)]
pub struct CodeUnit {
pub op: Instruction,
pub arg: OpArgByte,
Expand All @@ -330,7 +330,7 @@ impl TryFrom<&[u8]> for CodeUnit {
}
}

#[derive(Clone)]
#[derive(Clone, Debug)]
pub struct CodeUnits(Box<[CodeUnit]>);

impl TryFrom<&[u8]> for CodeUnits {
Expand Down
2 changes: 1 addition & 1 deletion crates/compiler-core/src/bytecode/oparg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ macro_rules! impl_oparg_enum {

impl OpArgType for $name {}

const _: () = assert!(::core::mem::size_of::<$name>() == ::core::mem::size_of::<u8>());
// const _: () = assert!(::core::mem::size_of::<$name>() == ::core::mem::size_of::<u8>());
};
}

Expand Down