configs: Remove Python 2 compatibility code in Arm configs

Remove uses of six and imports from __future__ and use native Python 3
functionality instead.

Change-Id: If37718ba99def2d6f176604e20d4ebeda75474ad
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39581
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Richard Cooper <richard.cooper@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/configs/example/arm/baremetal.py b/configs/example/arm/baremetal.py
index 04f60a19b36caed97b95eb9ee171084b100177e2..011883b401adee09f242439dda31470512a68abb 100644 (file)
--- a/configs/example/arm/baremetal.py
+++ b/configs/example/arm/baremetal.py
@@ -39,9 +39,6 @@ Research Starter Kit on System Modeling. More information can be found
 at: http://www.arm.com/ResearchEnablement/SystemModeling
 """
 
-from __future__ import print_function
-from __future__ import absolute_import
-
 import os
 import m5
 from m5.util import addToPath

diff --git a/configs/example/arm/devices.py b/configs/example/arm/devices.py
index e3cee1e721ae2f6d84d19a686827b82bd642c412..52613c699f2f543fc6483213898af47e802deee5 100644 (file)
--- a/configs/example/arm/devices.py
+++ b/configs/example/arm/devices.py
@@ -35,20 +35,12 @@
 
 # System components used by the bigLITTLE.py configuration script
 
-from __future__ import print_function
-from __future__ import absolute_import
-
-import six
-
 import m5
 from m5.objects import *
 m5.util.addToPath('../../')
 from common.Caches import *
 from common import ObjectList
 
-if six.PY3:
-    long = int
-
 have_kvm = "ArmV8KvmCPU" in ObjectList.cpu_list.get_names()
 have_fastmodel = "FastModelCortexA76" in ObjectList.cpu_list.get_names()
 
@@ -320,7 +312,7 @@ def simpleSystem(BaseSystem, caches, mem_size, platform=None, **kwargs):
             self.iobridge = Bridge(delay='50ns')
             # Device DMA -> MEM
             mem_range = self.realview._mem_regions[0]
-            assert long(mem_range.size()) >= long(Addr(mem_size))
+            assert int(mem_range.size()) >= int(Addr(mem_size))
             self.mem_ranges = [
                 AddrRange(start=mem_range.start, size=mem_size) ]
 

diff --git a/configs/example/arm/dist_bigLITTLE.py b/configs/example/arm/dist_bigLITTLE.py
index 1d826668471921a144c0915d7fa3d09e913042f2..6d35e537794d629fc0915e1bbe54e9d12356cdbe 100644 (file)
--- a/configs/example/arm/dist_bigLITTLE.py
+++ b/configs/example/arm/dist_bigLITTLE.py
@@ -36,9 +36,6 @@
 # This configuration file extends the example ARM big.LITTLE(tm)
 # configuration to enabe dist-gem5 siulations of big.LITTLE systems.
 
-from __future__ import print_function
-from __future__ import absolute_import
-
 import argparse
 import os
 

diff --git a/configs/example/arm/fs_bigLITTLE.py b/configs/example/arm/fs_bigLITTLE.py
index 090e07170f0199bdc19e8bd6c1642b10532a0ab9..85213ee43b56edd58183427496eb4b29d6105678 100644 (file)
--- a/configs/example/arm/fs_bigLITTLE.py
+++ b/configs/example/arm/fs_bigLITTLE.py
@@ -36,10 +36,6 @@
 # This is an example configuration script for full system simulation of
 # a generic ARM bigLITTLE system.
 
-
-from __future__ import print_function
-from __future__ import absolute_import
-
 import argparse
 import os
 import sys

diff --git a/configs/example/arm/fs_power.py b/configs/example/arm/fs_power.py
index 72c62920cb54c30f5a7d1107146fb9316bac2751..1c7b6b752b9a0913055c370d99546c292405d2ad 100644 (file)
--- a/configs/example/arm/fs_power.py
+++ b/configs/example/arm/fs_power.py
@@ -36,9 +36,6 @@
 # This configuration file extends the example ARM big.LITTLE(tm)
 # with example power models.
 
-from __future__ import print_function
-from __future__ import absolute_import
-
 import argparse
 import os
 

diff --git a/configs/example/arm/starter_fs.py b/configs/example/arm/starter_fs.py
index 8dee137772ae5125777a9fe7b3d53817e5ac7837..9d0f0d26b6a2f8d2643c8d887c3058b4132f7fc1 100644 (file)
--- a/configs/example/arm/starter_fs.py
+++ b/configs/example/arm/starter_fs.py
@@ -38,9 +38,6 @@ Research Starter Kit on System Modeling. More information can be found
 at: http://www.arm.com/ResearchEnablement/SystemModeling
 """
 
-from __future__ import print_function
-from __future__ import absolute_import
-
 import os
 import m5
 from m5.util import addToPath

diff --git a/configs/example/arm/starter_se.py b/configs/example/arm/starter_se.py
index 8b1dbd2a0f05101b4d6a1f497f95852de062ee86..23da8e7917c4e72e99cbb62afffe292327affa6f 100644 (file)
--- a/configs/example/arm/starter_se.py
+++ b/configs/example/arm/starter_se.py
@@ -38,9 +38,6 @@ Research Starter Kit on System Modeling. More information can be found
 at: http://www.arm.com/ResearchEnablement/SystemModeling
 """
 
-from __future__ import print_function
-from __future__ import absolute_import
-
 import os
 import m5
 from m5.util import addToPath

diff --git a/configs/example/arm/workloads.py b/configs/example/arm/workloads.py
index ce48cdd7c0c861a2aa7e9cf7f9059e468a313397..1fb9d0020458aae1749f7ea5ee2bbc1fd2e2c9f1 100644 (file)
--- a/configs/example/arm/workloads.py
+++ b/configs/example/arm/workloads.py
@@ -34,9 +34,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-from __future__ import print_function
-from __future__ import absolute_import
-
 import inspect
 import m5
 from m5.objects import *