sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ruby: changed all references to numCPs to num-cp

Browse source
This commit is contained in:
Brad Beckmann 2016-01-22 10:42:12 -05:00
parent 698866d461
commit 97a5e5b25e
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/example/ruby_gpu_random_test.py
View file

@ -59,7 +59,7 @@ parser.add_option("-f", "--wakeup_freq", metavar="N", default=10,
help="Wakeup every N cycles") help="Wakeup every N cycles")
parser.add_option("-u", "--num-compute-units", type="int", default=1, parser.add_option("-u", "--num-compute-units", type="int", default=1,
help="number of compute units in the GPU") 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)") help="Number of GPU Command Processors (CP)")
# not super important now, but to avoid putting the number 4 everywhere, make # not super important now, but to avoid putting the number 4 everywhere, make
# it an option/knob # it an option/knob

2
configs/ruby/GPU_RfO.py
View file

@ -600,7 +600,7 @@ def create_system(options, full_system, system, dma_devices, ruby_system):
# SQC also in GPU cluster # SQC also in GPU cluster
gpuCluster.add(sqc_cntrl) 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, tcp_cntrl = TCPCntrl(TCC_select_num_bits = TCC_bits,
number_of_TBEs = 2560) # max outstanding requests number_of_TBEs = 2560) # max outstanding requests

2
configs/ruby/GPU_VIPER.py
View file

@ -567,7 +567,7 @@ def create_system(options, full_system, system, dma_devices, ruby_system):
# SQC also in GPU cluster # SQC also in GPU cluster
gpuCluster.add(sqc_cntrl) gpuCluster.add(sqc_cntrl)
for i in xrange(options.numCPs): for i in xrange(options.num_cp):
tcp_ID = options.num_compute_units + i tcp_ID = options.num_compute_units + i
sqc_ID = options.num_sqc + i sqc_ID = options.num_sqc + i

2
tests/configs/gpu-randomtest-ruby.py
View file

@ -56,7 +56,7 @@ Options.addCommonOptions(parser)
# add the gpu specific options expected by the the gpu and gpu_RfO # add the gpu specific options expected by the the gpu and gpu_RfO
parser.add_option("-u", "--num-compute-units", type="int", default=8, parser.add_option("-u", "--num-compute-units", type="int", default=8,
help="number of compute units in the GPU") 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)") help="Number of GPU Command Processors (CP)")
parser.add_option("--simds-per-cu", type="int", default=4, help="SIMD units" \ parser.add_option("--simds-per-cu", type="int", default=4, help="SIMD units" \
"per CU") "per CU")

7
tests/configs/gpu-ruby.py
View file

@ -92,7 +92,7 @@ parser.add_option("-k", "--kernel-files",
help="file(s) containing GPU kernel code (colon separated)") help="file(s) containing GPU kernel code (colon separated)")
parser.add_option("-u", "--num-compute-units", type="int", default=2, parser.add_option("-u", "--num-compute-units", type="int", default=2,
help="number of GPU compute units"), 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)") help="Number of GPU Command Processors (CP)")
parser.add_option("--simds-per-cu", type="int", default=4, help="SIMD units" \ parser.add_option("--simds-per-cu", type="int", default=4, help="SIMD units" \
"per CU") "per CU")
@ -308,7 +308,7 @@ system.ruby._cpu_ports[0].mem_master_port = system.piobus.slave
# correctly. # correctly.
gpu_port_idx = len(system.ruby._cpu_ports) \ gpu_port_idx = len(system.ruby._cpu_ports) \
- options.num_compute_units - options.num_sqc - 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 wavefront_size = options.wf_size
for i in xrange(n_cu): for i in xrange(n_cu):
@ -326,7 +326,8 @@ for i in xrange(n_cu):
system.ruby._cpu_ports[gpu_port_idx].slave system.ruby._cpu_ports[gpu_port_idx].slave
gpu_port_idx = gpu_port_idx + 1 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 # connect dispatcher to the system.piobus
dispatcher.pio = system.piobus.master dispatcher.pio = system.piobus.master