-
Notifications
You must be signed in to change notification settings - Fork 213
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Implement solver for mov_registers_to_registers (#6089)
# Description ## Problem\* mov_registers_to_registers was a suboptimal codegen. ## Summary\* Moving a set of registers to another set a registers with possible overlap among them is an operation that is used in the codegen for calling conventions. In order to solve that, in the past, we just made a backup of every source register. That is inefficient and generates more than the optimal number of register movements. In order to achieve the optimal number of movements, this PR implements a solver that breaks the loops (like MOV 2=>3 MOV 3=>2, but of arbitrary size) by adding one temporary register per loop. We then perform the moves following a DFS on the dependency chain after the loops have been broken. ## 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\* - [x] I have tested the changes locally. - [x] I have formatted the changes with [Prettier](https://prettier.io/) and/or `cargo fmt` on default settings.
- Loading branch information
1 parent
1df102a
commit 4170c55
Showing
1 changed file
with
275 additions
and
11 deletions.
There are no files selected for viewing
286 changes: 275 additions & 11 deletions
286
compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_stack.rs
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 |
---|---|---|
@@ -1,26 +1,290 @@ | ||
use acvm::{acir::brillig::MemoryAddress, AcirField}; | ||
use fxhash::{FxHashMap as HashMap, FxHashSet as HashSet}; | ||
|
||
use super::{debug_show::DebugToString, registers::RegisterAllocator, BrilligContext}; | ||
|
||
impl<F: AcirField + DebugToString, Registers: RegisterAllocator> BrilligContext<F, Registers> { | ||
/// This function moves values from a set of registers to another set of registers. | ||
/// It first moves all sources to new allocated registers to avoid overwriting. | ||
/// The only requirement is that every destination needs to be written at most once. | ||
pub(crate) fn codegen_mov_registers_to_registers( | ||
&mut self, | ||
sources: Vec<MemoryAddress>, | ||
destinations: Vec<MemoryAddress>, | ||
) { | ||
let new_sources: Vec<_> = sources | ||
.iter() | ||
.map(|source| { | ||
let new_source = self.allocate_register(); | ||
self.mov_instruction(new_source, *source); | ||
new_source | ||
}) | ||
assert_eq!(sources.len(), destinations.len()); | ||
// Remove all no-ops | ||
let movements: Vec<_> = sources | ||
.into_iter() | ||
.zip(destinations) | ||
.filter(|(source, destination)| source != destination) | ||
.collect(); | ||
for (new_source, destination) in new_sources.iter().zip(destinations.iter()) { | ||
self.mov_instruction(*destination, *new_source); | ||
self.deallocate_register(*new_source); | ||
|
||
// Now we need to detect all cycles. | ||
// First build a map of the movements. Note that a source could have multiple destinations | ||
let mut movements_map: HashMap<MemoryAddress, HashSet<_>> = | ||
movements.into_iter().fold(HashMap::default(), |mut map, (source, destination)| { | ||
map.entry(source).or_default().insert(destination); | ||
map | ||
}); | ||
|
||
let destinations_set: HashSet<_> = movements_map.values().flatten().copied().collect(); | ||
assert_eq!( | ||
destinations_set.len(), | ||
movements_map.values().flatten().count(), | ||
"Multiple moves to the same register found" | ||
); | ||
|
||
let mut loop_detector = LoopDetector::default(); | ||
loop_detector.collect_loops(&movements_map); | ||
let loops = loop_detector.loops; | ||
// In order to break the loops we need to store one register from each in a temporary and then use that temporary as source. | ||
let mut temporaries = Vec::with_capacity(loops.len()); | ||
for loop_found in loops { | ||
let temp_register = self.allocate_register(); | ||
temporaries.push(temp_register); | ||
let first_source = loop_found.iter().next().unwrap(); | ||
self.mov_instruction(temp_register, *first_source); | ||
let destinations_of_temp = movements_map.remove(first_source).unwrap(); | ||
movements_map.insert(temp_register, destinations_of_temp); | ||
} | ||
// After removing loops we should have an DAG with each node having only one ancestor (but could have multiple successors) | ||
// Now we should be able to move the registers just by performing a DFS on the movements map | ||
let heads: Vec<_> = movements_map | ||
.keys() | ||
.filter(|source| !destinations_set.contains(source)) | ||
.copied() | ||
.collect(); | ||
for head in heads { | ||
self.perform_movements(&movements_map, head); | ||
} | ||
|
||
// Deallocate all temporaries | ||
for temp in temporaries { | ||
self.deallocate_register(temp); | ||
} | ||
} | ||
|
||
fn perform_movements( | ||
&mut self, | ||
movements: &HashMap<MemoryAddress, HashSet<MemoryAddress>>, | ||
current_source: MemoryAddress, | ||
) { | ||
if let Some(destinations) = movements.get(¤t_source) { | ||
for destination in destinations { | ||
self.perform_movements(movements, *destination); | ||
} | ||
for destination in destinations { | ||
self.mov_instruction(*destination, current_source); | ||
} | ||
} | ||
} | ||
} | ||
|
||
#[derive(Default)] | ||
struct LoopDetector { | ||
visited_sources: HashSet<MemoryAddress>, | ||
loops: Vec<im::OrdSet<MemoryAddress>>, | ||
} | ||
|
||
impl LoopDetector { | ||
fn collect_loops(&mut self, movements: &HashMap<MemoryAddress, HashSet<MemoryAddress>>) { | ||
for source in movements.keys() { | ||
self.find_loop_recursive(*source, movements, im::OrdSet::default()); | ||
} | ||
} | ||
|
||
fn find_loop_recursive( | ||
&mut self, | ||
source: MemoryAddress, | ||
movements: &HashMap<MemoryAddress, HashSet<MemoryAddress>>, | ||
mut previous_sources: im::OrdSet<MemoryAddress>, | ||
) { | ||
if self.visited_sources.contains(&source) { | ||
return; | ||
} | ||
// Mark as visited | ||
self.visited_sources.insert(source); | ||
|
||
previous_sources.insert(source); | ||
// Get all destinations | ||
if let Some(destinations) = movements.get(&source) { | ||
for destination in destinations { | ||
if previous_sources.contains(destination) { | ||
// Found a loop | ||
let loop_sources = previous_sources.clone(); | ||
self.loops.push(loop_sources); | ||
} else { | ||
self.find_loop_recursive(*destination, movements, previous_sources.clone()); | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod tests { | ||
use acvm::{ | ||
acir::brillig::{MemoryAddress, Opcode}, | ||
FieldElement, | ||
}; | ||
use fxhash::{FxHashMap as HashMap, FxHashSet as HashSet}; | ||
|
||
use crate::{ | ||
brillig::brillig_ir::{artifact::Label, registers::Stack, BrilligContext}, | ||
ssa::ir::function::FunctionId, | ||
}; | ||
|
||
// Tests for the loop finder | ||
|
||
fn generate_movements_map( | ||
movements: Vec<(usize, usize)>, | ||
) -> HashMap<MemoryAddress, HashSet<MemoryAddress>> { | ||
movements.into_iter().fold(HashMap::default(), |mut map, (source, destination)| { | ||
map.entry(MemoryAddress(source)).or_default().insert(MemoryAddress(destination)); | ||
map | ||
}) | ||
} | ||
|
||
#[test] | ||
fn test_loop_detector_basic_loop() { | ||
let movements = vec![(0, 1), (1, 2), (2, 3), (3, 0)]; | ||
let movements_map = generate_movements_map(movements); | ||
let mut loop_detector = super::LoopDetector::default(); | ||
loop_detector.collect_loops(&movements_map); | ||
assert_eq!(loop_detector.loops.len(), 1); | ||
assert_eq!(loop_detector.loops[0].len(), 4); | ||
} | ||
|
||
#[test] | ||
fn test_loop_detector_no_loop() { | ||
let movements = vec![(0, 1), (1, 2), (2, 3), (3, 4)]; | ||
let movements_map = generate_movements_map(movements); | ||
let mut loop_detector = super::LoopDetector::default(); | ||
loop_detector.collect_loops(&movements_map); | ||
assert_eq!(loop_detector.loops.len(), 0); | ||
} | ||
|
||
#[test] | ||
fn test_loop_detector_loop_with_branch() { | ||
let movements = vec![(0, 1), (1, 2), (2, 0), (0, 3), (3, 4)]; | ||
let movements_map = generate_movements_map(movements); | ||
let mut loop_detector = super::LoopDetector::default(); | ||
loop_detector.collect_loops(&movements_map); | ||
assert_eq!(loop_detector.loops.len(), 1); | ||
assert_eq!(loop_detector.loops[0].len(), 3); | ||
} | ||
|
||
#[test] | ||
fn test_loop_detector_two_loops() { | ||
let movements = vec![(0, 1), (1, 2), (2, 0), (3, 4), (4, 5), (5, 3)]; | ||
let movements_map = generate_movements_map(movements); | ||
let mut loop_detector = super::LoopDetector::default(); | ||
loop_detector.collect_loops(&movements_map); | ||
assert_eq!(loop_detector.loops.len(), 2); | ||
assert_eq!(loop_detector.loops[0].len(), 3); | ||
assert_eq!(loop_detector.loops[1].len(), 3); | ||
} | ||
|
||
// Tests for mov_registers_to_registers | ||
|
||
fn movements_to_source_and_destinations( | ||
movements: Vec<(usize, usize)>, | ||
) -> (Vec<MemoryAddress>, Vec<MemoryAddress>) { | ||
let sources = movements.iter().map(|(source, _)| MemoryAddress::from(*source)).collect(); | ||
let destinations = | ||
movements.iter().map(|(_, destination)| MemoryAddress::from(*destination)).collect(); | ||
(sources, destinations) | ||
} | ||
|
||
pub(crate) fn create_context() -> BrilligContext<FieldElement, Stack> { | ||
let mut context = BrilligContext::new(true); | ||
context.enter_context(Label::function(FunctionId::test_new(0))); | ||
context | ||
} | ||
|
||
#[test] | ||
#[should_panic(expected = "Multiple moves to the same register found")] | ||
fn test_mov_registers_to_registers_overwrite() { | ||
let movements = vec![(10, 11), (12, 11), (10, 13)]; | ||
let (sources, destinations) = movements_to_source_and_destinations(movements); | ||
let mut context = create_context(); | ||
|
||
context.codegen_mov_registers_to_registers(sources, destinations); | ||
} | ||
|
||
#[test] | ||
fn test_mov_registers_to_registers_no_loop() { | ||
let movements = vec![(10, 11), (11, 12), (12, 13), (13, 14)]; | ||
let (sources, destinations) = movements_to_source_and_destinations(movements); | ||
let mut context = create_context(); | ||
|
||
context.codegen_mov_registers_to_registers(sources, destinations); | ||
let opcodes = context.artifact().byte_code; | ||
assert_eq!( | ||
opcodes, | ||
vec![ | ||
Opcode::Mov { destination: MemoryAddress(14), source: MemoryAddress(13) }, | ||
Opcode::Mov { destination: MemoryAddress(13), source: MemoryAddress(12) }, | ||
Opcode::Mov { destination: MemoryAddress(12), source: MemoryAddress(11) }, | ||
Opcode::Mov { destination: MemoryAddress(11), source: MemoryAddress(10) }, | ||
] | ||
); | ||
} | ||
#[test] | ||
fn test_mov_registers_to_registers_no_op_filter() { | ||
let movements = vec![(10, 11), (11, 11), (11, 12)]; | ||
let (sources, destinations) = movements_to_source_and_destinations(movements); | ||
let mut context = create_context(); | ||
|
||
context.codegen_mov_registers_to_registers(sources, destinations); | ||
let opcodes = context.artifact().byte_code; | ||
assert_eq!( | ||
opcodes, | ||
vec![ | ||
Opcode::Mov { destination: MemoryAddress(12), source: MemoryAddress(11) }, | ||
Opcode::Mov { destination: MemoryAddress(11), source: MemoryAddress(10) }, | ||
] | ||
); | ||
} | ||
|
||
#[test] | ||
fn test_mov_registers_to_registers_loop() { | ||
let movements = vec![(10, 11), (11, 12), (12, 13), (13, 10)]; | ||
let (sources, destinations) = movements_to_source_and_destinations(movements); | ||
let mut context = create_context(); | ||
|
||
context.codegen_mov_registers_to_registers(sources, destinations); | ||
let opcodes = context.artifact().byte_code; | ||
assert_eq!( | ||
opcodes, | ||
vec![ | ||
Opcode::Mov { destination: MemoryAddress(3), source: MemoryAddress(10) }, | ||
Opcode::Mov { destination: MemoryAddress(10), source: MemoryAddress(13) }, | ||
Opcode::Mov { destination: MemoryAddress(13), source: MemoryAddress(12) }, | ||
Opcode::Mov { destination: MemoryAddress(12), source: MemoryAddress(11) }, | ||
Opcode::Mov { destination: MemoryAddress(11), source: MemoryAddress(3) } | ||
] | ||
); | ||
} | ||
|
||
#[test] | ||
fn test_mov_registers_to_registers_loop_and_branch() { | ||
let movements = vec![(10, 11), (11, 12), (12, 10), (10, 13), (13, 14)]; | ||
let (sources, destinations) = movements_to_source_and_destinations(movements); | ||
let mut context = create_context(); | ||
|
||
context.codegen_mov_registers_to_registers(sources, destinations); | ||
let opcodes = context.artifact().byte_code; | ||
assert_eq!( | ||
opcodes, | ||
vec![ | ||
Opcode::Mov { destination: MemoryAddress(3), source: MemoryAddress(10) }, // Temporary | ||
Opcode::Mov { destination: MemoryAddress(14), source: MemoryAddress(13) }, // Branch | ||
Opcode::Mov { destination: MemoryAddress(10), source: MemoryAddress(12) }, // Loop | ||
Opcode::Mov { destination: MemoryAddress(12), source: MemoryAddress(11) }, // Loop | ||
Opcode::Mov { destination: MemoryAddress(13), source: MemoryAddress(3) }, // Finish branch | ||
Opcode::Mov { destination: MemoryAddress(11), source: MemoryAddress(3) } // Finish loop | ||
] | ||
); | ||
} | ||
} |