From patchwork Thu Sep 27 17:15:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 187441 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 246E62C00AC for ; Fri, 28 Sep 2012 04:22:10 +1000 (EST) Received: from localhost ([::1]:35660 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THHhj-0000jh-Gd for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 13:16:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THHh2-00079X-C7 for qemu-devel@nongnu.org; Thu, 27 Sep 2012 13:16:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THHgw-000257-HY for qemu-devel@nongnu.org; Thu, 27 Sep 2012 13:16:08 -0400 Received: from hall.aurel32.net ([88.191.126.93]:41363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THHgw-0001ym-Bo for qemu-devel@nongnu.org; Thu, 27 Sep 2012 13:16:02 -0400 Received: from [37.160.60.195] (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 1THHgn-00056k-MH; Thu, 27 Sep 2012 19:15:54 +0200 Received: from aurel32 by ohm.aurel32.net with local (Exim 4.80) (envelope-from ) id 1THHgC-0004pu-D8; Thu, 27 Sep 2012 19:15:16 +0200 From: Aurelien Jarno To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 19:15:10 +0200 Message-Id: <1348766113-18373-11-git-send-email-aurelien@aurel32.net> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1348766113-18373-1-git-send-email-aurelien@aurel32.net> References: <1348766113-18373-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 10/13] tcg: don't explicitely 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. Signed-off-by: Aurelien Jarno --- tcg/tcg.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tcg/tcg.c b/tcg/tcg.c index 9e12be8..2f973e8 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1601,8 +1601,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 @@ -1629,7 +1635,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 } } @@ -1706,11 +1718,9 @@ static void tcg_reg_alloc_mov(TCGContext *s, const TCGOpDef *def, if (!ots->mem_allocated) { temp_allocate_frame(s, args[0]); } - if (ts->val_type == TEMP_VAL_REG) { - tcg_out_st(s, ots->type, ts->reg, ots->mem_reg, ots->mem_offset); - if (IS_DEAD_ARG(1)) { - temp_dead(s, args[1]); - } + tcg_out_st(s, ots->type, ts->reg, ots->mem_reg, ots->mem_offset); + if (IS_DEAD_ARG(1)) { + temp_dead(s, args[1]); } temp_dead(s, args[0]); } else if (ts->val_type == TEMP_VAL_CONST) {