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

This commit is contained in:
Gabe Black 2012-01-28 07:24:50 -08:00
parent 57e07ac2d2
commit d7f71bf424
9 changed files with 3 additions and 28 deletions

View file

@ -124,8 +124,7 @@ def run(options, root, testsys, cpu_class):
if options.fast_forward: if options.fast_forward:
testsys.cpu[i].max_insts_any_thread = int(options.fast_forward) testsys.cpu[i].max_insts_any_thread = int(options.fast_forward)
switch_cpus[i].system = testsys 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 switch_cpus[i].clock = testsys.cpu[0].clock
# simulation period # simulation period
if options.maxinsts: if options.maxinsts:
@ -148,9 +147,8 @@ def run(options, root, testsys, cpu_class):
for i in xrange(np): for i in xrange(np):
switch_cpus[i].system = testsys switch_cpus[i].system = testsys
switch_cpus_1[i].system = testsys switch_cpus_1[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_1[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[i].clock = testsys.cpu[0].clock
switch_cpus_1[i].clock = testsys.cpu[0].clock switch_cpus_1[i].clock = testsys.cpu[0].clock

View file

@ -47,9 +47,6 @@ from m5.defines import buildEnv
from m5.objects import * from m5.objects import *
from m5.util import addToPath, fatal from m5.util import addToPath, fatal
if not buildEnv['FULL_SYSTEM']:
fatal("This script requires full-system mode (*_FS).")
addToPath('../common') addToPath('../common')
from FSConfig import * from FSConfig import *

View file

@ -38,9 +38,6 @@ addToPath('../ruby')
import 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. # 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_path = os.path.dirname(os.path.abspath(__file__))
config_root = os.path.dirname(config_path) config_root = os.path.dirname(config_path)

View file

@ -40,9 +40,6 @@ from m5.defines import buildEnv
from m5.objects import * from m5.objects import *
from m5.util import addToPath, fatal from m5.util import addToPath, fatal
if not buildEnv['FULL_SYSTEM']:
fatal("This script requires full-system mode (*_FS).")
addToPath('../common') addToPath('../common')
addToPath('../ruby') addToPath('../ruby')

View file

@ -38,9 +38,6 @@ addToPath('../ruby')
import 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. # 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_path = os.path.dirname(os.path.abspath(__file__))
config_root = os.path.dirname(config_path) config_root = os.path.dirname(config_path)

View file

@ -37,9 +37,6 @@ addToPath('../common')
addToPath('../ruby') addToPath('../ruby')
import 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. # 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_path = os.path.dirname(os.path.abspath(__file__))
config_root = os.path.dirname(config_path) config_root = os.path.dirname(config_path)

View file

@ -38,9 +38,6 @@ addToPath('../ruby')
import 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. # 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_path = os.path.dirname(os.path.abspath(__file__))
config_root = os.path.dirname(config_path) config_root = os.path.dirname(config_path)

View file

@ -52,9 +52,6 @@ from m5.defines import buildEnv
from m5.objects import * from m5.objects import *
from m5.util import addToPath, fatal from m5.util import addToPath, fatal
if buildEnv['FULL_SYSTEM']:
fatal("This script requires syscall emulation mode (*_SE).")
addToPath('../common') addToPath('../common')
addToPath('../ruby') addToPath('../ruby')

View file

@ -51,8 +51,6 @@ def create_system(options, system, piobus, dma_devices, ruby_system):
# #
# The Garnet tester protocol does not support fs nor dma # 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(piobus == None)
assert(dma_devices == []) assert(dma_devices == [])