From: Brad Beckmann <Brad.Beckmann@amd.com>
Date: Tue, 8 Feb 2011 23:53:33 +0000 (-0800)
Subject: memtest: due to contention increase, increased deadlock threshold
X-Git-Tag: stable_2012_02_02~558
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea9d4c3a97b1570a3b30d2fd538514b53ac54944;p=gem5.git

memtest: due to contention increase, increased deadlock threshold
---

diff --git a/configs/example/ruby_mem_test.py b/configs/example/ruby_mem_test.py
index e32e0c114..f58ebc1de 100644
--- a/configs/example/ruby_mem_test.py
+++ b/configs/example/ruby_mem_test.py
@@ -135,6 +135,12 @@ for (i, cpu) in enumerate(cpus):
     cpu.test = system.ruby.cpu_ruby_ports[i].port
     cpu.functional = system.funcmem.port
 
+    #
+    # Since the memtester is incredibly bursty, increase the deadlock
+    # threshold to 5 million cycles
+    #
+    system.ruby.cpu_ruby_ports[i].deadlock_threshold = 5000000
+
 for (i, dma) in enumerate(dmas):
     #
     # Tie the dma memtester ports to the correct functional port
diff --git a/tests/configs/memtest-ruby.py b/tests/configs/memtest-ruby.py
index f1bb733dc..eb7a280f4 100644
--- a/tests/configs/memtest-ruby.py
+++ b/tests/configs/memtest-ruby.py
@@ -96,6 +96,12 @@ for (i, ruby_port) in enumerate(system.ruby.cpu_ruby_ports):
      #
      cpus[i].test = ruby_port.port
      cpus[i].functional = system.funcmem.port
+     
+     #
+     # Since the memtester is incredibly bursty, increase the deadlock
+     # threshold to 1 million cycles
+     #
+     ruby_port.deadlock_threshold = 1000000
 
 # -----------------------
 # run simulation