SE/FS: Get rid of FULL_SYSTEM in the configs directory

diff --git a/configs/common/Simulation.py b/configs/common/Simulation.py
index 193f8d48705b12816b2d7dac002b28d509933384..0ae287e776429e0870500a4d4bdbbb429deb2e88 100644 (file)
--- 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 9f41e24b965c60a5e040af506fbfa71b6d380427..4456212c9ef4d8dec311756ec137f40523f97563 100644 (file)
--- 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 *

diff --git a/configs/example/ruby_direct_test.py b/configs/example/ruby_direct_test.py
index d4843e8662e41e6bfa204028a401010fabf2720c..28c7dde55e136fe3fa8be22d82ba4aed7f53d078 100644 (file)
--- 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)

diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index e18ed95af23c057bdc3a9bcf6fd5c49408e47c88..88021bffdb27a46108db9335fe76d5bd43931b70 100644 (file)
--- 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')
 

diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py
index a418c47eb619ebf4564a52b938216d55226cf8fc..5b693f3f68ca6e717ab9664e83d896c390321021 100644 (file)
--- 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)

diff --git a/configs/example/ruby_network_test.py b/configs/example/ruby_network_test.py
index b5d788bf5eac421705e40a88d01a713b16471b32..79e6365af097ea92f0faea167d01adf99adc4558 100644 (file)
--- 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)

diff --git a/configs/example/ruby_random_test.py b/configs/example/ruby_random_test.py
index 4bf17d70bd3f9c0bfb6a920961c09dc35360caa6..4074b08f1a44378a59aa1efcf07fef238dfecf4c 100644 (file)
--- 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)

diff --git a/configs/example/se.py b/configs/example/se.py
index f1dae94827780f136c2a1f3ee69b42c8e068ddf4..1edd99e9b6bea6bc0edf9b399116c26f953af1a0 100644 (file)
--- 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')
 

diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py
index 0877ac00af4d8cbed8449e1ac4951bd06e940019..bbe7fe844905d5c7fe374aab8a14a9550ef3b921 100644 (file)
--- 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 == [])