Author: Maciej Fijalkowski <[email protected]>
Branch:
Changeset: r74966:62241619b8b5
Date: 2014-12-17 11:36 +0200
http://bitbucket.org/pypy/pypy/changeset/62241619b8b5/
Log: * rename test_disable_optimizations to test_zdisable_opts, so it
runs last
* disable test_multilabel - it's a feature we don't use outside of
this test, we might want to reconsider if it's even necessary
* kill available_boxes, I don't see how they can be useful outside of
multilabel
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
b/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_multilabel.py
@@ -545,8 +545,8 @@
self.optimize_loop(ops, expected)
-class TestLLtype(OptimizeoptTestMultiLabel, LLtypeMixin):
+class XxxTestLLtype(OptimizeoptTestMultiLabel, LLtypeMixin):
pass
-class TestOptimizerRenamingBoxesLLtype(BaseTestOptimizerRenamingBoxes,
LLtypeMixin):
+class XxxTestOptimizerRenamingBoxesLLtype(BaseTestOptimizerRenamingBoxes,
LLtypeMixin):
pass
diff --git
a/rpython/jit/metainterp/optimizeopt/test/test_disable_optimizations.py
b/rpython/jit/metainterp/optimizeopt/test/test_zdisable_opts.py
rename from
rpython/jit/metainterp/optimizeopt/test/test_disable_optimizations.py
rename to rpython/jit/metainterp/optimizeopt/test/test_zdisable_opts.py
diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py
b/rpython/jit/metainterp/optimizeopt/unroll.py
--- a/rpython/jit/metainterp/optimizeopt/unroll.py
+++ b/rpython/jit/metainterp/optimizeopt/unroll.py
@@ -182,8 +182,7 @@
for box in self.inputargs:
self.boxes_created_this_iteration[box] = None
- short_boxes = ShortBoxes(self.optimizer, inputargs,
- self.boxes_created_this_iteration)
+ short_boxes = ShortBoxes(self.optimizer, inputargs)
self.optimizer.clear_newoperations()
for i in range(len(original_jump_args)):
diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.py
b/rpython/jit/metainterp/optimizeopt/virtualstate.py
--- a/rpython/jit/metainterp/optimizeopt/virtualstate.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualstate.py
@@ -585,13 +585,12 @@
class ShortBoxes(object):
- def __init__(self, optimizer, surviving_boxes, available_boxes=None):
+ def __init__(self, optimizer, surviving_boxes):
self.potential_ops = {}
self.alternatives = {}
self.synthetic = {}
self.rename = {}
self.optimizer = optimizer
- self.available_boxes = available_boxes
self.assumed_classes = {}
if surviving_boxes is not None:
@@ -663,8 +662,6 @@
return
if box in self.short_boxes_in_production:
raise BoxNotProducable
- if self.available_boxes is not None and box not in
self.available_boxes:
- raise BoxNotProducable
self.short_boxes_in_production[box] = None
if box in self.potential_ops:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
