Matt Sinclair has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/69397?usp=email )
Change subject: mem-ruby: fix whitespacing errors in RubySystem
......................................................................
mem-ruby: fix whitespacing errors in RubySystem
These errors cause other commits to fail pre-commit
M src/mem/ruby/system/RubySystem.cc
1 file changed, 10 insertions(+), 9 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/ruby/system/RubySystem.cc
b/src/mem/ruby/system/RubySystem.cc
index 91c4bc3..5a81513 100644
--- a/src/mem/ruby/system/RubySystem.cc
+++ b/src/mem/ruby/system/RubySystem.cc
@@ -310,23 +310,24 @@
void
RubySystem::serialize(CheckpointOut &cp) const
{
- // Store the cache-block size, so we are able to restore on systems
with a
- // different cache-block size. CacheRecorder depends on the correct
- // cache-block size upon unserializing.
- // Store the cache-block size, so we are able to restore on systems
- // with a different cache-block size. CacheRecorder depends on the
- // correct cache-block size upon unserializing.
uint64_t block_size_bytes = getBlockSizeBytes();
SERIALIZE_SCALAR(block_size_bytes);
- // Check that there's a valid trace to use. If not, then memory won't
be
- // up-to-date and the simulation will probably fail when restoring
from the
- // checkpoint.
- // Check that there's a valid trace to use. If not, then memory won't
- // be up-to-date and the simulation will probably fail when restoring
- // from the checkpoint.
if (m_cache_recorder == NULL) {
trace");
- uint64_t cache_trace_size =
m_cache_recorder->aggregateRecords(&raw_data,
-
4096);
- uint64_t cache_trace_size = m_cache_recorder->aggregateRecords(
-
&raw_data, 4096);
std::string cache_trace_file = name() + ".cache.gz";
writeCompressedTrace(raw_data, cache_trace_file, cache_trace_size);
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/69397?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I379d2d7c73f88d0bb35de5aaa7d8cb70a83ee1dd
Gerrit-Change-Number: 69397
Gerrit-PatchSet: 3
Gerrit-Owner: Matt Sinclair mattdsinclair.wisc@gmail.com
Gerrit-Reviewer: Jason Lowe-Power jason@lowepower.com
Gerrit-Reviewer: Jason Lowe-Power power.jg@gmail.com
Gerrit-Reviewer: Matt Sinclair mattdsinclair@gmail.com
Gerrit-Reviewer: Matthew Poremba matthew.poremba@amd.com
Gerrit-Reviewer: VISHNU RAMADAS vramadas@wisc.edu
Gerrit-Reviewer: kokoro noreply+kokoro@google.com
Gerrit-MessageType: merged
Matt Sinclair has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/69397?usp=email )
Change subject: mem-ruby: fix whitespacing errors in RubySystem
......................................................................
mem-ruby: fix whitespacing errors in RubySystem
These errors cause other commits to fail pre-commit
Change-Id: I379d2d7c73f88d0bb35de5aaa7d8cb70a83ee1dd
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69397
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
---
M src/mem/ruby/system/RubySystem.cc
1 file changed, 10 insertions(+), 9 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/ruby/system/RubySystem.cc
b/src/mem/ruby/system/RubySystem.cc
index 91c4bc3..5a81513 100644
--- a/src/mem/ruby/system/RubySystem.cc
+++ b/src/mem/ruby/system/RubySystem.cc
@@ -310,23 +310,24 @@
void
RubySystem::serialize(CheckpointOut &cp) const
{
- // Store the cache-block size, so we are able to restore on systems
with a
- // different cache-block size. CacheRecorder depends on the correct
- // cache-block size upon unserializing.
+ // Store the cache-block size, so we are able to restore on systems
+ // with a different cache-block size. CacheRecorder depends on the
+ // correct cache-block size upon unserializing.
uint64_t block_size_bytes = getBlockSizeBytes();
SERIALIZE_SCALAR(block_size_bytes);
- // Check that there's a valid trace to use. If not, then memory won't
be
- // up-to-date and the simulation will probably fail when restoring
from the
- // checkpoint.
+ // Check that there's a valid trace to use. If not, then memory won't
+ // be up-to-date and the simulation will probably fail when restoring
+ // from the checkpoint.
if (m_cache_recorder == NULL) {
- fatal("Call memWriteback() before serialize() to create ruby
trace");
+ fatal("Call memWriteback() before serialize() to create"
+ "ruby trace");
}
// Aggregate the trace entries together into a single array
uint8_t *raw_data = new uint8_t[4096];
- uint64_t cache_trace_size =
m_cache_recorder->aggregateRecords(&raw_data,
- 4096);
+ uint64_t cache_trace_size = m_cache_recorder->aggregateRecords(
+ &raw_data, 4096);
std::string cache_trace_file = name() + ".cache.gz";
writeCompressedTrace(raw_data, cache_trace_file, cache_trace_size);
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/69397?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I379d2d7c73f88d0bb35de5aaa7d8cb70a83ee1dd
Gerrit-Change-Number: 69397
Gerrit-PatchSet: 3
Gerrit-Owner: Matt Sinclair <mattdsinclair.wisc@gmail.com>
Gerrit-Reviewer: Jason Lowe-Power <jason@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power.jg@gmail.com>
Gerrit-Reviewer: Matt Sinclair <mattdsinclair@gmail.com>
Gerrit-Reviewer: Matthew Poremba <matthew.poremba@amd.com>
Gerrit-Reviewer: VISHNU RAMADAS <vramadas@wisc.edu>
Gerrit-Reviewer: kokoro <noreply+kokoro@google.com>
Gerrit-MessageType: merged