Author: Armin Rigo <[email protected]>
Branch: remove-raisingops
Changeset: r84352:59ed937837d3
Date: 2016-05-10 19:54 +0200
http://bitbucket.org/pypy/pypy/changeset/59ed937837d3/
Log: Finish 1ad01ba1173b for the front-end
diff --git a/rpython/jit/backend/x86/assembler.py
b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -1444,7 +1444,7 @@
self.mov(imm0, resloc)
self.mc.CMOVNS(resloc, arglocs[0])
- def genop_int_c_mod(self, op, arglocs, resloc):
+ def XXX_genop_int_c_mod(self, op, arglocs, resloc):
if IS_X86_32:
self.mc.CDQ()
elif IS_X86_64:
@@ -1452,9 +1452,9 @@
self.mc.IDIV_r(ecx.value)
- genop_int_c_div = genop_int_c_mod
+ XXX_genop_int_c_div = XXX_genop_int_c_mod
- def genop_uint_floordiv(self, op, arglocs, resloc):
+ def XXX_genop_uint_floordiv(self, op, arglocs, resloc):
self.mc.XOR_rr(edx.value, edx.value)
self.mc.DIV_r(ecx.value)
diff --git a/rpython/jit/backend/x86/regalloc.py
b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -598,15 +598,15 @@
assert l2 is resultreg
self.rm.possibly_free_var(tmpvar)
- def consider_int_c_mod(self, op):
+ def XXX_consider_int_c_mod(self, op):
self._consider_int_div_or_mod(op, edx, eax)
self.perform(op, [eax, ecx], edx)
- def consider_int_c_div(self, op):
+ def XXX_consider_int_c_div(self, op):
self._consider_int_div_or_mod(op, eax, edx)
self.perform(op, [eax, ecx], eax)
- consider_uint_floordiv = consider_int_c_div
+ XXX_consider_uint_floordiv = XXX_consider_int_c_div
def _consider_compop(self, op):
vx = op.getarg(0)
diff --git a/rpython/jit/codewriter/jtransform.py
b/rpython/jit/codewriter/jtransform.py
--- a/rpython/jit/codewriter/jtransform.py
+++ b/rpython/jit/codewriter/jtransform.py
@@ -1908,9 +1908,14 @@
op0 = SpaceOperation(opname, args, op.result)
if oopspec_name in ('int.add_ovf', 'int.mul_ovf'):
op0 = self._rewrite_symmetric(op0)
- oplist = [op0]
- if oopspec_name.endswith('_ovf'):
- oplist.insert(0, SpaceOperation('-live-', [], None))
+ oplist = [SpaceOperation('-live-', [], None), op0]
+ return oplist
+ elif oopspec_name == 'int.neg_ovf':
+ [v_x] = args
+ op0 = SpaceOperation('int_sub_ovf',
+ [Constant(0, lltype.Signed), v_x],
+ op.result)
+ oplist = [SpaceOperation('-live-', [], None), op0]
return oplist
else:
os = getattr(EffectInfo, 'OS_' + opname.upper())
diff --git a/rpython/jit/codewriter/test/test_jtransform.py
b/rpython/jit/codewriter/test/test_jtransform.py
--- a/rpython/jit/codewriter/test/test_jtransform.py
+++ b/rpython/jit/codewriter/test/test_jtransform.py
@@ -308,6 +308,19 @@
assert op1.args == []
assert op1.result is None
+def test_neg_ovf():
+ v3 = varoftype(lltype.Signed)
+ for v1 in [varoftype(lltype.Signed), const(42)]:
+ op = SpaceOperation('direct_call', [Constant('neg_ovf'), v1], v3)
+ oplist = Transformer(FakeCPU())._handle_int_ovf(op, 'int.neg_ovf',
[v1])
+ op1, op0 = oplist
+ assert op0.opname == 'int_sub_ovf'
+ assert op0.args == [Constant(0), v1]
+ assert op0.result == v3
+ assert op1.opname == '-live-'
+ assert op1.args == []
+ assert op1.result is None
+
@py.test.mark.parametrize('opname', ['py_div', 'udiv', 'py_mod', 'umod'])
def test_asymmetric_op_residual(opname):
v3 = varoftype(lltype.Signed)
diff --git a/rpython/jit/metainterp/blackhole.py
b/rpython/jit/metainterp/blackhole.py
--- a/rpython/jit/metainterp/blackhole.py
+++ b/rpython/jit/metainterp/blackhole.py
@@ -430,19 +430,6 @@
return 0, label
@arguments("i", "i", returns="i")
- def bhimpl_int_py_div(a, b):
- return a // b
-
- @arguments("i", "i", returns="i")
- def bhimpl_uint_floordiv(a, b):
- c = llop.uint_floordiv(lltype.Unsigned, r_uint(a), r_uint(b))
- return intmask(c)
-
- @arguments("i", "i", returns="i")
- def bhimpl_int_py_mod(a, b):
- return a % b
-
- @arguments("i", "i", returns="i")
def bhimpl_int_and(a, b):
return a & b
diff --git a/rpython/jit/metainterp/executor.py
b/rpython/jit/metainterp/executor.py
--- a/rpython/jit/metainterp/executor.py
+++ b/rpython/jit/metainterp/executor.py
@@ -409,8 +409,6 @@
rop.GC_STORE,
rop.GC_STORE_INDEXED,
rop.LOAD_FROM_GC_TABLE,
- rop.INT_C_DIV,
- rop.INT_C_MOD,
): # list of opcodes never executed by pyjitpl
continue
if rop._VEC_PURE_FIRST <= value <= rop._VEC_PURE_LAST:
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
@@ -929,10 +929,10 @@
"""
exec py.code.Source(multiplicative_func_source
.format(name='INT_MUL', op='*', tgt='mul', cop='*')).compile()
- exec py.code.Source(multiplicative_func_source
- .format(name='INT_PY_DIV', op='*', tgt='div', cop='/')).compile()
- exec py.code.Source(multiplicative_func_source
- .format(name='UINT_FLOORDIV', op='*', tgt='div',
cop='/')).compile()
+ #exec py.code.Source(multiplicative_func_source
+ # .format(name='INT_PY_DIV', op='*', tgt='div', cop='/')).compile()
+ #exec py.code.Source(multiplicative_func_source
+ # .format(name='UINT_FLOORDIV', op='*', tgt='div',
cop='/')).compile()
del multiplicative_func_source
array_access_source = """
@@ -1042,9 +1042,11 @@
var = ResOperation(rop.INT_MUL, args)
opt.emit_operation(var)
if self.coefficient_div != 1:
- args = [var, ConstInt(self.coefficient_div)]
- var = ResOperation(rop.INT_FLOORDIV, args)
- opt.emit_operation(var)
+ assert 0 # XXX for now; should never be the case with handling
+ # of INT_PY_DIV commented out in this file...
+ #args = [var, ConstInt(self.coefficient_div)]
+ #var = ResOperation(rop.INT_FLOORDIV, args)
+ #opt.emit_operation(var)
if self.constant > 0:
args = [var, ConstInt(self.constant)]
var = ResOperation(rop.INT_ADD, args)
diff --git a/rpython/jit/metainterp/optimizeopt/intbounds.py
b/rpython/jit/metainterp/optimizeopt/intbounds.py
--- a/rpython/jit/metainterp/optimizeopt/intbounds.py
+++ b/rpython/jit/metainterp/optimizeopt/intbounds.py
@@ -172,14 +172,14 @@
if b.bounded():
r.intersect(b)
- def optimize_INT_PY_DIV(self, op):
+ def XXX_optimize_INT_PY_DIV(self, op):
b1 = self.getintbound(op.getarg(0))
b2 = self.getintbound(op.getarg(1))
self.emit_operation(op)
r = self.getintbound(op)
r.intersect(b1.py_div_bound(b2))
- def optimize_INT_PY_MOD(self, op):
+ def XXX_optimize_INT_PY_MOD(self, op):
b1 = self.getintbound(op.getarg(0))
b2 = self.getintbound(op.getarg(1))
if b2.is_constant():
diff --git a/rpython/jit/metainterp/optimizeopt/rewrite.py
b/rpython/jit/metainterp/optimizeopt/rewrite.py
--- a/rpython/jit/metainterp/optimizeopt/rewrite.py
+++ b/rpython/jit/metainterp/optimizeopt/rewrite.py
@@ -168,7 +168,7 @@
break
self.emit_operation(op)
- def optimize_UINT_FLOORDIV(self, op):
+ def XXX_optimize_UINT_FLOORDIV(self, op):
b2 = self.getintbound(op.getarg(1))
if b2.is_constant() and b2.getint() == 1:
@@ -678,7 +678,7 @@
def optimize_GUARD_FUTURE_CONDITION(self, op):
self.optimizer.notice_guard_future_condition(op)
- def optimize_INT_PY_DIV(self, op):
+ def XXX_optimize_INT_PY_DIV(self, op):
arg0 = op.getarg(0)
b1 = self.getintbound(arg0)
arg1 = op.getarg(1)
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -1856,6 +1856,7 @@
[i0]
jump(0)
"""
+ py.test.skip("XXX re-enable")
self.optimize_loop(ops, expected)
def test_fold_partially_constant_ops_ovf(self):
@@ -4643,6 +4644,7 @@
self.optimize_strunicode_loop(ops, expected)
def test_intmod_bounds(self):
+ py.test.skip("XXX re-enable")
ops = """
[i0, i1]
i2 = int_py_mod(i0, 12)
@@ -4699,6 +4701,7 @@
self.optimize_loop(ops, expected)
def test_intmod_bounds_bug1(self):
+ py.test.skip("XXX re-enable")
ops = """
[i0]
i1 = int_py_mod(i0, %d)
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -3491,6 +3491,7 @@
self.optimize_loop(ops, expected)
def test_fold_partially_constant_uint_floordiv(self):
+ py.test.skip("XXX re-enable")
ops = """
[i0]
i1 = uint_floordiv(i0, 1)
@@ -5241,6 +5242,7 @@
self.optimize_loop(ops, expected, preamble)
def test_bound_floordiv(self):
+ py.test.skip("XXX re-enable")
ops = """
[i0, i1, i2]
it1 = int_ge(i1, 0)
@@ -5315,6 +5317,7 @@
self.optimize_loop(ops, expected, preamble)
def test_division(self):
+ py.test.skip("XXX re-enable")
ops = """
[i7, i6, i8]
it1 = int_gt(i7, 0)
@@ -5366,6 +5369,7 @@
self.optimize_loop(ops, expected, preamble)
def test_division_to_rshift(self):
+ py.test.skip("XXX re-enable")
ops = """
[i1, i2]
it = int_gt(i1, 0)
@@ -5473,6 +5477,7 @@
self.optimize_loop(ops, expected)
def test_int_div_1(self):
+ py.test.skip("XXX re-enable")
ops = """
[i0]
i1 = int_floordiv(i0, 1)
@@ -5485,6 +5490,7 @@
self.optimize_loop(ops, expected)
def test_division_nonneg(self):
+ py.test.skip("XXX re-enable")
py.test.skip("harder")
# this is how an app-level division turns into right now
ops = """
@@ -5508,6 +5514,7 @@
self.optimize_loop(ops, expected)
def test_division_by_2(self):
+ py.test.skip("XXX re-enable")
py.test.skip("harder")
ops = """
[i4]
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
@@ -394,6 +394,7 @@
self.assert_equal(loop2, loop3)
def test_no_vec_impl(self):
+ py.test.skip("XXX re-enable")
loop1 = self.parse_trace("""
i10 = int_and(255, i1)
i11 = int_and(255, i2)
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_vecopt.py
b/rpython/jit/metainterp/optimizeopt/test/test_vecopt.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_vecopt.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_vecopt.py
@@ -659,6 +659,7 @@
assert mref1.is_adjacent_after(mref5)
def test_array_memory_ref_div(self):
+ py.test.skip("XXX re-enable")
ops = """
[p0,i0]
i1 = int_floordiv(i0,2)
@@ -721,6 +722,7 @@
assert mref == mref2
def test_array_memory_ref_diff_not_equal(self):
+ py.test.skip("XXX re-enable")
ops = """
[p0,i0]
i1 = int_add(i0,4)
diff --git a/rpython/jit/metainterp/pyjitpl.py
b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -201,11 +201,10 @@
# ------------------------------
- for _opimpl in ['int_add', 'int_sub', 'int_mul', 'int_py_div',
'int_py_mod',
+ for _opimpl in ['int_add', 'int_sub', 'int_mul',
'int_and', 'int_or', 'int_xor', 'int_signext',
'int_rshift', 'int_lshift', 'uint_rshift',
'uint_lt', 'uint_le', 'uint_gt', 'uint_ge',
- 'uint_floordiv',
'float_add', 'float_sub', 'float_mul', 'float_truediv',
'float_lt', 'float_le', 'float_eq',
'float_ne', 'float_gt', 'float_ge',
diff --git a/rpython/jit/metainterp/test/test_ajit.py
b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -586,7 +586,7 @@
def internfn(y):
return y * 3
def externfn(y):
- return y % 4
+ return y ^ 4
def f(y):
while y >= 0:
myjitdriver.can_enter_jit(y=y)
@@ -601,7 +601,7 @@
policy = StopAtXPolicy(externfn)
res = self.meta_interp(f, [31], policy=policy)
assert res == 42
- self.check_resops(int_mul=2, int_py_mod=0, int_c_mod=0)
+ self.check_resops(int_mul=2, int_xor=0)
def test_we_are_jitted(self):
myjitdriver = JitDriver(greens = [], reds = ['y'])
@@ -939,6 +939,7 @@
return n
res = self.meta_interp(f, [20, 1, 2])
assert res == 0
+ py.test.skip("XXX re-enable")
self.check_resops(call_i=0, call_r=0)
def test_abs(self):
@@ -1133,7 +1134,7 @@
while n > 0:
mydriver.can_enter_jit(n=n, x=x)
mydriver.jit_merge_point(n=n, x=x)
- if n % 2 == 0:
+ if n & 1 == 0:
cls = A
else:
cls = B
diff --git a/rpython/jit/metainterp/test/test_dict.py
b/rpython/jit/metainterp/test/test_dict.py
--- a/rpython/jit/metainterp/test/test_dict.py
+++ b/rpython/jit/metainterp/test/test_dict.py
@@ -99,9 +99,9 @@
py.test.skip("this is an r_dict test")
myjitdriver = JitDriver(greens = [], reds = ['total', 'dct'])
def key(x):
- return x % 2
+ return x & 1
def eq(x, y):
- return (x % 2) == (y % 2)
+ return (x & 1) == (y & 1)
def f(n):
dct = objectmodel.r_dict(eq, key)
@@ -117,7 +117,7 @@
res1 = f(100)
res2 = self.meta_interp(f, [100], listops=True)
assert res1 == res2
- self.check_resops(int_py_mod=2) # the hash was traced and eq, but
cached
+ self.check_resops(int_and=2) # the hash was traced and eq, but cached
def test_dict_setdefault(self):
myjitdriver = JitDriver(greens = [], reds = ['total', 'dct'])
@@ -140,9 +140,9 @@
py.test.skip("this is an r_dict test")
myjitdriver = JitDriver(greens = [], reds = ['total', 'dct'])
def key(x):
- return x % 2
+ return x & 1
def eq(x, y):
- return (x % 2) == (y % 2)
+ return (x & 1) == (y & 1)
def f(n):
dct = objectmodel.r_dict(eq, key)
@@ -156,7 +156,7 @@
assert f(100) == 50
res = self.meta_interp(f, [100], listops=True)
assert res == 50
- self.check_resops(int_py_mod=2) # key + eq, but cached
+ self.check_resops(int_and=2) # key + eq, but cached
def test_repeated_lookup(self):
if type(self.newdict()) is not dict:
@@ -370,7 +370,7 @@
d = {}
while n > 0:
myjitdriver.jit_merge_point()
- if n % 10 == 0:
+ if n & 7 == 0:
n -= len(d)
d = {}
d["a"] = n
diff --git a/rpython/jit/metainterp/test/test_executor.py
b/rpython/jit/metainterp/test/test_executor.py
--- a/rpython/jit/metainterp/test/test_executor.py
+++ b/rpython/jit/metainterp/test/test_executor.py
@@ -142,18 +142,18 @@
(133, 133, 0)]),
(rop.INT_MUL, [(-6, -3, 18),
(15, 15, 225)]),
- (rop.INT_FLOORDIV, [(110, 3, 36),
- (-110, 3, -36),
- (110, -3, -36),
- (-110, -3, 36),
- (-110, -1, 110),
- (minint, 1, minint),
- (-87, -87, 1)]),
- (rop.INT_MOD, [(11, 3, 2),
- (-11, 3, -2),
- (11, -3, 2),
- (-11, -3, -2),
- (-87, -87, 0)]),
+ ## (rop.INT_FLOORDIV, [(110, 3, 36),
+ ## (-110, 3, -36),
+ ## (110, -3, -36),
+ ## (-110, -3, 36),
+ ## (-110, -1, 110),
+ ## (minint, 1, minint),
+ ## (-87, -87, 1)]),
+ ## (rop.INT_MOD, [(11, 3, 2),
+ ## (-11, 3, -2),
+ ## (11, -3, 2),
+ ## (-11, -3, -2),
+ ## (-87, -87, 0)]),
(rop.INT_AND, [(0xFF00, 0x0FF0, 0x0F00),
(-111, -111, -111)]),
(rop.INT_OR, [(0xFF00, 0x0FF0, 0xFFF0),
@@ -170,15 +170,15 @@
(rop.UINT_RSHIFT, [(-1, 4, intmask(r_uint(-1) >> r_uint(4))),
( 1, 4, intmask(r_uint(1) >> r_uint(4))),
( 3, 3, 0)]),
- (rop.UINT_FLOORDIV, [(4, 3, intmask(r_uint(4) / r_uint(3))),
- (1, -1, intmask(r_uint(1) / r_uint(-1))),
- (110, 3, 36),
- (-110, 3, intmask(r_uint(-110) / r_uint(3))),
- (110, -3, intmask(r_uint(110) / r_uint(-3))),
- (-110, -3, intmask(r_uint(-110) / r_uint(-3))),
- (-110, -1, intmask(r_uint(-110) / r_uint(-1))),
- (minint, 1, intmask(r_uint(minint) / r_uint(1))),
- (-87, -87, intmask(r_uint(-87) / r_uint(-87)))])
+ ## (rop.UINT_FLOORDIV, [(4, 3, intmask(r_uint(4) / r_uint(3))),
+ ## (1, -1, intmask(r_uint(1) / r_uint(-1))),
+ ## (110, 3, 36),
+ ## (-110, 3, intmask(r_uint(-110) / r_uint(3))),
+ ## (110, -3, intmask(r_uint(110) / r_uint(-3))),
+ ## (-110, -3, intmask(r_uint(-110) / r_uint(-3))),
+ ## (-110, -1, intmask(r_uint(-110) / r_uint(-1))),
+ ## (minint, 1, intmask(r_uint(minint) /
r_uint(1))),
+ ## (-87, -87, intmask(r_uint(-87) /
r_uint(-87)))])
]:
for x, y, z in testcases:
yield opnum, [x, y], z
diff --git a/rpython/jit/metainterp/test/test_list.py
b/rpython/jit/metainterp/test/test_list.py
--- a/rpython/jit/metainterp/test/test_list.py
+++ b/rpython/jit/metainterp/test/test_list.py
@@ -212,7 +212,7 @@
s += lst[0]
lst.pop()
lst.append(1)
- s /= lst.pop()
+ s *= lst.pop()
return s
res = self.meta_interp(f, [15], listops=True)
assert res == f(15)
diff --git a/rpython/jit/metainterp/test/test_string.py
b/rpython/jit/metainterp/test/test_string.py
--- a/rpython/jit/metainterp/test/test_string.py
+++ b/rpython/jit/metainterp/test/test_string.py
@@ -511,7 +511,7 @@
def f(n):
while n < 21:
driver.jit_merge_point(n=n)
- promote_string(str(n % 3))
+ promote_string(str(n & 3))
n += 1
return 0
diff --git a/rpython/rtyper/rint.py b/rpython/rtyper/rint.py
--- a/rpython/rtyper/rint.py
+++ b/rpython/rtyper/rint.py
@@ -594,9 +594,8 @@
raise OverflowError("x<<y loosing bits or changing sign")
return result
[email protected]("int.neg_ovf(x)")
def ll_int_neg_ovf(x):
- if jit.we_are_jitted():
- return ll_int_sub_ovf(0, x)
if x == INT_MIN:
raise OverflowError
return -x
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
