let load lsq resp check omit bytes

those written by store in flight
JUSDJTIN · Jan 25, 2021 · 3e98122 · 3e98122
1 parent fc27a4c
commit 3e98122
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/test/scala/cache/L1DTest/CoreAgent.scala b/src/test/scala/cache/L1DTest/CoreAgent.scala
@@ -79,8 +79,7 @@ class CoreAgent(ID: Int, name: String, addrStateMap: mutable.Map[BigInt, AddrSta
           b
       )
       val conflictWordMask = maskOutOfWord(conflictMask, wordInBlock(loadAddr))
-      val newMask = (loadT.req.get.mask | conflictWordMask) ^ conflictWordMask
-      insertMaskedWordRead(loadAddr, resp.data, newMask)
+      insertMaskedWordRead(loadAddr, resp.data, cleanMask(loadT.req.get.mask, conflictWordMask))
       outerLoad -= loadT
     }
     else if (resp.replay) {
@@ -117,8 +116,16 @@ class CoreAgent(ID: Int, name: String, addrStateMap: mutable.Map[BigInt, AddrSta
       val alignAddr = addrAlignBlock(loadAddr)
       if (alignAddr == respAddr) {
         q.pairLsqResp(resp)
+        val conflictMask = storeIdMap.foldLeft(BigInt(0))((b, kv) =>
+          if (kv._2.req.get.addr == alignAddr) {
+            b | kv._2.req.get.mask
+          }
+          else
+            b
+        )
+        val loadBlockMask = genWordMaskInBlock(loadAddr, q.req.get.mask)
         insertMaskedReadSnap(alignAddr, resp.data, insertVersionRead(loadAddr, 0),
-          genWordMaskInBlock(loadAddr, q.req.get.mask))
+          cleanMask(loadBlockMask, conflictMask))
         outerLoad -= q
         true
       }

diff --git a/src/test/scala/cache/TLCTest/BigIntUtil.scala b/src/test/scala/cache/TLCTest/BigIntUtil.scala
@@ -45,4 +45,8 @@ trait BigIntExtract {
     val mask8 = BigInt(prefix ++ tmp)
     ((old | mask8) ^ mask8) | (in & mask8)
   }
+
+  def cleanMask(old: BigInt, off: BigInt): BigInt = {
+    (old | off) ^ off
+  }
 }