From 4ecb4ee850cff040bf7dcfb96088a5312efc6fe8 Mon Sep 17 00:00:00 2001
From: Archer613 <2846509110@qq.com>
Date: Wed, 15 May 2024 10:47:40 +0800
Subject: [PATCH] Fix bug of GrantBuf assert 'inflightGrant entries should not
 be full'

---
 src/main/scala/coupledL2/GrantBuffer.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/coupledL2/GrantBuffer.scala b/src/main/scala/coupledL2/GrantBuffer.scala
index 8d14e79da..e5a8dd73d 100644
--- a/src/main/scala/coupledL2/GrantBuffer.scala
+++ b/src/main/scala/coupledL2/GrantBuffer.scala
@@ -253,7 +253,7 @@ class GrantBuffer(implicit p: Parameters) extends L2Module {
     entry.bits.tag    := io.d_task.bits.task.tag
   }
   val inflight_full = Cat(inflightGrant.map(_.valid)).andR
-  assert(!inflight_full, "inflightGrant entries should not be full")
+  assert(!(inflight_full & (io.d_task.fire && (dtaskOpcode(2, 1) === Grant(2, 1) || io.d_task.bits.task.mergeA))), "inflightGrant entries overflow")
 
   // report status to SourceB to block same-addr Probe
   io.grantStatus zip inflightGrant foreach {