ruby: changed all references to numCPs to num-cp

diff --git a/configs/example/ruby_gpu_random_test.py b/configs/example/ruby_gpu_random_test.py
index 66ee4675f121675c8f78baab6029457d98ea000b..48567bbfd6b43a1ad6ebfe53bc02e1d696c1fb3c 100644 (file)
--- a/configs/example/ruby_gpu_random_test.py
+++ b/configs/example/ruby_gpu_random_test.py
@@ -59,7 +59,7 @@ parser.add_option("-f", "--wakeup_freq", metavar="N", default=10,
                   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 --git a/configs/ruby/GPU_RfO.py b/configs/ruby/GPU_RfO.py
index bb14252f3f87f26e58938869b8767f01ae00560f..283ba70afd24a19b991d76748ad6d5b658d32f3f 100644 (file)
--- a/configs/ruby/GPU_RfO.py
+++ b/configs/ruby/GPU_RfO.py
@@ -600,7 +600,7 @@ def create_system(options, full_system, system, dma_devices, ruby_system):
         # 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 --git a/configs/ruby/GPU_VIPER.py b/configs/ruby/GPU_VIPER.py
index f1384c40433e90d6a455dbfc00d7648e1c70de0a..eeed637d4bd6a5d4f78e987a35b470adf74e08b2 100644 (file)
--- a/configs/ruby/GPU_VIPER.py
+++ b/configs/ruby/GPU_VIPER.py
@@ -567,7 +567,7 @@ def create_system(options, full_system, system, dma_devices, ruby_system):
         # 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 --git a/tests/configs/gpu-randomtest-ruby.py b/tests/configs/gpu-randomtest-ruby.py
index 92e3003941b091b467d64d3af0ad624ffea52480..92810fd649cd6528e34aebb42bf1ab5f6f64229a 100644 (file)
--- a/tests/configs/gpu-randomtest-ruby.py
+++ b/tests/configs/gpu-randomtest-ruby.py
@@ -56,7 +56,7 @@ Options.addCommonOptions(parser)
 # 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 --git a/tests/configs/gpu-ruby.py b/tests/configs/gpu-ruby.py
index 632b4dec0041b258f633c53eabf8d70c65ef661d..d007ebffc635f311a7b94cd6a8755c9aa9474a20 100644 (file)
--- a/tests/configs/gpu-ruby.py
+++ b/tests/configs/gpu-ruby.py
@@ -92,7 +92,7 @@ parser.add_option("-k", "--kernel-files",
                   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 @@ system.ruby._cpu_ports[0].mem_master_port = system.piobus.slave
 # 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 @@ for i in xrange(n_cu):
             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