From 90b087171b048aa226be96dc32d73624f957b793 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Wed, 26 Oct 2016 14:50:54 -0400 Subject: config: Break out base options for usage with NULL ISA This patch breaks out the most basic configuration options into a set of base options, to allow them to be used also by scripts that do not involve any ISA, and thus no actual CPUs or devices. The patch also fixes a few modules so that they can be imported in a NULL build, and avoid dragging in FSConfig every time Options is imported. --- configs/example/garnet_synth_traffic.py | 2 +- configs/example/ruby_direct_test.py | 2 +- configs/example/ruby_gpu_random_test.py | 2 +- configs/example/ruby_mem_test.py | 2 +- configs/example/ruby_random_test.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'configs/example') diff --git a/configs/example/garnet_synth_traffic.py b/configs/example/garnet_synth_traffic.py index 16617486d..0cb1fae9f 100644 --- a/configs/example/garnet_synth_traffic.py +++ b/configs/example/garnet_synth_traffic.py @@ -43,7 +43,7 @@ config_root = os.path.dirname(config_path) m5_root = os.path.dirname(config_root) parser = optparse.OptionParser() -Options.addCommonOptions(parser) +Options.addNoISAOptions(parser) parser.add_option("--synthetic", type="choice", default="uniform_random", choices=['uniform_random', 'tornado', 'bit_complement', \ diff --git a/configs/example/ruby_direct_test.py b/configs/example/ruby_direct_test.py index 1c02e6e55..9e8c87a81 100644 --- a/configs/example/ruby_direct_test.py +++ b/configs/example/ruby_direct_test.py @@ -45,7 +45,7 @@ config_root = os.path.dirname(config_path) m5_root = os.path.dirname(config_root) parser = optparse.OptionParser() -Options.addCommonOptions(parser) +Options.addNoISAOptions(parser) parser.add_option("--requests", metavar="N", default=100, help="Stop after N requests") diff --git a/configs/example/ruby_gpu_random_test.py b/configs/example/ruby_gpu_random_test.py index 08eac583a..80aecf90e 100644 --- a/configs/example/ruby_gpu_random_test.py +++ b/configs/example/ruby_gpu_random_test.py @@ -50,7 +50,7 @@ config_root = os.path.dirname(config_path) m5_root = os.path.dirname(config_root) parser = optparse.OptionParser() -Options.addCommonOptions(parser) +Options.addNoISAOptions(parser) parser.add_option("--maxloads", metavar="N", default=100, help="Stop after N loads") diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py index 3b6c5f110..010c4a2bc 100644 --- a/configs/example/ruby_mem_test.py +++ b/configs/example/ruby_mem_test.py @@ -44,7 +44,7 @@ config_path = os.path.dirname(os.path.abspath(__file__)) config_root = os.path.dirname(config_path) parser = optparse.OptionParser() -Options.addCommonOptions(parser) +Options.addNoISAOptions(parser) parser.add_option("--maxloads", metavar="N", default=0, help="Stop after N loads") diff --git a/configs/example/ruby_random_test.py b/configs/example/ruby_random_test.py index ce898cd81..d96905e2c 100644 --- a/configs/example/ruby_random_test.py +++ b/configs/example/ruby_random_test.py @@ -45,7 +45,7 @@ config_root = os.path.dirname(config_path) m5_root = os.path.dirname(config_root) parser = optparse.OptionParser() -Options.addCommonOptions(parser) +Options.addNoISAOptions(parser) parser.add_option("--maxloads", metavar="N", default=100, help="Stop after N loads") -- cgit v1.2.3