still cannot run fence+ift...hitsb

1 files changed, 19 insertions, 12 deletions

diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh
index 80445e261..fb6d8cb54 100644
--- a/src/cpu/o3/lsq_unit_impl.hh
+++ b/src/cpu/o3/lsq_unit_impl.hh
@@ -124,12 +124,14 @@ LSQUnit<Impl>::completeDataAccess(PacketPtr pkt)
         return;
     }
 
-    if ( pkt->isSpec() && pkt->isRead() && (!pkt->isL1Hit()) ) {
-        DPRINTF(LSQUnit, "spec load miss for inst [sn:%lli], fence it.\n",
-                inst->seqNum);
-        inst->fenceDelay(true);
-    } else {
-        DPRINTF(LSQUnit, "spec load hit for inst [sn:%lli].\n");
+    if ( pkt->isSpec() ) {
+        if ( pkt->isRead() && (!pkt->isL1Hit()) ) {
+            DPRINTF(LSQUnit, "spec load miss for inst [sn:%lli], fence it.\n",
+                    inst->seqNum);
+            inst->fenceDelay(true);
+        } else {
+            DPRINTF(LSQUnit, "spec load hit for inst [sn:%lli].\n", inst->seqNum);
+        }
     }
 
     assert(!cpu->switchedOut());
@@ -1373,12 +1375,17 @@ LSQUnit<Impl>::writeback(const DynInstPtr &inst, PacketPtr pkt)
             "in this case, we will put it into ROB twice.");
 
     if (inst->fenceDelay()) {
-        DPRINTF(LSQUnit, "To write back a fence delayed spec load [sn:%lli].\n", inst->seqNum);
-        assert(pkt->isSpec());
-        inst->onlyWaitForFence(true);
-        inst->translationStarted(false);
-        inst->translationCompleted(false);
-        iewStage->instQueue.deferMemInst(inst);
+        if (pkt->isSpec()) {
+            DPRINTF(LSQUnit, "To write back a fence delayed spec load [sn:%lli].\n", inst->seqNum);
+            inst->onlyWaitForFence(true);
+            inst->translationStarted(false);
+            inst->translationCompleted(false);
+            iewStage->instQueue.deferMemInst(inst);
+        } else {
+            DPRINTF(LSQUnit, "inst [sn:%lli] inst->fenceDelay() && !pkt->isSpec()"
+                    "at LSQUnit::writeback, possibly due to IFT issue in gem5.\n", inst->seqNum);
+            inst->fenceDelay(false);
+        }
     } else if (!inst->isExecuted()) {
         inst->setExecuted();