From 10650fc5257c2351e95292747ad6099cea9dfb1f Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Thu, 27 Jun 2013 05:49:49 -0400 Subject: cpu: Consider instructions waiting for FU completion in draining This patch changes the IEW drain check to include the FU pool as there can be instructions that are "stored" in FU completion events and thus not covered by the existing checks. With this patch, we simply include a check to see if all the FUs are considered non-busy in the next tick. Without this patch, the pc-switcheroo-full regression fails after minor changes to the cache timing (aligning to clock edge). --- src/cpu/o3/iew_impl.hh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/cpu/o3/iew_impl.hh') diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh index 5bd5f6ae9..5d18789c3 100644 --- a/src/cpu/o3/iew_impl.hh +++ b/src/cpu/o3/iew_impl.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2012 ARM Limited + * Copyright (c) 2010-2013 ARM Limited * All rights reserved. * * The license below extends only to copyright in the software and shall @@ -376,6 +376,14 @@ DefaultIEW::isDrained() const } } + // Also check the FU pool as instructions are "stored" in FU + // completion events until they are done and not accounted for + // above + if (drained && !fuPool->isDrained()) { + DPRINTF(Drain, "FU pool still busy.\n"); + drained = false; + } + return drained; } @@ -387,7 +395,6 @@ DefaultIEW::drainSanityCheck() const instQueue.drainSanityCheck(); ldstQueue.drainSanityCheck(); - fuPool->drainSanityCheck(); } template -- cgit v1.2.3