From patchwork Fri Oct 19 21:38:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 192862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 253D62C0040 for ; Sat, 20 Oct 2012 09:39:31 +1100 (EST) Received: from localhost ([::1]:34209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPKKU-0002LC-KK for incoming@patchwork.ozlabs.org; Fri, 19 Oct 2012 17:42:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPKHz-0005pM-Q0 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 17:39:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPKHt-0005TH-EP for qemu-devel@nongnu.org; Fri, 19 Oct 2012 17:39:31 -0400 Received: from hall.aurel32.net ([88.191.126.93]:41848) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPKHt-0005Sf-3l for qemu-devel@nongnu.org; Fri, 19 Oct 2012 17:39:25 -0400 Received: from watt.aurel32.net ([82.228.202.134] helo=ohm.aurel32.net) by hall.aurel32.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1TPKHr-0004ky-Pg; Fri, 19 Oct 2012 23:39:23 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1TPKHp-0008Kj-9X; Fri, 19 Oct 2012 23:39:21 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Fri, 19 Oct 2012 23:38:59 +0200 Message-Id: <1350682755-31635-11-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350682755-31635-1-git-send-email-aurelien@aurel32.net> References: <1350682755-31635-1-git-send-email-aurelien@aurel32.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 88.191.126.93 Cc: Aurelien Jarno Subject: [Qemu-devel] [PATCH v3 10/26] tcg: don't explicitly save globals and temps X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The liveness analysis ensures that globals and temps are at the correct state at a basic block end or with an op with side effects. Avoid looping on all temps, this can be time consuming on targets with a lot of globals. Keep an assert in debug mode. Reviewed-by: Richard Henderson Signed-off-by: Aurelien Jarno --- tcg/tcg.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tcg/tcg.c b/tcg/tcg.c index 8333667..840e252 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1648,8 +1648,14 @@ static inline void temp_sync(TCGContext *s, int temp, TCGRegSet allocated_regs) temporary registers needs to be allocated to store a constant. */ static inline void temp_save(TCGContext *s, int temp, TCGRegSet allocated_regs) { +#ifdef USE_LIVENESS_ANALYSIS + /* The liveness analysis already ensures that globals are back + in memory. Keep an assert for safety. */ + assert(s->temps[temp].val_type == TEMP_VAL_MEM || s->temps[temp].fixed_reg); +#else temp_sync(s, temp, allocated_regs); temp_dead(s, temp); +#endif } /* save globals to their canonical location and assume they can be @@ -1676,7 +1682,13 @@ static void tcg_reg_alloc_bb_end(TCGContext *s, TCGRegSet allocated_regs) if (ts->temp_local) { temp_save(s, i, allocated_regs); } else { +#ifdef USE_LIVENESS_ANALYSIS + /* The liveness analysis already ensures that temps are dead. + Keep an assert for safety. */ + assert(ts->val_type == TEMP_VAL_DEAD); +#else temp_dead(s, i); +#endif } }