MSHR: return data when RetToSrc = 1 and snoop is SnpUnique* (#136)

Author: cyril0124

src/main/scala/coupledL2/tl2chi/MSHR.scala

@@ -179,13 +179,17 @@ class MSHR(implicit p: Parameters) extends TL2CHIL2Module {
     req_chiOpcode === SnpCleanShared ||
     req_chiOpcode === SnpCleanInvalid
   )
-  val doRespData_retToSrc_fwd = req.retToSrc.get && isSnpToBFwd(req_chiOpcode)
-  val doRespData_retToSrc_nonFwd = req.retToSrc.get && meta.state === BRANCH && isSnpToBNonFwd(req_chiOpcode)
+  val doRespData_retToSrc_fwd = req.retToSrc.get && (isSnpToBFwd(req_chiOpcode) || isSnpToNFwd(req_chiOpcode))
+  val doRespData_retToSrc_nonFwd = req.retToSrc.get && meta.state === BRANCH && (isSnpToBNonFwd(req_chiOpcode) || isSnpToNNonFwd(req_chiOpcode))
   val doRespData = Mux(
     dirResult.hit,
     doRespData_dirty || doRespData_retToSrc_fwd || doRespData_retToSrc_nonFwd,
     req.snpHitRelease && req.snpHitReleaseWithData
   )
+  dontTouch(doRespData_dirty)
+  dontTouch(doRespData_retToSrc_fwd)
+  dontTouch(doRespData_retToSrc_nonFwd)
+
   /**
     * About which snoop should echo SnpResp[Data]Fwded instead of SnpResp[Data]:
     * 1. When the snoop opcode is Snp*Fwd and the snooped block is valid.

src/main/scala/coupledL2/tl2chi/chi/Opcode.scala

@@ -186,6 +186,16 @@ object CHIOpcode {
       opcode === SnpSharedFwd
     }
 
+    def isSnpToNNonFwd(opcode: UInt): Bool = {
+     widthCheck(opcode) 
+     opcode === SnpUnique || opcode === SnpUniqueStash
+    }
+
+    def isSnpToNFwd(opcode: UInt): Bool = {
+     widthCheck(opcode) 
+     opcode === SnpUniqueFwd 
+    }
+
     def isSnpUniqueX(opcode: UInt): Bool = {
       widthCheck(opcode)
       opcode === SnpUnique || opcode === SnpUniqueFwd || opcode === SnpUniqueStash