summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
Diffstat (limited to 'configs')
-rw-r--r--configs/common/FSConfig.py4
-rw-r--r--configs/common/Simulation.py8
-rw-r--r--configs/example/fs.py7
-rw-r--r--configs/example/memtest.py2
-rw-r--r--configs/example/ruby_direct_test.py5
-rw-r--r--configs/example/ruby_fs.py5
-rw-r--r--configs/example/ruby_mem_test.py5
-rw-r--r--configs/example/ruby_network_test.py5
-rw-r--r--configs/example/ruby_random_test.py5
-rw-r--r--configs/example/se.py5
-rw-r--r--configs/ruby/Network_test.py2
-rw-r--r--configs/splash2/cluster.py2
-rw-r--r--configs/splash2/run.py2
13 files changed, 16 insertions, 41 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 6154f9877..80379f6a3 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -552,8 +552,8 @@ def makeLinuxX86System(mem_mode, numCPUs = 1, mdesc = None, Ruby = False):
return self
-def makeDualRoot(testSystem, driveSystem, dumpfile):
- self = Root()
+def makeDualRoot(full_system, testSystem, driveSystem, dumpfile):
+ self = Root(full_system = full_system)
self.testsys = testSystem
self.drivesys = driveSystem
self.etherlink = EtherLink()
diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 193f8d487..0ae287e77 100644
--- a/configs/common/Simulation.py
+++ b/configs/common/Simulation.py
@@ -124,8 +124,7 @@ def run(options, root, testsys, cpu_class):
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 @@ def run(options, root, testsys, cpu_class):
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 --git a/configs/example/fs.py b/configs/example/fs.py
index 08484559a..4456212c9 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -47,9 +47,6 @@ from m5.defines import buildEnv
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 *
@@ -198,9 +195,9 @@ if len(bm) == 2:
drive_sys.kernel = binary(options.kernel)
drive_sys.init_param = options.init_param
- root = makeDualRoot(test_sys, drive_sys, options.etherdump)
+ root = makeDualRoot(True, test_sys, drive_sys, options.etherdump)
elif len(bm) == 1:
- root = Root(system=test_sys)
+ root = Root(full_system=True, system=test_sys)
else:
print "Error I don't know how to create more than 2 systems."
sys.exit(1)
diff --git a/configs/example/memtest.py b/configs/example/memtest.py
index 24a49a9b3..b2cedc8f5 100644
--- a/configs/example/memtest.py
+++ b/configs/example/memtest.py
@@ -172,7 +172,7 @@ make_level(treespec, prototypes, system.physmem, "port")
# run simulation
# -----------------------
-root = Root( system = system )
+root = Root( full_system = False, system = system )
if options.atomic:
root.system.mem_mode = 'atomic'
else:
diff --git a/configs/example/ruby_direct_test.py b/configs/example/ruby_direct_test.py
index 55b1c85e6..28c7dde55 100644
--- a/configs/example/ruby_direct_test.py
+++ b/configs/example/ruby_direct_test.py
@@ -38,9 +38,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)
@@ -111,7 +108,7 @@ for ruby_port in system.ruby._cpu_ruby_ports:
# run simulation
# -----------------------
-root = Root( system = system )
+root = Root( full_system = False, system = system )
root.system.mem_mode = 'timing'
# Not much point in this being higher than the L1 latency
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index a7d0a26cd..d7fc45bde 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -40,9 +40,6 @@ from m5.defines import buildEnv
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')
@@ -136,6 +133,6 @@ for (i, cpu) in enumerate(system.cpu):
cpu.interrupts.pio = system.piobus.port
cpu.interrupts.int_port = system.piobus.port
-root = Root(system = system)
+root = Root(full_system = True, system = system)
Simulation.run(options, root, system, FutureClass)
diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py
index 6b1a46776..5b693f3f6 100644
--- a/configs/example/ruby_mem_test.py
+++ b/configs/example/ruby_mem_test.py
@@ -38,9 +38,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)
@@ -162,7 +159,7 @@ for (i, dma) in enumerate(dmas):
# run simulation
# -----------------------
-root = Root( system = system )
+root = Root( full_system = False, system = system )
root.system.mem_mode = 'timing'
# Not much point in this being higher than the L1 latency
diff --git a/configs/example/ruby_network_test.py b/configs/example/ruby_network_test.py
index cd221ec7e..79e6365af 100644
--- a/configs/example/ruby_network_test.py
+++ b/configs/example/ruby_network_test.py
@@ -37,9 +37,6 @@ addToPath('../common')
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)
@@ -121,7 +118,7 @@ for ruby_port in system.ruby._cpu_ruby_ports:
# run simulation
# -----------------------
-root = Root( system = system )
+root = Root( full_system = False, system = system )
root.system.mem_mode = 'timing'
# Not much point in this being higher than the L1 latency
diff --git a/configs/example/ruby_random_test.py b/configs/example/ruby_random_test.py
index 7655e32fd..4074b08f1 100644
--- a/configs/example/ruby_random_test.py
+++ b/configs/example/ruby_random_test.py
@@ -38,9 +38,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)
@@ -131,7 +128,7 @@ for ruby_port in system.ruby._cpu_ruby_ports:
# run simulation
# -----------------------
-root = Root( system = system )
+root = Root( full_system = False, system = system )
root.system.mem_mode = 'timing'
# Not much point in this being higher than the L1 latency
diff --git a/configs/example/se.py b/configs/example/se.py
index b94652ac0..35025a8ff 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -52,9 +52,6 @@ from m5.defines import buildEnv
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')
@@ -199,6 +196,6 @@ for i in xrange(np):
if options.fastmem:
system.cpu[0].physmem_port = system.physmem.port
-root = Root(system = system)
+root = Root(full_system = False, system = system)
Simulation.run(options, root, system, FutureClass)
diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py
index 0877ac00a..bbe7fe844 100644
--- a/configs/ruby/Network_test.py
+++ b/configs/ruby/Network_test.py
@@ -51,8 +51,6 @@ def create_system(options, system, piobus, dma_devices, ruby_system):
#
# 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 == [])
diff --git a/configs/splash2/cluster.py b/configs/splash2/cluster.py
index e8c471eaa..4a9446794 100644
--- a/configs/splash2/cluster.py
+++ b/configs/splash2/cluster.py
@@ -239,7 +239,7 @@ for cluster in clusters:
# Define the root
# ----------------------
-root = Root(system = system)
+root = Root(full_system = False, system = system)
# --------------------
# Pick the correct Splash2 Benchmarks
diff --git a/configs/splash2/run.py b/configs/splash2/run.py
index 200eb191d..8a9b815e6 100644
--- a/configs/splash2/run.py
+++ b/configs/splash2/run.py
@@ -225,7 +225,7 @@ for cpu in cpus:
# Define the root
# ----------------------
-root = Root(system = system)
+root = Root(full_system = False, system = system)
# --------------------
# Pick the correct Splash2 Benchmarks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 16:18:40 +0000