summaryrefslogtreecommitdiff
path: root/src/cpu/o3
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2019-05-02 15:33:32 -0700
committerGabe Black <gabeblack@google.com>2019-05-18 10:20:20 +0000
commit972c38b1cc5f6f6c649a0e9923695447bc5d6255 (patch)
treeba3ca960ad12e37c38d8d17ff53b267fd5511688 /src/cpu/o3
parente2656006df442a995bf80ee03fa9700d6ec14537 (diff)
downloadgem5-972c38b1cc5f6f6c649a0e9923695447bc5d6255.tar.xz
arch, base, cpu, dev, mem, sim: Remove #if 0-ed out code.
This code will be preserved through version control, but otherwise creates clutter and will rot in place since it's never compiled. Change-Id: Id265f6deac445116843956ea5cf1210d8127274e Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18608 Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Reviewed-by: Brandon Potter <Brandon.Potter@amd.com> Maintainer: Jason Lowe-Power <jason@lowepower.com> Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/cpu/o3')
-rw-r--r--src/cpu/o3/cpu.cc5
-rw-r--r--src/cpu/o3/fetch_impl.hh6
-rw-r--r--src/cpu/o3/inst_queue_impl.hh29
3 files changed, 0 insertions, 40 deletions
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index 50de81b2a..f2e0f60b7 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -351,11 +351,6 @@ FullO3CPU<Impl>::FullO3CPU(DerivO3CPUParams *params)
commit.setROB(&rob);
lastActivatedCycle = 0;
-#if 0
- // Give renameMap & rename stage access to the freeList;
- for (ThreadID tid = 0; tid < numThreads; tid++)
- globalSeqNum[tid] = 1;
-#endif
DPRINTF(O3CPU, "Creating O3CPU object.\n");
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 8ef3b6ac1..f0a97e429 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -1587,12 +1587,6 @@ template<class Impl>
ThreadID
DefaultFetch<Impl>::branchCount()
{
-#if 0
- list<ThreadID>::iterator thread = activeThreads->begin();
- assert(thread != activeThreads->end());
- ThreadID tid = *thread;
-#endif
-
panic("Branch Count Fetch policy unimplemented\n");
return InvalidThreadID;
}
diff --git a/src/cpu/o3/inst_queue_impl.hh b/src/cpu/o3/inst_queue_impl.hh
index 4a5262fd6..20b41e51d 100644
--- a/src/cpu/o3/inst_queue_impl.hh
+++ b/src/cpu/o3/inst_queue_impl.hh
@@ -1481,36 +1481,7 @@ template <class Impl>
int
InstructionQueue<Impl>::countInsts()
{
-#if 0
- //ksewell:This works but definitely could use a cleaner write
- //with a more intuitive way of counting. Right now it's
- //just brute force ....
- // Change the #if if you want to use this method.
- int total_insts = 0;
-
- for (ThreadID tid = 0; tid < numThreads; ++tid) {
- ListIt count_it = instList[tid].begin();
-
- while (count_it != instList[tid].end()) {
- if (!(*count_it)->isSquashed() && !(*count_it)->isSquashedInIQ()) {
- if (!(*count_it)->isIssued()) {
- ++total_insts;
- } else if ((*count_it)->isMemRef() &&
- !(*count_it)->memOpDone) {
- // Loads that have not been marked as executed still count
- // towards the total instructions.
- ++total_insts;
- }
- }
-
- ++count_it;
- }
- }
-
- return total_insts;
-#else
return numEntries - freeEntries;
-#endif
}
template <class Impl>