M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

compiler: Insert array binop shape check in caller for location information

This commit is contained in:
David Nadlinger 2020-08-02 20:35:31 +01:00
parent ef260adca8
commit 56a872ccc0
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
artiq/compiler/transforms/artiq_ir_generator.py
View File

@ -1510,21 +1510,12 @@ class ARTIQIRGenerator(algorithm.Visitor):
if name not in self.array_binop_funcs: if name not in self.array_binop_funcs:
def body_gen(result, lhs, rhs): def body_gen(result, lhs, rhs):
# TODO: Move into caller for correct location information (or pass)? # At this point, shapes are assumed to match; could just pass buffer
shape = self.append(ir.GetAttr(lhs, "shape")) # pointer for two of the three arrays as well.
rhs_shape = self.append(ir.GetAttr(rhs, "shape"))
self._make_check(
self.append(ir.Compare(ast.Eq(loc=None), shape, rhs_shape)),
lambda: self.alloc_exn(
builtins.TException("ValueError"),
ir.Constant("operands could not be broadcast together",
builtins.TStr())))
# We assume result has correct shape; could just pass buffer pointer
# as well.
result_buffer = self.append(ir.GetAttr(result, "buffer")) result_buffer = self.append(ir.GetAttr(result, "buffer"))
lhs_buffer = self.append(ir.GetAttr(lhs, "buffer")) lhs_buffer = self.append(ir.GetAttr(lhs, "buffer"))
rhs_buffer = self.append(ir.GetAttr(rhs, "buffer")) rhs_buffer = self.append(ir.GetAttr(rhs, "buffer"))
shape = self.append(ir.GetAttr(result, "shape"))
num_total_elts = self._get_total_array_len(shape) num_total_elts = self._get_total_array_len(shape)
def loop_gen(index): def loop_gen(index):
@ -1709,9 +1700,15 @@ class ARTIQIRGenerator(algorithm.Visitor):
lhs = self.visit(node.left) lhs = self.visit(node.left)
rhs = self.visit(node.right) rhs = self.visit(node.right)
# Array op implementation will check for matching shape.
# TODO: Broadcasts; select the widest shape.
shape = self.append(ir.GetAttr(lhs, "shape")) shape = self.append(ir.GetAttr(lhs, "shape"))
# TODO: Broadcasts; select the widest shape.
rhs_shape = self.append(ir.GetAttr(rhs, "shape"))
self._make_check(
self.append(ir.Compare(ast.Eq(loc=None), shape, rhs_shape)),
lambda: self.alloc_exn(
builtins.TException("ValueError"),
ir.Constant("operands could not be broadcast together",
builtins.TStr())))
result = self._allocate_new_array(node.type.find()["elt"], shape) result = self._allocate_new_array(node.type.find()["elt"], shape)
func = self._get_array_binop(node.op, node.type, node.left.type, node.right.type) func = self._get_array_binop(node.op, node.type, node.left.type, node.right.type)