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>
This commit is contained in:
Nikos Nikoleris
2017-10-09 13:57:49 +01:00
parent 2ec997fb73
commit d3ec34201c

View File

@@ -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();