From 5d895a553f32a42ff0107ae49ba629560c541366 Mon Sep 17 00:00:00 2001
From: Anzooooo <anzoso@outlook.com>
Date: Mon, 25 Nov 2024 15:12:33 +0800
Subject: [PATCH] fix(VMergeBuffer): `uopFinish` should not be set when
 redirect

---
 src/main/scala/xiangshan/mem/vector/VMergeBuffer.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/scala/xiangshan/mem/vector/VMergeBuffer.scala b/src/main/scala/xiangshan/mem/vector/VMergeBuffer.scala
index 1f87b7c032..bbe85a3c27 100644
--- a/src/main/scala/xiangshan/mem/vector/VMergeBuffer.scala
+++ b/src/main/scala/xiangshan/mem/vector/VMergeBuffer.scala
@@ -314,7 +314,7 @@ abstract class BaseVMergeBuffer(isVStore: Boolean=false)(implicit p: Parameters)
 
   //uopwriteback(deq)
   for (i <- 0 until uopSize){
-    when(allocated(i) && entries(i).allReady()){
+    when(allocated(i) && entries(i).allReady() && !needCancel(i)){
       uopFinish(i) := true.B
     }
   }