summaryrefslogtreecommitdiff
path: root/src/cpu/base.cc
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2016-04-06 19:43:31 +0100
committerAndreas Sandberg <andreas.sandberg@arm.com>2016-04-06 19:43:31 +0100
commitbe28d96510e0e722db83b26f1a12d3f5de979b32 (patch)
tree6a7e1807397f002f51fddb34568b89250fca45c8 /src/cpu/base.cc
parent8615b27174ae06db4665016c877b1e88031af203 (diff)
downloadgem5-be28d96510e0e722db83b26f1a12d3f5de979b32.tar.xz
Revert power patch sets with unexpected interactions
The following patches had unexpected interactions with the current upstream code and have been reverted for now: e07fd01651f3: power: Add support for power models 831c7f2f9e39: power: Low-power idle power state for idle CPUs 4f749e00b667: power: Add power states to ClockedObject Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com> --HG-- extra : amend_source : 0b6fb073c6bbc24be533ec431eb51fbf1b269508
Diffstat (limited to 'src/cpu/base.cc')
-rw-r--r--src/cpu/base.cc27
1 files changed, 0 insertions, 27 deletions
diff --git a/src/cpu/base.cc b/src/cpu/base.cc
index 0f9fe49ea..624843f42 100644
--- a/src/cpu/base.cc
+++ b/src/cpu/base.cc
@@ -64,7 +64,6 @@
#include "debug/SyscallVerbose.hh"
#include "mem/page_table.hh"
#include "params/BaseCPU.hh"
-#include "sim/clocked_object.hh"
#include "sim/full_system.hh"
#include "sim/process.hh"
#include "sim/sim_events.hh"
@@ -356,11 +355,6 @@ BaseCPU::startup()
if (params()->progress_interval) {
new CPUProgressEvent(this, params()->progress_interval);
}
-
- // Assumption CPU start to operate instantaneously without any latency
- if (ClockedObject::pwrState() == Enums::PwrState::UNDEFINED)
- ClockedObject::pwrState(Enums::PwrState::ON);
-
}
ProbePoints::PMUUPtr
@@ -479,27 +473,6 @@ BaseCPU::findContext(ThreadContext *tc)
}
void
-BaseCPU::activateContext(ThreadID thread_num)
-{
- // For any active thread running, update CPU power state to active (ON)
- ClockedObject::pwrState(Enums::PwrState::ON);
-}
-
-void
-BaseCPU::suspendContext(ThreadID thread_num)
-{
- // Check if all threads are suspended
- for (auto t : threadContexts) {
- if (t->status() != ThreadContext::Suspended) {
- return;
- }
- }
-
- // All CPU threads suspended, enter lower power state for the CPU
- ClockedObject::pwrState(Enums::PwrState::CLK_GATED);
-}
-
-void
BaseCPU::switchOut()
{
assert(!_switchedOut);