Skip to content
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

chore(ssa): Rename ObjectType::Pointer to ObjectType::ArrayPointer #1077

Merged
merged 2 commits into from
Mar 31, 2023
Merged

chore(ssa): Rename ObjectType::Pointer to ObjectType::ArrayPointer #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d17438
chore(ssa): Rename ObjectType::Pointer to ObjectType::ArrayPointer
joss-aztec Mar 31, 2023
2e4d4da
Merge branch 'master' into joss/rename-array-point
joss-aztec Mar 31, 2023
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
2 changes: 1 addition & 1 deletion crates/noirc_evaluator/src/ssa/acir_gen/internal_var_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ impl InternalVarCache {
variable.witness.unwrap_or_else(|| evaluator.add_witness_to_cs());
InternalVar::from_witness(witness)
}
ObjectType::Pointer(_) | ObjectType::NotAnObject => return None,
ObjectType::ArrayPointer(_) | ObjectType::NotAnObject => return None,
ObjectType::Function => {
unreachable!("ICE: functions should have been removed by this stage")
}
Expand Down
12 changes: 6 additions & 6 deletions crates/noirc_evaluator/src/ssa/acir_gen/operations/intrinsics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub(crate) fn evaluate(
let l_c =
acir_gen.var_cache.get_or_compute_internal_var_unwrap(args[0], evaluator, ctx);
outputs = to_radix_base(l_c.expression(), 2, bit_size, endianness, evaluator);
if let ObjectType::Pointer(a) = res_type {
if let ObjectType::ArrayPointer(a) = res_type {
acir_gen.memory.map_array(a, &outputs, ctx);
}
}
Expand All @@ -61,7 +61,7 @@ pub(crate) fn evaluate(
let l_c =
acir_gen.var_cache.get_or_compute_internal_var_unwrap(args[0], evaluator, ctx);
outputs = to_radix_base(l_c.expression(), radix, limb_size, endianness, evaluator);
if let ObjectType::Pointer(a) = res_type {
if let ObjectType::ArrayPointer(a) = res_type {
acir_gen.memory.map_array(a, &outputs, ctx);
}
}
Expand Down Expand Up @@ -125,7 +125,7 @@ pub(crate) fn evaluate(
bits,
sort_by: vec![0],
}));
if let node::ObjectType::Pointer(a) = res_type {
if let node::ObjectType::ArrayPointer(a) = res_type {
acir_gen.memory.map_array(a, &outputs, ctx);
} else {
unreachable!();
Expand Down Expand Up @@ -167,7 +167,7 @@ fn resolve_node_id(
match node_obj_type {
// If the `Variable` represents a Pointer
// Then we know that it is an `Array`
node::ObjectType::Pointer(a) => resolve_array(a, acir_gen, cfg, evaluator),
node::ObjectType::ArrayPointer(a) => resolve_array(a, acir_gen, cfg, evaluator),
// If it is not a pointer, we attempt to fetch the witness associated with it
_ => match v.witness {
Some(w) => {
Expand Down Expand Up @@ -229,7 +229,7 @@ fn prepare_outputs(
let outputs = vecmap(0..output_nb, |_| evaluator.add_witness_to_cs());

let l_obj = ctx.try_get_node(pointer).unwrap();
if let node::ObjectType::Pointer(a) = l_obj.get_type() {
if let node::ObjectType::ArrayPointer(a) = l_obj.get_type() {
memory_map.map_array(a, &outputs, ctx);
}
outputs
Expand All @@ -251,7 +251,7 @@ fn evaluate_println(

let obj_type = ctx.object_type(node_id);
match obj_type {
ObjectType::Pointer(array_id) => {
ObjectType::ArrayPointer(array_id) => {
let mem_array = &ctx.mem[array_id];
let mut field_elements = Vec::new();
for idx in 0..mem_array.len {
Expand Down
4 changes: 2 additions & 2 deletions crates/noirc_evaluator/src/ssa/block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ impl BasicBlock {
result.insert(*a);
}
node::Operation::Intrinsic(..) => {
if let node::ObjectType::Pointer(a) = ins.res_type {
if let node::ObjectType::ArrayPointer(a) = ins.res_type {
result.insert(a);
}
}
Expand All @@ -118,7 +118,7 @@ impl BasicBlock {
}
if let Some(f) = ctx.try_get_ssa_func(*func) {
for typ in &f.result_types {
if let node::ObjectType::Pointer(a) = typ {
if let node::ObjectType::ArrayPointer(a) = typ {
result.insert(*a);
}
}
Expand Down
8 changes: 4 additions & 4 deletions crates/noirc_evaluator/src/ssa/conditional.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ impl DecisionTree {
}
}
_ => {
if let ObjectType::Pointer(a) = ins1.res_type {
if let ObjectType::ArrayPointer(a) = ins1.res_type {
stack.new_array(a);
}
}
Expand Down Expand Up @@ -666,19 +666,19 @@ impl DecisionTree {
Operation::Intrinsic(_, _) => {
stack.push(ins_id);
if ctx.under_assumption(ass_value) {
if let ObjectType::Pointer(a) = ins.res_type {
if let ObjectType::ArrayPointer(a) = ins.res_type {
if stack.created_arrays[&a] != stack.block {
let array = &ctx.mem[a].clone();
let name = array.name.to_string() + DUPLICATED;
ctx.new_array(&name, array.element_type, array.len, None);
let array_dup = ctx.mem.last_id();
let ins2 = ctx.instruction_mut(ins_id);
ins2.res_type = ObjectType::Pointer(array_dup);
ins2.res_type = ObjectType::ArrayPointer(array_dup);

let mut memcpy_stack = StackFrame::new(stack.block);
ctx.memcpy_inline(
ins.res_type,
ObjectType::Pointer(array_dup),
ObjectType::ArrayPointer(array_dup),
&mut memcpy_stack,
);
self.apply_condition_to_instructions(
Expand Down
20 changes: 10 additions & 10 deletions crates/noirc_evaluator/src/ssa/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ impl SsaContext {
//we create a variable pointing to this MemArray
let new_var = node::Variable {
id: NodeId::dummy(),
obj_type: ObjectType::Pointer(array_index),
obj_type: ObjectType::ArrayPointer(array_index),
name: name.to_string(),
root: None,
def: def.clone(),
Expand Down Expand Up @@ -782,7 +782,7 @@ impl SsaContext {
return Ok(());
}

if let (ObjectType::Pointer(a), ObjectType::Pointer(b)) = (l_type, r_type) {
if let (ObjectType::ArrayPointer(a), ObjectType::ArrayPointer(b)) = (l_type, r_type) {
let len = self.mem[a].len;
let e_type = self.mem[b].element_type;
for i in 0..len {
Expand Down Expand Up @@ -838,7 +838,7 @@ impl SsaContext {
}) = self.try_get_instruction(rhs)
{
if index.is_none() {
if let ObjectType::Pointer(a) = lhs_type {
if let ObjectType::ArrayPointer(a) = lhs_type {
ret_array = Some((*func, a, *idx));
}
}
Expand All @@ -854,7 +854,7 @@ impl SsaContext {
//Issue #579: we initialize the array, unless it is also in arguments in which case it is already initialized.
let mut init = false;
for i in arguments.clone() {
if let ObjectType::Pointer(b) = self.object_type(i) {
if let ObjectType::ArrayPointer(b) = self.object_type(i) {
if a == b {
init = true;
}
Expand All @@ -881,7 +881,7 @@ impl SsaContext {
}

if let Some(idx) = index {
if let ObjectType::Pointer(a) = lhs_type {
if let ObjectType::ArrayPointer(a) = lhs_type {
//Store
let op_a = Operation::Store {
array_id: a,
Expand All @@ -894,7 +894,7 @@ impl SsaContext {
} else {
unreachable!("Index expression must be for an array");
}
} else if matches!(lhs_type, ObjectType::Pointer(_)) {
} else if matches!(lhs_type, ObjectType::ArrayPointer(_)) {
if let Some(Instruction {
operation: Operation::Intrinsic(_, _),
res_type: result_type,
Expand Down Expand Up @@ -981,7 +981,7 @@ impl SsaContext {
return;
}

if let (ObjectType::Pointer(a), ObjectType::Pointer(b)) = (l_type, r_type) {
if let (ObjectType::ArrayPointer(a), ObjectType::ArrayPointer(b)) = (l_type, r_type) {
let len = self.mem[a].len;
let e_type = self.mem[b].element_type;
for i in 0..len {
Expand Down Expand Up @@ -1018,10 +1018,10 @@ impl SsaContext {
) -> NodeId {
let lhs_type = self.object_type(lhs);
let rhs_type = self.object_type(rhs);
if let ObjectType::Pointer(a) = lhs_type {
if let ObjectType::ArrayPointer(a) = lhs_type {
//Array
let b = stack_frame.get_or_default(a);
self.memcpy_inline(ObjectType::Pointer(b), rhs_type, stack_frame);
self.memcpy_inline(ObjectType::ArrayPointer(b), rhs_type, stack_frame);
lhs
} else {
//new ssa
Expand Down Expand Up @@ -1081,7 +1081,7 @@ impl SsaContext {

let name = format!("if_{}_ret{c}", exit_block.0.into_raw_parts().0);
*c += 1;
if let ObjectType::Pointer(adr1) = a_type {
if let ObjectType::ArrayPointer(adr1) = a_type {
let len = self.mem[adr1].len;
let el_type = self.mem[adr1].element_type;
let (id, array_id) = self.new_array(&name, el_type, len, None);
Expand Down
8 changes: 4 additions & 4 deletions crates/noirc_evaluator/src/ssa/function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ impl SsaFunction {
let mut decision = DecisionTree::new(&ir_gen.context);
let mut builder = TreeBuilder::new(self.entry_block);
for (arg, _) in &self.arguments {
if let ObjectType::Pointer(a) = ir_gen.context.object_type(*arg) {
if let ObjectType::ArrayPointer(a) = ir_gen.context.object_type(*arg) {
builder.stack.created_arrays.insert(a, self.entry_block);
}
}
Expand Down Expand Up @@ -164,7 +164,7 @@ impl IrGenerator {
for typ in return_types {
func.result_types.push(match typ {
Type::Unit => ObjectType::NotAnObject,
Type::Array(_, _) => ObjectType::Pointer(crate::ssa::mem::ArrayId::dummy()),
Type::Array(_, _) => ObjectType::ArrayPointer(crate::ssa::mem::ArrayId::dummy()),
_ => self.context.convert_type(&typ),
});
}
Expand Down Expand Up @@ -318,7 +318,7 @@ impl IrGenerator {
let elem_type = self.context.convert_type(&elem_type);
let array_id = self.context.new_array("", elem_type, len as u32, None).1;
returned_arrays.push((array_id, i as u32));
ObjectType::Pointer(array_id)
ObjectType::ArrayPointer(array_id)
}
other => self.context.convert_type(&other),
};
Expand All @@ -338,7 +338,7 @@ impl IrGenerator {
let result_type = if len > 1 {
//We create an array that will contain the result and set the res_type to point to that array
let result_index = self.new_array(&format!("{op}_result"), elem_type, len, None).1;
node::ObjectType::Pointer(result_index)
node::ObjectType::ArrayPointer(result_index)
} else {
elem_type
};
Expand Down
14 changes: 7 additions & 7 deletions crates/noirc_evaluator/src/ssa/inline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ fn inline(

//1. return arrays
for arg_caller in arrays.iter() {
if let node::ObjectType::Pointer(a) = ssa_func.result_types[arg_caller.1 as usize] {
if let node::ObjectType::ArrayPointer(a) = ssa_func.result_types[arg_caller.1 as usize] {
stack_frame.array_map.insert(a, arg_caller.0);
stack_frame.return_arrays.push(arg_caller.0);
}
Expand All @@ -215,8 +215,8 @@ fn inline(
//2. by copy parameters:
for (&arg_caller, &arg_function) in args.iter().zip(&func_arg) {
//pass by-ref const array arguments
if let node::ObjectType::Pointer(x) = ctx.object_type(arg_function.0) {
if let node::ObjectType::Pointer(y) = ctx.object_type(arg_caller) {
if let node::ObjectType::ArrayPointer(x) = ctx.object_type(arg_function.0) {
if let node::ObjectType::ArrayPointer(y) = ctx.object_type(arg_caller) {
if !arg_function.1 && !stack_frame.array_map.contains_key(&x) {
stack_frame.array_map.insert(x, y);
continue;
Expand Down Expand Up @@ -276,7 +276,7 @@ fn inline_in_block(
let mut array_id = None;
let mut clone = ins.clone();

if let node::ObjectType::Pointer(id) = ins.res_type {
if let node::ObjectType::ArrayPointer(id) = ins.res_type {
//We collect data here for potential mapping using the array_map below.
array_id = Some(id);
}
Expand Down Expand Up @@ -342,7 +342,7 @@ fn inline_in_block(
let mut new_ins = new_cloned_instruction(clone, stack_frame.block);
if let Some(id) = array_id {
let new_id = stack_frame.get_or_default(id);
new_ins.res_type = node::ObjectType::Pointer(new_id);
new_ins.res_type = node::ObjectType::ArrayPointer(new_id);
}

let err = optimizations::simplify(ctx, &mut new_ins);
Expand All @@ -359,7 +359,7 @@ fn inline_in_block(
if let Mark::ReplaceWith(replacement) = new_ins.mark {
if let Some(id) = array_id {
if let Entry::Occupied(mut entry) = stack_frame.array_map.entry(id) {
if let node::ObjectType::Pointer(new_id) =
if let node::ObjectType::ArrayPointer(new_id) =
ctx[replacement].get_type()
{
//we now map the array to rhs array
Expand Down Expand Up @@ -437,7 +437,7 @@ impl node::Operation {
if b != a {
let new_var = node::Variable {
id: NodeId::dummy(),
obj_type: node::ObjectType::Pointer(b),
obj_type: node::ObjectType::ArrayPointer(b),
name: String::new(),
root: None,
def: None,
Expand Down
2 changes: 1 addition & 1 deletion crates/noirc_evaluator/src/ssa/mem.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl Memory {
//dereference a pointer
pub(super) fn deref(ctx: &SsaContext, id: NodeId) -> Option<ArrayId> {
ctx.try_get_node(id).and_then(|var| match var.get_type() {
node::ObjectType::Pointer(a) => Some(a),
node::ObjectType::ArrayPointer(a) => Some(a),
_ => None,
})
}
Expand Down
6 changes: 3 additions & 3 deletions crates/noirc_evaluator/src/ssa/node.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ impl Variable {
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
pub(crate) enum ObjectType {
Numeric(NumericType),
Pointer(ArrayId),
ArrayPointer(ArrayId),
Function,
NotAnObject, //not an object
}
Expand All @@ -203,7 +203,7 @@ impl ObjectType {
pub(crate) fn bits(&self) -> u32 {
match self {
ObjectType::NotAnObject => 0,
ObjectType::Pointer(_) => 0,
ObjectType::ArrayPointer(_) => 0,
ObjectType::Function => 0,
ObjectType::Numeric(numeric_type) => match numeric_type {
NumericType::Signed(c) | NumericType::Unsigned(c) => *c,
Expand Down Expand Up @@ -259,7 +259,7 @@ impl ObjectType {
pub(crate) fn field_to_type(&self, f: FieldElement) -> FieldElement {
match self {
// TODO: document why this is unreachable
ObjectType::NotAnObject | ObjectType::Pointer(_) => {
ObjectType::NotAnObject | ObjectType::ArrayPointer(_) => {
unreachable!()
}
ObjectType::Numeric(NumericType::NativeField) => f,
Expand Down
16 changes: 8 additions & 8 deletions crates/noirc_evaluator/src/ssa/optimizations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ fn evaluate_intrinsic(
let bit_count = args[1] as u32;
let mut result = Vec::new();

if let ObjectType::Pointer(a) = res_type {
if let ObjectType::ArrayPointer(a) = res_type {
for i in 0..bit_count {
let index = ctx.get_or_create_const(
FieldElement::from(i as i128),
Expand Down Expand Up @@ -132,7 +132,7 @@ fn evaluate_intrinsic(
}
let mut result = Vec::new();

if let ObjectType::Pointer(a) = res_type {
if let ObjectType::ArrayPointer(a) = res_type {
for (i, item) in element.iter().enumerate() {
let index = ctx.get_or_create_const(
FieldElement::from(i as i128),
Expand Down Expand Up @@ -280,13 +280,13 @@ fn cse_block_with_anchor(

match &operator {
Operation::Binary(binary) => {
if let ObjectType::Pointer(a) = ctx.object_type(binary.lhs) {
if let ObjectType::ArrayPointer(a) = ctx.object_type(binary.lhs) {
//No CSE for arrays because they are not in SSA form
//We could improve this in future by checking if the arrays are immutable or not modified in-between
let id = ctx.get_dummy_load(a);
anchor.push_mem_instruction(ctx, id)?;

if let ObjectType::Pointer(a) = ctx.object_type(binary.rhs) {
if let ObjectType::ArrayPointer(a) = ctx.object_type(binary.rhs) {
let id = ctx.get_dummy_load(a);
anchor.push_mem_instruction(ctx, id)?;
}
Expand Down Expand Up @@ -446,7 +446,7 @@ fn cse_block_with_anchor(
}
if let Some(f) = ctx.try_get_ssa_func(*func) {
for typ in &f.result_types {
if let ObjectType::Pointer(a) = typ {
if let ObjectType::ArrayPointer(a) = typ {
let id = ctx.get_dummy_store(*a);
anchor.push_mem_instruction(ctx, id)?;
}
Expand All @@ -455,7 +455,7 @@ fn cse_block_with_anchor(
//Add dummy load for function arguments:
for arg in arguments {
if let Some(obj) = ctx.try_get_node(*arg) {
if let ObjectType::Pointer(a) = obj.get_type() {
if let ObjectType::ArrayPointer(a) = obj.get_type() {
let id = ctx.get_dummy_load(a);
anchor.push_mem_instruction(ctx, id)?;
}
Expand All @@ -474,14 +474,14 @@ fn cse_block_with_anchor(

for arg in args {
if let Some(obj) = ctx.try_get_node(*arg) {
if let ObjectType::Pointer(a) = obj.get_type() {
if let ObjectType::ArrayPointer(a) = obj.get_type() {
let id = ctx.get_dummy_load(a);
anchor.push_mem_instruction(ctx, id)?;
activate_cse = false;
}
}
}
if let ObjectType::Pointer(a) = ins.res_type {
if let ObjectType::ArrayPointer(a) = ins.res_type {
let id = ctx.get_dummy_store(a);
anchor.push_mem_instruction(ctx, id)?;
activate_cse = false;
Expand Down
Loading