Author: Maciej Fijalkowski <[email protected]>
Branch: result-in-resops
Changeset: r58362:981f578b1731
Date: 2012-10-22 16:44 +0200
http://bitbucket.org/pypy/pypy/changeset/981f578b1731/
Log: (arigo, fijal) consistently pass descr as last
diff --git a/pypy/jit/codewriter/jtransform.py
b/pypy/jit/codewriter/jtransform.py
--- a/pypy/jit/codewriter/jtransform.py
+++ b/pypy/jit/codewriter/jtransform.py
@@ -580,8 +580,8 @@
kind = getkind(op.result.concretetype)
return [SpaceOperation('-live-', [], None),
SpaceOperation('getarrayitem_vable_%s' % kind[0],
- [v_base, arrayfielddescr, arraydescr,
- op.args[1]], op.result)]
+ [v_base, op.args[1], arrayfielddescr,
+ arraydescr], op.result)]
# normal case follows
pure = ''
immut = ARRAY._immutable_field(None)
@@ -604,12 +604,12 @@
kind = getkind(op.args[2].concretetype)
return [SpaceOperation('-live-', [], None),
SpaceOperation('setarrayitem_vable_%s' % kind[0],
- [v_base, arrayfielddescr, arraydescr,
- op.args[1], op.args[2]], None)]
+ [v_base, op.args[1], op.args[2],
+ arrayfielddescr, arraydescr], None)]
arraydescr = self.cpu.arraydescrof(ARRAY)
kind = getkind(op.args[2].concretetype)
return SpaceOperation('setarrayitem_%s_%s' % (ARRAY._gckind, kind[0]),
- [op.args[0], arraydescr, op.args[1], op.args[2]],
+ [op.args[0], op.args[1], op.args[2], arraydescr],
None)
def rewrite_op_getarraysize(self, op):
@@ -1535,13 +1535,13 @@
kind = getkind(args[2].concretetype)
return [SpaceOperation('-live-', [], None),
SpaceOperation('setarrayitem_vable_%s' % kind[0],
- [v_base, arrayfielddescr, arraydescr,
- args[1], args[2]], None)]
+ [v_base, args[1], args[2],
+ arrayfielddescr, arraydescr], None)]
v_index, extraop = self._prepare_list_getset(op, arraydescr, args,
'check_neg_index')
kind = getkind(args[2].concretetype)[0]
op = SpaceOperation('setarrayitem_gc_%s' % kind,
- [args[0], arraydescr, v_index, args[2]], None)
+ [args[0], v_index, args[2], arraydescr], None)
return extraop + [op]
def do_fixed_list_ll_arraycopy(self, op, args, arraydescr):
diff --git a/pypy/jit/codewriter/test/test_call.py
b/pypy/jit/codewriter/test/test_call.py
--- a/pypy/jit/codewriter/test/test_call.py
+++ b/pypy/jit/codewriter/test/test_call.py
@@ -173,7 +173,7 @@
py.test.skip("XXX add a test for CallControl.getcalldescr() -> EF_xxx")
def test_releases_gil_analyzer():
- from pypy.jit.backend.llgraph.runner import LLtypeCPU
+ from pypy.jit.backend.llgraph.runner import LLGraphCPU
T = rffi.CArrayPtr(rffi.TIME_T)
external = rffi.llexternal("time", [T], rffi.TIME_T, threadsafe=True)
@@ -184,7 +184,7 @@
rtyper = support.annotate(f, [])
jitdriver_sd = FakeJitDriverSD(rtyper.annotator.translator.graphs[0])
- cc = CallControl(LLtypeCPU(rtyper), jitdrivers_sd=[jitdriver_sd])
+ cc = CallControl(LLGraphCPU(rtyper), jitdrivers_sd=[jitdriver_sd])
res = cc.find_all_graphs(FakePolicy())
[f_graph] = [x for x in res if x.func is f]
@@ -194,7 +194,7 @@
assert call_descr.extrainfo.has_random_effects()
def test_random_effects_on_stacklet_switch():
- from pypy.jit.backend.llgraph.runner import LLtypeCPU
+ from pypy.jit.backend.llgraph.runner import LLGraphCPU
from pypy.translator.platform import CompilationError
try:
from pypy.rlib._rffi_stacklet import switch, thread_handle, handle
@@ -209,7 +209,7 @@
rtyper = support.annotate(f, [])
jitdriver_sd = FakeJitDriverSD(rtyper.annotator.translator.graphs[0])
- cc = CallControl(LLtypeCPU(rtyper), jitdrivers_sd=[jitdriver_sd])
+ cc = CallControl(LLGraphCPU(rtyper), jitdrivers_sd=[jitdriver_sd])
res = cc.find_all_graphs(FakePolicy())
[f_graph] = [x for x in res if x.func is f]
diff --git a/pypy/jit/codewriter/test/test_flatten.py
b/pypy/jit/codewriter/test/test_flatten.py
--- a/pypy/jit/codewriter/test/test_flatten.py
+++ b/pypy/jit/codewriter/test/test_flatten.py
@@ -688,7 +688,7 @@
return array[2] + len(array)
self.encoding_test(f, [], """
new_array $5, <Descr> -> %r0
- setarrayitem_gc_i %r0, <Descr>, $2, $5
+ setarrayitem_gc_i %r0, $2, $5, <Descr>
getarrayitem_gc_i %r0, $2, <Descr> -> %i0
arraylen_gc %r0, <Descr> -> %i1
int_add %i0, %i1 -> %i2
diff --git a/pypy/jit/codewriter/test/test_jtransform.py
b/pypy/jit/codewriter/test/test_jtransform.py
--- a/pypy/jit/codewriter/test/test_jtransform.py
+++ b/pypy/jit/codewriter/test/test_jtransform.py
@@ -1,21 +1,9 @@
import py
import random
-try:
- from itertools import product
-except ImportError:
- # Python 2.5, this is taken from the CPython docs, but simplified.
- def product(*args):
- # product('ABCD', 'xy') --> Ax Ay Bx By Cx Cy Dx Dy
- # product(range(2), repeat=3) --> 000 001 010 011 100 101 110 111
- pools = map(tuple, args)
- result = [[]]
- for pool in pools:
- result = [x+[y] for x in result for y in pool]
- for prod in result:
- yield tuple(prod)
+from itertools import product
-from pypy.objspace.flow.model import FunctionGraph, Block, Link
+from pypy.objspace.flow.model import Block, Link
from pypy.objspace.flow.model import SpaceOperation, Variable, Constant
from pypy.rpython.lltypesystem import lltype, llmemory, rclass, rstr, rffi
from pypy.rpython.lltypesystem.module import ll_math
diff --git a/pypy/jit/codewriter/test/test_list.py
b/pypy/jit/codewriter/test/test_list.py
--- a/pypy/jit/codewriter/test/test_list.py
+++ b/pypy/jit/codewriter/test/test_list.py
@@ -144,7 +144,7 @@
varoftype(lltype.Signed),
varoftype(lltype.Signed)],
lltype.Void, """
- setarrayitem_gc_i %r0, <ArrayDescr>, %i0, %i1
+ setarrayitem_gc_i %r0, %i0, %i1, <ArrayDescr>
""")
builtin_test('list.setitem/NEG', [varoftype(FIXEDLIST),
varoftype(lltype.Signed),
@@ -152,7 +152,7 @@
lltype.Void, """
-live-
check_neg_index %r0, <ArrayDescr>, %i0 -> %i1
- setarrayitem_gc_i %r0, <ArrayDescr>, %i1, %i2
+ setarrayitem_gc_i %r0, %i1, %i2, <ArrayDescr>
""")
def test_fixed_len():
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
