sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

the way i understand it, interrupts in m5 is a little bloated. the usage of CPU->checkInterrupts bool is inconsistent, and i think should eventually be phased out. For now, I've just assumed that CPU->checkInterrupts() is the way to fast path a CPU if you have no interrupts by having a simple bitfield in each ISA to determine whether interrupts are pending. getInterrupts has been mostly filled in.

Browse source 
src/arch/sparc/interrupts.hh:
    fill in how we do interrupts on sparc a little bit.

    1) create a bitfield for interrupts, and check that in checkInterrupts() to fast path CPU.
    2) fill in getInterrupts() a little bit.

    also, update the bitfield access to be HPSTATE::hpriv, etc.
src/arch/sparc/ua2005.cc:
    1) update formatting
    2) change the way interrupts are done to use the new way to tickle the CPU.
src/cpu/base.cc:
src/cpu/base.hh:
    overload the post_interrupt function for SPARC interrupts - which are only denoted by a single int value.

--HG--
extra : convert_revision : 9074a003eff37a40dcce78f56d20f6cbcc453eb5
This commit is contained in:
Lisa Hsu 2007-01-08 18:18:28 -05:00
parent b45219e7ae
commit 032ea9b2db
4 changed files with 219 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
src/arch/sparc/interrupts.hh
View file

@ -34,19 +34,45 @@
#include "arch/sparc/faults.hh" #include "arch/sparc/faults.hh"
#include "cpu/thread_context.hh" #include "cpu/thread_context.hh"
namespace SparcISA namespace SparcISA
{ {
enum interrupts_t {
trap_level_zero,
hstick_match,
interrupt_vector,
cpu_mondo,
dev_mondo,
resumable_error,
soft_interrupt,
num_interrupt_types
};
class Interrupts class Interrupts
{ {
protected:
private:
bool interrupts[num_interrupt_types];
int numPosted;
public: public:
Interrupts() Interrupts()
{ {
for (int i = 0; i < num_interrupt_types; ++i) {
interrupts[i] = false;
}
numPosted = 0;
} }
void post(int int_type)
{
if (int_type < 0 || int_type >= num_interrupt_types)
panic("posting unknown interrupt!\n");
interrupts[int_type] = true;
++numPosted;
}
void post(int int_num, int index) void post(int int_num, int index)
{ {
@ -64,9 +90,7 @@ namespace SparcISA
bool check_interrupts(ThreadContext * tc) const bool check_interrupts(ThreadContext * tc) const
{ {
// so far only handle softint interrupts if (numPosted)
int int_level = InterruptLevel(tc->readMiscReg(MISCREG_SOFTINT));
if (int_level)
return true; return true;
else else
return false; return false;
@ -74,14 +98,99 @@ namespace SparcISA
Fault getInterrupt(ThreadContext * tc) Fault getInterrupt(ThreadContext * tc)
{ {
int hpstate = tc->readMiscReg(MISCREG_HPSTATE);
int pstate = tc->readMiscReg(MISCREG_PSTATE);
bool ie = pstate & PSTATE::ie;
// THESE ARE IN ORDER OF PRIORITY
// since there are early returns, and the highest
// priority interrupts should get serviced,
// it is v. important that new interrupts are inserted
// in the right order of processing
if (hpstate & HPSTATE::hpriv) {
if (ie) {
if (interrupts[hstick_match]) {
interrupts[hstick_match] = false;
--numPosted;
return new HstickMatch;
}
if (interrupts[interrupt_vector]) {
interrupts[interrupt_vector] = false;
--numPosted;
//HAVEN'T IMPLed THIS YET
return NoFault;
}
}
} else {
if (interrupts[trap_level_zero]) {
//HAVEN'T IMPLed YET
if ((pstate & HPSTATE::tlz) && (tc->readMiscReg(MISCREG_TL) == 0)) {
interrupts[trap_level_zero] = false;
--numPosted;
return NoFault;
}
}
if (interrupts[hstick_match]) {
interrupts[hstick_match] = false;
--numPosted;
return new HstickMatch;
}
if (ie) {
if (interrupts[cpu_mondo]) {
interrupts[cpu_mondo] = false;
--numPosted;
return new CpuMondo;
}
if (interrupts[dev_mondo]) {
interrupts[dev_mondo] = false;
--numPosted;
return new DevMondo;
}
if (interrupts[soft_interrupt]) {
int il = InterruptLevel(tc->readMiscReg(MISCREG_SOFTINT));
// it seems that interrupt vectors are right in
// the middle of interrupt levels with regard to
// priority, so have to check
if ((il < 6) &&
interrupts[interrupt_vector]) {
// may require more details here since there
// may be lots of interrupts embedded in an
// platform interrupt vector
interrupts[interrupt_vector] = false;
--numPosted;
//HAVEN'T IMPLed YET
return NoFault;
} else {
if (il > tc->readMiscReg(MISCREG_PIL)) {
uint64_t si = tc->readMiscReg(MISCREG_SOFTINT);
uint64_t more = si & ~(1 << (il + 1));
if (!InterruptLevel(more)) {
interrupts[soft_interrupt] = false;
--numPosted;
}
return new InterruptLevelN(il);
}
}
}
if (interrupts[resumable_error]) {
interrupts[resumable_error] = false;
--numPosted;
return new ResumableError;
}
}
}
return NoFault;
// conditioning the softint interrups // conditioning the softint interrups
if (tc->readMiscReg(MISCREG_HPSTATE) & hpriv) { if (tc->readMiscReg(MISCREG_HPSTATE) & HPSTATE::hpriv) {
// if running in privileged mode, then pend the interrupt // if running in privileged mode, then pend the interrupt
return NoFault; return NoFault;
} else { } else {
int int_level = InterruptLevel(tc->readMiscReg(MISCREG_SOFTINT)); int int_level = InterruptLevel(tc->readMiscReg(MISCREG_SOFTINT));
if ((int_level <= tc->readMiscReg(MISCREG_PIL)) || if ((int_level <= tc->readMiscReg(MISCREG_PIL)) ||
!(tc->readMiscReg(MISCREG_PSTATE) & ie)) { !(tc->readMiscReg(MISCREG_PSTATE) & PSTATE::ie)) {
// if PIL or no interrupt enabled, then pend the interrupt // if PIL or no interrupt enabled, then pend the interrupt
return NoFault; return NoFault;
} else { } else {

188
src/arch/sparc/ua2005.cc
View file

@ -38,105 +38,105 @@ using namespace SparcISA;
void void
MiscRegFile::setFSRegWithEffect(int miscReg, const MiscReg &val, MiscRegFile::setFSRegWithEffect(int miscReg, const MiscReg &val,
ThreadContext *tc) ThreadContext *tc)
{ {
int64_t time; int64_t time;
switch (miscReg) { switch (miscReg) {
/* Full system only ASRs */ /* Full system only ASRs */
case MISCREG_SOFTINT: case MISCREG_SOFTINT:
// Check if we are going to interrupt because of something // Check if we are going to interrupt because of something
setReg(miscReg, val); setReg(miscReg, val);
tc->getCpuPtr()->checkInterrupts = true; tc->getCpuPtr()->post_interrupt(soft_interrupt);
warn("Writing to softint not really supported, writing: %#x\n", val); warn("Writing to softint not really supported, writing: %#x\n", val);
break; break;
case MISCREG_SOFTINT_CLR: case MISCREG_SOFTINT_CLR:
return setRegWithEffect(MISCREG_SOFTINT, ~val & softint, tc); return setRegWithEffect(MISCREG_SOFTINT, ~val & softint, tc);
case MISCREG_SOFTINT_SET: case MISCREG_SOFTINT_SET:
return setRegWithEffect(MISCREG_SOFTINT, val | softint, tc); return setRegWithEffect(MISCREG_SOFTINT, val | softint, tc);
case MISCREG_TICK_CMPR: case MISCREG_TICK_CMPR:
if (tickCompare == NULL) if (tickCompare == NULL)
tickCompare = new TickCompareEvent(this, tc); tickCompare = new TickCompareEvent(this, tc);
setReg(miscReg, val); setReg(miscReg, val);
if ((tick_cmpr & mask(63)) && tickCompare->scheduled()) if ((tick_cmpr & mask(63)) && tickCompare->scheduled())
tickCompare->deschedule(); tickCompare->deschedule();
time = (tick_cmpr & mask(63)) - (tick & mask(63)); time = (tick_cmpr & mask(63)) - (tick & mask(63));
if (!(tick_cmpr & ~mask(63)) && time > 0) if (!(tick_cmpr & ~mask(63)) && time > 0)
tickCompare->schedule(time * tc->getCpuPtr()->cycles(1)); tickCompare->schedule(time * tc->getCpuPtr()->cycles(1));
panic("writing to TICK compare register %#X\n", val); panic("writing to TICK compare register %#X\n", val);
break; break;
case MISCREG_STICK_CMPR: case MISCREG_STICK_CMPR:
if (sTickCompare == NULL) if (sTickCompare == NULL)
sTickCompare = new STickCompareEvent(this, tc); sTickCompare = new STickCompareEvent(this, tc);
setReg(miscReg, val); setReg(miscReg, val);
if ((stick_cmpr & ~mask(63)) && sTickCompare->scheduled()) if ((stick_cmpr & ~mask(63)) && sTickCompare->scheduled())
sTickCompare->deschedule(); sTickCompare->deschedule();
time = ((int64_t)(stick_cmpr & mask(63)) - (int64_t)stick) - time = ((int64_t)(stick_cmpr & mask(63)) - (int64_t)stick) -
tc->getCpuPtr()->instCount(); tc->getCpuPtr()->instCount();
if (!(stick_cmpr & ~mask(63)) && time > 0) if (!(stick_cmpr & ~mask(63)) && time > 0)
sTickCompare->schedule(time * tc->getCpuPtr()->cycles(1) + curTick); sTickCompare->schedule(time * tc->getCpuPtr()->cycles(1) + curTick);
DPRINTF(Timer, "writing to sTICK compare register value %#X\n", val); DPRINTF(Timer, "writing to sTICK compare register value %#X\n", val);
break; break;
case MISCREG_PSTATE: case MISCREG_PSTATE:
if (val & ie && !(pstate & ie)) { if (val & ie && !(pstate & ie)) {
tc->getCpuPtr()->checkInterrupts = true; tc->getCpuPtr()->checkInterrupts = true;
} }
setReg(miscReg, val); setReg(miscReg, val);
case MISCREG_PIL: case MISCREG_PIL:
if (val < pil) { if (val < pil) {
tc->getCpuPtr()->checkInterrupts = true; tc->getCpuPtr()->checkInterrupts = true;
} }
setReg(miscReg, val); setReg(miscReg, val);
break; break;
case MISCREG_HVER: case MISCREG_HVER:
panic("Shouldn't be writing HVER\n"); panic("Shouldn't be writing HVER\n");
case MISCREG_HTBA: case MISCREG_HTBA:
// clear lower 7 bits on writes. // clear lower 7 bits on writes.
setReg(miscReg, val & ULL(~0x7FFF)); setReg(miscReg, val & ULL(~0x7FFF));
break; break;
case MISCREG_QUEUE_CPU_MONDO_HEAD: case MISCREG_QUEUE_CPU_MONDO_HEAD:
case MISCREG_QUEUE_CPU_MONDO_TAIL: case MISCREG_QUEUE_CPU_MONDO_TAIL:
case MISCREG_QUEUE_DEV_MONDO_HEAD: case MISCREG_QUEUE_DEV_MONDO_HEAD:
case MISCREG_QUEUE_DEV_MONDO_TAIL: case MISCREG_QUEUE_DEV_MONDO_TAIL:
case MISCREG_QUEUE_RES_ERROR_HEAD: case MISCREG_QUEUE_RES_ERROR_HEAD:
case MISCREG_QUEUE_RES_ERROR_TAIL: case MISCREG_QUEUE_RES_ERROR_TAIL:
case MISCREG_QUEUE_NRES_ERROR_HEAD: case MISCREG_QUEUE_NRES_ERROR_HEAD:
case MISCREG_QUEUE_NRES_ERROR_TAIL: case MISCREG_QUEUE_NRES_ERROR_TAIL:
setReg(miscReg, val); setReg(miscReg, val);
tc->getCpuPtr()->checkInterrupts = true; tc->getCpuPtr()->checkInterrupts = true;
break; break;
case MISCREG_HSTICK_CMPR: case MISCREG_HSTICK_CMPR:
if (hSTickCompare == NULL) if (hSTickCompare == NULL)
hSTickCompare = new HSTickCompareEvent(this, tc); hSTickCompare = new HSTickCompareEvent(this, tc);
setReg(miscReg, val); setReg(miscReg, val);
if ((hstick_cmpr & ~mask(63)) && hSTickCompare->scheduled()) if ((hstick_cmpr & ~mask(63)) && hSTickCompare->scheduled())
hSTickCompare->deschedule(); hSTickCompare->deschedule();
time = ((int64_t)(hstick_cmpr & mask(63)) - (int64_t)stick) - time = ((int64_t)(hstick_cmpr & mask(63)) - (int64_t)stick) -
tc->getCpuPtr()->instCount(); tc->getCpuPtr()->instCount();
if (!(hstick_cmpr & ~mask(63)) && time > 0) if (!(hstick_cmpr & ~mask(63)) && time > 0)
hSTickCompare->schedule(curTick + time * tc->getCpuPtr()->cycles(1)); hSTickCompare->schedule(curTick + time * tc->getCpuPtr()->cycles(1));
DPRINTF(Timer, "writing to hsTICK compare register value %#X\n", val); DPRINTF(Timer, "writing to hsTICK compare register value %#X\n", val);
break; break;
case MISCREG_HPSTATE: case MISCREG_HPSTATE:
// T1000 spec says impl. dependent val must always be 1 // T1000 spec says impl. dependent val must always be 1
setReg(miscReg, val | id); setReg(miscReg, val | id);
break; break;
case MISCREG_HTSTATE: case MISCREG_HTSTATE:
case MISCREG_STRAND_STS_REG: case MISCREG_STRAND_STS_REG:
setReg(miscReg, val); setReg(miscReg, val);
break; break;
default: default:
panic("Invalid write to FS misc register %s\n", getMiscRegName(miscReg)); panic("Invalid write to FS misc register %s\n", getMiscRegName(miscReg));
} }
} }
@ -144,7 +144,7 @@ MiscReg
MiscRegFile::readFSRegWithEffect(int miscReg, ThreadContext * tc) MiscRegFile::readFSRegWithEffect(int miscReg, ThreadContext * tc)
{ {
switch (miscReg) { switch (miscReg) {
/* Privileged registers. */ /* Privileged registers. */
case MISCREG_QUEUE_CPU_MONDO_HEAD: case MISCREG_QUEUE_CPU_MONDO_HEAD:
case MISCREG_QUEUE_CPU_MONDO_TAIL: case MISCREG_QUEUE_CPU_MONDO_TAIL:
case MISCREG_QUEUE_DEV_MONDO_HEAD: case MISCREG_QUEUE_DEV_MONDO_HEAD:
@ -174,12 +174,12 @@ MiscRegFile::readFSRegWithEffect(int miscReg, ThreadContext * tc)
} }
} }
/* /*
In Niagra STICK==TICK so this isn't needed In Niagra STICK==TICK so this isn't needed
case MISCREG_STICK: case MISCREG_STICK:
SparcSystem *sys; SparcSystem *sys;
sys = dynamic_cast<SparcSystem*>(tc->getSystemPtr()); sys = dynamic_cast<SparcSystem*>(tc->getSystemPtr());
assert(sys != NULL); assert(sys != NULL);
return curTick/Clock::Int::ns - sys->sysTick | (stick & ~(mask(63))); return curTick/Clock::Int::ns - sys->sysTick | (stick & ~(mask(63)));
*/ */
@ -198,12 +198,13 @@ MiscRegFile::processSTickCompare(ThreadContext *tc)
// more // more
int ticks; int ticks;
ticks = ((int64_t)(stick_cmpr & mask(63)) - (int64_t)stick) - ticks = ((int64_t)(stick_cmpr & mask(63)) - (int64_t)stick) -
tc->getCpuPtr()->instCount(); tc->getCpuPtr()->instCount();
assert(ticks >= 0 && "stick compare missed interrupt cycle"); assert(ticks >= 0 && "stick compare missed interrupt cycle");
if (ticks == 0) { if (ticks == 0) {
DPRINTF(Timer, "STick compare cycle reached at %#x\n", DPRINTF(Timer, "STick compare cycle reached at %#x\n",
(stick_cmpr & mask(63))); (stick_cmpr & mask(63)));
tc->getCpuPtr()->post_interrupt(soft_interrupt);
tc->getCpuPtr()->checkInterrupts = true; tc->getCpuPtr()->checkInterrupts = true;
softint |= ULL(1) << 16; softint |= ULL(1) << 16;
} else } else
@ -218,12 +219,13 @@ MiscRegFile::processHSTickCompare(ThreadContext *tc)
// more // more
int ticks; int ticks;
ticks = ((int64_t)(hstick_cmpr & mask(63)) - (int64_t)stick) - ticks = ((int64_t)(hstick_cmpr & mask(63)) - (int64_t)stick) -
tc->getCpuPtr()->instCount(); tc->getCpuPtr()->instCount();
assert(ticks >= 0 && "hstick compare missed interrupt cycle"); assert(ticks >= 0 && "hstick compare missed interrupt cycle");
if (ticks == 0) { if (ticks == 0) {
DPRINTF(Timer, "HSTick compare cycle reached at %#x\n", DPRINTF(Timer, "HSTick compare cycle reached at %#x\n",
(stick_cmpr & mask(63))); (stick_cmpr & mask(63)));
tc->getCpuPtr()->post_interrupt(hstick_match);
tc->getCpuPtr()->checkInterrupts = true; tc->getCpuPtr()->checkInterrupts = true;
// Need to do something to cause interrupt to happen here !!! @todo // Need to do something to cause interrupt to happen here !!! @todo
} else } else

6
src/cpu/base.cc
View file

@ -362,6 +362,12 @@ BaseCPU::ProfileEvent::process()
schedule(curTick + interval); schedule(curTick + interval);
} }
void
BaseCPU::post_interrupt(int int_type)
{
interrupts.post(int_type);
}
void void
BaseCPU::post_interrupt(int int_num, int index) BaseCPU::post_interrupt(int int_num, int index)
{ {

1
src/cpu/base.hh
View file

@ -102,6 +102,7 @@ class BaseCPU : public MemObject
TheISA::Interrupts interrupts; TheISA::Interrupts interrupts;
public: public:
virtual void post_interrupt(int int_type);
virtual void post_interrupt(int int_num, int index); virtual void post_interrupt(int int_num, int index);
virtual void clear_interrupt(int int_num, int index); virtual void clear_interrupt(int int_num, int index);
virtual void clear_interrupts(); virtual void clear_interrupts();