feat(ECC): add ECC for coupledL2 and bump coupledL2 & openLLC (#3808)

* add optional ECC for L2 Cache tag & data * add Poison & (optional) DataCheck for CHI
OpenXiangShan · Dec 5, 2024 · 4aa305e · 4aa305e
1 parent 189833a
commit 4aa305e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/coupledL2 b/coupledL2
diff --git a/openLLC b/openLLC
diff --git a/src/main/scala/top/Configs.scala b/src/main/scala/top/Configs.scala
@@ -299,6 +299,11 @@ class WithNKBL2
         )),
         reqField = Seq(utility.ReqSourceField()),
         echoField = Seq(huancun.DirtyField()),
+        tagECC = Some("secded"),
+        dataECC = Some("secded"),
+        enableTagECC = true,
+        enableDataECC = true,
+        dataCheck = Some("oddparity"),
         prefetch = Seq(BOPParameters()) ++
           (if (tp) Seq(TPParameters()) else Nil) ++
           (if (p.prefetcher.nonEmpty) Seq(PrefetchReceiverParams()) else Nil),

diff --git a/src/main/scala/xiangshan/L2Top.scala b/src/main/scala/xiangshan/L2Top.scala
@@ -177,7 +177,8 @@ class L2TopInlined()(implicit p: Parameters) extends LazyModule
 
     val resetDelayN = Module(new DelayN(UInt(PAddrBits.W), 5))
 
-    beu.module.io.errors <> io.beu_errors
+    beu.module.io.errors.icache := io.beu_errors.icache
+    beu.module.io.errors.dcache := io.beu_errors.dcache
     resetDelayN.io.in := io.reset_vector.fromTile
     io.reset_vector.toCore := resetDelayN.io.out
     io.hartId.toCore := io.hartId.fromTile
@@ -240,6 +241,9 @@ class L2TopInlined()(implicit p: Parameters) extends LazyModule
           io.chi.get <> l2.io_chi
         case l2cache: TL2TLCoupledL2 =>
       }
+
+      beu.module.io.errors.l2.ecc_error.valid := l2.io.error.valid
+      beu.module.io.errors.l2.ecc_error.bits := l2.io.error.address
     } else {
       io.l2_hint := 0.U.asTypeOf(io.l2_hint)
       io.debugTopDown <> DontCare
@@ -249,6 +253,8 @@ class L2TopInlined()(implicit p: Parameters) extends LazyModule
       io.l2_tlb_req.req_kill := DontCare
       io.l2_tlb_req.resp.ready := true.B
       io.perfEvents := DontCare
+
+      beu.module.io.errors.l2 := 0.U.asTypeOf(beu.module.io.errors.l2)
     }
   }
+1 −0		src/main/scala/coupledL2/BaseSlice.scala
+6 −0		src/main/scala/coupledL2/Common.scala
+49 −0		src/main/scala/coupledL2/CoupledL2.scala
+55 −5		src/main/scala/coupledL2/DataStorage.scala
+54 −16		src/main/scala/coupledL2/Directory.scala
+11 −1		src/main/scala/coupledL2/L2Param.scala
+10 −1		src/main/scala/coupledL2/RequestBuffer.scala
+2 −0		src/main/scala/coupledL2/SinkA.scala
+3 −0		src/main/scala/coupledL2/SinkC.scala
+1 −1		src/main/scala/coupledL2/tl2chi/MSHR.scala
+41 −5		src/main/scala/coupledL2/tl2chi/MainPipe.scala
+17 −0		src/main/scala/coupledL2/tl2chi/RXDAT.scala
+3 −0		src/main/scala/coupledL2/tl2chi/Slice.scala
+16 −0		src/main/scala/coupledL2/tl2chi/TXDAT.scala
+4 −0		src/main/scala/coupledL2/tl2chi/chi/Message.scala
+10 −0		src/main/scala/coupledL2/tl2tl/MSHR.scala
+41 −4		src/main/scala/coupledL2/tl2tl/MainPipe.scala
+1 −0		src/main/scala/coupledL2/tl2tl/RefillUnit.scala
+3 −0		src/main/scala/coupledL2/tl2tl/Slice.scala
+18 −3		src/test/scala/TestTop.scala
+84 −0		.github/workflows/main.yml
+1 −1		coupledL2
+1 −1		openNCB
+1 −1		rocket-chip
+2 −0		src/main/scala/openLLC/Common.scala
+46 −6		src/test/scala/TestTop.scala