changeset b4bbf540d1a7 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=b4bbf540d1a7
description:
ruby: changed all references to numCPs to num-cp
diffstat:
configs/example/ruby_gpu_random_test.py | 2 +-
configs/ruby/GPU_RfO.py | 2 +-
configs/ruby/GPU_VIPER.py | 2 +-
tests/configs/gpu-randomtest-ruby.py | 2 +-
tests/configs/gpu-ruby.py | 7 ++++---
5 files changed, 8 insertions(+), 7 deletions(-)
diffs (79 lines):
diff -r 9be8a40026df -r b4bbf540d1a7 configs/example/ruby_gpu_random_test.py
--- a/configs/example/ruby_gpu_random_test.py Mon Jul 20 09:15:18 2015 -0500
+++ b/configs/example/ruby_gpu_random_test.py Fri Jan 22 10:42:12 2016 -0500
@@ -59,7 +59,7 @@
help="Wakeup every N cycles")
parser.add_option("-u", "--num-compute-units", type="int", default=1,
help="number of compute units in the GPU")
-parser.add_option("--numCPs", type="int", default=0,
+parser.add_option("--num-cp", type="int", default=0,
help="Number of GPU Command Processors (CP)")
# not super important now, but to avoid putting the number 4 everywhere, make
# it an option/knob
diff -r 9be8a40026df -r b4bbf540d1a7 configs/ruby/GPU_RfO.py
--- a/configs/ruby/GPU_RfO.py Mon Jul 20 09:15:18 2015 -0500
+++ b/configs/ruby/GPU_RfO.py Fri Jan 22 10:42:12 2016 -0500
@@ -600,7 +600,7 @@
# SQC also in GPU cluster
gpuCluster.add(sqc_cntrl)
- for i in xrange(options.numCPs):
+ for i in xrange(options.num_cp):
tcp_cntrl = TCPCntrl(TCC_select_num_bits = TCC_bits,
number_of_TBEs = 2560) # max outstanding requests
diff -r 9be8a40026df -r b4bbf540d1a7 configs/ruby/GPU_VIPER.py
--- a/configs/ruby/GPU_VIPER.py Mon Jul 20 09:15:18 2015 -0500
+++ b/configs/ruby/GPU_VIPER.py Fri Jan 22 10:42:12 2016 -0500
@@ -567,7 +567,7 @@
# SQC also in GPU cluster
gpuCluster.add(sqc_cntrl)
- for i in xrange(options.numCPs):
+ for i in xrange(options.num_cp):
tcp_ID = options.num_compute_units + i
sqc_ID = options.num_sqc + i
diff -r 9be8a40026df -r b4bbf540d1a7 tests/configs/gpu-randomtest-ruby.py
--- a/tests/configs/gpu-randomtest-ruby.py Mon Jul 20 09:15:18 2015 -0500
+++ b/tests/configs/gpu-randomtest-ruby.py Fri Jan 22 10:42:12 2016 -0500
@@ -56,7 +56,7 @@
# add the gpu specific options expected by the the gpu and gpu_RfO
parser.add_option("-u", "--num-compute-units", type="int", default=8,
help="number of compute units in the GPU")
-parser.add_option("--numCPs", type="int", default=0,
+parser.add_option("--num-cp", type="int", default=0,
help="Number of GPU Command Processors (CP)")
parser.add_option("--simds-per-cu", type="int", default=4, help="SIMD units" \
"per CU")
diff -r 9be8a40026df -r b4bbf540d1a7 tests/configs/gpu-ruby.py
--- a/tests/configs/gpu-ruby.py Mon Jul 20 09:15:18 2015 -0500
+++ b/tests/configs/gpu-ruby.py Fri Jan 22 10:42:12 2016 -0500
@@ -92,7 +92,7 @@
help="file(s) containing GPU kernel code (colon separated)")
parser.add_option("-u", "--num-compute-units", type="int", default=2,
help="number of GPU compute units"),
-parser.add_option("--numCPs", type="int", default=0,
+parser.add_option("--num-cp", type="int", default=0,
help="Number of GPU Command Processors (CP)")
parser.add_option("--simds-per-cu", type="int", default=4, help="SIMD units" \
"per CU")
@@ -308,7 +308,7 @@
# correctly.
gpu_port_idx = len(system.ruby._cpu_ports) \
- options.num_compute_units - options.num_sqc
-gpu_port_idx = gpu_port_idx - options.numCPs * 2
+gpu_port_idx = gpu_port_idx - options.num_cp * 2
wavefront_size = options.wf_size
for i in xrange(n_cu):
@@ -326,7 +326,8 @@
system.ruby._cpu_ports[gpu_port_idx].slave
gpu_port_idx = gpu_port_idx + 1
-assert(options.numCPs == 0)
+# Current regression tests do not support the command processor
+assert(options.num_cp == 0)
# connect dispatcher to the system.piobus
dispatcher.pio = system.piobus.master
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
