Author: Ronan Lamy <[email protected]>
Branch: optimizeopt-cleanup
Changeset: r96660:56e4e21e99d2
Date: 2019-05-17 02:34 +0100
http://bitbucket.org/pypy/pypy/changeset/56e4e21e99d2/
Log: kill BaseTest._do_optimize_loop()
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
@@ -34,8 +34,9 @@
call_pure_results = self._convert_call_pure_results(call_pure_results)
trace = convert_loop_to_trace(loop, self.metainterp_sd)
compile_data = compile.SimpleCompileData(
- trace, call_pure_results=call_pure_results)
- info, ops = self._do_optimize_loop(compile_data)
+ trace, call_pure_results=call_pure_results,
+ enable_opts=self.enable_opts)
+ info, ops = compile_data.optimize_trace(self.metainterp_sd, None, {})
label_op = ResOperation(rop.LABEL, info.inputargs)
loop.inputargs = info.inputargs
loop.operations = [label_op] + ops
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
@@ -33,7 +33,7 @@
self.convert_values(bridge.operations[-1].getarglist(),
bridge_values),
None, enable_opts=self.enable_opts,
inline_short_preamble=inline_short_preamble)
- bridge_info, ops = self._do_optimize_loop(data)
+ bridge_info, ops = data.optimize_trace(self.metainterp_sd, None, {})
loop.check_consistency(check_descr=False)
info.preamble.check_consistency(check_descr=False)
bridge.operations = ([ResOperation(rop.LABEL, bridge_info.inputargs)] +
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
@@ -42,8 +42,10 @@
inputargs = loop.inputargs
preamble = TreeLoop('preamble')
trace = oparser.convert_loop_to_trace(loop, self.metainterp_sd)
- compile_data = PreambleCompileData(trace, inputargs)
- start_state, newops = self._do_optimize_loop(compile_data)
+ compile_data = PreambleCompileData(
+ trace, inputargs, enable_opts=self.enable_opts)
+ start_state, newops = compile_data.optimize_trace(
+ self.metainterp_sd, None, {})
preamble.operations = newops
preamble.inputargs = start_state.renamed_inputargs
return start_state, loop, preamble
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
@@ -544,11 +544,6 @@
assert equaloplists(optimized.operations,
expected.operations, False, remap, text_right)
- def _do_optimize_loop(self, compile_data):
- compile_data.enable_opts = self.enable_opts
- state = compile_data.optimize_trace(self.metainterp_sd, None, {})
- return state
-
def _convert_call_pure_results(self, d):
if d is None:
return
@@ -586,11 +581,13 @@
t = convert_loop_to_trace(loop, self.metainterp_sd)
preamble_data = compile.PreambleCompileData(
t, runtime_boxes, call_pure_results, enable_opts=self.enable_opts)
- start_state, preamble_ops = self._do_optimize_loop(preamble_data)
+ start_state, preamble_ops = preamble_data.optimize_trace(
+ self.metainterp_sd, None, {})
preamble_data.forget_optimization_info()
- loop_data = compile.UnrolledLoopData(preamble_data.trace,
- celltoken, start_state, call_pure_results)
- loop_info, ops = self._do_optimize_loop(loop_data)
+ loop_data = compile.UnrolledLoopData(
+ preamble_data.trace, celltoken, start_state, call_pure_results,
+ enable_opts=self.enable_opts)
+ loop_info, ops = loop_data.optimize_trace(self.metainterp_sd, None, {})
preamble = TreeLoop('preamble')
preamble.inputargs = start_state.renamed_inputargs
start_label = ResOperation(rop.LABEL, start_state.renamed_inputargs)
diff --git a/rpython/jit/metainterp/test/test_resume.py
b/rpython/jit/metainterp/test/test_resume.py
--- a/rpython/jit/metainterp/test/test_resume.py
+++ b/rpython/jit/metainterp/test/test_resume.py
@@ -1544,4 +1544,3 @@
assert not modifier._invalidation_needed(10, 2)
assert not modifier._invalidation_needed(10, 3)
assert modifier._invalidation_needed(10, 4)
-
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
