ad44834907
1. Make sure connectMemPorts() only gets called when the CPU's peer gets changed. This is done by making setPeer() virtual, and overriding it in the CPU's ports. When it gets called on a CPU's port (dcache specifically), it calls the normal setPeer() function, and also connectMemPorts(). 2. Consolidate redundant code that handles switching in a CPU. src/cpu/base.cc: Move common code of switching over peers to base CPU. src/cpu/base.hh: Move common code of switching over peers to BaseCPU. src/cpu/o3/cpu.cc: Add in function that updates thread context's ports. Also use updated function to takeOverFrom() in BaseCPU. This gets rid of some repeated code. src/cpu/o3/cpu.hh: Include function to update thread context's memory ports. src/cpu/o3/lsq.hh: Add function to dcache port that will update the memory ports upon getting a new peer. Also include a function that will tell the CPU to update those memory ports. src/cpu/o3/lsq_impl.hh: Add function that will update the memory ports upon getting a new peer. src/cpu/simple/atomic.cc: src/cpu/simple/timing.cc: Add function that will update thread context's memory ports upon getting a new peer. Also use the new BaseCPU's take over from function. src/cpu/simple/atomic.hh: Add in function (and dcache port) that will allow the dcache to update memory ports when it gets assigned a new peer. src/cpu/simple/timing.hh: Add function that will update thread context's memory ports upon getting a new peer. src/mem/port.hh: Make setPeer virtual so that other classes can override it. --HG-- extra : convert_revision : 2050f1241dd2e83875d281cfc5ad5c6c8705fdaf
206 lines
5.4 KiB
C++
206 lines
5.4 KiB
C++
/*
|
|
* Copyright (c) 2002-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
|
|
*/
|
|
|
|
#ifndef __CPU_SIMPLE_TIMING_HH__
|
|
#define __CPU_SIMPLE_TIMING_HH__
|
|
|
|
#include "cpu/simple/base.hh"
|
|
|
|
class TimingSimpleCPU : public BaseSimpleCPU
|
|
{
|
|
public:
|
|
|
|
struct Params : public BaseSimpleCPU::Params {
|
|
};
|
|
|
|
TimingSimpleCPU(Params *params);
|
|
virtual ~TimingSimpleCPU();
|
|
|
|
virtual void init();
|
|
|
|
public:
|
|
//
|
|
enum Status {
|
|
Idle,
|
|
Running,
|
|
IcacheRetry,
|
|
IcacheWaitResponse,
|
|
IcacheWaitSwitch,
|
|
DcacheRetry,
|
|
DcacheWaitResponse,
|
|
DcacheWaitSwitch,
|
|
SwitchedOut
|
|
};
|
|
|
|
protected:
|
|
Status _status;
|
|
|
|
Status status() const { return _status; }
|
|
|
|
Event *drainEvent;
|
|
|
|
Event *fetchEvent;
|
|
|
|
private:
|
|
|
|
class CpuPort : public Port
|
|
{
|
|
protected:
|
|
TimingSimpleCPU *cpu;
|
|
Tick lat;
|
|
|
|
public:
|
|
|
|
CpuPort(const std::string &_name, TimingSimpleCPU *_cpu, Tick _lat)
|
|
: Port(_name, _cpu), cpu(_cpu), lat(_lat)
|
|
{ }
|
|
|
|
bool snoopRangeSent;
|
|
|
|
protected:
|
|
|
|
virtual Tick recvAtomic(PacketPtr pkt);
|
|
|
|
virtual void recvFunctional(PacketPtr pkt);
|
|
|
|
virtual void recvStatusChange(Status status);
|
|
|
|
virtual void getDeviceAddressRanges(AddrRangeList &resp,
|
|
AddrRangeList &snoop)
|
|
{ resp.clear(); snoop.clear(); snoop.push_back(RangeSize(0,0)); }
|
|
|
|
struct TickEvent : public Event
|
|
{
|
|
PacketPtr pkt;
|
|
TimingSimpleCPU *cpu;
|
|
|
|
TickEvent(TimingSimpleCPU *_cpu)
|
|
:Event(&mainEventQueue), cpu(_cpu) {}
|
|
const char *description() { return "Timing CPU clock event"; }
|
|
void schedule(PacketPtr _pkt, Tick t);
|
|
};
|
|
|
|
};
|
|
|
|
class IcachePort : public CpuPort
|
|
{
|
|
public:
|
|
|
|
IcachePort(TimingSimpleCPU *_cpu, Tick _lat)
|
|
: CpuPort(_cpu->name() + "-iport", _cpu, _lat), tickEvent(_cpu)
|
|
{ }
|
|
|
|
protected:
|
|
|
|
virtual bool recvTiming(PacketPtr pkt);
|
|
|
|
virtual void recvRetry();
|
|
|
|
struct ITickEvent : public TickEvent
|
|
{
|
|
|
|
ITickEvent(TimingSimpleCPU *_cpu)
|
|
: TickEvent(_cpu) {}
|
|
void process();
|
|
const char *description() { return "Timing CPU clock event"; }
|
|
};
|
|
|
|
ITickEvent tickEvent;
|
|
|
|
};
|
|
|
|
class DcachePort : public CpuPort
|
|
{
|
|
public:
|
|
|
|
DcachePort(TimingSimpleCPU *_cpu, Tick _lat)
|
|
: CpuPort(_cpu->name() + "-dport", _cpu, _lat), tickEvent(_cpu)
|
|
{ }
|
|
|
|
virtual void setPeer(Port *port);
|
|
|
|
protected:
|
|
|
|
virtual bool recvTiming(PacketPtr pkt);
|
|
|
|
virtual void recvRetry();
|
|
|
|
struct DTickEvent : public TickEvent
|
|
{
|
|
DTickEvent(TimingSimpleCPU *_cpu)
|
|
: TickEvent(_cpu) {}
|
|
void process();
|
|
const char *description() { return "Timing CPU clock event"; }
|
|
};
|
|
|
|
DTickEvent tickEvent;
|
|
|
|
};
|
|
|
|
IcachePort icachePort;
|
|
DcachePort dcachePort;
|
|
|
|
PacketPtr ifetch_pkt;
|
|
PacketPtr dcache_pkt;
|
|
|
|
int cpu_id;
|
|
Tick previousTick;
|
|
|
|
public:
|
|
|
|
virtual Port *getPort(const std::string &if_name, int idx = -1);
|
|
|
|
virtual void serialize(std::ostream &os);
|
|
virtual void unserialize(Checkpoint *cp, const std::string §ion);
|
|
|
|
virtual unsigned int drain(Event *drain_event);
|
|
virtual void resume();
|
|
|
|
void switchOut();
|
|
void takeOverFrom(BaseCPU *oldCPU);
|
|
|
|
virtual void activateContext(int thread_num, int delay);
|
|
virtual void suspendContext(int thread_num);
|
|
|
|
template <class T>
|
|
Fault read(Addr addr, T &data, unsigned flags);
|
|
|
|
template <class T>
|
|
Fault write(T data, Addr addr, unsigned flags, uint64_t *res);
|
|
|
|
void fetch();
|
|
void completeIfetch(PacketPtr );
|
|
void completeDataAccess(PacketPtr );
|
|
void advanceInst(Fault fault);
|
|
private:
|
|
void completeDrain();
|
|
};
|
|
|
|
#endif // __CPU_SIMPLE_TIMING_HH__
|