Currently the O3 and Ozone CPUs do not work in the new memory system; I still need to fix up the ports to work and handle responses properly. This check-in is so that the merge between m5 and newmem is no longer outstanding.
src/SConscript:
Need to include FU Pool for new CPU model. I'll try to figure out a cleaner way to handle this in the future.
src/base/traceflags.py:
Include new traces flags, fix up merge mess up.
src/cpu/SConscript:
Include the base_dyn_inst.cc as one of othe sources.
Don't compile the Ozone CPU for now.
src/cpu/base.cc:
Remove an extra } from the merge.
src/cpu/base_dyn_inst.cc:
Fixes to make compiling work. Don't instantiate the OzoneCPU for now.
src/cpu/base_dyn_inst.hh:
src/cpu/o3/2bit_local_pred.cc:
src/cpu/o3/alpha_cpu_builder.cc:
src/cpu/o3/alpha_cpu_impl.hh:
src/cpu/o3/alpha_dyn_inst.hh:
src/cpu/o3/alpha_params.hh:
src/cpu/o3/bpred_unit.cc:
src/cpu/o3/btb.hh:
src/cpu/o3/commit.hh:
src/cpu/o3/commit_impl.hh:
src/cpu/o3/cpu.cc:
src/cpu/o3/cpu.hh:
src/cpu/o3/fetch.hh:
src/cpu/o3/fetch_impl.hh:
src/cpu/o3/free_list.hh:
src/cpu/o3/iew.hh:
src/cpu/o3/iew_impl.hh:
src/cpu/o3/inst_queue.hh:
src/cpu/o3/inst_queue_impl.hh:
src/cpu/o3/regfile.hh:
src/cpu/o3/sat_counter.hh:
src/cpu/op_class.hh:
src/cpu/ozone/cpu.hh:
src/cpu/checker/cpu.cc:
src/cpu/checker/cpu.hh:
src/cpu/checker/exec_context.hh:
src/cpu/checker/o3_cpu_builder.cc:
src/cpu/ozone/cpu_impl.hh:
src/mem/request.hh:
src/cpu/o3/fu_pool.hh:
src/cpu/o3/lsq.hh:
src/cpu/o3/lsq_unit.hh:
src/cpu/o3/lsq_unit_impl.hh:
src/cpu/o3/thread_state.hh:
src/cpu/ozone/back_end.hh:
src/cpu/ozone/dyn_inst.cc:
src/cpu/ozone/dyn_inst.hh:
src/cpu/ozone/front_end.hh:
src/cpu/ozone/inorder_back_end.hh:
src/cpu/ozone/lw_back_end.hh:
src/cpu/ozone/lw_lsq.hh:
src/cpu/ozone/ozone_impl.hh:
src/cpu/ozone/thread_state.hh:
Fixes to get compiling to work.
src/cpu/o3/alpha_cpu.hh:
Fixes to get compiling to work.
Float reg accessors have changed, as well as MemReqPtrs to RequestPtrs.
src/cpu/o3/alpha_dyn_inst_impl.hh:
Fixes to get compiling to work.
Pass in the packet to the completeAcc function.
Fix up syscall function.
--HG--
rename : cpu/activity.cc => src/cpu/activity.cc
rename : cpu/activity.hh => src/cpu/activity.hh
rename : cpu/checker/cpu.cc => src/cpu/checker/cpu.cc
rename : cpu/checker/cpu.hh => src/cpu/checker/cpu.hh
rename : cpu/checker/cpu_builder.cc => src/cpu/checker/cpu_builder.cc
rename : cpu/checker/exec_context.hh => src/cpu/checker/exec_context.hh
rename : cpu/checker/o3_cpu_builder.cc => src/cpu/checker/o3_cpu_builder.cc
rename : cpu/o3/dep_graph.hh => src/cpu/o3/dep_graph.hh
rename : cpu/o3/fu_pool.cc => src/cpu/o3/fu_pool.cc
rename : cpu/o3/fu_pool.hh => src/cpu/o3/fu_pool.hh
rename : cpu/o3/lsq.cc => src/cpu/o3/lsq.cc
rename : cpu/o3/lsq.hh => src/cpu/o3/lsq.hh
rename : cpu/o3/lsq_impl.hh => src/cpu/o3/lsq_impl.hh
rename : cpu/o3/lsq_unit.cc => src/cpu/o3/lsq_unit.cc
rename : cpu/o3/lsq_unit.hh => src/cpu/o3/lsq_unit.hh
rename : cpu/o3/lsq_unit_impl.hh => src/cpu/o3/lsq_unit_impl.hh
rename : cpu/o3/scoreboard.cc => src/cpu/o3/scoreboard.cc
rename : cpu/o3/scoreboard.hh => src/cpu/o3/scoreboard.hh
rename : cpu/o3/thread_state.hh => src/cpu/o3/thread_state.hh
rename : cpu/ozone/back_end.cc => src/cpu/ozone/back_end.cc
rename : cpu/ozone/back_end.hh => src/cpu/ozone/back_end.hh
rename : cpu/ozone/back_end_impl.hh => src/cpu/ozone/back_end_impl.hh
rename : cpu/ozone/cpu_builder.cc => src/cpu/ozone/cpu_builder.cc
rename : cpu/ozone/dyn_inst.cc => src/cpu/ozone/dyn_inst.cc
rename : cpu/ozone/dyn_inst.hh => src/cpu/ozone/dyn_inst.hh
rename : cpu/ozone/dyn_inst_impl.hh => src/cpu/ozone/dyn_inst_impl.hh
rename : cpu/ozone/front_end.cc => src/cpu/ozone/front_end.cc
rename : cpu/ozone/front_end.hh => src/cpu/ozone/front_end.hh
rename : cpu/ozone/front_end_impl.hh => src/cpu/ozone/front_end_impl.hh
rename : cpu/ozone/inorder_back_end.cc => src/cpu/ozone/inorder_back_end.cc
rename : cpu/ozone/inorder_back_end.hh => src/cpu/ozone/inorder_back_end.hh
rename : cpu/ozone/inorder_back_end_impl.hh => src/cpu/ozone/inorder_back_end_impl.hh
rename : cpu/ozone/inst_queue.cc => src/cpu/ozone/inst_queue.cc
rename : cpu/ozone/inst_queue.hh => src/cpu/ozone/inst_queue.hh
rename : cpu/ozone/inst_queue_impl.hh => src/cpu/ozone/inst_queue_impl.hh
rename : cpu/ozone/lsq_unit.cc => src/cpu/ozone/lsq_unit.cc
rename : cpu/ozone/lsq_unit.hh => src/cpu/ozone/lsq_unit.hh
rename : cpu/ozone/lsq_unit_impl.hh => src/cpu/ozone/lsq_unit_impl.hh
rename : cpu/ozone/lw_back_end.cc => src/cpu/ozone/lw_back_end.cc
rename : cpu/ozone/lw_back_end.hh => src/cpu/ozone/lw_back_end.hh
rename : cpu/ozone/lw_back_end_impl.hh => src/cpu/ozone/lw_back_end_impl.hh
rename : cpu/ozone/lw_lsq.cc => src/cpu/ozone/lw_lsq.cc
rename : cpu/ozone/lw_lsq.hh => src/cpu/ozone/lw_lsq.hh
rename : cpu/ozone/lw_lsq_impl.hh => src/cpu/ozone/lw_lsq_impl.hh
rename : cpu/ozone/null_predictor.hh => src/cpu/ozone/null_predictor.hh
rename : cpu/ozone/ozone_impl.hh => src/cpu/ozone/ozone_impl.hh
rename : cpu/ozone/rename_table.cc => src/cpu/ozone/rename_table.cc
rename : cpu/ozone/rename_table.hh => src/cpu/ozone/rename_table.hh
rename : cpu/ozone/rename_table_impl.hh => src/cpu/ozone/rename_table_impl.hh
rename : cpu/ozone/simple_impl.hh => src/cpu/ozone/simple_impl.hh
rename : cpu/ozone/simple_params.hh => src/cpu/ozone/simple_params.hh
rename : cpu/ozone/thread_state.hh => src/cpu/ozone/thread_state.hh
rename : cpu/quiesce_event.cc => src/cpu/quiesce_event.cc
rename : cpu/quiesce_event.hh => src/cpu/quiesce_event.hh
rename : cpu/thread_state.hh => src/cpu/thread_state.hh
rename : python/m5/objects/FUPool.py => src/python/m5/objects/FUPool.py
rename : python/m5/objects/OzoneCPU.py => src/python/m5/objects/OzoneCPU.py
rename : python/m5/objects/SimpleOzoneCPU.py => src/python/m5/objects/SimpleOzoneCPU.py
extra : convert_revision : ca7f0fbf65ee1a70d482fb4eda9a1840c7f9b8f8
214 lines
4.9 KiB
C++
214 lines
4.9 KiB
C++
|
|
#ifndef __CPU_O3_DEP_GRAPH_HH__
|
|
#define __CPU_O3_DEP_GRAPH_HH__
|
|
|
|
#include "cpu/o3/comm.hh"
|
|
|
|
template <class DynInstPtr>
|
|
class DependencyEntry
|
|
{
|
|
public:
|
|
DependencyEntry()
|
|
: inst(NULL), next(NULL)
|
|
{ }
|
|
|
|
DynInstPtr inst;
|
|
//Might want to include data about what arch. register the
|
|
//dependence is waiting on.
|
|
DependencyEntry<DynInstPtr> *next;
|
|
};
|
|
|
|
template <class DynInstPtr>
|
|
class DependencyGraph
|
|
{
|
|
public:
|
|
typedef DependencyEntry<DynInstPtr> DepEntry;
|
|
|
|
DependencyGraph()
|
|
: numEntries(0), memAllocCounter(0), nodesTraversed(0), nodesRemoved(0)
|
|
{ }
|
|
|
|
void resize(int num_entries);
|
|
|
|
void reset();
|
|
|
|
void insert(PhysRegIndex idx, DynInstPtr &new_inst);
|
|
|
|
void setInst(PhysRegIndex idx, DynInstPtr &new_inst)
|
|
{ dependGraph[idx].inst = new_inst; }
|
|
|
|
void clearInst(PhysRegIndex idx)
|
|
{ dependGraph[idx].inst = NULL; }
|
|
|
|
void remove(PhysRegIndex idx, DynInstPtr &inst_to_remove);
|
|
|
|
DynInstPtr pop(PhysRegIndex idx);
|
|
|
|
bool empty(PhysRegIndex idx) { return !dependGraph[idx].next; }
|
|
|
|
/** Debugging function to dump out the dependency graph.
|
|
*/
|
|
void dump();
|
|
|
|
private:
|
|
/** Array of linked lists. Each linked list is a list of all the
|
|
* instructions that depend upon a given register. The actual
|
|
* register's index is used to index into the graph; ie all
|
|
* instructions in flight that are dependent upon r34 will be
|
|
* in the linked list of dependGraph[34].
|
|
*/
|
|
DepEntry *dependGraph;
|
|
|
|
int numEntries;
|
|
|
|
// Debug variable, remove when done testing.
|
|
unsigned memAllocCounter;
|
|
|
|
public:
|
|
uint64_t nodesTraversed;
|
|
uint64_t nodesRemoved;
|
|
};
|
|
|
|
template <class DynInstPtr>
|
|
void
|
|
DependencyGraph<DynInstPtr>::resize(int num_entries)
|
|
{
|
|
numEntries = num_entries;
|
|
dependGraph = new DepEntry[numEntries];
|
|
}
|
|
|
|
template <class DynInstPtr>
|
|
void
|
|
DependencyGraph<DynInstPtr>::reset()
|
|
{
|
|
// Clear the dependency graph
|
|
DepEntry *curr;
|
|
DepEntry *prev;
|
|
|
|
for (int i = 0; i < numEntries; ++i) {
|
|
curr = dependGraph[i].next;
|
|
|
|
while (curr) {
|
|
memAllocCounter--;
|
|
|
|
prev = curr;
|
|
curr = prev->next;
|
|
prev->inst = NULL;
|
|
|
|
delete prev;
|
|
}
|
|
|
|
if (dependGraph[i].inst) {
|
|
dependGraph[i].inst = NULL;
|
|
}
|
|
|
|
dependGraph[i].next = NULL;
|
|
}
|
|
}
|
|
|
|
template <class DynInstPtr>
|
|
void
|
|
DependencyGraph<DynInstPtr>::insert(PhysRegIndex idx, DynInstPtr &new_inst)
|
|
{
|
|
//Add this new, dependent instruction at the head of the dependency
|
|
//chain.
|
|
|
|
// First create the entry that will be added to the head of the
|
|
// dependency chain.
|
|
DepEntry *new_entry = new DepEntry;
|
|
new_entry->next = dependGraph[idx].next;
|
|
new_entry->inst = new_inst;
|
|
|
|
// Then actually add it to the chain.
|
|
dependGraph[idx].next = new_entry;
|
|
|
|
++memAllocCounter;
|
|
}
|
|
|
|
|
|
template <class DynInstPtr>
|
|
void
|
|
DependencyGraph<DynInstPtr>::remove(PhysRegIndex idx,
|
|
DynInstPtr &inst_to_remove)
|
|
{
|
|
DepEntry *prev = &dependGraph[idx];
|
|
DepEntry *curr = dependGraph[idx].next;
|
|
|
|
// Make sure curr isn't NULL. Because this instruction is being
|
|
// removed from a dependency list, it must have been placed there at
|
|
// an earlier time. The dependency chain should not be empty,
|
|
// unless the instruction dependent upon it is already ready.
|
|
if (curr == NULL) {
|
|
return;
|
|
}
|
|
|
|
nodesRemoved++;
|
|
|
|
// Find the instruction to remove within the dependency linked list.
|
|
while (curr->inst != inst_to_remove) {
|
|
prev = curr;
|
|
curr = curr->next;
|
|
nodesTraversed++;
|
|
|
|
assert(curr != NULL);
|
|
}
|
|
|
|
// Now remove this instruction from the list.
|
|
prev->next = curr->next;
|
|
|
|
--memAllocCounter;
|
|
|
|
// Could push this off to the destructor of DependencyEntry
|
|
curr->inst = NULL;
|
|
|
|
delete curr;
|
|
}
|
|
|
|
template <class DynInstPtr>
|
|
DynInstPtr
|
|
DependencyGraph<DynInstPtr>::pop(PhysRegIndex idx)
|
|
{
|
|
DepEntry *node;
|
|
node = dependGraph[idx].next;
|
|
DynInstPtr inst = NULL;
|
|
if (node) {
|
|
inst = node->inst;
|
|
dependGraph[idx].next = node->next;
|
|
node->inst = NULL;
|
|
memAllocCounter--;
|
|
delete node;
|
|
}
|
|
return inst;
|
|
}
|
|
|
|
template <class DynInstPtr>
|
|
void
|
|
DependencyGraph<DynInstPtr>::dump()
|
|
{
|
|
DepEntry *curr;
|
|
|
|
for (int i = 0; i < numEntries; ++i)
|
|
{
|
|
curr = &dependGraph[i];
|
|
|
|
if (curr->inst) {
|
|
cprintf("dependGraph[%i]: producer: %#x [sn:%lli] consumer: ",
|
|
i, curr->inst->readPC(), curr->inst->seqNum);
|
|
} else {
|
|
cprintf("dependGraph[%i]: No producer. consumer: ", i);
|
|
}
|
|
|
|
while (curr->next != NULL) {
|
|
curr = curr->next;
|
|
|
|
cprintf("%#x [sn:%lli] ",
|
|
curr->inst->readPC(), curr->inst->seqNum);
|
|
}
|
|
|
|
cprintf("\n");
|
|
}
|
|
cprintf("memAllocCounter: %i\n", memAllocCounter);
|
|
}
|
|
|
|
#endif // __CPU_O3_DEP_GRAPH_HH__
|