-
Notifications
You must be signed in to change notification settings - Fork 204
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: unknown slice lengths coming from as_slice (#4725)
# Description ## Problem\* Resolves #4722 ## Summary\* ## Additional Context ## Documentation\* Check one: - [x] No documentation needed. - [ ] Documentation included in this PR. - [ ] **[For Experimental Features]** Documentation to be submitted in a separate PR. # PR Checklist\* - [ ] I have tested the changes locally. - [ ] I have formatted the changes with [Prettier](https://prettier.io/) and/or `cargo fmt` on default settings. --------- Co-authored-by: Tom French <[email protected]>
- Loading branch information
1 parent
59fb832
commit f21129e
Showing
7 changed files
with
115 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
use crate::ssa::{ | ||
ir::{ | ||
function::Function, | ||
instruction::{Instruction, InstructionId, Intrinsic}, | ||
types::Type, | ||
value::Value, | ||
}, | ||
ssa_gen::Ssa, | ||
}; | ||
use fxhash::FxHashMap as HashMap; | ||
|
||
impl Ssa { | ||
/// A simple SSA pass to find any calls to `Intrinsic::AsSlice` and replacing any references to the length of the | ||
/// resulting slice with the length of the array from which it was generated. | ||
/// | ||
/// This allows the length of a slice generated from an array to be used in locations where a constant value is | ||
/// necessary when the value of the array is unknown. | ||
/// | ||
/// Note that this pass must be placed before loop unrolling to be useful. | ||
#[tracing::instrument(level = "trace", skip(self))] | ||
pub(crate) fn as_slice_optimization(mut self) -> Self { | ||
for func in self.functions.values_mut() { | ||
let known_slice_lengths = known_slice_lengths(func); | ||
replace_known_slice_lengths(func, known_slice_lengths); | ||
} | ||
self | ||
} | ||
} | ||
|
||
fn known_slice_lengths(func: &Function) -> HashMap<InstructionId, usize> { | ||
let mut known_slice_lengths = HashMap::default(); | ||
for block_id in func.reachable_blocks() { | ||
let block = &func.dfg[block_id]; | ||
for instruction_id in block.instructions() { | ||
let (target_func, arguments) = match &func.dfg[*instruction_id] { | ||
Instruction::Call { func, arguments } => (func, arguments), | ||
_ => continue, | ||
}; | ||
|
||
match &func.dfg[*target_func] { | ||
Value::Intrinsic(Intrinsic::AsSlice) => { | ||
let array_typ = func.dfg.type_of_value(arguments[0]); | ||
if let Type::Array(_, length) = array_typ { | ||
known_slice_lengths.insert(*instruction_id, length); | ||
} else { | ||
unreachable!("AsSlice called with non-array {}", array_typ); | ||
} | ||
} | ||
_ => continue, | ||
}; | ||
} | ||
} | ||
known_slice_lengths | ||
} | ||
|
||
fn replace_known_slice_lengths( | ||
func: &mut Function, | ||
known_slice_lengths: HashMap<InstructionId, usize>, | ||
) { | ||
known_slice_lengths.into_iter().for_each(|(instruction_id, known_length)| { | ||
let call_returns = func.dfg.instruction_results(instruction_id); | ||
let original_slice_length = call_returns[0]; | ||
|
||
// We won't use the new id for the original unknown length. | ||
// This isn't strictly necessary as a new result will be defined the next time for which the instruction | ||
// is reinserted but this avoids leaving the program in an invalid state. | ||
func.dfg.replace_result(instruction_id, original_slice_length); | ||
let known_length = func.dfg.make_constant(known_length.into(), Type::length_type()); | ||
func.dfg.set_value_from_id(original_slice_length, known_length); | ||
}); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
test_programs/execution_success/array_to_slice_constant_length/Nargo.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
[package] | ||
name = "array_to_slice_constant_length" | ||
type = "bin" | ||
authors = [""] | ||
compiler_version = ">=0.26.0" | ||
|
||
[dependencies] |
1 change: 1 addition & 0 deletions
1
test_programs/execution_success/array_to_slice_constant_length/Prover.toml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
val = "42" |
10 changes: 10 additions & 0 deletions
10
test_programs/execution_success/array_to_slice_constant_length/src/main.nr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// Regression test for https://github.com/noir-lang/noir/issues/4722 | ||
|
||
unconstrained fn return_array(val: Field) -> [Field; 1] { | ||
[val; 1] | ||
} | ||
|
||
fn main(val: Field) { | ||
let array = return_array(val); | ||
assert_constant(array.as_slice().len()); | ||
} |