diff options
| author | Brad Beckmann <Brad.Beckmann@amd.com> | 2016-01-22 10:42:12 -0500 |
|---|---|---|
| committer | Brad Beckmann <Brad.Beckmann@amd.com> | 2016-01-22 10:42:12 -0500 |
| commit | 97a5e5b25e149176dfdcee4af4ff41644d694449 (patch) | |
| tree | df904550d1d6dd97478dea3057f31d2eb2f12852 /tests/configs | |
| parent | 698866d46197ad062384894f1927f99f26b03f3b (diff) | |
| download | gem5-97a5e5b25e149176dfdcee4af4ff41644d694449.tar.xz | |
ruby: changed all references to numCPs to num-cp
Diffstat (limited to 'tests/configs')
| -rw-r--r-- | tests/configs/gpu-randomtest-ruby.py | 2 | ||||
| -rw-r--r-- | tests/configs/gpu-ruby.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/configs/gpu-randomtest-ruby.py b/tests/configs/gpu-randomtest-ruby.py index 92e300394..92810fd64 100644 --- 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 632b4dec0..d007ebffc 100644 --- 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 |