occheung
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Rework internal logic of slices.

This commit is contained in:
whitequark 2015-07-23 07:57:49 +03:00
parent 2b9ac344d8
commit 65121b437f
2 changed files with 65 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -723,38 +723,69 @@ class ARTIQIRGenerator(algorithm.Visitor):
length = self.iterable_len(value, node.slice.type) length = self.iterable_len(value, node.slice.type)
if node.slice.lower is not None: if node.slice.lower is not None:
min_index = self.visit(node.slice.lower) start_index = self.visit(node.slice.lower)
else: else:
min_index = ir.Constant(0, node.slice.type) start_index = ir.Constant(0, node.slice.type)
mapped_min_index = self._map_index(length, min_index) mapped_start_index = self._map_index(length, start_index)
if node.slice.upper is not None: if node.slice.upper is not None:
max_index = self.visit(node.slice.upper) stop_index = self.visit(node.slice.upper)
else: else:
max_index = length stop_index = length
mapped_max_index = self._map_index(length, max_index, one_past_the_end=True) mapped_stop_index = self._map_index(length, stop_index, one_past_the_end=True)
if node.slice.step is not None: if node.slice.step is not None:
step = self.visit(node.slice.step) step = self.visit(node.slice.step)
self._make_check(self.append(ir.Compare(ast.NotEq(loc=None), step,
ir.Constant(0, step.type))),
lambda: self.append(ir.Alloc([], builtins.TValueError())))
else: else:
step = ir.Constant(1, node.slice.type) step = ir.Constant(1, node.slice.type)
counting_up = self.append(ir.Compare(ast.Gt(loc=None), step,
ir.Constant(0, step.type)))
unstepped_size = self.append(ir.Arith(ast.Sub(loc=None), unstepped_size = self.append(ir.Arith(ast.Sub(loc=None),
mapped_max_index, mapped_min_index)) mapped_stop_index, mapped_start_index))
slice_size = self.append(ir.Arith(ast.FloorDiv(loc=None), unstepped_size, step, slice_size_a = self.append(ir.Arith(ast.FloorDiv(loc=None), unstepped_size, step))
slice_size_b = self.append(ir.Arith(ast.Mod(loc=None), unstepped_size, step))
rem_not_empty = self.append(ir.Compare(ast.NotEq(loc=None), slice_size_b,
ir.Constant(0, slice_size_b.type)))
slice_size_c = self.append(ir.Arith(ast.Add(loc=None), slice_size_a,
ir.Constant(1, slice_size_a.type)))
slice_size = self.append(ir.Select(rem_not_empty,
slice_size_c, slice_size_a,
name="slice.size")) name="slice.size"))
self._make_check(self.append(ir.Compare(ast.LtE(loc=None), slice_size, length)), self._make_check(self.append(ir.Compare(ast.LtE(loc=None), slice_size, length)),
lambda: self.append(ir.Alloc([], builtins.TValueError()))) lambda: self.append(ir.Alloc([], builtins.TValueError())))
if self.current_assign is None: if self.current_assign is None:
other_value = self.append(ir.Alloc([slice_size], value.type)) is_neg_size = self.append(ir.Compare(ast.Lt(loc=None),
slice_size, ir.Constant(0, slice_size.type)))
abs_slice_size = self.append(ir.Select(is_neg_size,
ir.Constant(0, slice_size.type), slice_size))
other_value = self.append(ir.Alloc([abs_slice_size], value.type,
name="slice.result"))
else: else:
other_value = self.current_assign other_value = self.current_assign
def body_gen(other_index): prehead = self.current_block
offset = self.append(ir.Arith(ast.Mult(loc=None), step, other_index))
index = self.append(ir.Arith(ast.Add(loc=None), min_index, offset)) head = self.current_block = self.add_block()
prehead.append(ir.Branch(head))
index = self.append(ir.Phi(node.slice.type,
name="slice.index"))
index.add_incoming(mapped_start_index, prehead)
other_index = self.append(ir.Phi(node.slice.type,
name="slice.resindex"))
other_index.add_incoming(ir.Constant(0, node.slice.type), prehead)
# Still within bounds?
bounded_up = self.append(ir.Compare(ast.Lt(loc=None), index, mapped_stop_index))
bounded_down = self.append(ir.Compare(ast.Gt(loc=None), index, mapped_stop_index))
within_bounds = self.append(ir.Select(counting_up, bounded_up, bounded_down))
body = self.current_block = self.add_block()
if self.current_assign is None: if self.current_assign is None:
elem = self.iterable_get(value, index) elem = self.iterable_get(value, index)
@ -763,11 +794,15 @@ class ARTIQIRGenerator(algorithm.Visitor):
elem = self.append(ir.GetElem(self.current_assign, other_index)) elem = self.append(ir.GetElem(self.current_assign, other_index))
self.append(ir.SetElem(value, index, elem)) self.append(ir.SetElem(value, index, elem))
return self.append(ir.Arith(ast.Add(loc=None), other_index, next_index = self.append(ir.Arith(ast.Add(loc=None), index, step))
index.add_incoming(next_index, body)
next_other_index = self.append(ir.Arith(ast.Add(loc=None), other_index,
ir.Constant(1, node.slice.type))) ir.Constant(1, node.slice.type)))
self._make_loop(ir.Constant(0, node.slice.type), other_index.add_incoming(next_other_index, body)
lambda index: self.append(ir.Compare(ast.Lt(loc=None), index, slice_size)), self.append(ir.Branch(head))
body_gen)
tail = self.current_block = self.add_block()
head.append(ir.BranchIf(within_bounds, body, tail))
if self.current_assign is None: if self.current_assign is None:
return other_value return other_value

5
lit-test/compiler/integration/subscript.py
View File

@ -10,3 +10,8 @@ assert lst[0:10] == lst
assert lst[1:-1] == lst[1:9] assert lst[1:-1] == lst[1:9]
assert lst[0:1:2] == [0] assert lst[0:1:2] == [0]
assert lst[0:2:2] == [0] assert lst[0:2:2] == [0]
assert lst[0:3:2] == [0, 2]
lst = [0, 0, 0, 0, 0]
lst[0:5:2] = [1, 2, 3]
assert lst == [1, 0, 2, 0, 3]