Author: Maciej Fijalkowski <[email protected]>
Branch: optresult-unroll
Changeset: r79541:2e44fd53af26
Date: 2015-09-08 14:58 +0200
http://bitbucket.org/pypy/pypy/changeset/2e44fd53af26/
Log: more fixes
diff --git a/rpython/jit/backend/llsupport/test/ztranslation_test.py
b/rpython/jit/backend/llsupport/test/ztranslation_test.py
--- a/rpython/jit/backend/llsupport/test/ztranslation_test.py
+++ b/rpython/jit/backend/llsupport/test/ztranslation_test.py
@@ -226,8 +226,8 @@
return len(ll_times)
res = self.meta_interp(main, [])
- assert res == 3
- # one for loop, one for entry point and one for the prologue
+ assert res == 2
+ # one for loop and one for the prologue, no unrolling
class TranslationRemoveTypePtrTest(CCompiledMixin):
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_short.py
b/rpython/jit/metainterp/optimizeopt/test/test_short.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_short.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_short.py
@@ -31,11 +31,19 @@
assert len(short_boxes) == 3
short_boxes.sort(key=str)
# inputarg
- assert short_boxes[0].short_op.res is i0
- assert short_boxes[0].preamble_op is sb.short_inputargs[0]
+ for i in range(3):
+ if short_boxes[i].short_op.res is i0:
+ assert short_boxes[i].preamble_op is sb.short_inputargs[0]
+ break
+ else:
+ raise Exception("did not find!")
# pure op
- assert short_boxes[2].preamble_op.getarg(0) is sb.short_inputargs[0]
- assert short_boxes[2].short_op.res is op
+ for i in range(3):
+ if short_boxes[2].preamble_op.getarg(0) is sb.short_inputargs[0]:
+ assert short_boxes[2].short_op.res is op
+ break
+ else:
+ raise Exception("did not find!")
def test_pure_ops_does_not_work(self):
i0 = InputArgInt()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
