CtrlBlock: send exception flush to mem block after a 'RegNext'

src/main/scala/xiangshan/backend/CtrlBlock.scala

@@ -324,7 +324,7 @@ class CtrlBlock extends XSModule with HasCircularQueuePtrHelper {
   io.toFpBlock.redirect <> backendRedirect
   io.toFpBlock.flush <> flush
   io.toLsBlock.redirect <> backendRedirect
-  io.toLsBlock.flush <> flush
+  io.toLsBlock.flush <> RegNext(flush)
 
   if (env.DualCoreDifftest) {
     difftestIO.fromRoq <> roq.difftestIO

src/main/scala/xiangshan/mem/lsqueue/LoadQueue.scala

@@ -578,7 +578,7 @@ class LoadQueue extends XSModule
   /**
     * update pointers
     */
-  val lastCycleCancelCount = PopCount(RegNext(needCancel)) - commitCount
+  val lastCycleCancelCount = PopCount(RegNext(needCancel))
   // when io.brqRedirect.valid, we don't allow eneuque even though it may fire.
   val enqNumber = Mux(io.enq.canAccept && io.enq.sqCanAccept && !(io.brqRedirect.valid || io.flush), PopCount(io.enq.req.map(_.valid)), 0.U)
   when (lastCycleRedirect.valid || lastCycleFlush) {