# HG changeset patch
# User Derek Hower <d...@cs.wisc.edu>
# Date 1253068660 18000
# Node ID 9740ade4596226623fa31923456c8ce58eb32408
# Parent b8421af116e59abbb3327cd48320c90e5a65b12e
ruby: improve libruby_issue_request feedback
diff --git a/src/mem/ruby/libruby.hh b/src/mem/ruby/libruby.hh
--- a/src/mem/ruby/libruby.hh
+++ b/src/mem/ruby/libruby.hh
@@ -69,6 +69,12 @@
RubyPortHandle libruby_get_port_by_name(const char* name);
+/**
+ * libruby_issue_request error return codes
+ */
+#define LIBRUBY_BUFFER_FULL -2
+#define LIBRUBY_ALIASED_REQUEST -3
+
/**
* issue_request returns a unique access_id to identify the ruby
* transaction. This access_id is later returned to the caller via
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -27,6 +27,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include "mem/ruby/libruby.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/system/Sequencer.hh"
#include "mem/ruby/system/System.hh"
@@ -360,49 +361,41 @@
}
// Returns true if the sequencer already has a load or store outstanding
-bool Sequencer::isReady(const RubyRequest& request, bool dont_set) {
+int Sequencer::isReady(const RubyRequest& request) {
// POLINA: check if we are currently flushing the write buffer, if so Ruby
is returned as not ready
// to simulate stalling of the front-end
// Do we stall all the sequencers? If it is atomic instruction - yes!
if (m_outstanding_count >= m_max_outstanding_requests) {
- return false;
+ 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 false;
+ return LIBRUBY_ALIASED_REQUEST;
}
-
- if (m_servicing_atomic != 200 && m_servicing_atomic != request.proc_id) {
- assert(m_atomics_counter > 0);
- return false;
+
+ if (request.type == RubyRequestType_RMW_Read) {
+ if (m_servicing_atomic == 200) {
+ assert(m_atomics_counter == 0);
+ m_servicing_atomic = request.proc_id;
+ }
+ else {
+ assert(m_servicing_atomic == request.proc_id);
+ }
+ m_atomics_counter++;
}
else {
- if (!dont_set) {
- if (request.type == RubyRequestType_RMW_Read) {
- if (m_servicing_atomic == 200) {
- assert(m_atomics_counter == 0);
- m_servicing_atomic = request.proc_id;
- }
- else {
- assert(m_servicing_atomic == request.proc_id);
- }
- m_atomics_counter++;
- }
- else {
- if (m_servicing_atomic == request.proc_id) {
- if (request.type != RubyRequestType_RMW_Write) {
- m_servicing_atomic = 200;
- m_atomics_counter = 0;
- }
- }
+ if (m_servicing_atomic == request.proc_id) {
+ if (request.type != RubyRequestType_RMW_Write) {
+ m_servicing_atomic = 200;
+ m_atomics_counter = 0;
}
}
}
- return true;
+ return 1;
}
bool Sequencer::empty() const {
@@ -413,7 +406,8 @@
int64_t Sequencer::makeRequest(const RubyRequest & request)
{
assert(Address(request.paddr).getOffset() + request.len <=
RubySystem::getBlockSizeBytes());
- if (isReady(request)) {
+ int ready = isReady(request);
+ if (ready > 0) {
int64_t id = makeUniqueRequestID();
SequencerRequest *srequest = new SequencerRequest(request, id,
g_eventQueue_ptr->getTime());
bool found = insertRequest(srequest);
@@ -441,7 +435,7 @@
}
}
else {
- return -1;
+ return ready;
}
}
diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh
--- a/src/mem/ruby/system/Sequencer.hh
+++ b/src/mem/ruby/system/Sequencer.hh
@@ -84,7 +84,7 @@
// called by Tester or Simics
int64_t makeRequest(const RubyRequest & request);
- bool isReady(const RubyRequest& request, bool dont_set = false);
+ int isReady(const RubyRequest& request);
bool empty() const;
void print(ostream& out) const;
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
