diff options
| -rw-r--r-- | src/mem/ruby/system/CacheRecorder.cc | 9 | ||||
| -rw-r--r-- | src/mem/ruby/system/System.cc | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/mem/ruby/system/CacheRecorder.cc b/src/mem/ruby/system/CacheRecorder.cc index 339cf1b4f..9568d6a88 100644 --- a/src/mem/ruby/system/CacheRecorder.cc +++ b/src/mem/ruby/system/CacheRecorder.cc @@ -58,15 +58,6 @@ CacheRecorder::CacheRecorder(uint8_t* uncompressed_trace, m_seq_map(seq_map), m_bytes_read(0), m_records_read(0), m_records_flushed(0), m_block_size_bytes(block_size_bytes) { - if (m_uncompressed_trace != NULL) { - if (m_block_size_bytes < RubySystem::getBlockSizeBytes()) { - // Block sizes larger than when the trace was recorded are not - // supported, as we cannot reliably turn accesses to smaller blocks - // into larger ones. - panic("Recorded cache block size (%d) < current block size (%d) !!", - m_block_size_bytes, RubySystem::getBlockSizeBytes()); - } - } } CacheRecorder::~CacheRecorder() diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc index b623e351d..ad2f59e4f 100644 --- a/src/mem/ruby/system/System.cc +++ b/src/mem/ruby/system/System.cc @@ -304,9 +304,17 @@ RubySystem::unserialize(CheckpointIn &cp) // This value should be set to the checkpoint-system's block-size. // Optional, as checkpoints without it can be run if the // checkpoint-system's block-size == current block-size. - uint64_t block_size_bytes = getBlockSizeBytes(); + uint64_t block_size_bytes = m_block_size_bytes; UNSERIALIZE_OPT_SCALAR(block_size_bytes); + if (block_size_bytes < m_block_size_bytes) { + // Block sizes larger than when the trace was recorded are not + // supported, as we cannot reliably turn accesses to smaller blocks + // into larger ones. + panic("Recorded cache block size (%d) < current block size (%d) !!", + block_size_bytes, m_block_size_bytes); + } + string cache_trace_file; uint64_t cache_trace_size = 0; |