Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
@TomAFrench
TomAFrench committed Dec 3, 2024
1 parent 06b97a5 commit d56489f
Showing 1 changed file with 94 additions and 114 deletions.
208 changes: 94 additions & 114 deletions compiler/noirc_evaluator/src/ssa/opt/flatten_cfg.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1029,123 +1029,101 @@ mod test {
// b7 b8
// ↘ ↙
// b9
let main_id = Id::test_new(0);
let mut builder = FunctionBuilder::new("main".into(), main_id);

let b1 = builder.insert_block();
let b2 = builder.insert_block();
let b3 = builder.insert_block();
let b4 = builder.insert_block();
let b5 = builder.insert_block();
let b6 = builder.insert_block();
let b7 = builder.insert_block();
let b8 = builder.insert_block();
let b9 = builder.insert_block();

let c1 = builder.add_parameter(Type::bool());
let c4 = builder.add_parameter(Type::bool());

let r1 = builder.insert_allocate(Type::field());

let store_value = |builder: &mut FunctionBuilder, value: u128| {
let value = builder.field_constant(value);
builder.insert_store(r1, value);
};

let test_function = Id::test_new(1);

let call_test_function = |builder: &mut FunctionBuilder, block: u128| {
let block = builder.field_constant(block);
let load = builder.insert_load(r1, Type::field());
builder.insert_call(test_function, vec![block, load], Vec::new());
};

let switch_store_and_test_function =
|builder: &mut FunctionBuilder, block, block_number: u128| {
builder.switch_to_block(block);
store_value(builder, block_number);
call_test_function(builder, block_number);
};

let switch_and_test_function =
|builder: &mut FunctionBuilder, block, block_number: u128| {
builder.switch_to_block(block);
call_test_function(builder, block_number);
};

store_value(&mut builder, 0);
call_test_function(&mut builder, 0);
builder.terminate_with_jmp(b1, vec![]);

switch_store_and_test_function(&mut builder, b1, 1);
builder.terminate_with_jmpif(c1, b2, b3);

switch_store_and_test_function(&mut builder, b2, 2);
builder.terminate_with_jmp(b4, vec![]);

switch_store_and_test_function(&mut builder, b3, 3);
builder.terminate_with_jmp(b8, vec![]);

switch_and_test_function(&mut builder, b4, 4);
builder.terminate_with_jmpif(c4, b5, b6);

switch_store_and_test_function(&mut builder, b5, 5);
builder.terminate_with_jmp(b7, vec![]);

switch_store_and_test_function(&mut builder, b6, 6);
builder.terminate_with_jmp(b7, vec![]);

switch_and_test_function(&mut builder, b7, 7);
builder.terminate_with_jmp(b9, vec![]);

switch_and_test_function(&mut builder, b8, 8);
builder.terminate_with_jmp(b9, vec![]);
let src = "
acir(inline) fn main f0 {
b0(v0: u1, v1: u1):
v2 = allocate -> &mut Field
store Field 0 at v2
v4 = load v2 -> Field
// call v1(Field 0, v4)
jmp b1()
b1():
store Field 1 at v2
v6 = load v2 -> Field
// call v1(Field 1, v6)
jmpif v0 then: b2, else: b3
b2():
store Field 2 at v2
v8 = load v2 -> Field
// call v1(Field 2, v8)
jmp b4()
b4():
v12 = load v2 -> Field
// call v1(Field 4, v12)
jmpif v1 then: b5, else: b6
b5():
store Field 5 at v2
v14 = load v2 -> Field
// call v1(Field 5, v14)
jmp b7()
b7():
v18 = load v2 -> Field
// call v1(Field 7, v18)
jmp b9()
b9():
v22 = load v2 -> Field
// call v1(Field 9, v22)
v23 = load v2 -> Field
return v23
b6():
store Field 6 at v2
v16 = load v2 -> Field
// call v1(Field 6, v16)
jmp b7()
b3():
store Field 3 at v2
v10 = load v2 -> Field
// call v1(Field 3, v10)
jmp b8()
b8():
v20 = load v2 -> Field
// call v1(Field 8, v20)
jmp b9()
}";

switch_and_test_function(&mut builder, b9, 9);
let load = builder.insert_load(r1, Type::field());
builder.terminate_with_return(vec![load]);
let ssa = Ssa::from_str(src).unwrap();

let ssa = builder.finish().flatten_cfg().mem2reg();
let ssa = ssa.flatten_cfg().mem2reg();

// Expected results after mem2reg removes the allocation and each load and store:
//
// fn main f0 {
// b0(v0: u1, v1: u1):
// call test_function(Field 0, Field 0)
// call test_function(Field 1, Field 1)
// enable_side_effects v0
// call test_function(Field 2, Field 2)
// call test_function(Field 4, Field 2)
// v29 = and v0, v1
// enable_side_effects v29
// call test_function(Field 5, Field 5)
// v32 = not v1
// v33 = and v0, v32
// enable_side_effects v33
// call test_function(Field 6, Field 6)
// enable_side_effects v0
// v36 = mul v1, Field 5
// v37 = mul v32, Field 2
// v38 = add v36, v37
// v39 = mul v1, Field 5
// v40 = mul v32, Field 6
// v41 = add v39, v40
// call test_function(Field 7, v42)
// v43 = not v0
// enable_side_effects v43
// store Field 3 at v2
// call test_function(Field 3, Field 3)
// call test_function(Field 8, Field 3)
// enable_side_effects Field 1
// v47 = mul v0, v41
// v48 = mul v43, Field 1
// v49 = add v47, v48
// v50 = mul v0, v44
// v51 = mul v43, Field 3
// v52 = add v50, v51
// call test_function(Field 9, v53)
// return v54
// }
let expected = "
acir(inline) fn main f0 {
b0(v0: u1, v1: u1):
v2 = allocate -> &mut Field
enable_side_effects v0
v3 = not v0
v4 = cast v0 as Field
v5 = cast v3 as Field
v7 = mul v4, Field 2
v8 = add v7, v5
v9 = mul v0, v1
enable_side_effects v9
v10 = not v9
v11 = cast v9 as Field
v12 = cast v10 as Field
v14 = mul v11, Field 5
v15 = mul v12, v8
v16 = add v14, v15
v17 = not v1
v18 = mul v0, v17
enable_side_effects v18
v19 = not v18
v20 = cast v18 as Field
v21 = cast v19 as Field
v23 = mul v20, Field 6
v24 = mul v21, v16
v25 = add v23, v24
enable_side_effects v0
v26 = not v0
enable_side_effects v26
v27 = cast v26 as Field
v28 = cast v0 as Field
v30 = mul v27, Field 3
v31 = mul v28, v25
v32 = add v30, v31
enable_side_effects u1 1
return v32
}";

let main = ssa.main();
let ret = match main.dfg[main.entry_block()].terminator() {
Expand All @@ -1154,7 +1132,9 @@ mod test {
};

let merged_values = get_all_constants_reachable_from_instruction(&main.dfg, ret);
assert_eq!(merged_values, vec![1, 3, 5, 6]);
assert_eq!(merged_values, vec![2, 3, 5, 6]);

assert_normalized_ssa_equals(ssa, expected);
}

#[test]
Expand Down

0 comments on commit d56489f

Please sign in to comment.