Author: Richard Plangger <r...@pasra.at> Branch: vecopt-merge Changeset: r79339:11cf3f890e18 Date: 2015-09-01 10:43 +0200 http://bitbucket.org/pypy/pypy/changeset/11cf3f890e18/
Log: tanslation issues, removed old function diff --git a/rpython/jit/metainterp/optimizeopt/dependency.py b/rpython/jit/metainterp/optimizeopt/dependency.py --- a/rpython/jit/metainterp/optimizeopt/dependency.py +++ b/rpython/jit/metainterp/optimizeopt/dependency.py @@ -968,12 +968,6 @@ self.coefficient_div == 1 and \ self.constant == 0 - def less(self, other): - # TODO - if self.same_variable(other): - return self.constant_diff(other) < 0 - return False - def clone(self): c = IndexVar(self.var) c.coefficient_mul = self.coefficient_mul diff --git a/rpython/jit/metainterp/optimizeopt/schedule.py b/rpython/jit/metainterp/optimizeopt/schedule.py --- a/rpython/jit/metainterp/optimizeopt/schedule.py +++ b/rpython/jit/metainterp/optimizeopt/schedule.py @@ -878,7 +878,6 @@ if op.casts_box(): count = pack_type.getcount() return count - count = vec_reg_size // pack_type.getsize() return count @@ -892,7 +891,7 @@ # casting is special, often only takes a half full vector pack_type = pack.input_type if pack_type is None: - pack_type = self.output_type # load operations + pack_type = pack.output_type # load operations return pack_type.byte_size() return vec_reg_size @@ -1001,6 +1000,7 @@ def slice_operations(self, vec_reg_size): count = opcount_filling_vector_register(self, vec_reg_size) + assert count > 0 newoplist = self.operations[count:] oplist = self.operations[:count] assert len(newoplist) + len(oplist) == len(self.operations) diff --git a/rpython/jit/metainterp/test/test_vectorize.py b/rpython/jit/metainterp/test/test_vectorize.py --- a/rpython/jit/metainterp/test/test_vectorize.py +++ b/rpython/jit/metainterp/test/test_vectorize.py @@ -289,27 +289,17 @@ res = self.meta_interp(f, [i]) assert res == f(i) - @py.test.mark.parametrize('i,v1,v2',[(25,2.5,0.3)]) + @py.test.mark.parametrize('i,v1,v2',[(25,2.5,0.3),(25,2.5,0.3)]) def test_list_vectorize(self,i,v1,v2): myjitdriver = JitDriver(greens = [], reds = 'auto') class ListF(object): - def __init__(self, size, init=0.0): + def __init__(self, size, init): self.list = [init] * size def __getitem__(self, key): - if key < 0: - raise IndexError - if key >= len(self.list): - raise IndexError return self.list[key] def __setitem__(self, key, value): - if key < 0: - raise IndexError - if key >= len(self.list): - raise IndexError self.list[key] = value - def append(self, value): - self.list.append(value) def f(d, v1, v2): a = ListF(d, v1) b = ListF(d, v2) _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit