[pypy-commit] pypy jit-leaner-frontend: fix more tests

[fijal]

Author: fijal
Branch: jit-leaner-frontend
Changeset: r83345:40b5c0262fc4
Date: 2016-03-25 13:12 +0200
http://bitbucket.org/pypy/pypy/changeset/40b5c0262fc4/

Log:	fix more tests

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
@@ -29,7 +29,7 @@
         exp = parse(optops, namespace=self.namespace.copy())
         expected = convert_old_style_to_targets(exp, jump=True)
         call_pure_results = self._convert_call_pure_results(call_pure_results)
-        trace = convert_loop_to_trace(loop)
+        trace = convert_loop_to_trace(loop, FakeMetaInterpStaticData(self.cpu))
         compile_data = compile.SimpleCompileData(trace,
                                                  call_pure_results)
         info, ops = self._do_optimize_loop(compile_data)
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebridge.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizebridge.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebridge.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebridge.py
@@ -1,6 +1,6 @@
 
 from rpython.jit.metainterp.optimizeopt.test.test_util import BaseTest,\
-     LLtypeMixin, convert_old_style_to_targets
+     LLtypeMixin, convert_old_style_to_targets, FakeMetaInterpStaticData
 from rpython.jit.metainterp import compile
 from rpython.jit.tool import oparser
 from rpython.jit.metainterp.resoperation import ResOperation, rop
@@ -28,7 +28,7 @@
         bridge = self.parse(bridge_ops)
         bridge.operations[-1].setdescr(jitcell_token)
         self.add_guard_future_condition(bridge)
-        trace = oparser.convert_loop_to_trace(bridge)
+        trace = oparser.convert_loop_to_trace(bridge, FakeMetaInterpStaticData(self.cpu))
         data = compile.BridgeCompileData(trace, self.convert_values(bridge.operations[-1].getarglist(), bridge_values),
                                          enable_opts=self.enable_opts,
                             inline_short_preamble=inline_short_preamble)
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_unroll.py b/rpython/jit/metainterp/optimizeopt/test/test_unroll.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_unroll.py
@@ -5,7 +5,7 @@
 import py
 
 from rpython.jit.metainterp.optimizeopt.test.test_util import BaseTest,\
-     LLtypeMixin
+     LLtypeMixin, FakeMetaInterpStaticData
 from rpython.jit.metainterp.optimizeopt.util import equaloplists
 from rpython.jit.metainterp.history import (TreeLoop, ConstInt,
                                             JitCellToken, TargetToken)
@@ -53,9 +53,7 @@
         preamble = TreeLoop('preamble')
 
         token = JitCellToken()
-        start_label = ResOperation(rop.LABEL, inputargs, descr=TargetToken(token))
-        stop_label = ResOperation(rop.LABEL, jump_args, descr=token)
-        trace = oparser.convert_loop_to_trace(loop)
+        trace = oparser.convert_loop_to_trace(loop, FakeMetaInterpStaticData(self.cpu))
         compile_data = LoopCompileData(trace, inputargs)
         start_state, newops = self._do_optimize_loop(compile_data)
         preamble.operations = newops
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_util.py b/rpython/jit/metainterp/optimizeopt/test/test_util.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_util.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_util.py
@@ -441,6 +441,7 @@
     vec = False
 
 class FakeMetaInterpStaticData(object):
+    all_descrs = []
 
     def __init__(self, cpu):
         self.cpu = cpu
@@ -574,7 +575,7 @@
         #                           descr=jump_op.getdescr())
         #end_label = jump_op.copy_and_change(opnum=rop.LABEL)
         call_pure_results = self._convert_call_pure_results(call_pure_results)
-        t = convert_loop_to_trace(loop)
+        t = convert_loop_to_trace(loop, FakeMetaInterpStaticData(self.cpu))
         preamble_data = compile.LoopCompileData(t, runtime_boxes,
                                                 call_pure_results)
         start_state, preamble_ops = self._do_optimize_loop(preamble_data)
diff --git a/rpython/jit/metainterp/test/test_compile.py b/rpython/jit/metainterp/test/test_compile.py
--- a/rpython/jit/metainterp/test/test_compile.py
+++ b/rpython/jit/metainterp/test/test_compile.py
@@ -94,7 +94,7 @@
     metainterp.staticdata = staticdata
     metainterp.cpu = cpu
     metainterp.history = History()
-    t = convert_loop_to_trace(loop)
+    t = convert_loop_to_trace(loop, staticdata)
     metainterp.history.inputargs = t.inputargs
     metainterp.history.trace = t
     #
diff --git a/rpython/jit/tool/oparser.py b/rpython/jit/tool/oparser.py
--- a/rpython/jit/tool/oparser.py
+++ b/rpython/jit/tool/oparser.py
@@ -424,7 +424,7 @@
         assert inp.type == 'f'
         return history.FloatFrontendOp
 
-def convert_loop_to_trace(loop, skip_last=False):
+def convert_loop_to_trace(loop, metainterp_sd, skip_last=False):
     from rpython.jit.metainterp.opencoder import Trace
     from rpython.jit.metainterp.test.test_opencoder import FakeFrame
     from rpython.jit.metainterp import history, resume
@@ -442,7 +442,7 @@
     mapping = {}
     for one, two in zip(loop.inputargs, inputargs):
         mapping[one] = two
-    trace = Trace(inputargs)
+    trace = Trace(inputargs, metainterp_sd)
     ops = loop.operations
     if skip_last:
         ops = ops[:-1]