diff options
14 files changed, 14 insertions, 63 deletions
diff --git a/tests/SConscript b/tests/SConscript index e6bf3e60b..053126b33 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -334,7 +334,7 @@ if env['TARGET_ISA'] == 'x86': configs += ['simple-atomic', 'simple-timing', 'o3-timing', 'memtest', 'simple-atomic-mp', 'simple-timing-mp', 'o3-timing-mp', 'inorder-timing', 'rubytest', 'tgen-simple-mem', - 'tgen-simple-dram'] + 'tgen-dram-ctrl'] if env['PROTOCOL'] != 'None': if env['PROTOCOL'] == 'MI_example': diff --git a/tests/configs/tgen-simple-dram.py b/tests/configs/tgen-dram-ctrl.py index d0d26e1f3..c98b92650 100644 --- a/tests/configs/tgen-simple-dram.py +++ b/tests/configs/tgen-dram-ctrl.py @@ -45,7 +45,7 @@ require_sim_object("CommMonitor") # even if this is only a traffic generator, call it cpu to make sure # the scripts are happy -cpu = TrafficGen(config_file = "tests/quick/se/70.tgen/tgen-simple-dram.cfg") +cpu = TrafficGen(config_file = "tests/quick/se/70.tgen/tgen-dram-ctrl.cfg") # system simulated system = System(cpu = cpu, physmem = DDR3_1600_x64(), diff --git a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/config.ini b/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/config.ini index b3c13e1c2..b3c13e1c2 100644 --- a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/config.ini +++ b/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/config.ini diff --git a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simerr b/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/simerr index e69de29bb..e69de29bb 100755 --- a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simerr +++ b/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/simerr diff --git a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simout b/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/simout index cffe93183..cffe93183 100755 --- a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simout +++ b/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/simout diff --git a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/stats.txt b/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/stats.txt index c44d33a13..c44d33a13 100644 --- a/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/stats.txt +++ b/tests/quick/se/70.tgen/ref/null/none/tgen-dram-ctrl/stats.txt diff --git a/tests/quick/se/70.tgen/test-frfcfs-toy.trc b/tests/quick/se/70.tgen/test-frfcfs-toy.trc deleted file mode 100644 index a1dd3088c..000000000 --- a/tests/quick/se/70.tgen/test-frfcfs-toy.trc +++ /dev/null @@ -1,7 +0,0 @@ -r,64,64,4000 -r,128,64,5000 -r,196,64,6000 -r,256,64,7000 -r,3453276,64,8000 -r,320,64,9000 -r,232123,64,500000 diff --git a/tests/quick/se/70.tgen/test-open-ops.trc b/tests/quick/se/70.tgen/test-open-ops.trc deleted file mode 100644 index 26aef5257..000000000 --- a/tests/quick/se/70.tgen/test-open-ops.trc +++ /dev/null @@ -1,6 +0,0 @@ -r,64,64,4000 -r,2048,64,5000 -r,128,64,6000 -r,196,64,7000 -r,12433,64,8000 -r,23223,64,1000000 diff --git a/tests/quick/se/70.tgen/test-refresh.trc b/tests/quick/se/70.tgen/test-refresh.trc deleted file mode 100644 index b8c02c7dc..000000000 --- a/tests/quick/se/70.tgen/test-refresh.trc +++ /dev/null @@ -1,3 +0,0 @@ -r,64,64,4000 -r, 128, 64, 7800001 -r, 196, 64, 100000000 diff --git a/tests/quick/se/70.tgen/test-writebuffer.trc b/tests/quick/se/70.tgen/test-writebuffer.trc deleted file mode 100644 index d0a719bfc..000000000 --- a/tests/quick/se/70.tgen/test-writebuffer.trc +++ /dev/null @@ -1,5 +0,0 @@ -r, 64, 64, 4000 -w, 128, 64, 6000 -r, 196, 64, 8000 -r, 128, 64, 10000 -r, 123143,64,100000 diff --git a/tests/quick/se/70.tgen/test-writefrfcfs.trc b/tests/quick/se/70.tgen/test-writefrfcfs.trc deleted file mode 100644 index a70e112f4..000000000 --- a/tests/quick/se/70.tgen/test-writefrfcfs.trc +++ /dev/null @@ -1,26 +0,0 @@ -w,64,64,4000 -w,128,64,5000 -w,196,64,6000 -w,256,64,7000 -w,345376,64,8000 -w,23223,64,10000 -w,12367,64,11000 -w,15328,64,12000 -w,19346,64,13000 -w,26456,64,14000 -w,34576,64,15000 -w,33620,64,16000 -w,2323,64,17000 -w,67354,64,18000 -w,1258,64,19000 -w,196,64,20000 -w,256,64,21000 -w,3276,64,22000 -w,14234,64,23000 -w,23123,64,24000 -w,23333,64,25000 -w,35318,64,26000 -w,32542,64,27000 -w,8576,64,28000 -w,34576,64,29000 -w,326660,64,30000000 diff --git a/tests/quick/se/70.tgen/tgen-simple-dram.cfg b/tests/quick/se/70.tgen/tgen-dram-ctrl.cfg index 7ac7510a2..0351744a3 100644 --- a/tests/quick/se/70.tgen/tgen-simple-dram.cfg +++ b/tests/quick/se/70.tgen/tgen-dram-ctrl.cfg @@ -8,9 +8,9 @@ # STATE <id> <duration (ticks)> <type> # # State IDLE idles -# -# States LINEAR and RANDOM have additional <percent reads> <start addr> -# <end addr> <access size (bytes)> <min period (ticks)> <max period (ticks)> +# +# States LINEAR and RANDOM have additional <percent reads> <start addr> +# <end addr> <access size (bytes)> <min period (ticks)> <max period (ticks)> # <data limit (bytes)> # # State TRACE plays back a pre-recorded trace once @@ -20,8 +20,12 @@ # random state is from a uniform random distribution over the # interval. If a specific value is desired, then the min and max can # be set to the same value. -STATE 0 100 IDLE +STATE 0 100 IDLE STATE 1 1000000000 LINEAR 100 0 134217728 64 30000 30000 0 +STATE 2 1000000 IDLE +STATE 3 1000000000 RANDOM 50 0 134217728 64 28000 32000 0 INIT 0 TRANSITION 0 1 1 -TRANSITION 1 1 1 +TRANSITION 1 2 1 +TRANSITION 2 3 1 +TRANSITION 3 3 1 diff --git a/tests/quick/se/70.tgen/tgen-simple-dram.trc b/tests/quick/se/70.tgen/tgen-simple-dram.trc deleted file mode 100644 index 26aef5257..000000000 --- a/tests/quick/se/70.tgen/tgen-simple-dram.trc +++ /dev/null @@ -1,6 +0,0 @@ -r,64,64,4000 -r,2048,64,5000 -r,128,64,6000 -r,196,64,7000 -r,12433,64,8000 -r,23223,64,1000000 diff --git a/tests/quick/se/70.tgen/tgen-simple-mem.cfg b/tests/quick/se/70.tgen/tgen-simple-mem.cfg index 532f1ef21..6d037f9ea 100644 --- a/tests/quick/se/70.tgen/tgen-simple-mem.cfg +++ b/tests/quick/se/70.tgen/tgen-simple-mem.cfg @@ -8,9 +8,9 @@ # STATE <id> <duration (ticks)> <type> # # State IDLE idles -# -# States LINEAR and RANDOM have additional <percent reads> <start addr> -# <end addr> <access size (bytes)> <min period (ticks)> <max period (ticks)> +# +# States LINEAR and RANDOM have additional <percent reads> <start addr> +# <end addr> <access size (bytes)> <min period (ticks)> <max period (ticks)> # <data limit (bytes)> # # State TRACE plays back a pre-recorded trace once |