Author: Richard Plangger <r...@pasra.at> Branch: vecopt-merge Changeset: r79109:21e4d477dc9c Date: 2015-08-21 14:18 +0200 http://bitbucket.org/pypy/pypy/changeset/21e4d477dc9c/
Log: added missing parameter needed for llgraph to the test suite diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py --- a/rpython/jit/metainterp/compile.py +++ b/rpython/jit/metainterp/compile.py @@ -191,7 +191,7 @@ """ metainterp_sd = metainterp.staticdata cpu = metainterp_sd.cpu - if loop.versions is not None: + if loop.versions: # compile each version once for the first fail descr! # this assumes that the root trace (= loop) is already compiled root = loop.versions[0] diff --git a/rpython/jit/metainterp/optimizeopt/guard.py b/rpython/jit/metainterp/optimizeopt/guard.py --- a/rpython/jit/metainterp/optimizeopt/guard.py +++ b/rpython/jit/metainterp/optimizeopt/guard.py @@ -264,16 +264,17 @@ self.collect_guard_information(loop) self.eliminate_guards(loop) # - assert len(loop.versions) == 2, "need one orignal loop version (before trans) and the current one" - root_version = loop.versions[0] - version = loop.versions[1] + if len(loop.versions) >= 2: + assert len(loop.version) == 2 + root_version = loop.versions[0] + version = loop.versions[1] - for op in loop.operations: - if not op.is_guard(): - continue - descr = op.getdescr() - if descr.loop_version(): - root_version.register_guard(op, version) + for op in loop.operations: + if not op.is_guard(): + continue + descr = op.getdescr() + if descr.loop_version(): + root_version.register_guard(op, version) if user_code: version = loop.snapshot() diff --git a/rpython/jit/metainterp/optimizeopt/test/test_schedule.py b/rpython/jit/metainterp/optimizeopt/test/test_schedule.py --- a/rpython/jit/metainterp/optimizeopt/test/test_schedule.py +++ b/rpython/jit/metainterp/optimizeopt/test/test_schedule.py @@ -184,7 +184,7 @@ v10[i64|2] = vec_box(2) v20[i64|2] = vec_int_pack(v10[i64|2], i0, 0, 1) v30[i64|2] = vec_int_pack(v20[i64|2], i1, 1, 1) - v40[i64|2] = vec_int_expand(73) + v40[i64|2] = vec_int_expand(73,2) # v50[i64|2] = vec_int_add(v30[i64|2], v40[i64|2]) """, False) @@ -200,7 +200,7 @@ v10[f64|2] = vec_box(2) v20[f64|2] = vec_float_pack(v10[f64|2], f0, 0, 1) v30[f64|2] = vec_float_pack(v20[f64|2], f1, 1, 1) - v40[f64|2] = vec_float_expand(73.0) + v40[f64|2] = vec_float_expand(73.0,2) # v50[f64|2] = vec_float_add(v30[f64|2], v40[f64|2]) """, False) @@ -220,7 +220,7 @@ v10[f64|2] = vec_box(2) v20[f64|2] = vec_float_pack(v10[f64|2], f0, 0, 1) v30[f64|2] = vec_float_pack(v20[f64|2], f1, 1, 1) - v40[f64|2] = vec_float_expand(f5) # only expaned once + v40[f64|2] = vec_float_expand(f5,2) # only expaned once # v50[f64|2] = vec_float_add(v30[f64|2], v40[f64|2]) v60[f64|2] = vec_float_add(v50[f64|2], v40[f64|2]) @@ -367,7 +367,7 @@ pack3 = self.pack(loop1, 4, 6, I64, None) loop2 = self.schedule(loop1, [pack1,pack2,pack3], prepend_invariant=True) loop3 = self.parse(""" - v9[i64|2] = vec_int_expand(255) + v9[i64|2] = vec_int_expand(255,2) v10[i64|2] = vec_raw_load(p0, i1, 2, descr=long) v11[i64|2] = vec_int_and(v10[i64|2], v9[i64|2]) guard_true(v11[i64|2]) [] @@ -404,8 +404,8 @@ pack1 = self.pack(loop1, 0, 2, I64, I64) loop2 = self.schedule(loop1, [pack1], prepend_invariant=True) loop3 = self.parse(""" - v1[i64|2] = vec_int_expand(255) - v2[i64|2] = vec_int_expand(i1) + v1[i64|2] = vec_int_expand(255,2) + v2[i64|2] = vec_int_expand(i1,2) v3[i64|2] = vec_int_and(v1[i64|2], v2[i64|2]) """, False) self.assert_equal(loop2, loop3) @@ -418,8 +418,8 @@ pack1 = self.pack(loop1, 0, 2, I64, I64) loop2 = self.schedule(loop1, [pack1], prepend_invariant=True) loop3 = self.parse(""" - v1[i64|2] = vec_int_expand(255) - v2[i64|2] = vec_int_expand(i1) + v1[i64|2] = vec_int_expand(255, 2) + v2[i64|2] = vec_int_expand(i1, 2) v3[i64|2] = vec_int_and(v1[i64|2], v2[i64|2]) """, False) self.assert_equal(loop2, loop3) @@ -437,7 +437,7 @@ pack4 = self.pack(loop1, 4, 6, I64, I64) loop2 = self.schedule(loop1, [pack1,pack4], prepend_invariant=True) loop3 = self.parse(""" - v1[i64|2] = vec_int_expand(255) + v1[i64|2] = vec_int_expand(255,2) v2[i64|2] = vec_box(2) v3[i64|2] = vec_int_pack(v2[i64|2], i1, 0, 1) v4[i64|2] = vec_int_pack(v3[i64|2], i2, 1, 1) diff --git a/rpython/jit/metainterp/optimizeopt/test/test_vectorize.py b/rpython/jit/metainterp/optimizeopt/test/test_vectorize.py --- a/rpython/jit/metainterp/optimizeopt/test/test_vectorize.py +++ b/rpython/jit/metainterp/optimizeopt/test/test_vectorize.py @@ -134,7 +134,7 @@ opt.combine_packset() opt.schedule(True) if with_guard_opt: - gso = GuardStrengthenOpt(opt.dependency_graph.index_vars) + gso = GuardStrengthenOpt(opt.dependency_graph.index_vars, opt.has_two_labels) gso.propagate_all_forward(opt.loop) return opt @@ -147,7 +147,7 @@ opt.schedule(True) if not opt.costmodel.profitable(): raise NotAProfitableLoop() - gso = GuardStrengthenOpt(opt.dependency_graph.index_vars) + gso = GuardStrengthenOpt(opt.dependency_graph.index_vars, opt.has_two_labels) gso.propagate_all_forward(opt.loop) return opt @@ -988,7 +988,7 @@ opt=""" [p0,i0] label(p0,i0) - v3 = vec_int_expand(42) + v3 = vec_int_expand(42, 2) label(p0,i0,v3) i20 = int_add(i0, 1) i30 = int_lt(i20, 10) @@ -1018,7 +1018,7 @@ opt=""" [p0,i0,f3] label(p0,i0,f3) - v3 = vec_float_expand(f3) + v3 = vec_float_expand(f3,2) label(p0,i0,f3,v3) i20 = int_add(i0, 1) i30 = int_lt(i20, 10) @@ -1412,7 +1412,7 @@ guard_false(i33, descr=<ResumeGuardFalseDescr object at 0x7f89c54cddc0>) [p1, p0, p6, p7, i29, None, None] jump(p0, p1, p6, p7, i29, p14, p15) """ - opt = self.schedule(self.parse_loop(trace)) + #opt = self.schedule(self.parse_loop(trace)) #self.debug_print_operations(opt.loop) class TestLLtype(BaseTestVectorize, LLtypeMixin): _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit