Delay flush by one cycle

coreblocks/backend/retirement.py

@@ -2,7 +2,6 @@
 from coreblocks.interface.layouts import RetirementLayouts
 
 from transactron.core import Method, Transaction, TModule, def_method
-from transactron.lib.simultaneous import condition
 from transactron.utils.dependencies import DependencyContext
 from transactron.lib.metrics import *
 
@@ -180,15 +179,8 @@ def flush_instr(rob_entry):
                         # Normally retire all non-trap instructions
                         m.d.av_comb += commit.eq(1)
 
-                    # Condition is used to avoid FRAT locking during normal operation
-                    with condition(m) as cond:
-                        with cond(commit):
-                            retire_instr(rob_entry)
-                        with cond():
-                            # Not using default condition, because we want to block if branch is not ready
-                            flush_instr(rob_entry)
-
-                            m.d.comb += core_flushing.eq(1)
+                    with m.If(commit):
+                        retire_instr(rob_entry)
 
                     validate_transaction.schedule_before(retire_transaction)