[pypy-commit] pypy optimizeopt-cleanup: Match class names to their base classes

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: optimizeopt-cleanup
Changeset: r96587:55c98086c509
Date: 2019-05-09 17:41 +0100
http://bitbucket.org/pypy/pypy/changeset/55c98086c509/

Log:	Match class names to their base classes

diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -72,8 +72,8 @@
         self.runtime_boxes = runtime_boxes
 
     def optimize(self, metainterp_sd, jitdriver_sd, optimizations):
-        from rpython.jit.metainterp.optimizeopt.unroll import UnrollOptimizer
-        opt = UnrollOptimizer(metainterp_sd, jitdriver_sd, optimizations)
+        from rpython.jit.metainterp.optimizeopt.unroll import OptUnroll
+        opt = OptUnroll(metainterp_sd, jitdriver_sd, optimizations)
         return opt.optimize_preamble(
             self.trace, self.runtime_boxes, self.call_pure_results,
             self.box_names_memo)
@@ -110,9 +110,9 @@
         self.resumestorage = resumestorage
 
     def optimize(self, metainterp_sd, jitdriver_sd, optimizations):
-        from rpython.jit.metainterp.optimizeopt.unroll import UnrollOptimizer
+        from rpython.jit.metainterp.optimizeopt.unroll import OptUnroll
 
-        opt = UnrollOptimizer(metainterp_sd, jitdriver_sd, optimizations)
+        opt = OptUnroll(metainterp_sd, jitdriver_sd, optimizations)
         return opt.optimize_bridge(self.trace, self.runtime_boxes,
                                    self.call_pure_results,
                                    self.inline_short_preamble,
@@ -136,8 +136,8 @@
         self.inline_short_preamble = inline_short_preamble
 
     def optimize(self, metainterp_sd, jitdriver_sd, optimizations):
-        from rpython.jit.metainterp.optimizeopt.unroll import UnrollOptimizer
-        opt = UnrollOptimizer(metainterp_sd, jitdriver_sd, optimizations)
+        from rpython.jit.metainterp.optimizeopt.unroll import OptUnroll
+        opt = OptUnroll(metainterp_sd, jitdriver_sd, optimizations)
         return opt.optimize_peeled_loop(self.trace, self.celltoken, self.state,
             self.call_pure_results, self.inline_short_preamble)
 
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
@@ -16,7 +16,7 @@
 from rpython.rlib.debug import debug_print, debug_start, debug_stop,\
      have_debug_prints
 
-class UnrollableOptimizer(Optimizer):
+class UnrollOptimizer(Optimizer):
     def force_op_from_preamble(self, preamble_op):
         if isinstance(preamble_op, PreambleOp):
             if self.optunroll.short_preamble_producer is None:
@@ -99,7 +99,7 @@
             op.set_forwarded(preamble_info._const)
 
 
-class UnrollOptimizer(Optimization):
+class OptUnroll(Optimization):
     """Unroll the loop into two iterations. The first one will
     become the preamble or entry bridge (don't think there is a
     distinction anymore)"""
@@ -107,7 +107,7 @@
     short_preamble_producer = None
 
     def __init__(self, metainterp_sd, jitdriver_sd, optimizations):
-        self.optimizer = UnrollableOptimizer(metainterp_sd, jitdriver_sd,
+        self.optimizer = UnrollOptimizer(metainterp_sd, jitdriver_sd,
                                              optimizations)
         self.optimizer.optunroll = self