From b9e23a6d741cdcdf0ffb7364c6aae36a487335ef Mon Sep 17 00:00:00 2001 From: Tushar Krishna Date: Thu, 6 Oct 2016 14:35:17 -0400 Subject: config: add a separate config file for the network. This patch adds a new file configs/network/Network.py to setup the network, instead of doing that within Ruby.py. --- configs/example/apu_se.py | 3 +++ configs/example/fs.py | 3 +++ configs/example/garnet_synth_traffic.py | 3 +++ configs/example/ruby_direct_test.py | 3 +++ configs/example/ruby_gpu_random_test.py | 3 +++ configs/example/ruby_mem_test.py | 3 +++ configs/example/ruby_random_test.py | 3 +++ configs/example/se.py | 3 +++ 8 files changed, 24 insertions(+) (limited to 'configs/example') diff --git a/configs/example/apu_se.py b/configs/example/apu_se.py index a044c9a43..2069daccb 100644 --- a/configs/example/apu_se.py +++ b/configs/example/apu_se.py @@ -43,11 +43,13 @@ from m5.objects import * from m5.util import addToPath addToPath('../ruby') +addToPath('../network') addToPath('../common') addToPath('../topologies') import Options import Ruby +import Network import Simulation import GPUTLBOptions, GPUTLBConfig @@ -157,6 +159,7 @@ parser.add_option('--fast-forward-pseudo-op', action='store_true', Ruby.define_options(parser) +Network.define_options(parser) #add TLB options to the parser GPUTLBOptions.tlb_options(parser) diff --git a/configs/example/fs.py b/configs/example/fs.py index a916ca49f..32fc699ba 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -51,8 +51,10 @@ from m5.util import addToPath, fatal addToPath('../common') addToPath('../ruby') +addToPath('../network') import Ruby +import Network from FSConfig import * from SysPaths import * @@ -306,6 +308,7 @@ Options.addFSOptions(parser) # Add the ruby specific and protocol specific options if '--ruby' in sys.argv: Ruby.define_options(parser) + Network.define_options(parser) (options, args) = parser.parse_args() diff --git a/configs/example/garnet_synth_traffic.py b/configs/example/garnet_synth_traffic.py index a4c44efbc..8962c4af1 100644 --- a/configs/example/garnet_synth_traffic.py +++ b/configs/example/garnet_synth_traffic.py @@ -33,10 +33,12 @@ from m5.util import addToPath import os, optparse, sys addToPath('../common') addToPath('../ruby') +addToPath('../network') addToPath('../topologies') import Options import Ruby +import Network # Get paths we might need. It's expected this file is in m5/configs/example. config_path = os.path.dirname(os.path.abspath(__file__)) @@ -85,6 +87,7 @@ parser.add_option("--inj-vnet", type="int", default=-1, # Add the ruby specific and protocol specific options # Ruby.define_options(parser) +Network.define_options(parser) execfile(os.path.join(config_root, "common", "Options.py")) diff --git a/configs/example/ruby_direct_test.py b/configs/example/ruby_direct_test.py index 857909ba9..cc74aec5d 100644 --- a/configs/example/ruby_direct_test.py +++ b/configs/example/ruby_direct_test.py @@ -35,10 +35,12 @@ from m5.util import addToPath import os, optparse, sys addToPath('../common') addToPath('../ruby') +addToPath('../network') addToPath('../topologies') import Options import Ruby +import Network # Get paths we might need. It's expected this file is in m5/configs/example. config_path = os.path.dirname(os.path.abspath(__file__)) @@ -63,6 +65,7 @@ parser.add_option("--percent-writes", type="int", default=100, # Add the ruby specific and protocol specific options # Ruby.define_options(parser) +Network.define_options(parser) (options, args) = parser.parse_args() if args: diff --git a/configs/example/ruby_gpu_random_test.py b/configs/example/ruby_gpu_random_test.py index 48567bbfd..005546712 100644 --- a/configs/example/ruby_gpu_random_test.py +++ b/configs/example/ruby_gpu_random_test.py @@ -40,10 +40,12 @@ from m5.util import addToPath import os, optparse, sys addToPath('../common') addToPath('../ruby') +addToPath('../network') addToPath('../topologies') import Options import Ruby +import Network # Get paths we might need. config_path = os.path.dirname(os.path.abspath(__file__)) @@ -76,6 +78,7 @@ parser.add_option("--wfs-per-simd", type="int", default=10, help="Number of " \ # Add the ruby specific and protocol specific options # Ruby.define_options(parser) +Network.define_options(parser) execfile(os.path.join(config_root, "common", "Options.py")) diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py index b6e153be4..d7d36d687 100644 --- a/configs/example/ruby_mem_test.py +++ b/configs/example/ruby_mem_test.py @@ -35,10 +35,12 @@ from m5.util import addToPath import os, optparse, sys addToPath('../common') addToPath('../ruby') +addToPath('../network') addToPath('../topologies') import Options import Ruby +import Network # Get paths we might need. It's expected this file is in m5/configs/example. config_path = os.path.dirname(os.path.abspath(__file__)) @@ -63,6 +65,7 @@ parser.add_option("--suppress-func-warnings", action="store_true", # Add the ruby specific and protocol specific options # Ruby.define_options(parser) +Network.define_options(parser) execfile(os.path.join(config_root, "common", "Options.py")) diff --git a/configs/example/ruby_random_test.py b/configs/example/ruby_random_test.py index 10d4318c7..44df082b3 100644 --- a/configs/example/ruby_random_test.py +++ b/configs/example/ruby_random_test.py @@ -35,10 +35,12 @@ from m5.util import addToPath import os, optparse, sys addToPath('../common') addToPath('../ruby') +addToPath('../network') addToPath('../topologies') import Options import Ruby +import Network # Get paths we might need. It's expected this file is in m5/configs/example. config_path = os.path.dirname(os.path.abspath(__file__)) @@ -57,6 +59,7 @@ parser.add_option("-f", "--wakeup_freq", metavar="N", default=10, # Add the ruby specific and protocol specific options # Ruby.define_options(parser) +Network.define_options(parser) execfile(os.path.join(config_root, "common", "Options.py")) diff --git a/configs/example/se.py b/configs/example/se.py index 1b3458709..238aa9e64 100644 --- a/configs/example/se.py +++ b/configs/example/se.py @@ -53,9 +53,11 @@ from m5.util import addToPath, fatal addToPath('../common') addToPath('../ruby') +addToPath('../network') import Options import Ruby +import Network import Simulation import CacheConfig import CpuConfig @@ -127,6 +129,7 @@ Options.addSEOptions(parser) if '--ruby' in sys.argv: Ruby.define_options(parser) + Network.define_options(parser) (options, args) = parser.parse_args() -- cgit v1.2.3