Skip to content

fix: avoid duplicating constant arrays #5287

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
TomAFrench merged 2 commits into from
Jun 19, 2024
Merged

fix: avoid duplicating constant arrays #5287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34cffdb
avoid duplicating constant arrays
guipublic Jun 19, 2024
ee5bbf2
Merge branch 'master' into gd/dup_array
guipublic Jun 19, 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
18 changes: 13 additions & 5 deletions compiler/noirc_evaluator/src/ssa/ir/function_inserter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ pub(crate) struct FunctionInserter<'f> {
pub(crate) function: &'f mut Function,

values: HashMap<ValueId, ValueId>,
const_arrays: HashMap<im::Vector<ValueId>, ValueId>,
}

impl<'f> FunctionInserter<'f> {
pub(crate) fn new(function: &'f mut Function) -> FunctionInserter<'f> {
Self { function, values: HashMap::default() }
Self { function, values: HashMap::default(), const_arrays: HashMap::default() }
}

/// Resolves a ValueId to its new, updated value.
Expand All @@ -34,10 +35,17 @@ impl<'f> FunctionInserter<'f> {
super::value::Value::Array { array, typ } => {
let array = array.clone();
let typ = typ.clone();
let new_array = array.iter().map(|id| self.resolve(*id)).collect();
let new_id = self.function.dfg.make_array(new_array, typ);
self.values.insert(value, new_id);
new_id
let new_array: im::Vector<ValueId> =
array.iter().map(|id| self.resolve(*id)).collect();
if self.const_arrays.get(&new_array) == Some(&value) {
value
} else {
let new_array_clone = new_array.clone();
let new_id = self.function.dfg.make_array(new_array, typ);
self.values.insert(value, new_id);
self.const_arrays.insert(new_array_clone, new_id);
new_id
}
}
_ => value,
},
Expand Down