changeset a5f134ef30d3 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=a5f134ef30d3
description:
mem: clean up write buffer check in Cache::handleSnoop()
The 'if (writebacks.size)' check was redundant, because
writeBuffer.findMatches() would return false if the
writebacks list was empty.
Also renamed 'mshr' to 'wb_entry' in this context since
we are pointing at a writebuffer entry and not an MSHR
(even though it's the same C++ class).
diffstat:
src/mem/cache/cache_impl.hh | 58 +++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 30 deletions(-)
diffs (77 lines):
diff -r 9a0f26a90db9 -r a5f134ef30d3 src/mem/cache/cache_impl.hh
--- a/src/mem/cache/cache_impl.hh Mon Mar 09 09:39:09 2015 -0500
+++ b/src/mem/cache/cache_impl.hh Sat Mar 14 06:51:07 2015 -0700
@@ -12,7 +12,7 @@
* modified or unmodified, in source code or in binary form.
*
* Copyright (c) 2002-2005 The Regents of The University of Michigan
- * Copyright (c) 2010 Advanced Micro Devices, Inc.
+ * Copyright (c) 2010,2015 Advanced Micro Devices, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1818,37 +1818,35 @@
DPRINTF(Cache, "Snoop hit in writeback to addr %#llx (%s)\n",
pkt->getAddr(), is_secure ? "s" : "ns");
- //Look through writebacks for any non-uncachable writes, use that
- if (writebacks.size()) {
- // We should only ever find a single match
- assert(writebacks.size() == 1);
- mshr = writebacks[0];
- assert(!mshr->isUncacheable());
- assert(mshr->getNumTargets() == 1);
- PacketPtr wb_pkt = mshr->getTarget()->pkt;
- assert(wb_pkt->cmd == MemCmd::Writeback);
+ // Look through writebacks for any cachable writes.
+ // We should only ever find a single match
+ assert(writebacks.size() == 1);
+ MSHR *wb_entry = writebacks[0];
+ assert(!wb_entry->isUncacheable());
+ assert(wb_entry->getNumTargets() == 1);
+ PacketPtr wb_pkt = wb_entry->getTarget()->pkt;
+ assert(wb_pkt->cmd == MemCmd::Writeback);
- assert(!pkt->memInhibitAsserted());
- pkt->assertMemInhibit();
- if (!pkt->needsExclusive()) {
- pkt->assertShared();
- // the writeback is no longer the exclusive copy in the system
- wb_pkt->clearSupplyExclusive();
- } else {
- // if we're not asserting the shared line, we need to
- // invalidate our copy. we'll do that below as long as
- // the packet's invalidate flag is set...
- assert(pkt->isInvalidate());
- }
- doTimingSupplyResponse(pkt, wb_pkt->getConstPtr<uint8_t>(),
- false, false);
+ assert(!pkt->memInhibitAsserted());
+ pkt->assertMemInhibit();
+ if (!pkt->needsExclusive()) {
+ pkt->assertShared();
+ // the writeback is no longer the exclusive copy in the system
+ wb_pkt->clearSupplyExclusive();
+ } else {
+ // if we're not asserting the shared line, we need to
+ // invalidate our copy. we'll do that below as long as
+ // the packet's invalidate flag is set...
+ assert(pkt->isInvalidate());
+ }
+ doTimingSupplyResponse(pkt, wb_pkt->getConstPtr<uint8_t>(),
+ false, false);
- if (pkt->isInvalidate()) {
- // Invalidation trumps our writeback... discard here
- markInService(mshr, false);
- delete wb_pkt;
- }
- } // writebacks.size()
+ if (pkt->isInvalidate()) {
+ // Invalidation trumps our writeback... discard here
+ markInService(wb_entry, false);
+ delete wb_pkt;
+ }
}
// If this was a shared writeback, there may still be
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
