diff options
| author | Nikos Nikoleris <nikos.nikoleris@arm.com> | 2017-10-09 13:57:49 +0100 |
|---|---|---|
| committer | Nikos Nikoleris <nikos.nikoleris@arm.com> | 2017-11-21 13:54:35 +0000 |
| commit | d3ec34201c14d551e864372a89ccddb1c255e77a (patch) | |
| tree | 89bc694a57a35a5bdf9d4e33f5530c4dd6ee95bf | |
| parent | 2ec997fb73eab01229909f0c91f7ff5456f7250a (diff) | |
| download | gem5-d3ec34201c14d551e864372a89ccddb1c255e77a.tar.xz | |
cpu-o3: Prevent cpu from suspending if it is already draining
Suspending the current thread context while draining due to a quiesce
pseudo instruction (for example a wfi instruction) could deadlock the
cpu and prevent it from successfully draining. This change ensures
that the cpu is not draining before suspending the thread context.
Change-Id: I7c019847f5a870d4bc9ce2b19936bc3dc45e5fd7
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/5881
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
| -rwxr-xr-x | src/cpu/o3/thread_context_impl.hh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/cpu/o3/thread_context_impl.hh b/src/cpu/o3/thread_context_impl.hh index fdaa35134..d9f84fb52 100755 --- a/src/cpu/o3/thread_context_impl.hh +++ b/src/cpu/o3/thread_context_impl.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012, 2016 ARM Limited + * Copyright (c) 2010-2012, 2016-2017 ARM Limited * Copyright (c) 2013 Advanced Micro Devices, Inc. * All rights reserved * @@ -109,6 +109,11 @@ O3ThreadContext<Impl>::suspend() if (thread->status() == ThreadContext::Suspended) return; + if (cpu->isDraining()) { + DPRINTF(O3CPU, "Ignoring suspend on TC due to pending drain\n"); + return; + } + thread->lastActivate = curTick(); thread->lastSuspend = curTick(); |