tests: Don't override tick rate in Ruby tests

Most Ruby tests assume that the highest frequency in the system under
test is 1GHz and limits the global tick rate to this frequency. This
assumption is broken since the default Ruby configuration scripts
clock the CPU at 2Ghz, which results in warnings and sometimes
incorrect behaviour.

Change-Id: I4b204660862ce3b0ea4a13df42caacd4398fef8c
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15975
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>

diff --git a/tests/configs/gpu-randomtest-ruby.py b/tests/configs/gpu-randomtest-ruby.py
index d0a891880f159eea16db4837c67a2e2c9c43a0c5..3d088f4ecc2cecd1445c6884466849f9ae4f4442 100644 (file)
--- a/tests/configs/gpu-randomtest-ruby.py
+++ b/tests/configs/gpu-randomtest-ruby.py
@@ -140,6 +140,3 @@ for ruby_port in system.ruby._cpu_ports:
 
 root = Root(full_system = False, system = system )
 root.system.mem_mode = 'timing'
-
-# Not much point in this being higher than the L1 latency
-m5.ticks.setGlobalFrequency('1ns')

diff --git a/tests/configs/memtest-ruby.py b/tests/configs/memtest-ruby.py
index 8b92af45c432dfbcfd56585cf7111bc929cad228..9cf92af63feedbe5ca15026322c762c097f2214d 100644 (file)
--- a/tests/configs/memtest-ruby.py
+++ b/tests/configs/memtest-ruby.py
@@ -116,6 +116,3 @@ for (i, ruby_port) in enumerate(system.ruby._cpu_ports):
 
 root = Root(full_system = False, system = system)
 root.system.mem_mode = 'timing'
-
-# Not much point in this being higher than the L1 latency
-m5.ticks.setGlobalFrequency('1ns')

diff --git a/tests/configs/rubytest-ruby.py b/tests/configs/rubytest-ruby.py
index 27dc0f28c8c1e27f217924007b07c5587f2a2b94..207f28c1b8d1df7dd165d1e7519bbc7f200f2709 100644 (file)
--- a/tests/configs/rubytest-ruby.py
+++ b/tests/configs/rubytest-ruby.py
@@ -125,6 +125,3 @@ for ruby_port in system.ruby._cpu_ports:
 
 root = Root(full_system = False, system = system )
 root.system.mem_mode = 'timing'
-
-# Not much point in this being higher than the L1 latency
-m5.ticks.setGlobalFrequency('1ns')

diff --git a/tests/configs/simple-timing-mp-ruby.py b/tests/configs/simple-timing-mp-ruby.py
index 897e053832cd16c2dcb7498a7b0761bd4ef5c0a7..248d04654ae314e9b00683095b75c8869e62cc72 100644 (file)
--- a/tests/configs/simple-timing-mp-ruby.py
+++ b/tests/configs/simple-timing-mp-ruby.py
@@ -93,6 +93,3 @@ for (i, cpu) in enumerate(system.cpu):
 
 root = Root( full_system=False, system = system )
 root.system.mem_mode = 'timing'
-
-# Not much point in this being higher than the L1 latency
-m5.ticks.setGlobalFrequency('1ns')

diff --git a/tests/configs/simple-timing-ruby.py b/tests/configs/simple-timing-ruby.py
index e76cd3963cb850133e0ef5e6f944628c9b0b9979..26ca3e9ceca145f58dd694445e0e08cde47b6234 100644 (file)
--- a/tests/configs/simple-timing-ruby.py
+++ b/tests/configs/simple-timing-ruby.py
@@ -97,6 +97,3 @@ cpu.connectAllPorts(system.ruby._cpu_ports[0])
 
 root = Root(full_system = False, system = system)
 root.system.mem_mode = 'timing'
-
-# Not much point in this being higher than the L1 latency
-m5.ticks.setGlobalFrequency('1ns')