summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorAnthony Gutierrez <atgutier@umich.edu>2012-08-15 10:38:08 -0400
committerAnthony Gutierrez <atgutier@umich.edu>2012-08-15 10:38:08 -0400
commit0b3897fc90901953e9d016466c37ab507f85023c (patch)
tree0e8b1fec8d7c4871686903d573e9fd0fd8734d1e /src/arch
parent5a648f2074caad8aee97e03f27e8eecc527a2cba (diff)
downloadgem5-0b3897fc90901953e9d016466c37ab507f85023c.tar.xz
O3,ARM: fix some problems with drain/switchout functionality and add Drain DPRINTFs
This patch fixes some problems with the drain/switchout functionality for the O3 cpu and for the ARM ISA and adds some useful debug print statements. This is an incremental fix as there are still a few bugs/mem leaks with the switchout code. Particularly when switching from an O3CPU to a TimingSimpleCPU. However, when switching from O3 to O3 cores with the ARM ISA I haven't encountered any more assertion failures; now the kernel will typically panic inside of simulation.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm/table_walker.cc47
-rw-r--r--src/arch/arm/table_walker.hh5
2 files changed, 39 insertions, 13 deletions
diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index dfb406543..7dbe92d9b 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -43,6 +43,7 @@
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
#include "debug/Checkpoint.hh"
+#include "debug/Drain.hh"
#include "debug/TLB.hh"
#include "debug/TLBVerbose.hh"
#include "sim/system.hh"
@@ -51,7 +52,7 @@ using namespace ArmISA;
TableWalker::TableWalker(const Params *p)
: MemObject(p), port(this, params()->sys, params()->min_backoff,
- params()->max_backoff),
+ params()->max_backoff), drainEvent(NULL),
tlb(NULL), currState(NULL), pending(false),
masterId(p->sys->getMasterId(name())),
doL1DescEvent(this), doL2DescEvent(this), doProcessEvent(this)
@@ -64,20 +65,38 @@ TableWalker::~TableWalker()
;
}
+void
+TableWalker::completeDrain()
+{
+ if (drainEvent && stateQueueL1.empty() && stateQueueL2.empty() &&
+ pendingQueue.empty()) {
+ changeState(Drained);
+ DPRINTF(Drain, "TableWalker done draining, processing drain event\n");
+ drainEvent->process();
+ drainEvent = NULL;
+ }
+}
+
unsigned int
TableWalker::drain(Event *de)
{
- if (stateQueueL1.size() || stateQueueL2.size() || pendingQueue.size())
- {
- changeState(Draining);
- DPRINTF(Checkpoint, "TableWalker busy, wait to drain\n");
- return 1;
- }
- else
- {
+ unsigned int count = port.drain(de);
+
+ if (stateQueueL1.empty() && stateQueueL2.empty() &&
+ pendingQueue.empty()) {
changeState(Drained);
- DPRINTF(Checkpoint, "TableWalker free, no need to drain\n");
- return 0;
+ DPRINTF(Drain, "TableWalker free, no need to drain\n");
+
+ // table walker is drained, but its ports may still need to be drained
+ return count;
+ } else {
+ drainEvent = de;
+ changeState(Draining);
+ DPRINTF(Drain, "TableWalker not drained\n");
+
+ // return port drain count plus the table walker itself needs to drain
+ return count + 1;
+
}
}
@@ -86,8 +105,8 @@ TableWalker::resume()
{
MemObject::resume();
if ((params()->sys->getMemoryMode() == Enums::timing) && currState) {
- delete currState;
- currState = NULL;
+ delete currState;
+ currState = NULL;
}
}
@@ -667,6 +686,7 @@ TableWalker::doL1DescriptorWrapper()
doL1Descriptor();
stateQueueL1.pop_front();
+ completeDrain();
// Check if fault was generated
if (currState->fault != NoFault) {
currState->transState->finish(currState->fault, currState->req,
@@ -723,6 +743,7 @@ TableWalker::doL2DescriptorWrapper()
stateQueueL2.pop_front();
+ completeDrain();
pending = false;
nextWalk(currState->tc);
diff --git a/src/arch/arm/table_walker.hh b/src/arch/arm/table_walker.hh
index db6b01cd4..1b95182c8 100644
--- a/src/arch/arm/table_walker.hh
+++ b/src/arch/arm/table_walker.hh
@@ -364,6 +364,9 @@ class TableWalker : public MemObject
/** Port to issue translation requests from */
SnoopingDmaPort port;
+ /** If we're draining keep the drain event around until we're drained */
+ Event *drainEvent;
+
/** TLB that is initiating these table walks */
TLB *tlb;
@@ -389,6 +392,8 @@ class TableWalker : public MemObject
return dynamic_cast<const Params *>(_params);
}
+ /** Checks if all state is cleared and if so, completes drain */
+ void completeDrain();
virtual unsigned int drain(Event *de);
virtual void resume();
virtual MasterPort& getMasterPort(const std::string &if_name,