29e34a739b
User script now invokes initialization and simulation loop after building configuration. These functions are exported from C++ to Python using SWIG. SConstruct: Set up SWIG builder & scanner. Set up symlinking of source files into build directory (by not disabling the default behavior). configs/test/test.py: Rewrite to use new script-driven interface. Include a sample option. src/SConscript: Set up symlinking of source files into build directory (by not disabling the default behavior). Add SWIG-generated main_wrap.cc to source list. src/arch/SConscript: Set up symlinking of source files into build directory (by not disabling the default behavior). src/arch/alpha/ev5.cc: src/arch/alpha/isa/decoder.isa: src/cpu/o3/alpha_cpu_impl.hh: src/cpu/trace/opt_cpu.cc: src/cpu/trace/trace_cpu.cc: src/sim/pseudo_inst.cc: src/sim/root.cc: src/sim/serialize.cc: src/sim/syscall_emul.cc: SimExit() is now exitSimLoop(). src/cpu/base.cc: SimExitEvent is now SimLoopExitEvent src/python/SConscript: Add SWIG build command for main.i. Use python/m5 in build dir as source for zip archive... easy now with file duplication enabled. src/python/m5/__init__.py: - Move copyright notice back to C++ so we can print it right away, even for interactive sessions. - Get rid of argument parsing code; just provide default option descriptors for user script to call optparse with. - Don't clutter m5 namespace by sucking in all of m5.config and m5.objects. - Move instantiate() function here from config.py. src/python/m5/config.py: - Move instantiate() function to __init__.py. - Param.Foo deferred type lookups must use m5.objects namespace now (not m5). src/python/m5/objects/AlphaConsole.py: src/python/m5/objects/AlphaFullCPU.py: src/python/m5/objects/AlphaTLB.py: src/python/m5/objects/BadDevice.py: src/python/m5/objects/BaseCPU.py: src/python/m5/objects/BaseCache.py: src/python/m5/objects/Bridge.py: src/python/m5/objects/Bus.py: src/python/m5/objects/CoherenceProtocol.py: src/python/m5/objects/Device.py: src/python/m5/objects/DiskImage.py: src/python/m5/objects/Ethernet.py: src/python/m5/objects/Ide.py: src/python/m5/objects/IntrControl.py: src/python/m5/objects/MemObject.py: src/python/m5/objects/MemTest.py: src/python/m5/objects/Pci.py: src/python/m5/objects/PhysicalMemory.py: src/python/m5/objects/Platform.py: src/python/m5/objects/Process.py: src/python/m5/objects/Repl.py: src/python/m5/objects/Root.py: src/python/m5/objects/SimConsole.py: src/python/m5/objects/SimpleDisk.py: src/python/m5/objects/System.py: src/python/m5/objects/Tsunami.py: src/python/m5/objects/Uart.py: Fix up imports (m5 namespace no longer includes m5.config). src/sim/eventq.cc: src/sim/eventq.hh: Support for Python-called simulate() function: - Use IsExitEvent flag to signal events that want to exit the simulation loop gracefully (instead of calling exit() to terminate the process). - Modify interface to hand exit event object back to caller so it can be inspected for cause. src/sim/host.hh: Add MaxTick constant. src/sim/main.cc: Move copyright notice back to C++ so we can print it right away, even for interactive sessions. Use PYTHONPATH environment var to set module path (instead of clunky code injection method). Move main control from here into Python: - Separate initialization code and simulation loop into separate functions callable from Python. - Make Python interpreter invocation more pure (more like directly invoking interpreter). Add -i and -p flags (only options on binary itself; other options processed by Python). Import readline package when using interactive mode. src/sim/sim_events.cc: SimExitEvent is now SimLoopExitEvent, and uses IsSimExit flag to terminate loop (instead of exiting simulator process). src/sim/sim_events.hh: SimExitEvent is now SimLoopExitEvent, and uses IsSimExit flag to terminate loop (instead of exiting simulator process). Get rid of a few unused constructors. src/sim/sim_exit.hh: SimExit() is now exitSimLoop(). Get rid of unused functions. Add comments. --HG-- extra : convert_revision : 280b0d671516b25545a6f24cefa64a68319ff3d4
270 lines
6.8 KiB
C++
270 lines
6.8 KiB
C++
/*
|
|
* Copyright (c) 2000-2005 The Regents of The University of Michigan
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are
|
|
* met: redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer;
|
|
* redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution;
|
|
* neither the name of the copyright holders nor the names of its
|
|
* contributors may be used to endorse or promote products derived from
|
|
* this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* Authors: Steve Reinhardt
|
|
* Nathan Binkert
|
|
* Steve Raasch
|
|
*/
|
|
|
|
#include <assert.h>
|
|
|
|
#include <iostream>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "cpu/smt.hh"
|
|
#include "base/misc.hh"
|
|
|
|
#include "sim/eventq.hh"
|
|
#include "base/trace.hh"
|
|
#include "sim/root.hh"
|
|
|
|
using namespace std;
|
|
|
|
//
|
|
// Main Event Queue
|
|
//
|
|
// Events on this queue are processed at the *beginning* of each
|
|
// cycle, before the pipeline simulation is performed.
|
|
//
|
|
EventQueue mainEventQueue("MainEventQueue");
|
|
|
|
void
|
|
EventQueue::insert(Event *event)
|
|
{
|
|
if (head == NULL || event->when() < head->when() ||
|
|
(event->when() == head->when() &&
|
|
event->priority() <= head->priority())) {
|
|
event->next = head;
|
|
head = event;
|
|
} else {
|
|
Event *prev = head;
|
|
Event *curr = head->next;
|
|
|
|
while (curr) {
|
|
if (event->when() <= curr->when() &&
|
|
(event->when() < curr->when() ||
|
|
event->priority() <= curr->priority()))
|
|
break;
|
|
|
|
prev = curr;
|
|
curr = curr->next;
|
|
}
|
|
|
|
event->next = curr;
|
|
prev->next = event;
|
|
}
|
|
}
|
|
|
|
void
|
|
EventQueue::remove(Event *event)
|
|
{
|
|
if (head == NULL)
|
|
return;
|
|
|
|
if (head == event){
|
|
head = event->next;
|
|
return;
|
|
}
|
|
|
|
Event *prev = head;
|
|
Event *curr = head->next;
|
|
while (curr && curr != event) {
|
|
prev = curr;
|
|
curr = curr->next;
|
|
}
|
|
|
|
if (curr == event)
|
|
prev->next = curr->next;
|
|
}
|
|
|
|
Event *
|
|
EventQueue::serviceOne()
|
|
{
|
|
Event *event = head;
|
|
event->clearFlags(Event::Scheduled);
|
|
head = event->next;
|
|
|
|
// handle action
|
|
if (!event->squashed()) {
|
|
event->process();
|
|
if (event->isExitEvent()) {
|
|
assert(!event->getFlags(Event::AutoDelete)); // would be silly
|
|
return event;
|
|
}
|
|
} else {
|
|
event->clearFlags(Event::Squashed);
|
|
}
|
|
|
|
if (event->getFlags(Event::AutoDelete) && !event->scheduled())
|
|
delete event;
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
void
|
|
Event::serialize(std::ostream &os)
|
|
{
|
|
SERIALIZE_SCALAR(_when);
|
|
SERIALIZE_SCALAR(_priority);
|
|
SERIALIZE_ENUM(_flags);
|
|
}
|
|
|
|
|
|
void
|
|
Event::unserialize(Checkpoint *cp, const string §ion)
|
|
{
|
|
if (scheduled())
|
|
deschedule();
|
|
|
|
UNSERIALIZE_SCALAR(_when);
|
|
UNSERIALIZE_SCALAR(_priority);
|
|
|
|
// need to see if original event was in a scheduled, unsquashed
|
|
// state, but don't want to restore those flags in the current
|
|
// object itself (since they aren't immediately true)
|
|
UNSERIALIZE_ENUM(_flags);
|
|
bool wasScheduled = (_flags & Scheduled) && !(_flags & Squashed);
|
|
_flags &= ~(Squashed | Scheduled);
|
|
|
|
if (wasScheduled) {
|
|
DPRINTF(Config, "rescheduling at %d\n", _when);
|
|
schedule(_when);
|
|
}
|
|
}
|
|
|
|
void
|
|
EventQueue::serialize(ostream &os)
|
|
{
|
|
std::list<Event *> eventPtrs;
|
|
|
|
int numEvents = 0;
|
|
Event *event = head;
|
|
while (event) {
|
|
if (event->getFlags(Event::AutoSerialize)) {
|
|
eventPtrs.push_back(event);
|
|
paramOut(os, csprintf("event%d", numEvents++), event->name());
|
|
}
|
|
event = event->next;
|
|
}
|
|
|
|
SERIALIZE_SCALAR(numEvents);
|
|
|
|
for (std::list<Event *>::iterator it=eventPtrs.begin();
|
|
it != eventPtrs.end(); ++it) {
|
|
(*it)->nameOut(os);
|
|
(*it)->serialize(os);
|
|
}
|
|
}
|
|
|
|
void
|
|
EventQueue::unserialize(Checkpoint *cp, const std::string §ion)
|
|
{
|
|
int numEvents;
|
|
UNSERIALIZE_SCALAR(numEvents);
|
|
|
|
std::string eventName;
|
|
for (int i = 0; i < numEvents; i++) {
|
|
// get the pointer value associated with the event
|
|
paramIn(cp, section, csprintf("event%d", i), eventName);
|
|
|
|
// create the event based on its pointer value
|
|
Serializable::create(cp, eventName);
|
|
}
|
|
}
|
|
|
|
void
|
|
EventQueue::dump()
|
|
{
|
|
cprintf("============================================================\n");
|
|
cprintf("EventQueue Dump (cycle %d)\n", curTick);
|
|
cprintf("------------------------------------------------------------\n");
|
|
|
|
if (empty())
|
|
cprintf("<No Events>\n");
|
|
else {
|
|
Event *event = head;
|
|
while (event) {
|
|
event->dump();
|
|
event = event->next;
|
|
}
|
|
}
|
|
|
|
cprintf("============================================================\n");
|
|
}
|
|
|
|
extern "C"
|
|
void
|
|
dumpMainQueue()
|
|
{
|
|
mainEventQueue.dump();
|
|
}
|
|
|
|
|
|
const char *
|
|
Event::description()
|
|
{
|
|
return "generic";
|
|
}
|
|
|
|
#if TRACING_ON
|
|
void
|
|
Event::trace(const char *action)
|
|
{
|
|
// This DPRINTF is unconditional because calls to this function
|
|
// are protected by an 'if (DTRACE(Event))' in the inlined Event
|
|
// methods.
|
|
//
|
|
// This is just a default implementation for derived classes where
|
|
// it's not worth doing anything special. If you want to put a
|
|
// more informative message in the trace, override this method on
|
|
// the particular subclass where you have the information that
|
|
// needs to be printed.
|
|
DPRINTFN("%s event %s @ %d\n", description(), action, when());
|
|
}
|
|
#endif
|
|
|
|
void
|
|
Event::dump()
|
|
{
|
|
cprintf("Event (%s)\n", description());
|
|
cprintf("Flags: %#x\n", _flags);
|
|
#if TRACING_ON
|
|
cprintf("Created: %d\n", when_created);
|
|
#endif
|
|
if (scheduled()) {
|
|
#if TRACING_ON
|
|
cprintf("Scheduled at %d\n", when_scheduled);
|
|
#endif
|
|
cprintf("Scheduled for %d, priority %d\n", when(), _priority);
|
|
}
|
|
else {
|
|
cprintf("Not Scheduled\n");
|
|
}
|
|
}
|