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

Update #defines for the O3CPU. Also include the copyright.

Browse source 
base/timebuf.hh:
    Updated copyright.
cpu/o3/2bit_local_pred.hh:
cpu/o3/alpha_cpu.hh:
cpu/o3/alpha_cpu_impl.hh:
cpu/o3/alpha_dyn_inst.hh:
cpu/o3/alpha_impl.hh:
cpu/o3/alpha_params.hh:
cpu/o3/btb.hh:
cpu/o3/comm.hh:
cpu/o3/commit.hh:
cpu/o3/cpu.cc:
cpu/o3/cpu.hh:
cpu/o3/cpu_policy.hh:
cpu/o3/decode.hh:
cpu/o3/fetch.hh:
cpu/o3/free_list.hh:
cpu/o3/iew.hh:
cpu/o3/inst_queue.hh:
cpu/o3/mem_dep_unit.hh:
cpu/o3/ras.hh:
cpu/o3/regfile.hh:
cpu/o3/rename.hh:
cpu/o3/rename_map.hh:
cpu/o3/rob.cc:
cpu/o3/rob.hh:
cpu/o3/rob_impl.hh:
cpu/o3/sat_counter.hh:
cpu/o3/store_set.hh:
cpu/o3/tournament_pred.hh:
    Updated #define to have correct path.
docs/footer.html:
    Remove e-mail addr.

--HG--
extra : convert_revision : 68d7af52674621dc3b6d6ac0d564790ffd595fe3
This commit is contained in:
Kevin Lim 2005-06-05 03:25:26 -04:00
parent 7d367f4cc4
commit 77b9829f13
29 changed files with 176 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cpu/o3/2bit_local_pred.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_2BIT_LOCAL_PRED_HH__ #ifndef __CPU_O3_CPU_2BIT_LOCAL_PRED_HH__
#define __CPU_BETA_CPU_2BIT_LOCAL_PRED_HH__ #define __CPU_O3_CPU_2BIT_LOCAL_PRED_HH__
// For Addr type. // For Addr type.
#include "arch/alpha/isa_traits.hh" #include "arch/alpha/isa_traits.hh"
@ -83,4 +83,4 @@ class DefaultBP
unsigned indexMask; unsigned indexMask;
}; };
#endif // __CPU_BETA_CPU_2BIT_LOCAL_PRED_HH__ #endif // __CPU_O3_CPU_2BIT_LOCAL_PRED_HH__

8
cpu/o3/alpha_cpu.hh
View file

@ -29,13 +29,13 @@
// Todo: Find all the stuff in ExecContext and ev5 that needs to be // Todo: Find all the stuff in ExecContext and ev5 that needs to be
// specifically designed for this CPU. // specifically designed for this CPU.
#ifndef __CPU_BETA_CPU_ALPHA_FULL_CPU_HH__ #ifndef __CPU_O3_CPU_ALPHA_FULL_CPU_HH__
#define __CPU_BETA_CPU_ALPHA_FULL_CPU_HH__ #define __CPU_O3_CPU_ALPHA_FULL_CPU_HH__
#include "cpu/o3/cpu.hh" #include "cpu/o3/cpu.hh"
template <class Impl> template <class Impl>
class AlphaFullCPU : public FullBetaCPU<Impl> class AlphaFullCPU : public FullO3CPU<Impl>
{ {
public: public:
typedef typename Impl::ISA AlphaISA; typedef typename Impl::ISA AlphaISA;
@ -288,4 +288,4 @@ class AlphaFullCPU : public FullBetaCPU<Impl>
}; };
#endif // __CPU_BETA_CPU_ALPHA_FULL_CPU_HH__ #endif // __CPU_O3_CPU_ALPHA_FULL_CPU_HH__

29
cpu/o3/alpha_cpu_impl.hh
View file

@ -1,3 +1,30 @@
/*
* 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.
*/
#include "base/cprintf.hh" #include "base/cprintf.hh"
#include "base/statistics.hh" #include "base/statistics.hh"
@ -22,7 +49,7 @@
template <class Impl> template <class Impl>
AlphaFullCPU<Impl>::AlphaFullCPU(Params &params) AlphaFullCPU<Impl>::AlphaFullCPU(Params &params)
: FullBetaCPU<Impl>(params) : FullO3CPU<Impl>(params)
{ {
DPRINTF(FullCPU, "AlphaFullCPU: Creating AlphaFullCPU object.\n"); DPRINTF(FullCPU, "AlphaFullCPU: Creating AlphaFullCPU object.\n");

6
cpu/o3/alpha_dyn_inst.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_ALPHA_DYN_INST_HH__ #ifndef __CPU_O3_CPU_ALPHA_DYN_INST_HH__
#define __CPU_BETA_CPU_ALPHA_DYN_INST_HH__ #define __CPU_O3_CPU_ALPHA_DYN_INST_HH__
#include "cpu/base_dyn_inst.hh" #include "cpu/base_dyn_inst.hh"
#include "cpu/o3/alpha_cpu.hh" #include "cpu/o3/alpha_cpu.hh"
@ -231,5 +231,5 @@ class AlphaDynInst : public BaseDynInst<Impl>
} }
}; };
#endif // __CPU_BETA_CPU_ALPHA_DYN_INST_HH__ #endif // __CPU_O3_CPU_ALPHA_DYN_INST_HH__

6
cpu/o3/alpha_impl.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_ALPHA_IMPL_HH__ #ifndef __CPU_O3_CPU_ALPHA_IMPL_HH__
#define __CPU_BETA_CPU_ALPHA_IMPL_HH__ #define __CPU_O3_CPU_ALPHA_IMPL_HH__
#include "arch/alpha/isa_traits.hh" #include "arch/alpha/isa_traits.hh"
@ -79,4 +79,4 @@ struct AlphaSimpleImpl
}; };
}; };
#endif // __CPU_BETA_CPU_ALPHA_IMPL_HH__ #endif // __CPU_O3_CPU_ALPHA_IMPL_HH__

6
cpu/o3/alpha_params.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_ALPHA_SIMPLE_PARAMS_HH__ #ifndef __CPU_O3_CPU_ALPHA_SIMPLE_PARAMS_HH__
#define __CPU_BETA_CPU_ALPHA_SIMPLE_PARAMS_HH__ #define __CPU_O3_CPU_ALPHA_SIMPLE_PARAMS_HH__
#include "cpu/o3/cpu.hh" #include "cpu/o3/cpu.hh"
@ -160,4 +160,4 @@ class AlphaSimpleParams : public BaseFullCPU::Params
bool defReg; bool defReg;
}; };
#endif // __CPU_BETA_CPU_ALPHA_PARAMS_HH__ #endif // __CPU_O3_CPU_ALPHA_PARAMS_HH__

6
cpu/o3/btb.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_BTB_HH__ #ifndef __CPU_O3_CPU_BTB_HH__
#define __CPU_BETA_CPU_BTB_HH__ #define __CPU_O3_CPU_BTB_HH__
// For Addr type. // For Addr type.
#include "arch/alpha/isa_traits.hh" #include "arch/alpha/isa_traits.hh"
@ -77,4 +77,4 @@ class DefaultBTB
unsigned tagShiftAmt; unsigned tagShiftAmt;
}; };
#endif // __CPU_BETA_CPU_BTB_HH__ #endif // __CPU_O3_CPU_BTB_HH__

6
cpu/o3/comm.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_COMM_HH__ #ifndef __CPU_O3_CPU_COMM_HH__
#define __CPU_BETA_CPU_COMM_HH__ #define __CPU_O3_CPU_COMM_HH__
#include <vector> #include <vector>
@ -160,4 +160,4 @@ struct TimeBufStruct {
commitComm commitInfo; commitComm commitInfo;
}; };
#endif //__CPU_BETA_CPU_COMM_HH__ #endif //__CPU_O3_CPU_COMM_HH__

6
cpu/o3/commit.hh
View file

@ -40,8 +40,8 @@
// Probably not a big deal if the IPR stuff isn't cycle accurate. Can just // Probably not a big deal if the IPR stuff isn't cycle accurate. Can just
// have the original function handle writing to the IPR register. // have the original function handle writing to the IPR register.
#ifndef __CPU_BETA_CPU_SIMPLE_COMMIT_HH__ #ifndef __CPU_O3_CPU_SIMPLE_COMMIT_HH__
#define __CPU_BETA_CPU_SIMPLE_COMMIT_HH__ #define __CPU_O3_CPU_SIMPLE_COMMIT_HH__
#include "base/statistics.hh" #include "base/statistics.hh"
#include "base/timebuf.hh" #include "base/timebuf.hh"
@ -178,4 +178,4 @@ class SimpleCommit
Stats::Distribution<> n_committed_dist; Stats::Distribution<> n_committed_dist;
}; };
#endif // __CPU_BETA_CPU_SIMPLE_COMMIT_HH__ #endif // __CPU_O3_CPU_SIMPLE_COMMIT_HH__

82
cpu/o3/cpu.cc
View file

@ -46,28 +46,28 @@ BaseFullCPU::BaseFullCPU(Params &params)
} }
template <class Impl> template <class Impl>
FullBetaCPU<Impl>::TickEvent::TickEvent(FullBetaCPU<Impl> *c) FullO3CPU<Impl>::TickEvent::TickEvent(FullO3CPU<Impl> *c)
: Event(&mainEventQueue, CPU_Tick_Pri), cpu(c) : Event(&mainEventQueue, CPU_Tick_Pri), cpu(c)
{ {
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::TickEvent::process() FullO3CPU<Impl>::TickEvent::process()
{ {
cpu->tick(); cpu->tick();
} }
template <class Impl> template <class Impl>
const char * const char *
FullBetaCPU<Impl>::TickEvent::description() FullO3CPU<Impl>::TickEvent::description()
{ {
return "FullBetaCPU tick event"; return "FullO3CPU tick event";
} }
//Call constructor to all the pipeline stages here //Call constructor to all the pipeline stages here
template <class Impl> template <class Impl>
FullBetaCPU<Impl>::FullBetaCPU(Params &params) FullO3CPU<Impl>::FullO3CPU(Params &params)
#ifdef FULL_SYSTEM #ifdef FULL_SYSTEM
: BaseFullCPU(params), : BaseFullCPU(params),
#else #else
@ -161,7 +161,7 @@ FullBetaCPU<Impl>::FullBetaCPU(Params &params)
// The stages also need their CPU pointer setup. However this must be // The stages also need their CPU pointer setup. However this must be
// done at the upper level CPU because they have pointers to the upper // done at the upper level CPU because they have pointers to the upper
// level CPU, and not this FullBetaCPU. // level CPU, and not this FullO3CPU.
// Give each of the stages the time buffer they will use. // Give each of the stages the time buffer they will use.
fetch.setTimeBuffer(&timeBuffer); fetch.setTimeBuffer(&timeBuffer);
@ -194,22 +194,22 @@ FullBetaCPU<Impl>::FullBetaCPU(Params &params)
} }
template <class Impl> template <class Impl>
FullBetaCPU<Impl>::~FullBetaCPU() FullO3CPU<Impl>::~FullO3CPU()
{ {
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::fullCPURegStats() FullO3CPU<Impl>::fullCPURegStats()
{ {
// Register any of the FullCPU's stats here. // Register any of the FullCPU's stats here.
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::tick() FullO3CPU<Impl>::tick()
{ {
DPRINTF(FullCPU, "\n\nFullCPU: Ticking main, FullBetaCPU.\n"); DPRINTF(FullCPU, "\n\nFullCPU: Ticking main, FullO3CPU.\n");
//Tick each of the stages if they're actually running. //Tick each of the stages if they're actually running.
//Will want to figure out a way to unschedule itself if they're all //Will want to figure out a way to unschedule itself if they're all
@ -238,7 +238,7 @@ FullBetaCPU<Impl>::tick()
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::init() FullO3CPU<Impl>::init()
{ {
if(!deferRegistration) if(!deferRegistration)
{ {
@ -278,7 +278,7 @@ FullBetaCPU<Impl>::init()
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::activateContext(int thread_num, int delay) FullO3CPU<Impl>::activateContext(int thread_num, int delay)
{ {
// Needs to set each stage to running as well. // Needs to set each stage to running as well.
@ -289,35 +289,35 @@ FullBetaCPU<Impl>::activateContext(int thread_num, int delay)
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::suspendContext(int thread_num) FullO3CPU<Impl>::suspendContext(int thread_num)
{ {
panic("suspendContext unimplemented!"); panic("suspendContext unimplemented!");
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::deallocateContext(int thread_num) FullO3CPU<Impl>::deallocateContext(int thread_num)
{ {
panic("deallocateContext unimplemented!"); panic("deallocateContext unimplemented!");
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::haltContext(int thread_num) FullO3CPU<Impl>::haltContext(int thread_num)
{ {
panic("haltContext unimplemented!"); panic("haltContext unimplemented!");
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::switchOut() FullO3CPU<Impl>::switchOut()
{ {
panic("FullBetaCPU does not have a switch out function.\n"); panic("FullO3CPU does not have a switch out function.\n");
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::takeOverFrom(BaseCPU *oldCPU) FullO3CPU<Impl>::takeOverFrom(BaseCPU *oldCPU)
{ {
BaseCPU::takeOverFrom(oldCPU); BaseCPU::takeOverFrom(oldCPU);
@ -336,7 +336,7 @@ FullBetaCPU<Impl>::takeOverFrom(BaseCPU *oldCPU)
template <class Impl> template <class Impl>
InstSeqNum InstSeqNum
FullBetaCPU<Impl>::getAndIncrementInstSeq() FullO3CPU<Impl>::getAndIncrementInstSeq()
{ {
// Hopefully this works right. // Hopefully this works right.
return globalSeqNum++; return globalSeqNum++;
@ -344,91 +344,91 @@ FullBetaCPU<Impl>::getAndIncrementInstSeq()
template <class Impl> template <class Impl>
uint64_t uint64_t
FullBetaCPU<Impl>::readIntReg(int reg_idx) FullO3CPU<Impl>::readIntReg(int reg_idx)
{ {
return regFile.readIntReg(reg_idx); return regFile.readIntReg(reg_idx);
} }
template <class Impl> template <class Impl>
float float
FullBetaCPU<Impl>::readFloatRegSingle(int reg_idx) FullO3CPU<Impl>::readFloatRegSingle(int reg_idx)
{ {
return regFile.readFloatRegSingle(reg_idx); return regFile.readFloatRegSingle(reg_idx);
} }
template <class Impl> template <class Impl>
double double
FullBetaCPU<Impl>::readFloatRegDouble(int reg_idx) FullO3CPU<Impl>::readFloatRegDouble(int reg_idx)
{ {
return regFile.readFloatRegDouble(reg_idx); return regFile.readFloatRegDouble(reg_idx);
} }
template <class Impl> template <class Impl>
uint64_t uint64_t
FullBetaCPU<Impl>::readFloatRegInt(int reg_idx) FullO3CPU<Impl>::readFloatRegInt(int reg_idx)
{ {
return regFile.readFloatRegInt(reg_idx); return regFile.readFloatRegInt(reg_idx);
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::setIntReg(int reg_idx, uint64_t val) FullO3CPU<Impl>::setIntReg(int reg_idx, uint64_t val)
{ {
regFile.setIntReg(reg_idx, val); regFile.setIntReg(reg_idx, val);
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::setFloatRegSingle(int reg_idx, float val) FullO3CPU<Impl>::setFloatRegSingle(int reg_idx, float val)
{ {
regFile.setFloatRegSingle(reg_idx, val); regFile.setFloatRegSingle(reg_idx, val);
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::setFloatRegDouble(int reg_idx, double val) FullO3CPU<Impl>::setFloatRegDouble(int reg_idx, double val)
{ {
regFile.setFloatRegDouble(reg_idx, val); regFile.setFloatRegDouble(reg_idx, val);
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::setFloatRegInt(int reg_idx, uint64_t val) FullO3CPU<Impl>::setFloatRegInt(int reg_idx, uint64_t val)
{ {
regFile.setFloatRegInt(reg_idx, val); regFile.setFloatRegInt(reg_idx, val);
} }
template <class Impl> template <class Impl>
uint64_t uint64_t
FullBetaCPU<Impl>::readPC() FullO3CPU<Impl>::readPC()
{ {
return regFile.readPC(); return regFile.readPC();
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::setNextPC(uint64_t val) FullO3CPU<Impl>::setNextPC(uint64_t val)
{ {
regFile.setNextPC(val); regFile.setNextPC(val);
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::setPC(Addr new_PC) FullO3CPU<Impl>::setPC(Addr new_PC)
{ {
regFile.setPC(new_PC); regFile.setPC(new_PC);
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::addInst(DynInstPtr &inst) FullO3CPU<Impl>::addInst(DynInstPtr &inst)
{ {
instList.push_back(inst); instList.push_back(inst);
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::instDone() FullO3CPU<Impl>::instDone()
{ {
// Keep an instruction count. // Keep an instruction count.
numInsts++; numInsts++;
@ -439,7 +439,7 @@ FullBetaCPU<Impl>::instDone()
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::removeBackInst(DynInstPtr &inst) FullO3CPU<Impl>::removeBackInst(DynInstPtr &inst)
{ {
DynInstPtr inst_to_delete; DynInstPtr inst_to_delete;
@ -465,7 +465,7 @@ FullBetaCPU<Impl>::removeBackInst(DynInstPtr &inst)
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::removeFrontInst(DynInstPtr &inst) FullO3CPU<Impl>::removeFrontInst(DynInstPtr &inst)
{ {
DynInstPtr inst_to_remove; DynInstPtr inst_to_remove;
@ -482,7 +482,7 @@ FullBetaCPU<Impl>::removeFrontInst(DynInstPtr &inst)
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::removeInstsNotInROB() FullO3CPU<Impl>::removeInstsNotInROB()
{ {
DPRINTF(FullCPU, "FullCPU: Deleting instructions from instruction " DPRINTF(FullCPU, "FullCPU: Deleting instructions from instruction "
"list.\n"); "list.\n");
@ -494,7 +494,7 @@ FullBetaCPU<Impl>::removeInstsNotInROB()
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::removeInstsUntil(const InstSeqNum &seq_num) FullO3CPU<Impl>::removeInstsUntil(const InstSeqNum &seq_num)
{ {
DPRINTF(FullCPU, "FullCPU: Deleting instructions from instruction " DPRINTF(FullCPU, "FullCPU: Deleting instructions from instruction "
"list.\n"); "list.\n");
@ -522,14 +522,14 @@ FullBetaCPU<Impl>::removeInstsUntil(const InstSeqNum &seq_num)
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::removeAllInsts() FullO3CPU<Impl>::removeAllInsts()
{ {
instList.clear(); instList.clear();
} }
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::dumpInsts() FullO3CPU<Impl>::dumpInsts()
{ {
int num = 0; int num = 0;
typename list<DynInstPtr>::iterator inst_list_it = instList.begin(); typename list<DynInstPtr>::iterator inst_list_it = instList.begin();
@ -546,10 +546,10 @@ FullBetaCPU<Impl>::dumpInsts()
template <class Impl> template <class Impl>
void void
FullBetaCPU<Impl>::wakeDependents(DynInstPtr &inst) FullO3CPU<Impl>::wakeDependents(DynInstPtr &inst)
{ {
iew.wakeDependents(inst); iew.wakeDependents(inst);
} }
// Forward declaration of FullBetaCPU. // Forward declaration of FullO3CPU.
template class FullBetaCPU<AlphaSimpleImpl>; template class FullO3CPU<AlphaSimpleImpl>;

14
cpu/o3/cpu.hh
View file

@ -33,8 +33,8 @@
//itself properly. Threads! //itself properly. Threads!
// Avoid running stages and advancing queues if idle/stalled. // Avoid running stages and advancing queues if idle/stalled.
#ifndef __CPU_BETA_CPU_FULL_CPU_HH__ #ifndef __CPU_O3_CPU_FULL_CPU_HH__
#define __CPU_BETA_CPU_FULL_CPU_HH__ #define __CPU_O3_CPU_FULL_CPU_HH__
#include <iostream> #include <iostream>
#include <list> #include <list>
@ -73,7 +73,7 @@ class BaseFullCPU : public BaseCPU
}; };
template <class Impl> template <class Impl>
class FullBetaCPU : public BaseFullCPU class FullO3CPU : public BaseFullCPU
{ {
public: public:
//Put typedefs from the Impl here. //Put typedefs from the Impl here.
@ -96,10 +96,10 @@ class FullBetaCPU : public BaseFullCPU
class TickEvent : public Event class TickEvent : public Event
{ {
private: private:
FullBetaCPU<Impl> *cpu; FullO3CPU<Impl> *cpu;
public: public:
TickEvent(FullBetaCPU<Impl> *c); TickEvent(FullO3CPU<Impl> *c);
void process(); void process();
const char *description(); const char *description();
}; };
@ -123,8 +123,8 @@ class FullBetaCPU : public BaseFullCPU
} }
public: public:
FullBetaCPU(Params &params); FullO3CPU(Params &params);
~FullBetaCPU(); ~FullO3CPU();
void fullCPURegStats(); void fullCPURegStats();

6
cpu/o3/cpu_policy.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_CPU_POLICY_HH__ #ifndef __CPU_O3_CPU_CPU_POLICY_HH__
#define __CPU_BETA_CPU_CPU_POLICY_HH__ #define __CPU_O3_CPU_CPU_POLICY_HH__
#include "cpu/o3/bpred_unit.hh" #include "cpu/o3/bpred_unit.hh"
#include "cpu/o3/free_list.hh" #include "cpu/o3/free_list.hh"
@ -85,4 +85,4 @@ struct SimpleCPUPolicy
}; };
#endif //__CPU_BETA_CPU_CPU_POLICY_HH__ #endif //__CPU_O3_CPU_CPU_POLICY_HH__

6
cpu/o3/decode.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_SIMPLE_DECODE_HH__ #ifndef __CPU_O3_CPU_SIMPLE_DECODE_HH__
#define __CPU_BETA_CPU_SIMPLE_DECODE_HH__ #define __CPU_O3_CPU_SIMPLE_DECODE_HH__
#include <queue> #include <queue>
@ -166,4 +166,4 @@ class SimpleDecode
Stats::Scalar<> decodeSquashedInsts; Stats::Scalar<> decodeSquashedInsts;
}; };
#endif // __CPU_BETA_CPU_SIMPLE_DECODE_HH__ #endif // __CPU_O3_CPU_SIMPLE_DECODE_HH__

6
cpu/o3/fetch.hh
View file

@ -29,8 +29,8 @@
// Todo: SMT fetch, // Todo: SMT fetch,
// Add a way to get a stage's current status. // Add a way to get a stage's current status.
#ifndef __CPU_BETA_CPU_SIMPLE_FETCH_HH__ #ifndef __CPU_O3_CPU_SIMPLE_FETCH_HH__
#define __CPU_BETA_CPU_SIMPLE_FETCH_HH__ #define __CPU_O3_CPU_SIMPLE_FETCH_HH__
#include "base/statistics.hh" #include "base/statistics.hh"
#include "base/timebuf.hh" #include "base/timebuf.hh"
@ -221,4 +221,4 @@ class SimpleFetch
Stats::Distribution<> fetch_nisn_dist; Stats::Distribution<> fetch_nisn_dist;
}; };
#endif //__CPU_BETA_CPU_SIMPLE_FETCH_HH__ #endif //__CPU_O3_CPU_SIMPLE_FETCH_HH__

6
cpu/o3/free_list.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_FREE_LIST_HH__ #ifndef __CPU_O3_CPU_FREE_LIST_HH__
#define __CPU_BETA_CPU_FREE_LIST_HH__ #define __CPU_O3_CPU_FREE_LIST_HH__
#include <iostream> #include <iostream>
#include <queue> #include <queue>
@ -192,4 +192,4 @@ SimpleFreeList::addFloatReg(PhysRegIndex freed_reg)
freeFloatRegs.push(freed_reg); freeFloatRegs.push(freed_reg);
} }
#endif // __CPU_BETA_CPU_FREE_LIST_HH__ #endif // __CPU_O3_CPU_FREE_LIST_HH__

6
cpu/o3/iew.hh
View file

@ -30,8 +30,8 @@
//Need to handle delaying writes to the writeback bus if it's full at the //Need to handle delaying writes to the writeback bus if it's full at the
//given time. //given time.
#ifndef __CPU_BETA_CPU_SIMPLE_IEW_HH__ #ifndef __CPU_O3_CPU_SIMPLE_IEW_HH__
#define __CPU_BETA_CPU_SIMPLE_IEW_HH__ #define __CPU_O3_CPU_SIMPLE_IEW_HH__
#include <queue> #include <queue>
@ -236,4 +236,4 @@ class SimpleIEW
Stats::Scalar<> predictedTakenIncorrect; Stats::Scalar<> predictedTakenIncorrect;
}; };
#endif // __CPU_BETA_CPU_IEW_HH__ #endif // __CPU_O3_CPU_IEW_HH__

6
cpu/o3/inst_queue.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_INST_QUEUE_HH__ #ifndef __CPU_O3_CPU_INST_QUEUE_HH__
#define __CPU_BETA_CPU_INST_QUEUE_HH__ #define __CPU_O3_CPU_INST_QUEUE_HH__
#include <list> #include <list>
#include <map> #include <map>
@ -333,4 +333,4 @@ class InstructionQueue
}; };
#endif //__CPU_BETA_CPU_INST_QUEUE_HH__ #endif //__CPU_O3_CPU_INST_QUEUE_HH__

6
cpu/o3/mem_dep_unit.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_MEM_DEP_UNIT_HH__ #ifndef __CPU_O3_CPU_MEM_DEP_UNIT_HH__
#define __CPU_BETA_CPU_MEM_DEP_UNIT_HH__ #define __CPU_O3_CPU_MEM_DEP_UNIT_HH__
#include <map> #include <map>
#include <set> #include <set>
@ -161,4 +161,4 @@ class MemDepUnit {
Stats::Scalar<> conflictingStores; Stats::Scalar<> conflictingStores;
}; };
#endif // __CPU_BETA_CPU_MEM_DEP_UNIT_HH__ #endif // __CPU_O3_CPU_MEM_DEP_UNIT_HH__

6
cpu/o3/ras.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_RAS_HH__ #ifndef __CPU_O3_CPU_RAS_HH__
#define __CPU_BETA_CPU_RAS_HH__ #define __CPU_O3_CPU_RAS_HH__
// For Addr type. // For Addr type.
#include "arch/alpha/isa_traits.hh" #include "arch/alpha/isa_traits.hh"
@ -65,4 +65,4 @@ class ReturnAddrStack
unsigned tos; unsigned tos;
}; };
#endif // __CPU_BETA_CPU_RAS_HH__ #endif // __CPU_O3_CPU_RAS_HH__

6
cpu/o3/regfile.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_REGFILE_HH__ #ifndef __CPU_O3_CPU_REGFILE_HH__
#define __CPU_BETA_CPU_REGFILE_HH__ #define __CPU_O3_CPU_REGFILE_HH__
// @todo: Destructor // @todo: Destructor
@ -631,4 +631,4 @@ PhysRegFile<Impl>::setIpr(int idx, uint64_t val)
#endif // #ifdef FULL_SYSTEM #endif // #ifdef FULL_SYSTEM
#endif // __CPU_BETA_CPU_REGFILE_HH__ #endif // __CPU_O3_CPU_REGFILE_HH__

6
cpu/o3/rename.hh
View file

@ -31,8 +31,8 @@
// May want to have different statuses to differentiate the different stall // May want to have different statuses to differentiate the different stall
// conditions. // conditions.
#ifndef __CPU_BETA_CPU_SIMPLE_RENAME_HH__ #ifndef __CPU_O3_CPU_SIMPLE_RENAME_HH__
#define __CPU_BETA_CPU_SIMPLE_RENAME_HH__ #define __CPU_O3_CPU_SIMPLE_RENAME_HH__
#include <list> #include <list>
@ -231,4 +231,4 @@ class SimpleRename
Stats::Scalar<> renameValidUndoneMaps; Stats::Scalar<> renameValidUndoneMaps;
}; };
#endif // __CPU_BETA_CPU_SIMPLE_RENAME_HH__ #endif // __CPU_O3_CPU_SIMPLE_RENAME_HH__

6
cpu/o3/rename_map.hh
View file

@ -30,8 +30,8 @@
// Have it so that there's a more meaningful name given to the variable // Have it so that there's a more meaningful name given to the variable
// that marks the beginning of the FP registers. // that marks the beginning of the FP registers.
#ifndef __CPU_BETA_CPU_RENAME_MAP_HH__ #ifndef __CPU_O3_CPU_RENAME_MAP_HH__
#define __CPU_BETA_CPU_RENAME_MAP_HH__ #define __CPU_O3_CPU_RENAME_MAP_HH__
#include <iostream> #include <iostream>
#include <utility> #include <utility>
@ -167,4 +167,4 @@ class SimpleRenameMap
std::vector<bool> miscScoreboard; std::vector<bool> miscScoreboard;
}; };
#endif //__CPU_BETA_CPU_RENAME_MAP_HH__ #endif //__CPU_O3_CPU_RENAME_MAP_HH__

27
cpu/o3/rob.cc
View file

@ -1,3 +1,30 @@
/*
* 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.
*/
#include "cpu/o3/alpha_dyn_inst.hh" #include "cpu/o3/alpha_dyn_inst.hh"
#include "cpu/o3/alpha_impl.hh" #include "cpu/o3/alpha_impl.hh"

6
cpu/o3/rob.hh
View file

@ -32,8 +32,8 @@
// all instructions after the instruction, and all instructions after *and* // all instructions after the instruction, and all instructions after *and*
// including that instruction. // including that instruction.
#ifndef __CPU_BETA_CPU_ROB_HH__ #ifndef __CPU_O3_CPU_ROB_HH__
#define __CPU_BETA_CPU_ROB_HH__ #define __CPU_O3_CPU_ROB_HH__
#include <utility> #include <utility>
#include <vector> #include <vector>
@ -159,4 +159,4 @@ class ROB
bool doneSquashing; bool doneSquashing;
}; };
#endif //__CPU_BETA_CPU_ROB_HH__ #endif //__CPU_O3_CPU_ROB_HH__

6
cpu/o3/rob_impl.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_ROB_IMPL_HH__ #ifndef __CPU_O3_CPU_ROB_IMPL_HH__
#define __CPU_BETA_CPU_ROB_IMPL_HH__ #define __CPU_O3_CPU_ROB_IMPL_HH__
#include "cpu/o3/rob.hh" #include "cpu/o3/rob.hh"
@ -308,4 +308,4 @@ ROB<Impl>::readTailSeqNum()
return (*tail)->seqNum; return (*tail)->seqNum;
} }
#endif // __CPU_BETA_CPU_ROB_IMPL_HH__ #endif // __CPU_O3_CPU_ROB_IMPL_HH__

6
cpu/o3/sat_counter.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_SAT_COUNTER_HH__ #ifndef __CPU_O3_CPU_SAT_COUNTER_HH__
#define __CPU_BETA_CPU_SAT_COUNTER_HH__ #define __CPU_O3_CPU_SAT_COUNTER_HH__
#include "sim/host.hh" #include "sim/host.hh"
@ -87,4 +87,4 @@ class SatCounter
uint8_t counter; uint8_t counter;
}; };
#endif // __CPU_BETA_CPU_SAT_COUNTER_HH__ #endif // __CPU_O3_CPU_SAT_COUNTER_HH__

6
cpu/o3/store_set.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_STORE_SET_HH__ #ifndef __CPU_O3_CPU_STORE_SET_HH__
#define __CPU_BETA_CPU_STORE_SET_HH__ #define __CPU_O3_CPU_STORE_SET_HH__
#include <vector> #include <vector>
@ -83,4 +83,4 @@ class StoreSet
int offset_bits; int offset_bits;
}; };
#endif // __CPU_BETA_CPU_STORE_SET_HH__ #endif // __CPU_O3_CPU_STORE_SET_HH__

6
cpu/o3/tournament_pred.hh
View file

@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifndef __CPU_BETA_CPU_TOURNAMENT_PRED_HH__ #ifndef __CPU_O3_CPU_TOURNAMENT_PRED_HH__
#define __CPU_BETA_CPU_TOURNAMENT_PRED_HH__ #define __CPU_O3_CPU_TOURNAMENT_PRED_HH__
// For Addr type. // For Addr type.
#include "arch/alpha/isa_traits.hh" #include "arch/alpha/isa_traits.hh"
@ -140,4 +140,4 @@ class TournamentBP
unsigned threshold; unsigned threshold;
}; };
#endif // __CPU_BETA_CPU_TOURNAMENT_PRED_HH__ #endif // __CPU_O3_CPU_TOURNAMENT_PRED_HH__

1
docs/footer.html
View file

@ -1,6 +1,5 @@
<hr size="1"><address style="align: right;"><small> <hr size="1"><address style="align: right;"><small>
Generated on $datetime for $projectname by <a href="http://www.doxygen.org/index.html"> doxygen</a> $doxygenversion</small></address> Generated on $datetime for $projectname by <a href="http://www.doxygen.org/index.html"> doxygen</a> $doxygenversion</small></address>
<address><a href="mailto:m5-dev@eecs.umich.edu">M5 Development Team</a></address>
</body> </body>
</html> </html>