diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2019-06-28 10:04:43 +0100 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2019-07-16 13:16:42 +0000 |
| commit | 34e77161fb42847797338ffe95674f248798ab43 (patch) | |
| tree | f9d097e30ed18bc358eb7f8c647eaefc590d6341 /src/cpu/simple | |
| parent | 9af53ddaec43653d915649173660dc5c71f06a72 (diff) | |
| download | gem5-34e77161fb42847797338ffe95674f248798ab43.tar.xz | |
cpu: isDrained renamed to isCpuDrained
cpu models inheriting from BaseCPU implement a draining checker called
isDrained. This hides the base Drainable::isDrained method and might
create confusion in the reader.
This patch is renaming it to isCpuDrained in order to avoid any
ambiguity
Change-Id: Ie5221da6a4673432c2403996e42d451cae960bbf
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19468
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src/cpu/simple')
| -rw-r--r-- | src/cpu/simple/atomic.cc | 6 | ||||
| -rw-r--r-- | src/cpu/simple/atomic.hh | 2 | ||||
| -rw-r--r-- | src/cpu/simple/timing.cc | 4 | ||||
| -rw-r--r-- | src/cpu/simple/timing.hh | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc index 5fc1d69a9..aa2b64112 100644 --- a/src/cpu/simple/atomic.cc +++ b/src/cpu/simple/atomic.cc @@ -112,7 +112,7 @@ AtomicSimpleCPU::drain() if (switchedOut()) return DrainState::Drained; - if (!isDrained()) { + if (!isCpuDrained()) { DPRINTF(Drain, "Requesting drain.\n"); return DrainState::Draining; } else { @@ -183,7 +183,7 @@ AtomicSimpleCPU::tryCompleteDrain() return false; DPRINTF(Drain, "tryCompleteDrain.\n"); - if (!isDrained()) + if (!isCpuDrained()) return false; DPRINTF(Drain, "CPU done draining, processing drain event\n"); @@ -200,7 +200,7 @@ AtomicSimpleCPU::switchOut() assert(!tickEvent.scheduled()); assert(_status == BaseSimpleCPU::Running || _status == Idle); - assert(isDrained()); + assert(isCpuDrained()); } diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh index 100306981..ba52bc933 100644 --- a/src/cpu/simple/atomic.hh +++ b/src/cpu/simple/atomic.hh @@ -88,7 +88,7 @@ class AtomicSimpleCPU : public BaseSimpleCPU * <li>Stay at PC is true. * </ul> */ - bool isDrained() { + bool isCpuDrained() const { SimpleExecContext &t_info = *threadInfo[curThread]; return t_info.thread->microPC() == 0 && diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc index 454259099..4aa008e33 100644 --- a/src/cpu/simple/timing.cc +++ b/src/cpu/simple/timing.cc @@ -100,7 +100,7 @@ TimingSimpleCPU::drain() return DrainState::Drained; if (_status == Idle || - (_status == BaseSimpleCPU::Running && isDrained())) { + (_status == BaseSimpleCPU::Running && isCpuDrained())) { DPRINTF(Drain, "No need to drain.\n"); activeThreads.clear(); return DrainState::Drained; @@ -161,7 +161,7 @@ TimingSimpleCPU::tryCompleteDrain() return false; DPRINTF(Drain, "tryCompleteDrain.\n"); - if (!isDrained()) + if (!isCpuDrained()) return false; DPRINTF(Drain, "CPU done draining, processing drain event\n"); diff --git a/src/cpu/simple/timing.hh b/src/cpu/simple/timing.hh index a49822fc1..e423ae8e2 100644 --- a/src/cpu/simple/timing.hh +++ b/src/cpu/simple/timing.hh @@ -350,7 +350,7 @@ class TimingSimpleCPU : public BaseSimpleCPU * activated it can happen. * </ul> */ - bool isDrained() { + bool isCpuDrained() const { SimpleExecContext& t_info = *threadInfo[curThread]; SimpleThread* thread = t_info.thread; |