[pypy-commit] pypy jit-cleanup: clean up uses of AbstractCPU and random stylistic issues, including a duplicated test

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: jit-cleanup
Changeset: r96414:8c0194bc5160
Date: 2019-04-04 01:51 +0100
http://bitbucket.org/pypy/pypy/changeset/8c0194bc5160/

Log:	clean up uses of AbstractCPU and random stylistic issues, including
	a duplicated test

diff --git a/rpython/jit/backend/test/jitlog_test.py b/rpython/jit/backend/test/jitlog_test.py
--- a/rpython/jit/backend/test/jitlog_test.py
+++ b/rpython/jit/backend/test/jitlog_test.py
@@ -1,18 +1,8 @@
-import re
 import os
-from rpython.rlib import debug
-from rpython.jit.tool.oparser import pure_parse
-from rpython.jit.metainterp import logger
 from rpython.rlib.rjitlog import rjitlog as jl
-from StringIO import StringIO
-from rpython.jit.metainterp.optimizeopt.util import equaloplists
-from rpython.jit.metainterp.history import AbstractDescr, JitCellToken, BasicFailDescr, BasicFinalDescr
-from rpython.jit.backend.model import AbstractCPU
 from rpython.rlib.jit import JitDriver
-from rpython.rlib.objectmodel import always_inline
 from rpython.jit.metainterp.test.support import LLJitMixin
 from rpython.rlib.rjitlog import rjitlog
-import tempfile
 
 class LoggerTest(LLJitMixin):
 
@@ -33,7 +23,7 @@
         file = tmpdir.join('jitlog')
         monkeypatch.setenv("JITLOG", file.strpath)
         f = self.run_sample_loop(None)
-        self.meta_interp(f, [10,0])
+        self.meta_interp(f, [10, 0])
         assert os.path.exists(file.strpath)
         with file.open('rb') as fd:
             # check the file header
@@ -45,28 +35,16 @@
         monkeypatch.setattr(jl, 'JITLOG_VERSION_16BIT_LE', '\xff\xfe')
         monkeypatch.setenv("JITLOG", file.strpath)
         f = self.run_sample_loop(None)
-        self.meta_interp(f, [10,0])
+        self.meta_interp(f, [10, 0])
         assert os.path.exists(file.strpath)
         with file.open('rb') as fd:
             # check the file header
             assert fd.read(3) == jl.MARK_JITLOG_HEADER + '\xff\xfe'
             assert len(fd.read()) > 0
 
-    def test_version(self, monkeypatch, tmpdir):
-        file = tmpdir.join('jitlog')
-        monkeypatch.setattr(jl, 'JITLOG_VERSION_16BIT_LE', '\xff\xfe')
-        monkeypatch.setenv("JITLOG", file.strpath)
-        f = self.run_sample_loop(None)
-        self.meta_interp(f, [10,0])
-        assert os.path.exists(file.strpath)
-        with file.open('rb') as fd:
-            # check the file header
-            assert fd.read(3) == jl.MARK_JITLOG_HEADER + '\xff\xfe'
-            assert len(fd.read()) > 0
-
-    def run_sample_loop(self, func, myjitdriver = None):
+    def run_sample_loop(self, func, myjitdriver=None):
         if not myjitdriver:
-            myjitdriver = JitDriver(greens = [], reds = 'auto')
+            myjitdriver = JitDriver(greens=[], reds='auto')
         def f(y, x):
             res = 0
             if func:
diff --git a/rpython/jit/metainterp/test/test_logger.py b/rpython/jit/metainterp/test/test_logger.py
--- a/rpython/jit/metainterp/test/test_logger.py
+++ b/rpython/jit/metainterp/test/test_logger.py
@@ -6,7 +6,6 @@
 from rpython.jit.metainterp.optimizeopt.util import equaloplists
 from rpython.jit.metainterp.history import (
     AbstractDescr, JitCellToken, BasicFailDescr, BasicFinalDescr)
-from rpython.jit.backend.model import AbstractCPU
 
 
 class Descr(AbstractDescr):
@@ -19,8 +18,10 @@
             for arg in args:
                 print >> log_stream, arg,
             print >> log_stream
+
         def debug_start(self, *args):
             pass
+
         def debug_stop(self, *args):
             pass
     try:
@@ -55,7 +56,6 @@
                 get_location_str = staticmethod(lambda args: "dupa")
 
         class FakeMetaInterpSd:
-            cpu = AbstractCPU()
             jitdrivers_sd = [FakeJitDriver()]
             def get_name_from_address(self, addr):
                 return 'Name'
diff --git a/rpython/rlib/rjitlog/test/test_jitlog.py b/rpython/rlib/rjitlog/test/test_jitlog.py
--- a/rpython/rlib/rjitlog/test/test_jitlog.py
+++ b/rpython/rlib/rjitlog/test/test_jitlog.py
@@ -1,10 +1,7 @@
 import pytest
 import sys
-from rpython.jit.tool.oparser import pure_parse
-from rpython.jit.metainterp.optimizeopt.util import equaloplists
 from rpython.jit.metainterp.resoperation import ResOperation, rop
-from rpython.jit.backend.model import AbstractCPU
-from rpython.jit.metainterp.history import ConstInt, ConstPtr
+from rpython.jit.metainterp.history import ConstInt
 from rpython.rlib.rjitlog import rjitlog as jl
 from rpython.jit.metainterp.history import AbstractDescr
 from rpython.rlib.objectmodel import compute_unique_id
@@ -41,7 +38,6 @@
 
 
 class FakeMetaInterpSd:
-    cpu = AbstractCPU()
     jitdrivers_sd = [FakeJitDriver()]
     def get_name_from_address(self, addr):
         return 'Name'