From 2804311f7beb05a78aaa57d002b99031643d0a20 Mon Sep 17 00:00:00 2001
From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Mon, 17 Jun 2024 20:24:43 +0100
Subject: [PATCH] cpu-o3: Revert "Do not set Executed on load instruction to be
 replayed" (#1251)

Reverts gem5/gem5#1182

This is breaking O3 execution. Investigating the matter
---
 src/cpu/o3/lsq_unit.cc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/cpu/o3/lsq_unit.cc b/src/cpu/o3/lsq_unit.cc
index a00c8c7d06..68fd464627 100644
--- a/src/cpu/o3/lsq_unit.cc
+++ b/src/cpu/o3/lsq_unit.cc
@@ -611,12 +611,6 @@ LSQUnit::executeLoad(const DynInstPtr &inst)
     if (inst->isTranslationDelayed() && load_fault == NoFault)
         return load_fault;
 
-    // Partial Store-to-Load Forwarding condition marks the load to be
-    // reissued during LSQUnit::read(). In this case we shouldn't notify
-    // iewStage that the instruction is ready for commit.
-    if (!inst->isIssued() && !inst->effAddrValid())
-        return load_fault;
-
     if (load_fault != NoFault && inst->translationCompleted() &&
             inst->savedRequest->isPartialFault()
             && !inst->savedRequest->isComplete()) {