diff options
| author | JRPAN <[email protected]> | 2021-05-17 17:35:06 -0400 |
|---|---|---|
| committer | JRPAN <[email protected]> | 2021-05-20 15:15:21 -0400 |
| commit | c8eca04403d3acaff413788e342fd6aadd122948 (patch) | |
| tree | 95930caa2b5084e6aba2792a9e23e5ce3aa4d7e3 | |
| parent | 2aef4e3d5a662d04da03ec782b116d16a5bcc012 (diff) | |
fix merge conflict
| -rw-r--r-- | src/gpgpu-sim/gpu-cache.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpgpu-sim/gpu-cache.h b/src/gpgpu-sim/gpu-cache.h index 6698d92..007403f 100644 --- a/src/gpgpu-sim/gpu-cache.h +++ b/src/gpgpu-sim/gpu-cache.h @@ -563,10 +563,10 @@ class cache_config { char ct, rp, wp, ap, mshr_type, wap, sif; int ntok = - sscanf(config, "%c:%u:%u:%u,%c:%c:%c:%c:%c,%c:%u:%u,%u:%u,%u,%u", &ct, + sscanf(config, "%c:%u:%u:%u,%c:%c:%c:%c:%c,%c:%u:%u,%u:%u,%u", &ct, &m_nset, &m_line_sz, &m_assoc, &rp, &wp, &ap, &wap, &sif, &mshr_type, &m_mshr_entries, &m_mshr_max_merge, - &m_miss_queue_size, &m_result_fifo_entries, &m_data_port_width, &m_wr_percent); + &m_miss_queue_size, &m_result_fifo_entries, &m_data_port_width); if (ntok < 12) { if (!strcmp(config, "none")) { |