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
181 lines
5.4 KiB
C++
181 lines
5.4 KiB
C++
/*
|
|
* Copyright (c) 2004-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: Erik Hallnor
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* Declaration of a memory trace CPU object. Uses a memory trace to drive the
|
|
* provided memory hierarchy.
|
|
*/
|
|
|
|
#include <algorithm> // For min
|
|
|
|
#include "cpu/trace/trace_cpu.hh"
|
|
#include "cpu/trace/reader/mem_trace_reader.hh"
|
|
#include "mem/base_mem.hh" // For PARAM constructor
|
|
#include "mem/mem_interface.hh"
|
|
#include "sim/builder.hh"
|
|
#include "sim/sim_events.hh"
|
|
|
|
using namespace std;
|
|
|
|
TraceCPU::TraceCPU(const string &name,
|
|
MemInterface *icache_interface,
|
|
MemInterface *dcache_interface,
|
|
MemTraceReader *data_trace)
|
|
: SimObject(name), icacheInterface(icache_interface),
|
|
dcacheInterface(dcache_interface),
|
|
dataTrace(data_trace), outstandingRequests(0), tickEvent(this)
|
|
{
|
|
assert(dcacheInterface);
|
|
nextCycle = dataTrace->getNextReq(nextReq);
|
|
tickEvent.schedule(0);
|
|
}
|
|
|
|
void
|
|
TraceCPU::tick()
|
|
{
|
|
assert(outstandingRequests >= 0);
|
|
assert(outstandingRequests < 1000);
|
|
int instReqs = 0;
|
|
int dataReqs = 0;
|
|
|
|
while (nextReq && curTick >= nextCycle) {
|
|
assert(nextReq->thread_num < 4 && "Not enough threads");
|
|
if (nextReq->isInstRead() && icacheInterface) {
|
|
if (icacheInterface->isBlocked())
|
|
break;
|
|
|
|
nextReq->time = curTick;
|
|
if (nextReq->cmd == Squash) {
|
|
icacheInterface->squash(nextReq->asid);
|
|
} else {
|
|
++instReqs;
|
|
if (icacheInterface->doEvents()) {
|
|
nextReq->completionEvent =
|
|
new TraceCompleteEvent(nextReq, this);
|
|
icacheInterface->access(nextReq);
|
|
} else {
|
|
icacheInterface->access(nextReq);
|
|
completeRequest(nextReq);
|
|
}
|
|
}
|
|
} else {
|
|
if (dcacheInterface->isBlocked())
|
|
break;
|
|
|
|
++dataReqs;
|
|
nextReq->time = curTick;
|
|
if (dcacheInterface->doEvents()) {
|
|
nextReq->completionEvent =
|
|
new TraceCompleteEvent(nextReq, this);
|
|
dcacheInterface->access(nextReq);
|
|
} else {
|
|
dcacheInterface->access(nextReq);
|
|
completeRequest(nextReq);
|
|
}
|
|
|
|
}
|
|
nextCycle = dataTrace->getNextReq(nextReq);
|
|
}
|
|
|
|
if (!nextReq) {
|
|
// No more requests to send. Finish trailing events and exit.
|
|
if (mainEventQueue.empty()) {
|
|
exitSimLoop("end of memory trace reached");
|
|
} else {
|
|
tickEvent.schedule(mainEventQueue.nextEventTime() + cycles(1));
|
|
}
|
|
} else {
|
|
tickEvent.schedule(max(curTick + cycles(1), nextCycle));
|
|
}
|
|
}
|
|
|
|
void
|
|
TraceCPU::completeRequest(MemReqPtr& req)
|
|
{
|
|
}
|
|
|
|
void
|
|
TraceCompleteEvent::process()
|
|
{
|
|
tester->completeRequest(req);
|
|
}
|
|
|
|
const char *
|
|
TraceCompleteEvent::description()
|
|
{
|
|
return "trace access complete";
|
|
}
|
|
|
|
TraceCPU::TickEvent::TickEvent(TraceCPU *c)
|
|
: Event(&mainEventQueue, CPU_Tick_Pri), cpu(c)
|
|
{
|
|
}
|
|
|
|
void
|
|
TraceCPU::TickEvent::process()
|
|
{
|
|
cpu->tick();
|
|
}
|
|
|
|
const char *
|
|
TraceCPU::TickEvent::description()
|
|
{
|
|
return "TraceCPU tick event";
|
|
}
|
|
|
|
|
|
|
|
BEGIN_DECLARE_SIM_OBJECT_PARAMS(TraceCPU)
|
|
|
|
SimObjectParam<BaseMem *> icache;
|
|
SimObjectParam<BaseMem *> dcache;
|
|
SimObjectParam<MemTraceReader *> data_trace;
|
|
|
|
END_DECLARE_SIM_OBJECT_PARAMS(TraceCPU)
|
|
|
|
BEGIN_INIT_SIM_OBJECT_PARAMS(TraceCPU)
|
|
|
|
INIT_PARAM_DFLT(icache, "instruction cache", NULL),
|
|
INIT_PARAM_DFLT(dcache, "data cache", NULL),
|
|
INIT_PARAM_DFLT(data_trace, "data trace", NULL)
|
|
|
|
END_INIT_SIM_OBJECT_PARAMS(TraceCPU)
|
|
|
|
CREATE_SIM_OBJECT(TraceCPU)
|
|
{
|
|
return new TraceCPU(getInstanceName(),
|
|
(icache) ? icache->getInterface() : NULL,
|
|
(dcache) ? dcache->getInterface() : NULL,
|
|
data_trace);
|
|
}
|
|
|
|
REGISTER_SIM_OBJECT("TraceCPU", TraceCPU)
|
|
|