From: Derek Hower <drh5@cs.wisc.edu>
Date: Fri, 13 Nov 2009 15:44:51 +0000 (-0600)
Subject: ruby: gave ALIASED_REQUEST priority over BUFFER_FULL in sequencer
X-Git-Tag: Calvin_Submission~3
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f7f475a6f414dcd69790a1a052910386cbbe0a93;p=gem5.git

ruby: gave ALIASED_REQUEST priority over BUFFER_FULL in sequencer
---

diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index bef0d5412..3e0997708 100644
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -354,16 +354,14 @@ void Sequencer::hitCallback(SequencerRequest* srequest, DataBlock& data) {
 
 // Returns true if the sequencer already has a load or store outstanding
 int Sequencer::isReady(const RubyRequest& request) {
-  if (m_outstanding_count >= m_max_outstanding_requests) {
-    return LIBRUBY_BUFFER_FULL;
-  }
-
   if( m_writeRequestTable.exist(line_address(Address(request.paddr))) ||
       m_readRequestTable.exist(line_address(Address(request.paddr))) ){
-    //cout << "OUTSTANDING REQUEST EXISTS " << p << " VER " << m_version << endl;
-    //printProgress(cout);
     return LIBRUBY_ALIASED_REQUEST;
   }
+
+  if (m_outstanding_count >= m_max_outstanding_requests) {
+    return LIBRUBY_BUFFER_FULL;
+  }
   
   return 1;
 }