Merge ktlim@zamp:/z/ktlim2/clean/m5-o3

[gem5.git] / src / cpu / o3 / commit_impl.hh

diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh
index 9efe30d24328390c4a059141cc85e9dce7a6c265..f8a252b87bbcb500ef55d3903804fd2878acfa62 100644 (file)
--- a/src/cpu/o3/commit_impl.hh
+++ b/src/cpu/o3/commit_impl.hh
@@ -692,7 +692,7 @@ DefaultCommit<Impl>::commit()
 
     while (threads != (*activeThreads).end()) {
         unsigned tid = *threads++;
-
+/*
         if (fromFetch->fetchFault && commitStatus[0] != TrapPending) {
             // Record the fault.  Wait until it's empty in the ROB.
             // Then handle the trap.  Ignore it if there's already a
@@ -714,7 +714,7 @@ DefaultCommit<Impl>::commit()
                 commitStatus[0] = Running;
             }
         }
-
+*/
         // Not sure which one takes priority.  I think if we have
         // both, that's a bad sign.
         if (trapSquash[tid] == true) {
@@ -926,7 +926,7 @@ DefaultCommit<Impl>::commitInsts()
     numCommittedDist.sample(num_committed);
 
     if (num_committed == commitWidth) {
-        commitEligible[0]++;
+        commitEligibleSamples++;
     }
 }
 
@@ -948,6 +948,7 @@ DefaultCommit<Impl>::commitHead(DynInstPtr &head_inst, unsigned inst_num)
         head_inst->reachedCommit = true;
 
         if (head_inst->isNonSpeculative() ||
+            head_inst->isStoreConditional() ||
             head_inst->isMemBarrier() ||
             head_inst->isWriteBarrier()) {