DebugFlag('IntRegs')
DebugFlag('FloatRegs')
DebugFlag('CCRegs')
-DebugFlag('VectorRegs')
DebugFlag('MiscRegs')
-CompoundFlag('Registers', [ 'IntRegs', 'FloatRegs', 'CCRegs', 'VectorRegs',
- 'MiscRegs' ])
+CompoundFlag('Registers', [ 'IntRegs', 'FloatRegs', 'CCRegs', 'MiscRegs' ])
return reg;
}
- // dummy
- int
- flattenVectorIndex(int reg) const
- {
- return reg;
- }
-
int
flattenMiscIndex(int reg) const
{
// dummy typedef since we don't have CC regs
typedef uint8_t CCReg;
-// vector register file entry type
-typedef uint64_t VectorRegElement;
-const int NumVectorRegElements = 0;
-const int VectorRegBytes = NumVectorRegElements * sizeof(VectorRegElement);
-typedef std::array<VectorRegElement, NumVectorRegElements> VectorReg;
-
union AnyReg
{
IntReg intreg;
const int NumIntRegs = NumIntArchRegs + NumPALShadowRegs;
const int NumFloatRegs = NumFloatArchRegs;
const int NumCCRegs = 0;
-const int NumVectorRegs = 0;
const int NumMiscRegs = NUM_MISCREGS;
const int TotalNumRegs =
// 32..63 are the FP regs 0..31, i.e. use (reg + FP_Reg_Base)
FP_Reg_Base = NumIntRegs,
CC_Reg_Base = FP_Reg_Base + NumFloatRegs,
- Vector_Reg_Base = CC_Reg_Base + NumCCRegs, // NumCCRegs == 0
- Misc_Reg_Base = Vector_Reg_Base + NumCCRegs, // NumVectorRegs == 0
+ Misc_Reg_Base = CC_Reg_Base + NumCCRegs, // NumCCRegs == 0
Max_Reg_Index = Misc_Reg_Base + NumMiscRegs + NumInternalProcRegs
};
// Would need to add condition-code regs if implemented
assert(NumCCRegs == 0);
- assert(NumVectorRegs == 0);
// Copy misc. registers
copyMiscRegs(src, dest);
case CCRegClass:
ccprintf(os, "cc_%s", ArmISA::ccRegName[rel_reg]);
break;
- case VectorRegClass:
- panic("ARM ISA does not have any vector registers yet!");
}
}
return reg;
}
- int
- flattenVectorIndex(int reg) const
- {
- assert(reg >= 0);
- return reg;
- }
-
int
flattenMiscIndex(int reg) const
{
// condition code register; must be at least 32 bits for FpCondCodes
typedef uint64_t CCReg;
-// vector register file entry type
-typedef uint64_t VectorRegElement;
-const int NumVectorRegElements = 0;
-const int VectorRegBytes = NumVectorRegElements * sizeof(VectorRegElement);
-typedef std::array<VectorRegElement, NumVectorRegElements> VectorReg;
-
// Constants Related to the number of registers
const int NumIntArchRegs = NUM_ARCH_INTREGS;
// The number of single precision floating point registers
const int NumIntRegs = NUM_INTREGS;
const int NumFloatRegs = NumFloatV8ArchRegs + NumFloatSpecialRegs;
const int NumCCRegs = NUM_CCREGS;
-const int NumVectorRegs = 0;
const int NumMiscRegs = NUM_MISCREGS;
#define ISA_HAS_CC_REGS
// These help enumerate all the registers for dependence tracking.
const int FP_Reg_Base = NumIntRegs * (MODE_MAXMODE + 1);
const int CC_Reg_Base = FP_Reg_Base + NumFloatRegs;
-const int Vector_Reg_Base = CC_Reg_Base + NumCCRegs;
-const int Misc_Reg_Base = Vector_Reg_Base + NumVectorRegs;
+const int Misc_Reg_Base = CC_Reg_Base + NumCCRegs;
const int Max_Reg_Index = Misc_Reg_Base + NumMiscRegs;
typedef union {
for (int i = 0; i < NumCCRegs; i++)
dest->setCCReg(i, src->readCCReg(i));
- // Copy vector registers when vector registers put to use.
- assert(NumVectorRegs == 0);
-
for (int i = 0; i < NumMiscRegs; i++)
dest->setMiscRegNoEffect(i, src->readMiscRegNoEffect(i));
def isCCReg(self):
return 0
- def isVectorReg(self):
- return 0
-
def isControlReg(self):
return 0
return wb
-class VectorRegOperand(Operand):
- def isReg(self):
- return 1
-
- def isVectorReg(self):
- return 1
-
- def __init__(self, parser, full_name, ext, is_src, is_dest):
- ## Vector registers are always treated as source registers since
- ## not the whole of them might be written, in which case we need
- ## to retain the earlier value.
- super(VectorRegOperand, self).__init__(parser, full_name, ext,
- True, is_dest)
- self.size = 0
-
- def finalize(self, predRead, predWrite):
- self.flags = self.getFlags()
- self.constructor = self.makeConstructor(predRead, predWrite)
- self.op_decl = self.makeDecl()
-
- if self.is_src:
- self.op_rd = self.makeRead(predRead)
- self.op_src_decl = self.makeDecl()
- else:
- self.op_rd = ''
- self.op_src_decl = ''
-
- if self.is_dest:
- self.op_wb = self.makeWrite(predWrite)
- self.op_dest_decl = self.makeDecl()
- else:
- self.op_wb = ''
- self.op_dest_decl = ''
-
- def makeConstructor(self, predRead, predWrite):
- c_src = ''
- c_dest = ''
-
- if self.is_src:
- c_src = '\n\t_srcRegIdx[_numSrcRegs++] = %s + Vector_Reg_Base;' % \
- (self.reg_spec)
- if self.hasReadPred():
- c_src = '\n\tif (%s) {%s\n\t}' % \
- (self.read_predicate, c_src)
-
- if self.is_dest:
- c_dest = '\n\t_destRegIdx[_numDestRegs++] = %s + Vector_Reg_Base;' % \
- (self.reg_spec)
- c_dest += '\n\t_numVectorDestRegs++;'
- if self.hasWritePred():
- c_dest = '\n\tif (%s) {%s\n\t}' % \
- (self.write_predicate, c_dest)
-
- return c_src + c_dest
-
- def makeRead(self, predRead):
- if self.read_code != None:
- return self.buildReadCode('readVectorRegOperand')
-
- vector_reg_val = ''
- if predRead:
- vector_reg_val = 'xc->readVectorRegOperand(this, _sourceIndex++)'
- if self.hasReadPred():
- vector_reg_val = '(%s) ? %s : 0' % \
- (self.read_predicate, vector_reg_val)
- else:
- vector_reg_val = 'xc->readVectorRegOperand(this, %d)' % \
- self.src_reg_idx
-
- return '%s = %s;\n' % (self.base_name, vector_reg_val)
-
- def makeWrite(self, predWrite):
- if self.write_code != None:
- return self.buildWriteCode('setVectorRegOperand')
-
- if predWrite:
- wp = 'true'
- if self.hasWritePred():
- wp = self.write_predicate
-
- wcond = 'if (%s)' % (wp)
- windex = '_destIndex++'
- else:
- wcond = ''
- windex = '%d' % self.dest_reg_idx
-
- wb = '''
- %s
- {
- TheISA::VectorReg final_val = %s;
- xc->setVectorRegOperand(this, %s, final_val);\n
- if (traceData) { traceData->setData(final_val); }
- }''' % (wcond, self.base_name, windex)
-
- return wb
-
- def makeDecl(self):
- ctype = 'TheISA::VectorReg'
- return '%s %s;\n' % (ctype, self.base_name)
-
class ControlRegOperand(Operand):
def isReg(self):
return 1
# Note that initializations in the declarations are solely
# to avoid 'uninitialized variable' errors from the compiler.
# Declare memory data variable.
- if 'IsVector' in self.flags:
- return 'TheISA::VectorReg %s;\n' % self.base_name
- else:
- return '%s %s = 0;\n' % (self.ctype, self.base_name)
+ return '%s %s = 0;\n' % (self.ctype, self.base_name)
def makeRead(self, predRead):
if self.read_code != None:
self.numFPDestRegs = 0
self.numIntDestRegs = 0
self.numCCDestRegs = 0
- self.numVectorDestRegs = 0
self.numMiscDestRegs = 0
self.memOperand = None
self.numIntDestRegs += 1
elif op_desc.isCCReg():
self.numCCDestRegs += 1
- elif op_desc.isVectorReg():
- self.numVectorDestRegs += 1
elif op_desc.isControlReg():
self.numMiscDestRegs += 1
elif op_desc.isMem():
header += '\n\t_numFPDestRegs = 0;'
header += '\n\t_numIntDestRegs = 0;'
header += '\n\t_numCCDestRegs = 0;'
- header += '\n\t_numVectorDestRegs = 0;'
self.constructor = header + \
self.operands.concatAttrStrings('constructor')
operandsREString = r'''
(?<!\w) # neg. lookbehind assertion: prevent partial matches
- ((%s)(?:_(%s))?(?:\[\w+\])?) # match: operand with optional '_'
- # then suffix, and then an optional array index.
+ ((%s)(?:_(%s))?) # match: operand with optional '_' then suffix
(?!\w) # neg. lookahead assertion: prevent partial matches
''' % (string.join(operands, '|'), string.join(extensions, '|'))
return reg;
}
- // dummy
- int
- flattenVectorIndex(int reg) const
- {
- return reg;
- }
-
int
flattenMiscIndex(int reg) const
{
const int NumIntRegs = NumIntArchRegs + NumIntSpecialRegs; //HI & LO Regs
const int NumFloatRegs = NumFloatArchRegs + NumFloatSpecialRegs;//
const int NumCCRegs = 0;
-const int NumVectorRegs = 0;
const uint32_t MIPS32_QNAN = 0x7fbfffff;
const uint64_t MIPS64_QNAN = ULL(0x7ff7ffffffffffff);
// These help enumerate all the registers for dependence tracking.
const int FP_Reg_Base = NumIntRegs;
const int CC_Reg_Base = FP_Reg_Base + NumFloatRegs;
-const int Vector_Reg_Base = CC_Reg_Base + NumCCRegs; // NumCCRegs == 0
-const int Misc_Reg_Base = Vector_Reg_Base + NumVectorRegs;
+const int Misc_Reg_Base = CC_Reg_Base + NumCCRegs; // NumCCRegs == 0
const int Max_Reg_Index = Misc_Reg_Base + NumMiscRegs;
const int TotalNumRegs = NumIntRegs + NumFloatRegs + NumMiscRegs;
// dummy typedef since we don't have CC regs
typedef uint8_t CCReg;
-// vector register file entry type
-typedef uint64_t VectorRegElement;
-const int NumVectorRegElements = 0;
-const int VectorRegBytes = NumVectorRegElements * sizeof(VectorRegElement);
-typedef std::array<VectorRegElement, NumVectorRegElements> VectorReg;
-
typedef union {
IntReg intreg;
FloatReg fpreg;
// Would need to add condition-code regs if implemented
assert(NumCCRegs == 0);
- // Copy vector registers when vector registers put to use.
- assert(NumVectorRegs == 0);
-
// Copy misc. registers
for (int i = 0; i < NumMiscRegs; i++)
dest->setMiscRegNoEffect(i, src->readMiscRegNoEffect(i));
typedef float FloatReg;
typedef uint8_t CCReg;
typedef uint64_t MiscReg;
-typedef uint64_t VectorRegElement;
-typedef std::array<VectorRegElement, 0> VectorReg;
}
}
case CCRegClass:
panic("printReg: POWER does not implement CCRegClass\n");
- case VectorRegClass:
- panic("printReg: POWER does not implement VectorRegClass\n");
}
}
return reg;
}
- // dummy
- int
- flattenVectorIndex(int reg) const
- {
- return reg;
- }
-
int
flattenMiscIndex(int reg) const
{
// dummy typedef since we don't have CC regs
typedef uint8_t CCReg;
-// typedefs for Vector registers
-const int NumVectorRegElements = 0;
-typedef uint64_t VectorRegElement;
-const int VectorRegBytes = NumVectorRegElements * sizeof(VectorRegElement);
-typedef std::array<VectorRegElement, NumVectorRegElements> VectorReg;
-
// Constants Related to the number of registers
const int NumIntArchRegs = 32;
const int NumIntRegs = NumIntArchRegs + NumIntSpecialRegs;
const int NumFloatRegs = NumFloatArchRegs + NumFloatSpecialRegs;
const int NumCCRegs = 0;
-const int NumVectorRegs = 0;
const int NumMiscRegs = NUM_MISCREGS;
// Semantically meaningful register indices
// These help enumerate all the registers for dependence tracking.
const int FP_Reg_Base = NumIntRegs;
const int CC_Reg_Base = FP_Reg_Base + NumFloatRegs;
-const int Vector_Reg_Base = CC_Reg_Base + NumCCRegs; // NumCCRegs == 0
-const int Misc_Reg_Base = Vector_Reg_Base + NumVectorRegs; // NumVectorRegs == 0
+const int Misc_Reg_Base = CC_Reg_Base + NumCCRegs; // NumCCRegs == 0
const int Max_Reg_Index = Misc_Reg_Base + NumMiscRegs;
typedef union {
// Would need to add condition-code regs if implemented
assert(NumCCRegs == 0);
- // Copy vector registers when vector registers put to use.
- assert(NumVectorRegs == 0);
-
// Copy misc. registers
copyMiscRegs(src, dest);
return reg;
}
- // dummy
- int
- flattenVectorIndex(int reg) const
- {
- return reg;
- }
-
int
flattenMiscIndex(int reg) const
{
// dummy typedef since we don't have CC regs
typedef uint8_t CCReg;
-// vector register file entry type
-typedef uint64_t VectorRegElement;
-const int NumVectorRegElements = 0;
-const int VectorRegBytes = NumVectorRegElements * sizeof(VectorRegElement);
-typedef std::array<VectorRegElement, NumVectorRegElements> VectorReg;
typedef union
{
const int NumIntArchRegs = 32;
const int NumIntRegs = (MaxGL + 1) * 8 + NWindows * 16 + NumMicroIntRegs;
const int NumCCRegs = 0;
-const int NumVectorRegs = 0;
const int TotalNumRegs = NumIntRegs + NumFloatRegs + NumMiscRegs;
enum DependenceTags {
FP_Reg_Base = NumIntRegs,
CC_Reg_Base = FP_Reg_Base + NumFloatRegs,
- Vector_Reg_Base = CC_Reg_Base + NumCCRegs, // NumCCRegs == 0
- Misc_Reg_Base = Vector_Reg_Base + NumVectorRegs, // NumVectorRegs == 0
+ Misc_Reg_Base = CC_Reg_Base + NumCCRegs, // NumCCRegs == 0
Max_Reg_Index = Misc_Reg_Base + NumMiscRegs,
};
// Would need to add condition-code regs if implemented
assert(NumCCRegs == 0);
- // Copy vector registers when vector registers put to use.
- assert(NumVectorRegs == 0);
-
// Copy misc. registers
copyMiscRegs(src, dest);
ccprintf(os, "%%cc%d", rel_reg);
break;
- case VectorRegClass:
- ccprintf(os, "%%cc%d", rel_reg);
- break;
-
case MiscRegClass:
switch (rel_reg) {
default:
ccprintf(os, "%%ctrl%d", rel_reg);
}
break;
-
- default:
- panic("Invalid register class!\n");
}
}
return reg;
}
- int
- flattenVectorIndex(int reg) const
- {
- return reg;
- }
-
int
flattenMiscIndex(int reg) const
{
const int NumIntArchRegs = NUM_INTREGS;
const int NumIntRegs = NumIntArchRegs + NumMicroIntRegs + NumImplicitIntRegs;
const int NumCCRegs = NUM_CCREGS;
-const int NumVectorRegs = 0;
#define ISA_HAS_CC_REGS
// we just start at (1 << 7) == 128.
FP_Reg_Base = 128,
CC_Reg_Base = FP_Reg_Base + NumFloatRegs,
- Vector_Reg_Base = CC_Reg_Base + NumCCRegs,
- Misc_Reg_Base = Vector_Reg_Base + NumVectorRegs,
+ Misc_Reg_Base = CC_Reg_Base + NumCCRegs,
Max_Reg_Index = Misc_Reg_Base + NumMiscRegs
};
typedef uint64_t IntReg;
typedef uint64_t CCReg;
-
-// vector register file entry type
-typedef uint64_t VectorRegElement;
-const int NumVectorRegElements = 0;
-const int VectorRegBytes = NumVectorRegElements * sizeof(VectorRegElement);
-typedef std::array<VectorRegElement, NumVectorRegElements> VectorReg;
-
//XXX Should this be a 128 bit structure for XMM memory ops?
typedef uint64_t LargestRead;
typedef uint64_t MiscReg;
//copy condition-code regs
for (int i = 0; i < NumCCRegs; ++i)
dest->setCCRegFlat(i, src->readCCRegFlat(i));
-
- // copy vector regs when added to the architecture
- assert(NumVectorRegs == 0);
-
copyMiscRegs(src, dest);
dest->pcState(src->pcState());
}
vals = [
'IsNop', # Is a no-op (no effect at all).
- 'IsInteger', # References scalar integer regs.
- 'IsFloating', # References scalar FP regs.
+ 'IsInteger', # References integer regs.
+ 'IsFloating', # References FP regs.
'IsCC', # References CC regs.
'IsMemRef', # References memory (load, store, or prefetch)
'IsMicroBranch', # This microop branches within the microcode for
# a macroop
'IsDspOp',
- 'IsSquashAfter', # Squash all uncommitted state after executed
- 'IsVector', # References vector register.
+ 'IsSquashAfter' # Squash all uncommitted state after executed
]
union Result {
uint64_t integer;
double dbl;
-
- // I am assuming that vector register type is different from the two
- // types used above. Else it seems useless to have a separate typedef
- // for vector registers.
- VectorReg vector;
-
void set(uint64_t i) { integer = i; }
void set(double d) { dbl = d; }
- void set(const VectorReg &v) { vector = v; }
-
void get(uint64_t& i) { i = integer; }
void get(double& d) { d = dbl; }
- void get(VectorReg& v) { v = vector; }
};
protected:
bool isDataPrefetch() const { return staticInst->isDataPrefetch(); }
bool isInteger() const { return staticInst->isInteger(); }
bool isFloating() const { return staticInst->isFloating(); }
- bool isVector() const { return staticInst->isVector(); }
- bool isCC() const { return staticInst->isCC(); }
-
bool isControl() const { return staticInst->isControl(); }
bool isCall() const { return staticInst->isCall(); }
bool isReturn() const { return staticInst->isReturn(); }
bool isFirstMicroop() const { return staticInst->isFirstMicroop(); }
bool isMicroBranch() const { return staticInst->isMicroBranch(); }
- void printFlags(std::ostream &outs, const std::string &separator) const
- { staticInst->printFlags(outs, separator); }
-
- std::string getName() const { return staticInst->getName(); }
-
/** Temporarily sets this instruction as a serialize before instruction. */
void setSerializeBefore() { status.set(SerializeBefore); }
int8_t numFPDestRegs() const { return staticInst->numFPDestRegs(); }
int8_t numIntDestRegs() const { return staticInst->numIntDestRegs(); }
int8_t numCCDestRegs() const { return staticInst->numCCDestRegs(); }
- int8_t numVectorDestRegs() const
- { return staticInst->numVectorDestRegs(); }
/** Returns the logical register index of the i'th destination register. */
RegIndex destRegIdx(int i) const { return staticInst->destRegIdx(i); }
setResult<uint64_t>(val);
}
- /** Records a vector register being set to a value. */
- void setVectorRegOperand(const StaticInst *si, int idx,
- const VectorReg &val)
- {
- setResult<const VectorReg &>(val);
- }
-
/** Records that one of the source registers is ready. */
void markSrcRegReady();
typedef TheISA::FloatReg FloatReg;
typedef TheISA::FloatRegBits FloatRegBits;
typedef TheISA::MiscReg MiscReg;
- typedef TheISA::VectorReg VectorReg;
/** id attached to all issued requests */
MasterID masterId;
union Result {
uint64_t integer;
double dbl;
-
- // I am assuming that vector register type is different from the two
- // types used above. Else it seems useless to have a separate typedef
- // for vector registers.
- VectorReg vector;
-
void set(uint64_t i) { integer = i; }
void set(double d) { dbl = d; }
- void set(const VectorReg &v) { vector = v; }
-
void get(uint64_t& i) { i = integer; }
void get(double& d) { d = dbl; }
- void get(VectorReg& v) { v = vector; }
};
// ISAs like ARM can have multiple destination registers to check,
return thread->readCCReg(reg_idx);
}
- const VectorReg &readVectorRegOperand(const StaticInst *si, int idx)
- {
- return thread->readVectorReg(si->srcRegIdx(idx));
- }
-
template <class T>
void setResult(T t)
{
setResult<uint64_t>(val);
}
- void setVectorRegOperand(const StaticInst *si, int idx,
- const VectorReg &val)
- {
- thread->setVectorReg(si->destRegIdx(idx), val);
- setResult<VectorReg>(val);
- }
-
bool readPredicate() { return thread->readPredicate(); }
void setPredicate(bool val)
{
void validateExecution(DynInstPtr &inst);
void validateState();
- void copyResult(DynInstPtr &inst, Result mismatch_val, int start_idx);
+ void copyResult(DynInstPtr &inst, uint64_t mismatch_val, int start_idx);
void handlePendingInt();
private:
// Unverifiable instructions assume they were executed
// properly by the CPU. Grab the result from the
// instruction and write it to the register.
- Result r;
- r.integer = 0;
- copyResult(inst, r, idx);
+ copyResult(inst, 0, idx);
} else if (inst->numDestRegs() > 0 && !result.empty()) {
DPRINTF(Checker, "Dest regs %d, number of checker dest regs %d\n",
inst->numDestRegs(), result.size());
// The load/store queue in Detailed CPU can also cause problems
// if load/store forwarding is allowed.
if (inst->isLoad() && warnOnlyOnLoadError) {
- Result r;
- r.integer = inst_val;
- copyResult(inst, r, idx);
+ copyResult(inst, inst_val, idx);
} else {
handleError(inst);
}
template <class Impl>
void
-Checker<Impl>::copyResult(DynInstPtr &inst, Result mismatch_val,
+Checker<Impl>::copyResult(DynInstPtr &inst, uint64_t mismatch_val,
int start_idx)
{
// We've already popped one dest off the queue,
RegIndex idx = inst->destRegIdx(start_idx);
switch (regIdxToClass(idx)) {
case IntRegClass:
- thread->setIntReg(idx, mismatch_val.integer);
+ thread->setIntReg(idx, mismatch_val);
break;
case FloatRegClass:
- thread->setFloatRegBits(idx - TheISA::FP_Reg_Base,
- mismatch_val.integer);
+ thread->setFloatRegBits(idx - TheISA::FP_Reg_Base, mismatch_val);
break;
case CCRegClass:
- thread->setCCReg(idx - TheISA::CC_Reg_Base, mismatch_val.integer);
- break;
- case VectorRegClass:
- thread->setVectorReg(idx - TheISA::Vector_Reg_Base,
- mismatch_val.vector);
+ thread->setCCReg(idx - TheISA::CC_Reg_Base, mismatch_val);
break;
case MiscRegClass:
thread->setMiscReg(idx - TheISA::Misc_Reg_Base,
- mismatch_val.integer);
+ mismatch_val);
break;
}
}
-
start_idx++;
+ uint64_t res = 0;
for (int i = start_idx; i < inst->numDestRegs(); i++) {
RegIndex idx = inst->destRegIdx(i);
+ inst->template popResult<uint64_t>(res);
switch (regIdxToClass(idx)) {
- case IntRegClass: {
- uint64_t res = 0;
- inst->template popResult<uint64_t>(res);
- thread->setIntReg(idx, res);
- }
- break;
-
- case FloatRegClass: {
- uint64_t res = 0;
- inst->template popResult<uint64_t>(res);
- thread->setFloatRegBits(idx - TheISA::FP_Reg_Base, res);
- }
- break;
-
- case CCRegClass: {
- uint64_t res = 0;
- inst->template popResult<uint64_t>(res);
- thread->setCCReg(idx - TheISA::CC_Reg_Base, res);
- }
- break;
-
- case VectorRegClass: {
- VectorReg res;
- inst->template popResult<VectorReg>(res);
- thread->setVectorReg(idx - TheISA::Vector_Reg_Base, res);
- }
- break;
-
- case MiscRegClass: {
- // Try to get the proper misc register index for ARM here...
- uint64_t res = 0;
- inst->template popResult<uint64_t>(res);
- thread->setMiscReg(idx - TheISA::Misc_Reg_Base, res);
- }
- break;
+ case IntRegClass:
+ thread->setIntReg(idx, res);
+ break;
+ case FloatRegClass:
+ thread->setFloatRegBits(idx - TheISA::FP_Reg_Base, res);
+ break;
+ case CCRegClass:
+ thread->setCCReg(idx - TheISA::CC_Reg_Base, res);
+ break;
+ case MiscRegClass:
+ // Try to get the proper misc register index for ARM here...
+ thread->setMiscReg(idx - TheISA::Misc_Reg_Base, res);
+ break;
// else Register is out of range...
}
}
CCReg readCCReg(int reg_idx)
{ return actualTC->readCCReg(reg_idx); }
- const VectorReg &readVectorReg(int reg_idx)
- { return actualTC->readVectorReg(reg_idx); }
-
void setIntReg(int reg_idx, uint64_t val)
{
actualTC->setIntReg(reg_idx, val);
checkerTC->setCCReg(reg_idx, val);
}
- void setVectorReg(int reg_idx, const VectorReg &val)
- {
- actualTC->setVectorReg(reg_idx, val);
- checkerTC->setVectorReg(reg_idx, val);
- }
-
/** Reads this thread's PC state. */
TheISA::PCState pcState()
{ return actualTC->pcState(); }
int flattenIntIndex(int reg) { return actualTC->flattenIntIndex(reg); }
int flattenFloatIndex(int reg) { return actualTC->flattenFloatIndex(reg); }
int flattenCCIndex(int reg) { return actualTC->flattenCCIndex(reg); }
- int flattenVectorIndex(int reg) { return actualTC->flattenVectorIndex(reg); }
int flattenMiscIndex(int reg) { return actualTC->flattenMiscIndex(reg); }
unsigned readStCondFailures()
void setCCRegFlat(int idx, CCReg val)
{ actualTC->setCCRegFlat(idx, val); }
-
- const VectorReg &readVectorRegFlat(int idx)
- { return actualTC->readVectorRegFlat(idx); }
-
- void setVectorRegFlat(int idx, const VectorReg &val)
- { actualTC->setVectorRegFlat(idx, val); }
};
#endif // __CPU_CHECKER_EXEC_CONTEXT_HH__
typedef TheISA::MiscReg MiscReg;
typedef TheISA::CCReg CCReg;
- typedef TheISA::VectorReg VectorReg;
public:
/**
virtual void setCCRegOperand(const StaticInst *si, int idx, CCReg val) = 0;
/** @} */
- /**
- * @{
- * @name Vector Register Interfaces
- *
- */
-
- /** Reads a vector register. */
- virtual const VectorReg &readVectorRegOperand (const StaticInst *si,
- int idx) = 0;
-
- /** Sets a vector register to a value. */
- virtual void setVectorRegOperand(const StaticInst *si,
- int idx, const VectorReg &val) = 0;
-
- /** @} */
-
/**
* @{
* @name Misc Register Interfaces
break;
case CCRegClass:
os << 'c' << static_cast<unsigned int>(reg - TheISA::CC_Reg_Base);
- case VectorRegClass:
- os << 'v' << static_cast<unsigned int>(reg - TheISA::Vector_Reg_Base);
}
}
return thread.readFloatRegBits(reg_idx);
}
- TheISA::CCReg
- readCCRegOperand(const StaticInst *si, int idx)
- {
- int reg_idx = si->srcRegIdx(idx) - TheISA::CC_Reg_Base;
- return thread.readCCReg(reg_idx);
- }
-
- const TheISA::VectorReg &
- readVectorRegOperand(const StaticInst *si, int idx)
- {
- int reg_idx = si->srcRegIdx(idx) - TheISA::Vector_Reg_Base;
- return thread.readVectorReg(reg_idx);
- }
-
void
setIntRegOperand(const StaticInst *si, int idx, IntReg val)
{
thread.setFloatRegBits(reg_idx, val);
}
- void
- setCCRegOperand(const StaticInst *si, int idx, TheISA::CCReg val)
- {
- int reg_idx = si->destRegIdx(idx) - TheISA::CC_Reg_Base;
- thread.setCCReg(reg_idx, val);
- }
-
- void
- setVectorRegOperand(const StaticInst *si, int idx,
- const TheISA::VectorReg &val)
- {
- int reg_idx = si->destRegIdx(idx) - TheISA::Vector_Reg_Base;
- thread.setVectorReg(reg_idx, val);
- }
-
bool
readPredicate()
{
thread.getDTBPtr()->demapPage(vaddr, asn);
}
+ TheISA::CCReg
+ readCCRegOperand(const StaticInst *si, int idx)
+ {
+ int reg_idx = si->srcRegIdx(idx) - TheISA::CC_Reg_Base;
+ return thread.readCCReg(reg_idx);
+ }
+
+ void
+ setCCRegOperand(const StaticInst *si, int idx, TheISA::CCReg val)
+ {
+ int reg_idx = si->destRegIdx(idx) - TheISA::CC_Reg_Base;
+ thread.setCCReg(reg_idx, val);
+ }
+
void
demapInstPage(Addr vaddr, uint64_t asn)
{
scoreboard_index = TheISA::NumIntRegs + reg - TheISA::FP_Reg_Base;
ret = true;
break;
- case VectorRegClass:
- scoreboard_index = TheISA::NumIntRegs + TheISA::NumCCRegs +
- TheISA::NumFloatRegs + reg - TheISA::Vector_Reg_Base;
- ret = true;
- break;
case MiscRegClass:
/* Don't bother with Misc registers */
ret = false;
case CCRegClass:
ret = thread_context->flattenCCIndex(reg);
break;
- case VectorRegClass:
- ret = thread_context->flattenVectorIndex(reg);
- break;
case MiscRegClass:
/* Don't bother to flatten misc regs as we don't need them here */
/* return thread_context->flattenMiscIndex(reg); */
{
public:
/** The number of registers in the Scoreboard. These
- * are just the integer, CC, float and vector registers packed
+ * are just the integer, CC and float registers packed
* together with integer regs in the range [0,NumIntRegs-1],
- * CC regs in the range [NumIntRegs, NumIntRegs + NumCCRegs - 1],
- * float regs in the range
- * [NumIntRegs + NumCCRegs, NumFloatRegs + NumIntRegs + NumCCRegs - 1]
- * and vector regs in the range [NumFloatRegs + NumIntRegs + NumCCRegs,
- * NumFloatRegs + NumIntRegs + NumCCRegs + NumVectorRegs - 1]*/
+ * CC regs in the range [NumIntRegs, NumIntRegs+NumCCRegs-1]
+ * and float regs in the range
+ * [NumIntRegs+NumCCRegs, NumFloatRegs+NumIntRegs+NumCCRegs-1] */
const unsigned numRegs;
/** Type to use for thread context registers */
Scoreboard(const std::string &name) :
Named(name),
numRegs(TheISA::NumIntRegs + TheISA::NumCCRegs +
- TheISA::NumFloatRegs + TheISA::NumVectorRegs),
+ TheISA::NumFloatRegs),
numResults(numRegs, 0),
numUnpredictableResults(numRegs, 0),
fuIndices(numRegs, 0),
numPhysIntRegs = Param.Unsigned(256, "Number of physical integer registers")
numPhysFloatRegs = Param.Unsigned(256, "Number of physical floating point "
"registers")
-
# most ISAs don't use condition-code regs, so default is 0
_defaultNumPhysCCRegs = 0
if buildEnv['TARGET_ISA'] in ('arm','x86'):
_defaultNumPhysCCRegs = Self.numPhysIntRegs * 5
numPhysCCRegs = Param.Unsigned(_defaultNumPhysCCRegs,
"Number of physical cc registers")
-
- # most ISAs don't use vector regs, so default is 0
- _defaultNumPhysVectorRegs = 0
- numPhysVectorRegs = Param.Unsigned(_defaultNumPhysVectorRegs,
- "Number of physical vector registers")
-
numIQEntries = Param.Unsigned(64, "Number of instruction queue entries")
numROBEntries = Param.Unsigned(192, "Number of reorder buffer entries")
regFile(params->numPhysIntRegs,
params->numPhysFloatRegs,
- params->numPhysCCRegs,
- params->numPhysVectorRegs),
+ params->numPhysCCRegs),
freeList(name() + ".freelist", ®File),
assert(params->numPhysIntRegs >= numThreads * TheISA::NumIntRegs);
assert(params->numPhysFloatRegs >= numThreads * TheISA::NumFloatRegs);
assert(params->numPhysCCRegs >= numThreads * TheISA::NumCCRegs);
- assert(params->numPhysVectorRegs >= numThreads * TheISA::NumVectorRegs);
rename.setScoreboard(&scoreboard);
iew.setScoreboard(&scoreboard);
renameMap[tid].setCCEntry(ridx, phys_reg);
commitRenameMap[tid].setCCEntry(ridx, phys_reg);
}
-
- for (RegIndex ridx = 0; ridx < TheISA::NumVectorRegs; ++ridx) {
- PhysRegIndex phys_reg = freeList.getVectorReg();
- renameMap[tid].setVectorEntry(ridx, phys_reg);
- commitRenameMap[tid].setVectorEntry(ridx, phys_reg);
- }
}
rename.setRenameMap(renameMap);
.desc("number of cc regfile writes")
.prereq(ccRegfileWrites);
- vectorRegfileReads
- .name(name() + ".vector_regfile_reads")
- .desc("number of vector regfile reads")
- .prereq(vectorRegfileReads);
-
- vectorRegfileWrites
- .name(name() + ".vector_regfile_writes")
- .desc("number of vector regfile writes")
- .prereq(vectorRegfileWrites);
-
miscRegfileReads
.name(name() + ".misc_regfile_reads")
.desc("number of misc regfile reads")
scoreboard.setReg(phys_reg);
}
- //Bind vector Regs to Rename Map
- max_reg = TheISA::NumIntRegs + TheISA::NumFloatRegs + TheISA::NumCCRegs +
- TheISA::NumVectorRegs;
- for (int vreg = TheISA::NumIntRegs + TheISA::NumFloatRegs +
- TheISA::NumCCRegs;
- vreg < max_reg; vreg++) {
- PhysRegIndex phys_reg = freeList.getVectorReg();
-
- renameMap[tid].setEntry(vreg, phys_reg);
- scoreboard.setReg(phys_reg);
- }
-
//Copy Thread Data Into RegFile
//this->copyFromTC(tid);
freeList.addReg(phys_reg);
}
- // Unbind condition-code Regs from Rename Map
- max_reg = TheISA::Vector_Reg_Base + TheISA::NumVectorRegs;
- for (int vreg = TheISA::Vector_Reg_Base; vreg < max_reg; vreg++) {
- PhysRegIndex phys_reg = renameMap[tid].lookup(vreg);
- scoreboard.unsetReg(phys_reg);
- freeList.addReg(phys_reg);
- }
-
// Squash Throughout Pipeline
DynInstPtr inst = commit.rob->readHeadInst(tid);
InstSeqNum squash_seq_num = inst->seqNum;
return regFile.readCCReg(reg_idx);
}
-template <class Impl>
-const VectorReg &
-FullO3CPU<Impl>::readVectorReg(int reg_idx)
-{
- vectorRegfileReads++;
- return regFile.readVectorReg(reg_idx);
-}
-
template <class Impl>
void
FullO3CPU<Impl>::setIntReg(int reg_idx, uint64_t val)
regFile.setCCReg(reg_idx, val);
}
-template <class Impl>
-void
-FullO3CPU<Impl>::setVectorReg(int reg_idx, const VectorReg &val)
-{
- vectorRegfileWrites++;
- regFile.setVectorReg(reg_idx, val);
-}
-
template <class Impl>
uint64_t
FullO3CPU<Impl>::readArchIntReg(int reg_idx, ThreadID tid)
return regFile.readCCReg(phys_reg);
}
-template <class Impl>
-const VectorReg&
-FullO3CPU<Impl>::readArchVectorReg(int reg_idx, ThreadID tid)
-{
- vectorRegfileReads++;
- PhysRegIndex phys_reg = commitRenameMap[tid].lookupVector(reg_idx);
-
- return regFile.readVectorReg(phys_reg);
-}
-
template <class Impl>
void
FullO3CPU<Impl>::setArchIntReg(int reg_idx, uint64_t val, ThreadID tid)
regFile.setCCReg(phys_reg, val);
}
-template <class Impl>
-void
-FullO3CPU<Impl>::setArchVectorReg(int reg_idx, const VectorReg &val,
- ThreadID tid)
-{
- vectorRegfileWrites++;
- PhysRegIndex phys_reg = commitRenameMap[tid].lookupVector(reg_idx);
- regFile.setVectorReg(phys_reg, val);
-}
-
template <class Impl>
TheISA::PCState
FullO3CPU<Impl>::pcState(ThreadID tid)
TheISA::CCReg readCCReg(int reg_idx);
- const TheISA::VectorReg &readVectorReg(int reg_idx);
-
void setIntReg(int reg_idx, uint64_t val);
void setFloatReg(int reg_idx, TheISA::FloatReg val);
void setCCReg(int reg_idx, TheISA::CCReg val);
- void setVectorReg(int reg_idx, const TheISA::VectorReg &val);
-
uint64_t readArchIntReg(int reg_idx, ThreadID tid);
float readArchFloatReg(int reg_idx, ThreadID tid);
TheISA::CCReg readArchCCReg(int reg_idx, ThreadID tid);
- const TheISA::VectorReg &readArchVectorReg(int reg_idx, ThreadID tid);
-
/** Architectural register accessors. Looks up in the commit
* rename table to obtain the true physical index of the
* architected register first, then accesses that physical
void setArchCCReg(int reg_idx, TheISA::CCReg val, ThreadID tid);
- void setArchVectorReg(int reg_idx, const TheISA::VectorReg &val,
- ThreadID tid);
-
/** Sets the commit PC state of a specific thread. */
void pcState(const TheISA::PCState &newPCState, ThreadID tid);
//number of CC register file accesses
Stats::Scalar ccRegfileReads;
Stats::Scalar ccRegfileWrites;
- //number of integer register file accesses
- Stats::Scalar vectorRegfileReads;
- Stats::Scalar vectorRegfileWrites;
//number of misc
Stats::Scalar miscRegfileReads;
Stats::Scalar miscRegfileWrites;
typedef TheISA::FloatReg FloatReg;
typedef TheISA::FloatRegBits FloatRegBits;
typedef TheISA::CCReg CCReg;
- typedef TheISA::VectorReg VectorReg;
/** Misc register index type. */
typedef TheISA::MiscReg MiscReg;
void forwardOldRegs()
{
+
for (int idx = 0; idx < this->numDestRegs(); idx++) {
PhysRegIndex prev_phys_reg = this->prevDestRegIdx(idx);
TheISA::RegIndex original_dest_reg =
this->setCCRegOperand(this->staticInst.get(), idx,
this->cpu->readCCReg(prev_phys_reg));
break;
- case VectorRegClass:
- this->setVectorRegOperand(this->staticInst.get(), idx,
- this->cpu->readVectorReg(prev_phys_reg));
- break;
-
case MiscRegClass:
// no need to forward misc reg values
break;
return this->cpu->readCCReg(this->_srcRegIdx[idx]);
}
- const VectorReg &readVectorRegOperand(const StaticInst *si, int idx)
- {
- return this->cpu->readVectorReg(this->_srcRegIdx[idx]);
- }
-
/** @todo: Make results into arrays so they can handle multiple dest
* registers.
*/
BaseDynInst<Impl>::setCCRegOperand(si, idx, val);
}
- void setVectorRegOperand(const StaticInst *si, int idx,
- const VectorReg &val)
- {
- this->cpu->setVectorReg(this->_destRegIdx[idx], val);
- BaseDynInst<Impl>::setVectorRegOperand(si, idx, val);
- }
-
#if THE_ISA == MIPS_ISA
MiscReg readRegOtherThread(int misc_reg, ThreadID tid)
{
/** The list of free condition-code registers. */
SimpleFreeList ccList;
- /** The list of free vector registers. */
- SimpleFreeList vectorList;
-
/**
* The register file object is used only to distinguish integer
* from floating-point physical register indices.
/** Gets a free cc register. */
PhysRegIndex getCCReg() { return ccList.getReg(); }
- /** Gets a free vector register. */
- PhysRegIndex getVectorReg() { return vectorList.getReg(); }
-
/** Adds a register back to the free list. */
void addReg(PhysRegIndex freed_reg);
/** Adds a cc register back to the free list. */
void addCCReg(PhysRegIndex freed_reg) { ccList.addReg(freed_reg); }
- /** Adds a vector register back to the free list. */
- void addVectorReg(PhysRegIndex freed_reg) { vectorList.addReg(freed_reg); }
-
/** Checks if there are any free integer registers. */
bool hasFreeIntRegs() const { return intList.hasFreeRegs(); }
/** Checks if there are any free cc registers. */
bool hasFreeCCRegs() const { return ccList.hasFreeRegs(); }
- /** Checks if there are any free vector registers. */
- bool hasFreeVectorRegs() const { return vectorList.hasFreeRegs(); }
-
/** Returns the number of free integer registers. */
unsigned numFreeIntRegs() const { return intList.numFreeRegs(); }
/** Returns the number of free cc registers. */
unsigned numFreeCCRegs() const { return ccList.numFreeRegs(); }
-
- /** Returns the number of free vector registers. */
- unsigned numFreeVectorRegs() const { return vectorList.numFreeRegs(); }
};
inline void
intList.addReg(freed_reg);
} else if (regFile->isFloatPhysReg(freed_reg)) {
floatList.addReg(freed_reg);
- } else if (regFile->isCCPhysReg(freed_reg)) {
- ccList.addReg(freed_reg);
} else {
- assert(regFile->isVectorPhysReg(freed_reg));
- vectorList.addReg(freed_reg);
+ assert(regFile->isCCPhysReg(freed_reg));
+ ccList.addReg(freed_reg);
}
// These assert conditions ensure that the number of free
// Set the number of total physical registers
numPhysRegs = params->numPhysIntRegs + params->numPhysFloatRegs +
- params->numPhysCCRegs + params->numPhysVectorRegs;
+ params->numPhysCCRegs;
//Create an entry for each physical register within the
//dependency graph.
PhysRegFile::PhysRegFile(unsigned _numPhysicalIntRegs,
unsigned _numPhysicalFloatRegs,
- unsigned _numPhysicalCCRegs,
- unsigned _numPhysicalVectorRegs)
+ unsigned _numPhysicalCCRegs)
: intRegFile(_numPhysicalIntRegs),
floatRegFile(_numPhysicalFloatRegs),
ccRegFile(_numPhysicalCCRegs),
- vectorRegFile(_numPhysicalVectorRegs),
baseFloatRegIndex(_numPhysicalIntRegs),
baseCCRegIndex(_numPhysicalIntRegs + _numPhysicalFloatRegs),
- baseVectorRegIndex(_numPhysicalIntRegs + _numPhysicalFloatRegs
- + _numPhysicalCCRegs),
totalNumRegs(_numPhysicalIntRegs
+ _numPhysicalFloatRegs
- + _numPhysicalCCRegs
- + _numPhysicalVectorRegs)
+ + _numPhysicalCCRegs)
{
if (TheISA::NumCCRegs == 0 && _numPhysicalCCRegs != 0) {
// Just make this a warning and go ahead and allocate them
warn("Non-zero number of physical CC regs specified, even though\n"
" ISA does not use them.\n");
}
-
- if (TheISA::NumVectorRegs == 0 && _numPhysicalVectorRegs != 0) {
- // Just make this a warning and go ahead and allocate them
- // anyway, to keep from having to add checks everywhere
- warn("Non-zero number of physical vector regs specified, even though\n"
- " ISA does not use them.\n");
- }
}
freeList->addFloatReg(reg_idx++);
}
- // The next batch of registers are the condition-code physical
+ // The rest of the registers are the condition-code physical
// registers; put them onto the condition-code free list.
- while (reg_idx < baseVectorRegIndex) {
- freeList->addCCReg(reg_idx++);
- }
-
- // The rest of the registers are the vector physical
- // registers; put them onto the vector free list.
while (reg_idx < totalNumRegs) {
- freeList->addVectorReg(reg_idx++);
+ freeList->addCCReg(reg_idx++);
}
}
typedef TheISA::FloatReg FloatReg;
typedef TheISA::FloatRegBits FloatRegBits;
typedef TheISA::CCReg CCReg;
- typedef TheISA::VectorReg VectorReg;
typedef union {
FloatReg d;
/** Condition-code register file. */
std::vector<CCReg> ccRegFile;
- /** Vector register file. */
- std::vector<VectorReg> vectorRegFile;
-
/**
* The first floating-point physical register index. The physical
* register file has a single continuous index space, with the
*/
unsigned baseCCRegIndex;
- /**
- * The first vector physical register index. The vector registers follow
- * the condition-code registers.
- */
- unsigned baseVectorRegIndex;
-
/** Total number of physical registers. */
unsigned totalNumRegs;
*/
PhysRegFile(unsigned _numPhysicalIntRegs,
unsigned _numPhysicalFloatRegs,
- unsigned _numPhysicalCCRegs,
- unsigned _numPhysicalVectorRegs);
+ unsigned _numPhysicalCCRegs);
/**
* Destructor to free resources
/** @return the number of condition-code physical registers. */
unsigned numCCPhysRegs() const
- { return baseVectorRegIndex - baseCCRegIndex; }
-
- /** @return the number of vector physical registers. */
- unsigned numVectorPhysRegs() const
- { return totalNumRegs - baseVectorRegIndex; }
+ { return totalNumRegs - baseCCRegIndex; }
/** @return the total number of physical registers. */
unsigned totalNumPhysRegs() const { return totalNumRegs; }
*/
bool isCCPhysReg(PhysRegIndex reg_idx)
{
- return (baseCCRegIndex <= reg_idx && reg_idx < baseVectorRegIndex);
- }
-
- /**
- * @return true if the specified physical register index
- * corresponds to a vector physical register.
- */
- bool isVectorPhysReg(PhysRegIndex reg_idx) const
- {
- return baseVectorRegIndex <= reg_idx && reg_idx < totalNumRegs;
+ return (baseCCRegIndex <= reg_idx && reg_idx < totalNumRegs);
}
/** Reads an integer register. */
return ccRegFile[reg_offset];
}
- /** Reads a vector register. */
- const VectorReg &readVectorReg(PhysRegIndex reg_idx) const
- {
- assert(isVectorPhysReg(reg_idx));
-
- // Remove the base vector reg dependency.
- PhysRegIndex reg_offset = reg_idx - baseVectorRegIndex;
-
- DPRINTF(IEW, "RegFile: Access to vector register %i\n", int(reg_idx));
- return vectorRegFile[reg_offset];
- }
-
/** Sets an integer register to the given value. */
void setIntReg(PhysRegIndex reg_idx, uint64_t val)
{
ccRegFile[reg_offset] = val;
}
-
- /** Sets a vector register to the given value. */
- void setVectorReg(PhysRegIndex reg_idx, const VectorReg &val)
- {
- assert(isVectorPhysReg(reg_idx));
- // Remove the base vector reg dependency.
- PhysRegIndex reg_offset = reg_idx - baseVectorRegIndex;
- DPRINTF(IEW, "RegFile: Setting vector register %i\n", int(reg_idx));
- vectorRegFile[reg_offset] = val;
- }
};
commitWidth(params->commitWidth),
numThreads(params->numThreads),
maxPhysicalRegs(params->numPhysIntRegs + params->numPhysFloatRegs
- + params->numPhysCCRegs + params->numPhysVectorRegs)
+ + params->numPhysCCRegs)
{
if (renameWidth > Impl::MaxWidth)
fatal("renameWidth (%d) is larger than compiled limit (%d),\n"
// to rename to. Otherwise block.
if (!renameMap[tid]->canRename(inst->numIntDestRegs(),
inst->numFPDestRegs(),
- inst->numCCDestRegs(),
- inst->numVectorDestRegs())) {
+ inst->numCCDestRegs())) {
DPRINTF(Rename, "Blocking due to lack of free "
"physical registers to rename to.\n");
blockThisCycle = true;
renamed_reg = map->lookupCC(flat_rel_src_reg);
break;
- case VectorRegClass:
- flat_rel_src_reg = tc->flattenVectorIndex(rel_src_reg);
- renamed_reg = map->lookupVector(flat_rel_src_reg);
- break;
-
case MiscRegClass:
// misc regs don't get flattened
flat_rel_src_reg = rel_src_reg;
flat_uni_dest_reg = flat_rel_dest_reg + TheISA::CC_Reg_Base;
break;
- case VectorRegClass:
- flat_rel_dest_reg = tc->flattenVectorIndex(rel_dest_reg);
- rename_result = map->renameVector(flat_rel_dest_reg);
- flat_uni_dest_reg = flat_rel_dest_reg + TheISA::Vector_Reg_Base;
- break;
-
case MiscRegClass:
// misc regs don't get flattened
flat_rel_dest_reg = rel_dest_reg;
DefaultRename<Impl>::calcFreeLQEntries(ThreadID tid)
{
int num_free = freeEntries[tid].lqEntries -
- (loadsInProgress[tid] - fromIEW->iewInfo[tid].dispatchedToLQ);
+ (loadsInProgress[tid] - fromIEW->iewInfo[tid].dispatchedToLQ);
DPRINTF(Rename, "calcFreeLQEntries: free lqEntries: %d, loadsInProgress: %d, "
"loads dispatchedToLQ: %d\n", freeEntries[tid].lqEntries,
loadsInProgress[tid], fromIEW->iewInfo[tid].dispatchedToLQ);
DefaultRename<Impl>::calcFreeSQEntries(ThreadID tid)
{
int num_free = freeEntries[tid].sqEntries -
- (storesInProgress[tid] - fromIEW->iewInfo[tid].dispatchedToSQ);
+ (storesInProgress[tid] - fromIEW->iewInfo[tid].dispatchedToSQ);
DPRINTF(Rename, "calcFreeSQEntries: free sqEntries: %d, storesInProgress: %d, "
"stores dispatchedToSQ: %d\n", freeEntries[tid].sqEntries,
storesInProgress[tid], fromIEW->iewInfo[tid].dispatchedToSQ);
floatMap.init(TheISA::NumFloatRegs, &(freeList->floatList), _floatZeroReg);
ccMap.init(TheISA::NumCCRegs, &(freeList->ccList), (RegIndex)-1);
-
- vectorMap.init(TheISA::NumVectorRegs, &(freeList->vectorList),
- (RegIndex)-1);
}
case CCRegClass:
return renameCC(rel_arch_reg);
- case VectorRegClass:
- return renameVector(rel_arch_reg);
-
case MiscRegClass:
return renameMisc(rel_arch_reg);
case CCRegClass:
return lookupCC(rel_arch_reg);
- case VectorRegClass:
- return lookupVector(rel_arch_reg);
-
case MiscRegClass:
return lookupMisc(rel_arch_reg);
case CCRegClass:
return setCCEntry(rel_arch_reg, phys_reg);
- case VectorRegClass:
- return setVectorEntry(rel_arch_reg, phys_reg);
-
case MiscRegClass:
// Misc registers do not actually rename, so don't change
// their mappings. We end up here when a commit or squash
/** The condition-code register rename map */
SimpleRenameMap ccMap;
- /** The vector register rename map */
- SimpleRenameMap vectorMap;
-
public:
typedef TheISA::RegIndex RegIndex;
return info;
}
- /**
- * Perform rename() on a vector register, given a relative vector register
- * index.
- */
- RenameInfo renameVector(RegIndex rel_arch_reg)
- {
- RenameInfo info = vectorMap.rename(rel_arch_reg);
- assert(regFile->isVectorPhysReg(info.first));
- return info;
- }
-
/**
* Perform rename() on a misc register, given a relative
* misc register index.
return phys_reg;
}
- /**
- * Perform lookup() on a vector register, given a relative
- * vector register index.
- */
- PhysRegIndex lookupVector(RegIndex rel_arch_reg) const
- {
- PhysRegIndex phys_reg = vectorMap.lookup(rel_arch_reg);
- assert(regFile->isVectorPhysReg(phys_reg));
- return phys_reg;
- }
-
/**
* Perform lookup() on a misc register, given a relative
* misc register index.
ccMap.setEntry(arch_reg, phys_reg);
}
- /**
- * Perform setEntry() on a vector register, given a relative vector
- * register index.
- */
- void setVectorEntry(RegIndex arch_reg, PhysRegIndex phys_reg)
- {
- assert(regFile->isVectorPhysReg(phys_reg));
- vectorMap.setEntry(arch_reg, phys_reg);
- }
-
/**
* Return the minimum number of free entries across all of the
* register classes. The minimum is used so we guarantee that
/**
* Return whether there are enough registers to serve the request.
*/
- bool canRename(uint32_t intRegs, uint32_t floatRegs, uint32_t ccRegs,
- uint32_t vectorRegs) const
+ bool canRename(uint32_t intRegs, uint32_t floatRegs, uint32_t ccRegs) const
{
return intRegs <= intMap.numFreeEntries() &&
floatRegs <= floatMap.numFreeEntries() &&
- ccRegs <= ccMap.numFreeEntries() &&
- vectorRegs <= vectorMap.numFreeEntries();
+ ccRegs <= ccMap.numFreeEntries();
}
};
return readCCRegFlat(flattenCCIndex(reg_idx));
}
- virtual const VectorReg &readVectorReg(int reg_idx) {
- return readVectorRegFlat(flattenVectorIndex(reg_idx));
- }
-
/** Sets an integer register to a value. */
virtual void setIntReg(int reg_idx, uint64_t val) {
setIntRegFlat(flattenIntIndex(reg_idx), val);
setCCRegFlat(flattenCCIndex(reg_idx), val);
}
- virtual void setVectorReg(int reg_idx, const VectorReg &val) {
- setVectorRegFlat(flattenVectorIndex(reg_idx), val);
- }
-
/** Reads this thread's PC state. */
virtual TheISA::PCState pcState()
{ return cpu->pcState(thread->threadId()); }
virtual int flattenIntIndex(int reg);
virtual int flattenFloatIndex(int reg);
virtual int flattenCCIndex(int reg);
- virtual int flattenVectorIndex(int reg);
virtual int flattenMiscIndex(int reg);
/** Returns the number of consecutive store conditional failures. */
virtual CCReg readCCRegFlat(int idx);
virtual void setCCRegFlat(int idx, CCReg val);
-
- virtual const VectorReg &readVectorRegFlat(int idx);
- virtual void setVectorRegFlat(int idx, const VectorReg &val);
};
#endif
return cpu->readArchCCReg(reg_idx, thread->threadId());
}
-template <class Impl>
-const TheISA::VectorReg &
-O3ThreadContext<Impl>::readVectorRegFlat(int reg_idx)
-{
- return cpu->readArchVectorReg(reg_idx, thread->threadId());
-}
-
template <class Impl>
void
O3ThreadContext<Impl>::setIntRegFlat(int reg_idx, uint64_t val)
conditionalSquash();
}
-template <class Impl>
-void
-O3ThreadContext<Impl>::setVectorRegFlat(int reg_idx,
- const TheISA::VectorReg &val)
-{
- cpu->setArchVectorReg(reg_idx, val, thread->threadId());
- conditionalSquash();
-}
-
template <class Impl>
void
O3ThreadContext<Impl>::pcState(const TheISA::PCState &val)
return cpu->isa[thread->threadId()]->flattenCCIndex(reg);
}
-template <class Impl>
-int
-O3ThreadContext<Impl>::flattenVectorIndex(int reg)
-{
- return cpu->isa[thread->threadId()]->flattenVectorIndex(reg);
-}
-
template <class Impl>
int
O3ThreadContext<Impl>::flattenMiscIndex(int reg)
"IntRegClass",
"FloatRegClass",
"CCRegClass",
- "VectorRegClass",
"MiscRegClass"
};
IntRegClass, ///< Integer register
FloatRegClass, ///< Floating-point register
CCRegClass, ///< Condition-code register
- VectorRegClass, ///< Vector register
MiscRegClass ///< Control (misc) register
};
} else if (reg_idx < TheISA::CC_Reg_Base) {
cl = FloatRegClass;
offset = TheISA::FP_Reg_Base;
- } else if (reg_idx < TheISA::Vector_Reg_Base) {
+ } else if (reg_idx < TheISA::Misc_Reg_Base) {
// if there are no CC regs, the ISA should set
// CC_Reg_Base == Misc_Reg_Base so the if above
// never succeeds
cl = CCRegClass;
offset = TheISA::CC_Reg_Base;
- } else if (reg_idx < TheISA::Misc_Reg_Base) {
- cl = VectorRegClass;
- offset = TheISA::Vector_Reg_Base;
} else {
cl = MiscRegClass;
offset = TheISA::Misc_Reg_Base;
typedef TheISA::FloatReg FloatReg;
typedef TheISA::FloatRegBits FloatRegBits;
typedef TheISA::CCReg CCReg;
- typedef TheISA::VectorReg VectorReg;
BPredUnit *branchPred;
Stats::Scalar numCCRegReads;
Stats::Scalar numCCRegWrites;
- //number of vector register file accesses
- Stats::Scalar numVectorRegReads;
- Stats::Scalar numVectorRegWrites;
-
// number of simulated memory references
Stats::Scalar numMemRefs;
Stats::Scalar numLoadInsts;
return thread->readCCReg(reg_idx);
}
- const VectorReg &readVectorRegOperand(const StaticInst *si, int idx)
- {
- numVectorRegReads++;
- int reg_idx = si->srcRegIdx(idx) - TheISA::Vector_Reg_Base;
- return thread->readVectorReg(reg_idx);
- }
-
void setIntRegOperand(const StaticInst *si, int idx, IntReg val)
{
numIntRegWrites++;
thread->setCCReg(reg_idx, val);
}
- void setVectorRegOperand(const StaticInst *si, int idx,
- const VectorReg &val)
- {
- numVectorRegWrites++;
- int reg_idx = si->destRegIdx(idx) - TheISA::Vector_Reg_Base;
- thread->setVectorReg(reg_idx, val);
- }
-
bool readPredicate() { return thread->readPredicate(); }
void setPredicate(bool val)
{
#include "debug/CCRegs.hh"
#include "debug/FloatRegs.hh"
#include "debug/IntRegs.hh"
-#include "debug/VectorRegs.hh"
#include "mem/page_table.hh"
#include "mem/request.hh"
#include "sim/byteswap.hh"
typedef TheISA::FloatReg FloatReg;
typedef TheISA::FloatRegBits FloatRegBits;
typedef TheISA::CCReg CCReg;
- typedef TheISA::VectorReg VectorReg;
-
public:
typedef ThreadContext::Status Status;
FloatRegBits i[TheISA::NumFloatRegs];
} floatRegs;
TheISA::IntReg intRegs[TheISA::NumIntRegs];
-
#ifdef ISA_HAS_CC_REGS
TheISA::CCReg ccRegs[TheISA::NumCCRegs];
#endif
-
-#ifdef ISA_HAS_VECTOR_REGS
- TheISA::VectorReg vectorRegs[TheISA::NumVectorRegs];
-#endif
-
TheISA::ISA *const isa; // one "instance" of the current ISA.
TheISA::PCState _pcState;
#endif
}
- const VectorReg &readVectorReg(int reg_idx)
- {
- int flatIndex = isa->flattenVectorIndex(reg_idx);
- assert(0 <= flatIndex);
- assert(flatIndex < TheISA::NumVectorRegs);
- DPRINTF(VectorRegs, "Reading vector reg %d (%d).\n",
- reg_idx, flatIndex);
- return readVectorRegFlat(flatIndex);
- }
-
void setIntReg(int reg_idx, uint64_t val)
{
int flatIndex = isa->flattenIntIndex(reg_idx);
#endif
}
- void setVectorReg(int reg_idx, const VectorReg &val)
- {
-#ifdef ISA_HAS_VECTOR_REGS
- int flatIndex = isa->flattenVectorIndex(reg_idx);
- assert(flatIndex < TheISA::NumVectorRegs);
- DPRINTF(VectorRegs, "Setting vector reg %d (%d).\n",
- reg_idx, flatIndex);
- setVectorRegFlat(flatIndex, val);
-#else
- panic("Tried to set a vector register.");
-#endif
- }
-
TheISA::PCState
pcState()
{
return isa->flattenCCIndex(reg);
}
- int
- flattenVectorIndex(int reg)
- {
- return isa->flattenVectorIndex(reg);
- }
-
int
flattenMiscIndex(int reg)
{
void setCCRegFlat(int idx, CCReg val)
{ panic("setCCRegFlat w/no CC regs!\n"); }
#endif
-
-#ifdef ISA_HAS_VECTOR_REGS
- const VectorReg &readVectorRegFlat(int idx) { return vectorRegs[idx]; }
- void setVectorRegFlat(int idx, const VectorReg &val)
- { vectorRegs[idx] = val; }
-#else
- const VectorReg &readVectorRegFlat(int idx)
- { panic("readVectorRegFlat w/no Vector regs!\n"); }
-
- void setVectorRegFlat(int idx, const VectorReg &val)
- { panic("setVectorRegFlat w/no Vector regs!\n"); }
-#endif
};
int8_t _numFPDestRegs;
int8_t _numIntDestRegs;
int8_t _numCCDestRegs;
- int8_t _numVectorDestRegs;
//@}
public:
int8_t numFPDestRegs() const { return _numFPDestRegs; }
/// Number of integer destination regs.
int8_t numIntDestRegs() const { return _numIntDestRegs; }
- /// Number of condition code destination regs.
+ //@}
+ /// Number of coprocesor destination regs.
int8_t numCCDestRegs() const { return _numCCDestRegs; }
- /// Number of vector destination regs.
- int8_t numVectorDestRegs() const { return _numVectorDestRegs; }
//@}
/// @name Flag accessors.
bool isInteger() const { return flags[IsInteger]; }
bool isFloating() const { return flags[IsFloating]; }
- bool isVector() const { return flags[IsVector]; }
bool isCC() const { return flags[IsCC]; }
bool isControl() const { return flags[IsControl]; }
StaticInst(const char *_mnemonic, ExtMachInst _machInst, OpClass __opClass)
: _opClass(__opClass), _numSrcRegs(0), _numDestRegs(0),
_numFPDestRegs(0), _numIntDestRegs(0), _numCCDestRegs(0),
- _numVectorDestRegs(0), machInst(_machInst), mnemonic(_mnemonic),
- cachedDisassembly(0)
+ machInst(_machInst), mnemonic(_mnemonic), cachedDisassembly(0)
{ }
public:
void printFlags(std::ostream &outs, const std::string &separator) const;
/// Return name of machine instruction
- std::string getName() const { return mnemonic; }
+ std::string getName() { return mnemonic; }
};
#endif // __CPU_STATIC_INST_HH__
panic("CC reg idx %d doesn't match, one: %#x, two: %#x",
i, t1, t2);
}
-
- // loop through the Vector registers.
- for (int i = 0; i < TheISA::NumVectorRegs; ++i) {
- const TheISA::VectorReg &t1 = one->readVectorReg(i);
- const TheISA::VectorReg &t2 = two->readVectorReg(i);
- if (t1 != t2)
- panic("Vector reg idx %d doesn't match", i);
- }
-
if (!(one->pcState() == two->pcState()))
panic("PC state doesn't match.");
int id1 = one->cpuId();
SERIALIZE_ARRAY(ccRegs, NumCCRegs);
#endif
-#ifdef ISA_HAS_VECTOR_REGS
- VectorRegElement vectorRegs[NumVectorRegs * NumVectorRegElements];
- for (int i = 0; i < NumVectorRegs; ++i) {
- const VectorReg &v = tc.readVectorRegFlat(i);
- for (int j = 0; i < NumVectorRegElements; ++j)
- vectorRegs[i * NumVectorRegElements + j] = v[j];
- }
- SERIALIZE_ARRAY(vectorRegs, NumVectorRegs * NumVectorRegElements);
-#endif
-
tc.pcState().serialize(cp);
// thread_num and cpu_id are deterministic from the config
tc.setCCRegFlat(i, ccRegs[i]);
#endif
-#ifdef ISA_HAS_VECTOR_REGS
- VectorRegElement vectorRegs[NumVectorRegs * NumVectorRegElements];
- UNSERIALIZE_ARRAY(vectorRegs, NumVectorRegs * NumVectorRegElements);
- for (int i = 0; i < NumVectorRegs; ++i) {
- VectorReg v;
- for (int j = 0; i < NumVectorRegElements; ++j)
- v[j] = vectorRegs[i * NumVectorRegElements + j];
- tc.setVectorRegFlat(i, v);
- }
-#endif
-
PCState pcState;
pcState.unserialize(cp);
tc.pcState(pcState);
typedef TheISA::FloatReg FloatReg;
typedef TheISA::FloatRegBits FloatRegBits;
typedef TheISA::CCReg CCReg;
- typedef TheISA::VectorReg VectorReg;
typedef TheISA::MiscReg MiscReg;
public:
virtual CCReg readCCReg(int reg_idx) = 0;
- virtual const VectorReg &readVectorReg(int reg_idx) = 0;
-
virtual void setIntReg(int reg_idx, uint64_t val) = 0;
virtual void setFloatReg(int reg_idx, FloatReg val) = 0;
virtual void setCCReg(int reg_idx, CCReg val) = 0;
- virtual void setVectorReg(int reg_idx, const VectorReg &val) = 0;
-
virtual TheISA::PCState pcState() = 0;
virtual void pcState(const TheISA::PCState &val) = 0;
virtual int flattenIntIndex(int reg) = 0;
virtual int flattenFloatIndex(int reg) = 0;
virtual int flattenCCIndex(int reg) = 0;
- virtual int flattenVectorIndex(int reg) = 0;
virtual int flattenMiscIndex(int reg) = 0;
virtual uint64_t
virtual CCReg readCCRegFlat(int idx) = 0;
virtual void setCCRegFlat(int idx, CCReg val) = 0;
-
- virtual const VectorReg &readVectorRegFlat(int idx) = 0;
- virtual void setVectorRegFlat(int idx, const VectorReg &val) = 0;
/** @} */
};
CCReg readCCReg(int reg_idx)
{ return actualTC->readCCReg(reg_idx); }
- const VectorReg &readVectorReg(int reg_idx)
- { return actualTC->readVectorReg(reg_idx); }
-
void setIntReg(int reg_idx, uint64_t val)
{ actualTC->setIntReg(reg_idx, val); }
void setCCReg(int reg_idx, CCReg val)
{ actualTC->setCCReg(reg_idx, val); }
- void setVectorReg(int reg_idx, const VectorReg &val)
- { actualTC->setVectorReg(reg_idx, val); }
-
TheISA::PCState pcState() { return actualTC->pcState(); }
void pcState(const TheISA::PCState &val) { actualTC->pcState(val); }
int flattenCCIndex(int reg)
{ return actualTC->flattenCCIndex(reg); }
- int flattenVectorIndex(int reg)
- { return actualTC->flattenVectorIndex(reg); }
-
int flattenMiscIndex(int reg)
{ return actualTC->flattenMiscIndex(reg); }
void setCCRegFlat(int idx, CCReg val)
{ actualTC->setCCRegFlat(idx, val); }
-
- const VectorReg &readVectorRegFlat(int idx)
- { return actualTC->readVectorRegFlat(idx); }
-
- void setVectorRegFlat(int idx, const VectorReg &val)
- { actualTC->setVectorRegFlat(idx, val); }
};
/** @{ */
class InstRecord
{
protected:
- typedef TheISA::VectorReg VectorReg;
-
Tick when;
// The following fields are initialized by the constructor and
union {
uint64_t as_int;
double as_double;
- VectorReg as_vector;
} data;
/** @defgroup fetch_seq
DataInt16 = 2,
DataInt32 = 4,
DataInt64 = 8,
- DataDouble = 3,
- DataVector = sizeof(VectorReg),
+ DataDouble = 3
} data_status;
/** @ingroup memory
void setData(int8_t d) { setData((uint8_t)d); }
void setData(double d) { data.as_double = d; data_status = DataDouble; }
- void setData(const VectorReg& v)
- { data.as_vector = v; data_status = DataVector; }
void setFetchSeq(InstSeqNum seq)
{ fetch_seq = seq; fetch_seq_valid = true; }
uint64_t getIntData() const { return data.as_int; }
double getFloatData() const { return data.as_double; }
- const VectorReg &getVectorData() const { return data.as_vector; }
int getDataStatus() const { return data_status; }
InstSeqNum getFetchSeq() const { return fetch_seq; }
projects / gem5.git / commitdiff