diff options
| author | Roland Green <[email protected]> | 2019-08-26 16:28:51 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-08-26 16:28:51 -0400 |
| commit | 93e98042f7c4a589bf0e4c7cfcc639c316c8a4b2 (patch) | |
| tree | 1e32c07e932b3d3cc6b977e29a1327274f4f29a8 /src/gpgpu-sim/gpu-cache.cc | |
| parent | 6be23a1b36a3311c7dafc45a5e692e38cb351337 (diff) | |
| parent | b88c9e9a545960b7fcc1c373b60005612296158b (diff) | |
Merge pull request #28 from CoffeeBeforeArch/fix_warnings
Fix a bunch of outstanding warnings and undefined behavior. Fix single merge-error with Mahmoud's changes.
Diffstat (limited to 'src/gpgpu-sim/gpu-cache.cc')
| -rw-r--r-- | src/gpgpu-sim/gpu-cache.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpgpu-sim/gpu-cache.cc b/src/gpgpu-sim/gpu-cache.cc index d034303..1e99fec 100644 --- a/src/gpgpu-sim/gpu-cache.cc +++ b/src/gpgpu-sim/gpu-cache.cc @@ -785,7 +785,7 @@ void cache_stats::print_stats(FILE *fout, const char *cache_name) const{ } for (unsigned type = 0; type < NUM_MEM_ACCESS_TYPE; ++type) { if(total_access[type] > 0) - fprintf(fout, "\t%s[%s][%s] = %llu\n", + fprintf(fout, "\t%s[%s][%s] = %u\n", m_cache_name.c_str(), mem_access_type_str((enum mem_access_type)type), "TOTAL_ACCESS", @@ -798,7 +798,7 @@ void cache_stats::print_fail_stats(FILE *fout, const char *cache_name) const{ for (unsigned type = 0; type < NUM_MEM_ACCESS_TYPE; ++type) { for (unsigned fail = 0; fail < NUM_CACHE_RESERVATION_FAIL_STATUS; ++fail) { if(m_fail_stats[type][fail] > 0){ - fprintf(fout, "\t%s[%s][%s] = %u\n", + fprintf(fout, "\t%s[%s][%s] = %llu\n", m_cache_name.c_str(), mem_access_type_str((enum mem_access_type)type), cache_fail_status_str((enum cache_reservation_fail_reason)fail), @@ -1425,8 +1425,6 @@ data_cache::wr_miss_wa_lazy_fetch_on_read( new_addr_type addr, { new_addr_type block_addr = m_config.block_addr(addr); - new_addr_type mshr_addr = m_config.mshr_addr(mf->get_addr()); - //if the request writes to the whole cache line/sector, then, write and set cache line Modified. //and no need to send read request to memory or reserve mshr |