[pypy-commit] pypy ppc-vsx-support: resolve several issues to run test_vector again
plan_rich
pypy.commits at gmail.com
Tue Jun 28 08:17:57 EDT 2016
Author: Richard Plangger <planrichi at gmail.com>
Branch: ppc-vsx-support
Changeset: r85425:647de5c9a91f
Date: 2016-06-27 16:17 +0200
http://bitbucket.org/pypy/pypy/changeset/647de5c9a91f/
Log: resolve several issues to run test_vector again
diff --git a/rpython/jit/backend/ppc/vector_ext.py b/rpython/jit/backend/ppc/vector_ext.py
--- a/rpython/jit/backend/ppc/vector_ext.py
+++ b/rpython/jit/backend/ppc/vector_ext.py
@@ -70,15 +70,11 @@
genop_discard_vec_setarrayitem_gc = _emit_vec_setitem
def emit_vec_store(self, op, arglocs, regalloc):
- baseloc, ofsloc, valueloc, size_loc, baseofs, \
+ baseloc, indexloc, valueloc, sizeloc, baseofs, \
integer_loc, aligned_loc = arglocs
#dest_loc = addr_add(base_loc, ofs_loc, baseofs.value, 0)
assert baseofs.value == 0
- # self._vec_store(baseloc, ofsloc, valueloc, integer_loc.value,
- # size_loc.value, regalloc)
-
- #def _vec_store(self, baseloc, indexloc, valueloc, integer, itemsize, regalloc):
- if integer:
+ if integer_loc.value:
Vloloc = regalloc.ivrm.get_scratch_reg()
Vhiloc = regalloc.ivrm.get_scratch_reg()
Vploc = regalloc.ivrm.get_scratch_reg()
@@ -117,6 +113,7 @@
self.mc.stvx(Vlo, indexloc.value, t)
self.mc.stvx(Vhi, indexloc.value, baseloc.value)
else:
+ itemsize = sizeloc.value
if itemsize == 4:
self.mc.stxvw4x(valueloc.value, indexloc.value, baseloc.value)
elif itemsize == 8:
diff --git a/rpython/jit/metainterp/test/test_vector.py b/rpython/jit/metainterp/test/test_vector.py
--- a/rpython/jit/metainterp/test/test_vector.py
+++ b/rpython/jit/metainterp/test/test_vector.py
@@ -161,7 +161,6 @@
self.meta_interp(f, [l*size, va, vb, vc])
for i in range(l):
- import pdb; pdb.set_trace()
c = raw_storage_getitem(type,vc,i*size)
r = func(la[i], lb[i])
assert isclose(r, c)
More information about the pypy-commit
mailing list