Author: Antonio Cuni <[email protected]>
Branch:
Changeset: r44953:2a332139025b
Date: 2011-06-14 17:25 +0200
http://bitbucket.org/pypy/pypy/changeset/2a332139025b/
Log: use the "official" way to build optimization chains in tests
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -130,7 +130,11 @@
class BaseTestBasic(BaseTest):
+ enable_opts = "intbounds:rewrite:virtualize:string:heap"
+
def optimize_loop(self, ops, optops, call_pure_results=None):
+ from pypy.jit.metainterp.optimizeopt import optimize_loop_1
+
loop = self.parse(ops)
#
self.loop = loop
@@ -144,25 +148,7 @@
if hasattr(self, 'callinfocollection'):
metainterp_sd.callinfocollection = self.callinfocollection
#
- # XXX list the exact optimizations that are needed for each test
- from pypy.jit.metainterp.optimizeopt import (OptIntBounds,
- OptRewrite,
- OptVirtualize,
- OptString,
- OptHeap,
- Optimizer)
- from pypy.jit.metainterp.optimizeopt.fficall import OptFfiCall
-
- optimizations = [OptIntBounds(),
- OptRewrite(),
- OptVirtualize(),
- OptString(),
- OptHeap(),
- OptFfiCall(),
- ]
- optimizer = Optimizer(metainterp_sd, loop, optimizations)
- optimizer.propagate_all_forward()
- #
+ optimize_loop_1(metainterp_sd, loop, self.enable_opts)
expected = self.parse(optops)
print '\n'.join([str(o) for o in loop.operations])
self.assert_equal(loop, expected)
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_optimizefficall.py
b/pypy/jit/metainterp/optimizeopt/test/test_optimizefficall.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_optimizefficall.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_optimizefficall.py
@@ -33,6 +33,8 @@
class TestFfiCall(BaseTestBasic, LLtypeMixin):
+ enable_opts = "intbounds:rewrite:virtualize:string:heap:ffi"
+
class namespace:
cpu = LLtypeMixin.cpu
FUNC = LLtypeMixin.FUNC
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
