changeset 3b36be1927b8 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=3b36be1927b8
description:
Automated merge with ssh://[email protected]/m5
diffstat:
6 files changed, 6 insertions(+), 6 deletions(-)
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 +-
diffs (72 lines):
diff -r aa93ab97adf7 -r 3b36be1927b8 tests/configs/o3-timing-mp-ruby.py
--- a/tests/configs/o3-timing-mp-ruby.py Sat Jan 23 14:02:03 2010 -0800
+++ b/tests/configs/o3-timing-mp-ruby.py Mon Jan 25 11:53:06 2010 -0600
@@ -34,7 +34,7 @@
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 -r aa93ab97adf7 -r 3b36be1927b8 tests/configs/o3-timing-ruby.py
--- a/tests/configs/o3-timing-ruby.py Sat Jan 23 14:02:03 2010 -0800
+++ b/tests/configs/o3-timing-ruby.py Mon Jan 25 11:53:06 2010 -0600
@@ -32,7 +32,7 @@
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 -r aa93ab97adf7 -r 3b36be1927b8 tests/configs/simple-atomic-mp-ruby.py
--- a/tests/configs/simple-atomic-mp-ruby.py Sat Jan 23 14:02:03 2010 -0800
+++ b/tests/configs/simple-atomic-mp-ruby.py Mon Jan 25 11:53:06 2010 -0600
@@ -34,7 +34,7 @@
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 -r aa93ab97adf7 -r 3b36be1927b8 tests/configs/simple-atomic-ruby.py
--- a/tests/configs/simple-atomic-ruby.py Sat Jan 23 14:02:03 2010 -0800
+++ b/tests/configs/simple-atomic-ruby.py Mon Jan 25 11:53:06 2010 -0600
@@ -30,7 +30,7 @@
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 -r aa93ab97adf7 -r 3b36be1927b8 tests/configs/simple-timing-mp-ruby.py
--- a/tests/configs/simple-timing-mp-ruby.py Sat Jan 23 14:02:03 2010 -0800
+++ b/tests/configs/simple-timing-mp-ruby.py Mon Jan 25 11:53:06 2010 -0600
@@ -33,7 +33,7 @@
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 -r aa93ab97adf7 -r 3b36be1927b8 tests/configs/simple-timing-ruby.py
--- a/tests/configs/simple-timing-ruby.py Sat Jan 23 14:02:03 2010 -0800
+++ b/tests/configs/simple-timing-ruby.py Mon Jan 25 11:53:06 2010 -0600
@@ -30,7 +30,7 @@
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,
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
