derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configs: Remove Python 2.7 glue code

Browse Source 
Remove uses of six and from __future__ imports as they are no longer
needed.

Change-Id: I6e2f270557d7343bbad30c8e6d743e363c43715a
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39755
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Andreas Sandberg
2021-01-26 12:32:39 +00:00
parent 9d6bf74c47
commit 40c581be44
70 changed files with 16 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configs/common/Benchmarks.py
View File

@@ -24,9 +24,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
from common.SysPaths import script, disk, binary
from os import environ as env
from m5.defines import buildEnv

3
configs/common/CacheConfig.py
View File

@@ -40,9 +40,6 @@
# Configure the M5 cache hierarchy config in one place
#
from __future__ import print_function
from __future__ import absolute_import
import m5
from m5.objects import *
from common.Caches import *

3
configs/common/Caches.py
View File

@@ -37,9 +37,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
from m5.defines import buildEnv
from m5.objects import *

3
configs/common/CpuConfig.py
View File

@@ -33,9 +33,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
from m5 import fatal
import m5.objects

14
configs/common/FSConfig.py
View File

@@ -38,20 +38,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
import six
import m5
from m5.objects import *
from m5.util import *
from common.Benchmarks import *
from common import ObjectList
if six.PY3:
long = int
# Populate to reflect supported os types per target ISA
os_types = { 'mips' : [ 'linux' ],
'riscv' : [ 'linux' ], # TODO that's a lie
@@ -228,11 +220,11 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
pci_devices.append(self.pci_ide)
self.mem_ranges = []
size_remain = long(Addr(mdesc.mem()))
size_remain = int(Addr(mdesc.mem()))
for region in self.realview._mem_regions:
if size_remain > long(region.size()):
if size_remain > int(region.size()):
self.mem_ranges.append(region)
size_remain = size_remain - long(region.size())
size_remain = size_remain - int(region.size())
else:
self.mem_ranges.append(AddrRange(region.start, size=size_remain))
size_remain = 0

2
configs/common/FileSystemConfig.py
View File

@@ -36,8 +36,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
import m5
from m5.objects import *
from m5.util.convert import *

3
configs/common/GPUTLBConfig.py
View File

@@ -29,9 +29,6 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
# Configure the TLB hierarchy
# Places which would probably need to be modified if you
# want a different hierarchy are specified by a <Modify here .. >'

3
configs/common/GPUTLBOptions.py
View File

@@ -29,9 +29,6 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
def tlb_options(parser):
#===================================================================

3
configs/common/HMC.py
View File

@@ -119,9 +119,6 @@
# 2 Crossbars are connected to only local vaults. From other 2 crossbar, a
# request can be forwarded to any other vault.
from __future__ import print_function
from __future__ import absolute_import
import argparse
import m5

3
configs/common/MemConfig.py
View File

@@ -33,9 +33,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
import m5.objects
from common import ObjectList
from common import HMC

3
configs/common/ObjectList.py
View File

@@ -34,9 +34,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
import m5.objects
import inspect
import sys

3
configs/common/Options.py
View File

@@ -36,9 +36,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
import m5
from m5.defines import buildEnv
from m5.objects import *

3
configs/common/SimpleOpts.py
View File

@@ -25,9 +25,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
""" Options wrapper for simple gem5 configuration scripts
This module wraps the optparse class so that we can register options

9
configs/common/Simulation.py
View File

@@ -37,10 +37,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
import six
import sys
from os import getcwd
from os.path import join as joinpath
@@ -53,9 +49,6 @@ from m5.defines import buildEnv
from m5.objects import *
from m5.util import *
if six.PY3:
long = int
addToPath('../common')
def getCPUClass(cpu_type):
@@ -196,7 +189,7 @@ def findCptDir(options, cptdir, testsys):
if match:
cpts.append(match.group(1))
cpts.sort(key = lambda a: long(a))
cpts.sort(key = lambda a: int(a))
cpt_num = options.checkpoint_restore
if cpt_num > len(cpts):

6
configs/common/SysPaths.py
View File

@@ -24,10 +24,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
from six import string_types
import os, sys
config_path = os.path.dirname(os.path.abspath(__file__))
@@ -38,7 +34,7 @@ class PathSearchFunc(object):
environment_variable = 'M5_PATH'
def __init__(self, subdirs, sys_paths=None):
if isinstance(subdirs, string_types):
if isinstance(subdirs, str):
subdirs = [subdirs]
self._subdir = os.path.join(*subdirs)
if sys_paths:

3
configs/common/__init__.py
View File

@@ -33,6 +33,3 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import

3
configs/common/cores/__init__.py
View File

@@ -32,6 +32,3 @@
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import

3
configs/common/cores/arm/HPI.py
View File

@@ -42,9 +42,6 @@ at: http://www.arm.com/ResearchEnablement/SystemModeling
"""
from __future__ import print_function
from __future__ import absolute_import
from m5.objects import *
# Simple function to allow a string of [01x_] to be converted into a

3
configs/common/cores/arm/O3_ARM_v7a.py
View File

@@ -24,9 +24,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
from m5.objects import *
# Simple ALU Instructions have a latency of 1

3
configs/common/cores/arm/__init__.py
View File

@@ -33,9 +33,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
from pkgutil import iter_modules
from importlib import import_module

3
configs/common/cores/arm/ex5_LITTLE.py
View File

@@ -25,9 +25,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
from m5.objects import *
#-----------------------------------------------------------------------

3
configs/common/cores/arm/ex5_big.py
View File

@@ -25,9 +25,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
from m5.objects import *
#-----------------------------------------------------------------------

3
configs/common/cpu2000.py
View File

@@ -24,9 +24,6 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from __future__ import print_function
from __future__ import absolute_import
import os
import sys
from os.path import basename, exists, join as joinpath, normpath