-
Notifications
You must be signed in to change notification settings - Fork 4
β‘ Bolt: [performance improvement] Optimize Value Display Allocations #54
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.
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| use criterion::{black_box, criterion_group, criterion_main, Criterion}; | ||
| use expression_engine::Value; | ||
|
|
||
| fn bench_display_value(c: &mut Criterion) { | ||
| let mut list = Vec::new(); | ||
| for i in 0..10 { | ||
| list.push(Value::from(i)); | ||
| } | ||
|
|
||
| let mut map = Vec::new(); | ||
| for i in 0..10 { | ||
| map.push((Value::from(format!("key{}", i)), Value::from(i))); | ||
| } | ||
|
|
||
| let val = Value::List(vec![ | ||
| Value::from("hello"), | ||
| Value::from(42), | ||
| Value::from(true), | ||
| Value::List(list), | ||
| Value::Map(map), | ||
| ]); | ||
|
|
||
| c.bench_function("display_value", |b| { | ||
| b.iter(|| format!("{}", black_box(&val))) | ||
| }); | ||
| } | ||
|
|
||
| criterion_group!(benches, bench_display_value); | ||
| criterion_main!(benches); | ||
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -13,29 +13,29 @@ pub enum Value { | |||||||||||||||||||||
| None, | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
| // Optimization: Write directly to `std::fmt::Formatter` instead of creating intermediate | ||||||||||||||||||||||
| // strings and calling `format!()` in a loop. | ||||||||||||||||||||||
| // Impact: Reduces heap allocations, avoiding O(N) allocations for Lists and Maps. | ||||||||||||||||||||||
| #[cfg(not(tarpaulin_include))] | ||||||||||||||||||||||
| impl fmt::Display for Value { | ||||||||||||||||||||||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | ||||||||||||||||||||||
| match self { | ||||||||||||||||||||||
| Self::String(val) => write!(f, "value string: {}", val.clone()), | ||||||||||||||||||||||
| Self::Number(val) => write!(f, "value number: {}", val.clone()), | ||||||||||||||||||||||
| Self::Bool(val) => write!(f, "value bool: {}", val.clone()), | ||||||||||||||||||||||
| Self::String(val) => write!(f, "value string: {}", val), | ||||||||||||||||||||||
| Self::Number(val) => write!(f, "value number: {}", val), | ||||||||||||||||||||||
| Self::Bool(val) => write!(f, "value bool: {}", val), | ||||||||||||||||||||||
| Self::List(values) => { | ||||||||||||||||||||||
| let mut s = String::from("["); | ||||||||||||||||||||||
| write!(f, "value list: [")?; | ||||||||||||||||||||||
| for value in values { | ||||||||||||||||||||||
| s.push_str(format!("{},", value.clone()).as_str()); | ||||||||||||||||||||||
| write!(f, "{},", value)?; | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
Comment on lines
28
to
30
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The current implementation adds a trailing comma for every element in the list, resulting in output like
Suggested change
|
||||||||||||||||||||||
| s.push_str("]"); | ||||||||||||||||||||||
| write!(f, "value list: {}", s) | ||||||||||||||||||||||
| write!(f, "]") | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
| Self::Map(m) => { | ||||||||||||||||||||||
| let mut s = String::from("{"); | ||||||||||||||||||||||
| write!(f, "value map: {{")?; | ||||||||||||||||||||||
| for (k, v) in m { | ||||||||||||||||||||||
| s.push_str(format!("key: {},", k.clone()).as_str()); | ||||||||||||||||||||||
| s.push_str(format!("value: {}; ", v.clone()).as_str()); | ||||||||||||||||||||||
| write!(f, "key: {},value: {}; ", k, v)?; | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
Comment on lines
35
to
37
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The current implementation adds a trailing semicolon and space for every entry in the map, resulting in output like for (i, (k, v)) in m.iter().enumerate() {
if i > 0 {
write!(f, "; ")?;
}
write!(f, "key: {},value: {}", k, v)?;
} |
||||||||||||||||||||||
| s.push_str("}"); | ||||||||||||||||||||||
| write!(f, "value map: {}", s) | ||||||||||||||||||||||
| write!(f, "}}") | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
| Self::None => write!(f, "None"), | ||||||||||||||||||||||
| } | ||||||||||||||||||||||
|
|
||||||||||||||||||||||
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.
This Criterion benchmark target likely won't compile/run under
cargo benchunless it is registered inCargo.tomlwithharness = false. Without an explicit[[bench]]entry, Cargo uses the default benchmark harness, which conflicts withcriterion_main!generating its ownmain(typically causing a duplicate/unknown main harness error). Add a[[bench]] name = "display_value"entry withharness = falseso the new benchmark works consistently.