summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2009-09-22 15:24:16 -0700
committerNathan Binkert <nate@binkert.org>2009-09-22 15:24:16 -0700
commit9a8cb7db7e86c25a755f2e2817a0385b13e3ac32 (patch)
tree56c7b56824b967ad385b6e8890f345d18c102980 /tests
parent0d58d32ad51eed32e6c7f9135b901006777fbe87 (diff)
downloadgem5-9a8cb7db7e86c25a755f2e2817a0385b13e3ac32.tar.xz
python: Move more code into m5.util allow SCons to use that code.
Get rid of misc.py and just stick misc things in __init__.py Move utility functions out of SCons files and into m5.util Move utility type stuff from m5/__init__.py to m5/util/__init__.py Remove buildEnv from m5 and allow access only from m5.defines Rename AddToPath to addToPath while we're moving it to m5.util Rename read_command to readCommand while we're moving it Rename compare_versions to compareVersions while we're moving it. --HG-- rename : src/python/m5/convert.py => src/python/m5/util/convert.py rename : src/python/m5/smartdict.py => src/python/m5/util/smartdict.py
Diffstat (limited to 'tests')
-rw-r--r--tests/configs/inorder-timing.py2
-rw-r--r--tests/configs/o3-timing-mp-ruby.py2
-rw-r--r--tests/configs/o3-timing-mp.py2
-rw-r--r--tests/configs/o3-timing-ruby.py2
-rw-r--r--tests/configs/o3-timing.py2
-rw-r--r--tests/configs/t1000-simple-atomic.py2
-rw-r--r--tests/configs/tsunami-o3-dual.py2
-rw-r--r--tests/configs/tsunami-o3.py2
-rw-r--r--tests/configs/tsunami-simple-atomic-dual.py2
-rw-r--r--tests/configs/tsunami-simple-atomic.py2
-rw-r--r--tests/configs/tsunami-simple-timing-dual.py2
-rw-r--r--tests/configs/tsunami-simple-timing.py2
-rw-r--r--tests/configs/twosys-tsunami-simple-atomic.py2
-rw-r--r--tests/long/00.gzip/test.py2
-rw-r--r--tests/long/10.mcf/test.py2
-rw-r--r--tests/long/20.parser/test.py2
-rw-r--r--tests/long/30.eon/test.py2
-rw-r--r--tests/long/40.perlbmk/test.py2
-rw-r--r--tests/long/50.vortex/test.py2
-rw-r--r--tests/long/60.bzip2/test.py2
-rw-r--r--tests/long/70.twolf/test.py2
21 files changed, 21 insertions, 21 deletions
diff --git a/tests/configs/inorder-timing.py b/tests/configs/inorder-timing.py
index 62f8b5850..10f9e4232 100644
--- a/tests/configs/inorder-timing.py
+++ b/tests/configs/inorder-timing.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
class MyCache(BaseCache):
assoc = 2
diff --git a/tests/configs/o3-timing-mp-ruby.py b/tests/configs/o3-timing-mp-ruby.py
index eab9bfaf2..77e1ba992 100644
--- a/tests/configs/o3-timing-mp-ruby.py
+++ b/tests/configs/o3-timing-mp-ruby.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
nb_cores = 4
cpus = [ DerivO3CPU(cpu_id=i) for i in xrange(nb_cores) ]
diff --git a/tests/configs/o3-timing-mp.py b/tests/configs/o3-timing-mp.py
index fc6a72a82..59776d5c3 100644
--- a/tests/configs/o3-timing-mp.py
+++ b/tests/configs/o3-timing-mp.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
# --------------------
# Base L1 Cache
diff --git a/tests/configs/o3-timing-ruby.py b/tests/configs/o3-timing-ruby.py
index a91a9cf39..f7ad41d99 100644
--- a/tests/configs/o3-timing-ruby.py
+++ b/tests/configs/o3-timing-ruby.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
import ruby_config
diff --git a/tests/configs/o3-timing.py b/tests/configs/o3-timing.py
index 366a3eb0d..563772213 100644
--- a/tests/configs/o3-timing.py
+++ b/tests/configs/o3-timing.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
class MyCache(BaseCache):
assoc = 2
diff --git a/tests/configs/t1000-simple-atomic.py b/tests/configs/t1000-simple-atomic.py
index 6a078e715..35b329f57 100644
--- a/tests/configs/t1000-simple-atomic.py
+++ b/tests/configs/t1000-simple-atomic.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
import FSConfig
cpu = AtomicSimpleCPU(cpu_id=0)
diff --git a/tests/configs/tsunami-o3-dual.py b/tests/configs/tsunami-o3-dual.py
index 3044f5433..76aca3806 100644
--- a/tests/configs/tsunami-o3-dual.py
+++ b/tests/configs/tsunami-o3-dual.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
import FSConfig
diff --git a/tests/configs/tsunami-o3.py b/tests/configs/tsunami-o3.py
index 34fa235bd..9b52cd92b 100644
--- a/tests/configs/tsunami-o3.py
+++ b/tests/configs/tsunami-o3.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
import FSConfig
diff --git a/tests/configs/tsunami-simple-atomic-dual.py b/tests/configs/tsunami-simple-atomic-dual.py
index 593b02680..dfbdd101d 100644
--- a/tests/configs/tsunami-simple-atomic-dual.py
+++ b/tests/configs/tsunami-simple-atomic-dual.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
import FSConfig
# --------------------
diff --git a/tests/configs/tsunami-simple-atomic.py b/tests/configs/tsunami-simple-atomic.py
index 0c6feaeac..cfc619b06 100644
--- a/tests/configs/tsunami-simple-atomic.py
+++ b/tests/configs/tsunami-simple-atomic.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
import FSConfig
# --------------------
diff --git a/tests/configs/tsunami-simple-timing-dual.py b/tests/configs/tsunami-simple-timing-dual.py
index 212449914..ce17475e3 100644
--- a/tests/configs/tsunami-simple-timing-dual.py
+++ b/tests/configs/tsunami-simple-timing-dual.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
import FSConfig
# --------------------
diff --git a/tests/configs/tsunami-simple-timing.py b/tests/configs/tsunami-simple-timing.py
index f0eaa08d7..0c3984628 100644
--- a/tests/configs/tsunami-simple-timing.py
+++ b/tests/configs/tsunami-simple-timing.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
import FSConfig
diff --git a/tests/configs/twosys-tsunami-simple-atomic.py b/tests/configs/twosys-tsunami-simple-atomic.py
index e7214a059..ce191930e 100644
--- a/tests/configs/twosys-tsunami-simple-atomic.py
+++ b/tests/configs/twosys-tsunami-simple-atomic.py
@@ -28,7 +28,7 @@
import m5
from m5.objects import *
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
from FSConfig import *
from Benchmarks import *
diff --git a/tests/long/00.gzip/test.py b/tests/long/00.gzip/test.py
index f69914046..7acce6e81 100644
--- a/tests/long/00.gzip/test.py
+++ b/tests/long/00.gzip/test.py
@@ -26,7 +26,7 @@
#
# Authors: Korey Sewell
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
from cpu2000 import gzip_log
workload = gzip_log(isa, opsys, 'smred')
diff --git a/tests/long/10.mcf/test.py b/tests/long/10.mcf/test.py
index c4ffb248a..9bd18a83f 100644
--- a/tests/long/10.mcf/test.py
+++ b/tests/long/10.mcf/test.py
@@ -26,7 +26,7 @@
#
# Authors: Korey Sewell
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
from cpu2000 import mcf
workload = mcf(isa, opsys, 'smred')
diff --git a/tests/long/20.parser/test.py b/tests/long/20.parser/test.py
index 8e745ec26..c96a46e60 100644
--- a/tests/long/20.parser/test.py
+++ b/tests/long/20.parser/test.py
@@ -26,7 +26,7 @@
#
# Authors: Korey Sewell
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
from cpu2000 import parser
workload = parser(isa, opsys, 'mdred')
diff --git a/tests/long/30.eon/test.py b/tests/long/30.eon/test.py
index 318da1049..de4d12dd8 100644
--- a/tests/long/30.eon/test.py
+++ b/tests/long/30.eon/test.py
@@ -26,7 +26,7 @@
#
# Authors: Korey Sewell
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
from cpu2000 import eon_cook
workload = eon_cook(isa, opsys, 'mdred')
diff --git a/tests/long/40.perlbmk/test.py b/tests/long/40.perlbmk/test.py
index e32416265..8fe5d6047 100644
--- a/tests/long/40.perlbmk/test.py
+++ b/tests/long/40.perlbmk/test.py
@@ -26,7 +26,7 @@
#
# Authors: Korey Sewell
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
from cpu2000 import perlbmk_makerand
workload = perlbmk_makerand(isa, opsys, 'lgred')
diff --git a/tests/long/50.vortex/test.py b/tests/long/50.vortex/test.py
index fbf0dc081..92422c234 100644
--- a/tests/long/50.vortex/test.py
+++ b/tests/long/50.vortex/test.py
@@ -26,7 +26,7 @@
#
# Authors: Korey Sewell
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
from cpu2000 import vortex
workload = vortex(isa, opsys, 'smred')
diff --git a/tests/long/60.bzip2/test.py b/tests/long/60.bzip2/test.py
index 7fa3d1a07..fa74d0860 100644
--- a/tests/long/60.bzip2/test.py
+++ b/tests/long/60.bzip2/test.py
@@ -26,7 +26,7 @@
#
# Authors: Korey Sewell
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
from cpu2000 import bzip2_source
workload = bzip2_source(isa, opsys, 'lgred')
diff --git a/tests/long/70.twolf/test.py b/tests/long/70.twolf/test.py
index 85b106eb4..761ec8b2e 100644
--- a/tests/long/70.twolf/test.py
+++ b/tests/long/70.twolf/test.py
@@ -26,7 +26,7 @@
#
# Authors: Korey Sewell
-m5.AddToPath('../configs/common')
+m5.util.addToPath('../configs/common')
from cpu2000 import twolf
import os