cpu: Fix memory access in Minor not setting parent Request flags

This patch fixes cases where uncacheable/memory type flags are not set
correctly on a memory op which is split in the LSQ.  Without this
patch, request->request if freely used to check flags where the flags
should actually come from the accumulation of request fragment flags.

This patch also fixes a bug where an uncacheable access which passes
through tryToSendRequest more than once can increment
LSQ::numAccessesInMemorySystem more than once.

1 files changed, 3 insertions, 1 deletions

diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc
index c5e38c78d..b05ae514c 100644
--- a/src/cpu/minor/lsq.cc
+++ b/src/cpu/minor/lsq.cc
@@ -476,6 +476,8 @@ LSQ::SplitDataRequest::makeFragmentPackets()
             makePacketForRequest(*fragment, isLoad, this, request_data);
 
         fragmentPackets.push_back(fragment_packet);
+        /* Accumulate flags in parent request */
+        request.setFlags(fragment->getFlags());
     }
 
     /* Might as well make the overall/response packet here */
@@ -1029,7 +1031,7 @@ LSQ::tryToSendToTransfers(LSQRequestPtr request)
 
         /* Remember if this is an access which can't be idly
          *  discarded by an interrupt */
-        if (!bufferable) {
+        if (!bufferable && !request->issuedToMemory) {
             numAccessesIssuedToMemory++;
             request->issuedToMemory = true;
         }