Skip to content

Deduplicate VM constants #712

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

Open
triallax wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Deduplicate VM constants #712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 32 additions & 21 deletions numbat/src/bytecode_interpreter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl BytecodeInterpreter {
fn compile_expression(&mut self, expr: &Expression) -> Result<()> {
match expr {
Expression::Scalar(_span, n, _type) => {
let index = self.vm.add_constant(Constant::Scalar(n.to_f64()));
let index = self.vm.add_constant(Constant::Scalar(n.to_f64()), true);
self.vm.add_op1(Op::LoadConstant, index);
}
Expression::Identifier(_span, identifier, _type) => {
Expand All @@ -72,13 +72,14 @@ impl BytecodeInterpreter {
} else if LAST_RESULT_IDENTIFIERS.contains(identifier) {
self.vm.add_op(Op::GetLastResult);
} else if let Some(is_foreign) = self.functions.get(*identifier) {
let index = self
.vm
.add_constant(Constant::FunctionReference(if *is_foreign {
let index = self.vm.add_constant(
Constant::FunctionReference(if *is_foreign {
FunctionReference::Foreign(identifier.to_compact_string())
} else {
FunctionReference::Normal(identifier.to_compact_string())
}));
}),
true,
);
self.vm.add_op1(Op::LoadConstant, index);
} else {
unreachable!("Unknown identifier '{identifier}'")
Expand Down Expand Up @@ -214,14 +215,14 @@ impl BytecodeInterpreter {
self.vm.add_op1(Op::CallCallable, args.len() as u16);
}
Expression::Boolean(_, val) => {
let index = self.vm.add_constant(Constant::Boolean(*val));
let index = self.vm.add_constant(Constant::Boolean(*val), true);
self.vm.add_op1(Op::LoadConstant, index);
}
Expression::String(_, string_parts) => {
for part in string_parts {
match part {
StringPart::Fixed(s) => {
let index = self.vm.add_constant(Constant::String(s.clone()));
let index = self.vm.add_constant(Constant::String(s.clone()), true);
self.vm.add_op1(Op::LoadConstant, index)
}
StringPart::Interpolation {
Expand All @@ -230,9 +231,12 @@ impl BytecodeInterpreter {
format_specifiers,
} => {
self.compile_expression(expr)?;
let index = self.vm.add_constant(Constant::FormatSpecifiers(
format_specifiers.map(|s| s.to_compact_string()),
));
let index = self.vm.add_constant(
Constant::FormatSpecifiers(
format_specifiers.map(|s| s.to_compact_string()),
),
true,
);
self.vm.add_op1(Op::LoadConstant, index)
}
}
Expand Down Expand Up @@ -400,10 +404,14 @@ impl BytecodeInterpreter {
)
.map_err(RuntimeError::UnitRegistryError)?;

let constant_idx = self.vm.add_constant(Constant::Unit(Unit::new_base(
unit_name.to_compact_string(),
crate::decorator::get_canonical_unit_name(unit_name, &decorators[..]),
)));
let constant_idx = self.vm.add_constant(
Constant::Unit(Unit::new_base(
unit_name.to_compact_string(),
crate::decorator::get_canonical_unit_name(unit_name, &decorators[..]),
)),
// already unique
false,
);
for (name, _) in decorator::name_and_aliases(unit_name, decorators) {
self.unit_name_to_constant_index
.insert(name.into(), constant_idx);
Expand All @@ -421,13 +429,16 @@ impl BytecodeInterpreter {
.map(|(name, ap)| (name.to_compact_string(), ap))
.collect();

let constant_idx = self.vm.add_constant(Constant::Unit(Unit::new_base(
CompactString::const_new("<dummy>"),
CanonicalName {
name: CompactString::const_new("<dummy>"),
accepts_prefix: AcceptsPrefix::both(),
},
))); // TODO: dummy is just a temp. value until the SetUnitConstant op runs
let constant_idx = self.vm.add_constant(
Constant::Unit(Unit::new_base(
CompactString::const_new("<dummy>"),
CanonicalName {
name: CompactString::const_new("<dummy>"),
accepts_prefix: AcceptsPrefix::both(),
},
)),
false,
); // TODO: dummy is just a temp. value until the SetUnitConstant op runs
let unit_information_idx = self.vm.add_unit_information(
unit_name,
Some(
Expand Down
14 changes: 10 additions & 4 deletions numbat/src/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ impl Op {
}
}

#[derive(Clone, Debug)]
#[derive(Clone, Debug, PartialEq)]
pub enum Constant {
Scalar(f64),
Unit(Unit),
Expand Down Expand Up @@ -391,7 +391,13 @@ impl Vm {
chunk[offset + 1] = ((arg >> 8) & 0xff) as u8;
}

pub fn add_constant(&mut self, constant: Constant) -> u16 {
pub fn add_constant(&mut self, constant: Constant, dedupe: bool) -> u16 {
if dedupe {
if let Some(idx) = self.constants.iter().position(|c| *c == constant) {
return idx as u16;
}
}

self.constants.push(constant);
assert!(self.constants.len() <= u16::MAX as usize);
(self.constants.len() - 1) as u16 // TODO: this can overflow, see above
Expand Down Expand Up @@ -1098,8 +1104,8 @@ impl Vm {
#[test]
fn vm_basic() {
let mut vm = Vm::new();
vm.add_constant(Constant::Scalar(42.0));
vm.add_constant(Constant::Scalar(1.0));
vm.add_constant(Constant::Scalar(42.0), true);
vm.add_constant(Constant::Scalar(1.0), true);

vm.add_op1(Op::LoadConstant, 0);
vm.add_op1(Op::LoadConstant, 1);
Expand Down