diff --git a/hercules_opt/src/sroa.rs b/hercules_opt/src/sroa.rs index 6205421f176de205c699864f367fa46d069c08a7..afbc775bebdeb14e912c0bc0b437e143b4e2d1f2 100644 --- a/hercules_opt/src/sroa.rs +++ b/hercules_opt/src/sroa.rs @@ -412,6 +412,7 @@ pub fn sroa(editor: &mut FunctionEditor, reverse_postorder: &Vec<NodeID>, types: }, ); }); + to_delete.push(node); } else { worklist.push_back(WorkItem::AllocatedTernary { cond, diff --git a/hercules_samples/products.hir b/hercules_samples/products.hir index d09bb0fa43df6d8f6111facc77c970e36e69b101..9d191beb1e9ba9a4618188ad831ac0c16222f7fa 100644 --- a/hercules_samples/products.hir +++ b/hercules_samples/products.hir @@ -1,3 +1,23 @@ -fn test(x : prod(i32, f32), y: prod(i32, f32), b: bool) -> prod(i32, f32) - res = select(b, x, y) - r = return(start, res) +fn test(x : prod(i32, f32), b: bool) -> prod(i32, f32) + zero = constant(u64, 0) + one = constant(i32, 1) + two = constant(u64, 2) + three = constant(f32, 3.0) + + f_ctrl = fork(start, 10) + idx = thread_id(f_ctrl, 0) + + mod2 = rem(idx, two) + is_even = eq(mod2, zero) + field0 = read(res, field(0)) + field1 = read(res, field(1)) + add = add(field0, one) + mul = mul(field1, three) + upd0 = write(res, add, field(0)) + upd1 = write(res, mul, field(1)) + select = select(is_even, upd0, upd1) + + j_ctrl = join(f_ctrl) + res = reduce(j_ctrl, x, select) + + r = return(j_ctrl, res)