changeset f6c5785bc8fd in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=f6c5785bc8fd
description:
SE/FS: Get rid of FULL_SYSTEM in the configs directory
diffstat:
configs/common/Simulation.py | 8 +++-----
configs/example/fs.py | 3 ---
configs/example/ruby_direct_test.py | 3 ---
configs/example/ruby_fs.py | 3 ---
configs/example/ruby_mem_test.py | 3 ---
configs/example/ruby_network_test.py | 3 ---
configs/example/ruby_random_test.py | 3 ---
configs/example/se.py | 3 ---
configs/ruby/Network_test.py | 2 --
9 files changed, 3 insertions(+), 28 deletions(-)
diffs (128 lines):
diff -r ef66a9083bc4 -r f6c5785bc8fd configs/common/Simulation.py
--- a/configs/common/Simulation.py Sat Jan 28 07:24:45 2012 -0800
+++ b/configs/common/Simulation.py Sat Jan 28 07:24:50 2012 -0800
@@ -124,8 +124,7 @@
if options.fast_forward:
testsys.cpu[i].max_insts_any_thread = int(options.fast_forward)
switch_cpus[i].system = testsys
- if not buildEnv['FULL_SYSTEM']:
- switch_cpus[i].workload = testsys.cpu[i].workload
+ switch_cpus[i].workload = testsys.cpu[i].workload
switch_cpus[i].clock = testsys.cpu[0].clock
# simulation period
if options.maxinsts:
@@ -148,9 +147,8 @@
for i in xrange(np):
switch_cpus[i].system = testsys
switch_cpus_1[i].system = testsys
- if not buildEnv['FULL_SYSTEM']:
- switch_cpus[i].workload = testsys.cpu[i].workload
- switch_cpus_1[i].workload = testsys.cpu[i].workload
+ switch_cpus[i].workload = testsys.cpu[i].workload
+ switch_cpus_1[i].workload = testsys.cpu[i].workload
switch_cpus[i].clock = testsys.cpu[0].clock
switch_cpus_1[i].clock = testsys.cpu[0].clock
diff -r ef66a9083bc4 -r f6c5785bc8fd configs/example/fs.py
--- a/configs/example/fs.py Sat Jan 28 07:24:45 2012 -0800
+++ b/configs/example/fs.py Sat Jan 28 07:24:50 2012 -0800
@@ -47,9 +47,6 @@
from m5.objects import *
from m5.util import addToPath, fatal
-if not buildEnv['FULL_SYSTEM']:
- fatal("This script requires full-system mode (*_FS).")
-
addToPath('../common')
from FSConfig import *
diff -r ef66a9083bc4 -r f6c5785bc8fd configs/example/ruby_direct_test.py
--- a/configs/example/ruby_direct_test.py Sat Jan 28 07:24:45 2012 -0800
+++ b/configs/example/ruby_direct_test.py Sat Jan 28 07:24:50 2012 -0800
@@ -38,9 +38,6 @@
import Ruby
-if buildEnv['FULL_SYSTEM']:
- panic("This script requires system-emulation mode (*_SE).")
-
# Get paths we might need. It's expected this file is in m5/configs/example.
config_path = os.path.dirname(os.path.abspath(__file__))
config_root = os.path.dirname(config_path)
diff -r ef66a9083bc4 -r f6c5785bc8fd configs/example/ruby_fs.py
--- a/configs/example/ruby_fs.py Sat Jan 28 07:24:45 2012 -0800
+++ b/configs/example/ruby_fs.py Sat Jan 28 07:24:50 2012 -0800
@@ -40,9 +40,6 @@
from m5.objects import *
from m5.util import addToPath, fatal
-if not buildEnv['FULL_SYSTEM']:
- fatal("This script requires full-system mode (*_FS).")
-
addToPath('../common')
addToPath('../ruby')
diff -r ef66a9083bc4 -r f6c5785bc8fd configs/example/ruby_mem_test.py
--- a/configs/example/ruby_mem_test.py Sat Jan 28 07:24:45 2012 -0800
+++ b/configs/example/ruby_mem_test.py Sat Jan 28 07:24:50 2012 -0800
@@ -38,9 +38,6 @@
import Ruby
-if buildEnv['FULL_SYSTEM']:
- panic("This script requires system-emulation mode (*_SE).")
-
# Get paths we might need. It's expected this file is in m5/configs/example.
config_path = os.path.dirname(os.path.abspath(__file__))
config_root = os.path.dirname(config_path)
diff -r ef66a9083bc4 -r f6c5785bc8fd configs/example/ruby_network_test.py
--- a/configs/example/ruby_network_test.py Sat Jan 28 07:24:45 2012 -0800
+++ b/configs/example/ruby_network_test.py Sat Jan 28 07:24:50 2012 -0800
@@ -37,9 +37,6 @@
addToPath('../ruby')
import Ruby
-if buildEnv['FULL_SYSTEM']:
- panic("This script requires system-emulation mode (*_SE).")
-
# Get paths we might need. It's expected this file is in m5/configs/example.
config_path = os.path.dirname(os.path.abspath(__file__))
config_root = os.path.dirname(config_path)
diff -r ef66a9083bc4 -r f6c5785bc8fd configs/example/ruby_random_test.py
--- a/configs/example/ruby_random_test.py Sat Jan 28 07:24:45 2012 -0800
+++ b/configs/example/ruby_random_test.py Sat Jan 28 07:24:50 2012 -0800
@@ -38,9 +38,6 @@
import Ruby
-if buildEnv['FULL_SYSTEM']:
- panic("This script requires system-emulation mode (*_SE).")
-
# Get paths we might need. It's expected this file is in m5/configs/example.
config_path = os.path.dirname(os.path.abspath(__file__))
config_root = os.path.dirname(config_path)
diff -r ef66a9083bc4 -r f6c5785bc8fd configs/example/se.py
--- a/configs/example/se.py Sat Jan 28 07:24:45 2012 -0800
+++ b/configs/example/se.py Sat Jan 28 07:24:50 2012 -0800
@@ -52,9 +52,6 @@
from m5.objects import *
from m5.util import addToPath, fatal
-if buildEnv['FULL_SYSTEM']:
- fatal("This script requires syscall emulation mode (*_SE).")
-
addToPath('../common')
addToPath('../ruby')
diff -r ef66a9083bc4 -r f6c5785bc8fd configs/ruby/Network_test.py
--- a/configs/ruby/Network_test.py Sat Jan 28 07:24:45 2012 -0800
+++ b/configs/ruby/Network_test.py Sat Jan 28 07:24:50 2012 -0800
@@ -51,8 +51,6 @@
#
# The Garnet tester protocol does not support fs nor dma
#
- if buildEnv['FULL_SYSTEM']:
- panic("This script requires system-emulation mode (*_SE).")
assert(piobus == None)
assert(dma_devices == [])
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
