summaryrefslogtreecommitdiff
path: root/src/mem/ruby/system/Sequencer.cc
diff options
context:
space:
mode:
authorIru Cai <mytbk920423@gmail.com>2019-05-12 16:20:05 +0800
committerIru Cai <mytbk920423@gmail.com>2019-05-12 16:22:45 +0800
commitd3e361f60741ea9ebea06375c8525385014dd9d2 (patch)
tree4cc8146567125ac5bc56f8cd4c9f14a8a38f9f0c /src/mem/ruby/system/Sequencer.cc
parentb0e609d5cf6961bb9b3f12065659e1c42c13ef06 (diff)
downloadgem5-d3e361f60741ea9ebea06375c8525385014dd9d2.tar.xz
finally runs dhrystone
Change-Id: I7466a825f8726682622d237460311a1c4b23b8ad
Diffstat (limited to 'src/mem/ruby/system/Sequencer.cc')
-rw-r--r--src/mem/ruby/system/Sequencer.cc14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc
index 090030f08..a0d3cab1b 100644
--- a/src/mem/ruby/system/Sequencer.cc
+++ b/src/mem/ruby/system/Sequencer.cc
@@ -237,16 +237,6 @@ Sequencer::insertRequest(PacketPtr pkt, RubyRequestType request_type)
RequestTable::iterator i = r.first;
i->second = new SequencerRequest(pkt, request_type, curCycle());
m_outstanding_count++;
- } else if (request_type == RubyRequestType_SPEC_LD) {
- auto i = m_readRequestTable.find(line_addr);
- if (i->second->m_type == RubyRequestType_SPEC_LD) {
- DPRINTFR(SpecBuffer, "%10s Merging (idx=%d-%d, addr=%#x) with %d\n", curTick(), pkt->reqIdx, pkt->isFirst()? 0 : 1, printAddress(pkt->getAddr()), i->second->pkt->reqIdx);
- i->second->dependentSpecRequests.push_back(pkt);
- return RequestStatus_Merged;
- } else {
- m_load_waiting_on_load++;
- return RequestStatus_Aliased;
- }
} else {
// There is an outstanding read request for the cache line
m_load_waiting_on_load++;
@@ -653,9 +643,7 @@ Sequencer::makeRequest(PacketPtr pkt)
}
RequestStatus status = insertRequest(pkt, primary_type);
- if (status == RequestStatus_Merged) {
- return RequestStatus_Issued;
- } else if (status != RequestStatus_Ready) {
+ if (status != RequestStatus_Ready) {
return status;
}