From 5a4ebd6d1293b51cadc33d5556daff81fd76799a Mon Sep 17 00:00:00 2001 From: Derek Hower Date: Mon, 25 Jan 2010 11:51:16 -0600 Subject: [PATCH] config: changed default ruby config file for regression --- tests/configs/o3-timing-mp-ruby.py | 2 +- tests/configs/o3-timing-ruby.py | 2 +- tests/configs/simple-atomic-mp-ruby.py | 2 +- tests/configs/simple-atomic-ruby.py | 2 +- tests/configs/simple-timing-mp-ruby.py | 2 +- tests/configs/simple-timing-ruby.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/configs/o3-timing-mp-ruby.py b/tests/configs/o3-timing-mp-ruby.py index 77e1ba992..afa46faa5 100644 --- a/tests/configs/o3-timing-mp-ruby.py +++ b/tests/configs/o3-timing-mp-ruby.py @@ -34,7 +34,7 @@ nb_cores = 4 cpus = [ DerivO3CPU(cpu_id=i) for i in xrange(nb_cores) ] import ruby_config -ruby_memory = ruby_config.generate("MI_example-homogeneous.rb", nb_cores) +ruby_memory = ruby_config.generate("TwoLevel_SplitL1UnifiedL2.rb", nb_cores) # system simulated system = System(cpu = cpus, physmem = ruby_memory, membus = Bus()) diff --git a/tests/configs/o3-timing-ruby.py b/tests/configs/o3-timing-ruby.py index f7ad41d99..40d90623a 100644 --- a/tests/configs/o3-timing-ruby.py +++ b/tests/configs/o3-timing-ruby.py @@ -32,7 +32,7 @@ m5.util.addToPath('../configs/common') import ruby_config -ruby_memory = ruby_config.generate("MI_example-homogeneous.rb", 1) +ruby_memory = ruby_config.generate("TwoLevel_SplitL1UnifiedL2.rb", 1) cpu = DerivO3CPU(cpu_id=0) cpu.clock = '2GHz' diff --git a/tests/configs/simple-atomic-mp-ruby.py b/tests/configs/simple-atomic-mp-ruby.py index 1b60418d0..570a1766a 100644 --- a/tests/configs/simple-atomic-mp-ruby.py +++ b/tests/configs/simple-atomic-mp-ruby.py @@ -34,7 +34,7 @@ nb_cores = 4 cpus = [ AtomicSimpleCPU(cpu_id=i) for i in xrange(nb_cores) ] import ruby_config -ruby_memory = ruby_config.generate("MI_example-homogeneous.rb", nb_cores) +ruby_memory = ruby_config.generate("TwoLevel_SplitL1UnifiedL2.rb", nb_cores) # system simulated system = System(cpu = cpus, physmem = ruby_memory, membus = Bus()) diff --git a/tests/configs/simple-atomic-ruby.py b/tests/configs/simple-atomic-ruby.py index c9c61788c..21d90e56f 100644 --- a/tests/configs/simple-atomic-ruby.py +++ b/tests/configs/simple-atomic-ruby.py @@ -30,7 +30,7 @@ import m5 from m5.objects import * import ruby_config -ruby_memory = ruby_config.generate("MI_example-homogeneous.rb", 1) +ruby_memory = ruby_config.generate("TwoLevel_SplitL1UnifiedL2.rb", 1) system = System(cpu = AtomicSimpleCPU(cpu_id=0), physmem = ruby_memory, diff --git a/tests/configs/simple-timing-mp-ruby.py b/tests/configs/simple-timing-mp-ruby.py index ed4b5b4c6..416983014 100644 --- a/tests/configs/simple-timing-mp-ruby.py +++ b/tests/configs/simple-timing-mp-ruby.py @@ -33,7 +33,7 @@ nb_cores = 4 cpus = [ TimingSimpleCPU(cpu_id=i) for i in xrange(nb_cores) ] import ruby_config -ruby_memory = ruby_config.generate("MI_example-homogeneous.rb", nb_cores) +ruby_memory = ruby_config.generate("TwoLevel_SplitL1UnifiedL2.rb", nb_cores) # system simulated system = System(cpu = cpus, physmem = ruby_memory, membus = Bus()) diff --git a/tests/configs/simple-timing-ruby.py b/tests/configs/simple-timing-ruby.py index d3cd7273f..de63a8bbb 100644 --- a/tests/configs/simple-timing-ruby.py +++ b/tests/configs/simple-timing-ruby.py @@ -30,7 +30,7 @@ import m5 from m5.objects import * import ruby_config -ruby_memory = ruby_config.generate("MI_example-homogeneous.rb", 1) +ruby_memory = ruby_config.generate("TwoLevel_SplitL1UnifiedL2.rb", 1) cpu = TimingSimpleCPU(cpu_id=0) system = System(cpu = cpu,