From patchwork Thu Jun 9 10:45:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Batuzov X-Patchwork-Id: 99724 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 725C8B6F9C for ; Thu, 9 Jun 2011 20:58:21 +1000 (EST) Received: from localhost ([::1]:37421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUcwM-00085U-7H for incoming@patchwork.ozlabs.org; Thu, 09 Jun 2011 06:58:18 -0400 Received: from eggs.gnu.org ([140.186.70.92]:47182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUckf-0005eQ-AK for qemu-devel@nongnu.org; Thu, 09 Jun 2011 06:46:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QUckd-0008CR-OM for qemu-devel@nongnu.org; Thu, 09 Jun 2011 06:46:12 -0400 Received: from smtp.ispras.ru ([83.149.198.202]:52094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QUckc-0008AW-Pn for qemu-devel@nongnu.org; Thu, 09 Jun 2011 06:46:11 -0400 Received: from ispserv.ispras.ru (ispserv.ispras.ru [83.149.198.72]) by smtp.ispras.ru (Postfix) with ESMTP id 8426B5D4144; Thu, 9 Jun 2011 14:41:04 +0400 (MSD) Received: from bulbul.intra.ispras.ru (winnie.ispras.ru [83.149.198.236]) by ispserv.ispras.ru (Postfix) with ESMTP id 6A08D3FC5D; Thu, 9 Jun 2011 14:45:58 +0400 (MSD) From: Kirill Batuzov To: qemu-devel@nongnu.org Date: Thu, 9 Jun 2011 14:45:42 +0400 Message-Id: <1307616344-27161-5-git-send-email-batuzovk@ispras.ru> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1307616344-27161-1-git-send-email-batuzovk@ispras.ru> References: <1307616344-27161-1-git-send-email-batuzovk@ispras.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 83.149.198.202 Cc: zhur@ispras.ru Subject: [Qemu-devel] [PATCH v2 4/6] Do constant folding for boolean operations. 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 Perform constant folding for AND, OR, XOR operations. Signed-off-by: Kirill Batuzov --- tcg/optimize.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 29da6fa..0bd8c78 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -92,12 +92,18 @@ static int op_bits(int op) case INDEX_op_add_i32: case INDEX_op_sub_i32: case INDEX_op_mul_i32: + case INDEX_op_and_i32: + case INDEX_op_or_i32: + case INDEX_op_xor_i32: return 32; #if TCG_TARGET_REG_BITS == 64 case INDEX_op_mov_i64: case INDEX_op_add_i64: case INDEX_op_sub_i64: case INDEX_op_mul_i64: + case INDEX_op_and_i64: + case INDEX_op_or_i64: + case INDEX_op_xor_i64: return 64; #endif default: @@ -153,6 +159,24 @@ static TCGArg do_constant_folding_2(int op, TCGArg x, TCGArg y) #endif return x * y; + case INDEX_op_and_i32: +#if TCG_TARGET_REG_BITS == 64 + case INDEX_op_and_i64: +#endif + return x & y; + + case INDEX_op_or_i32: +#if TCG_TARGET_REG_BITS == 64 + case INDEX_op_or_i64: +#endif + return x | y; + + case INDEX_op_xor_i32: +#if TCG_TARGET_REG_BITS == 64 + case INDEX_op_xor_i64: +#endif + return x ^ y; + default: fprintf(stderr, "Unrecognized operation %d in do_constant_folding.\n", op); @@ -272,6 +296,32 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, continue; } break; + case INDEX_op_or_i32: + case INDEX_op_and_i32: +#if TCG_TARGET_REG_BITS == 64 + case INDEX_op_and_i64: + case INDEX_op_or_i64: +#endif + if (args[1] == args[2]) { + if (args[1] == args[0]) { + args += 3; + gen_opc_buf[op_index] = INDEX_op_nop; + } else { + reset_temp(temps, args[0], nb_temps, nb_globals); + if (args[1] >= s->nb_globals) { + temps[args[0]].state = TCG_TEMP_COPY; + temps[args[0]].val = args[1]; + assert(temps[args[0]].num_copies == 0); + } + gen_opc_buf[op_index] = op_to_mov(op); + gen_args[0] = args[0]; + gen_args[1] = args[1]; + gen_args += 2; + args += 3; + } + continue; + } + break; } /* Propagate constants through copy operations and do constant @@ -321,10 +371,16 @@ static TCGArg *tcg_constant_folding(TCGContext *s, uint16_t *tcg_opc_ptr, gen_args += 2; args += 2; break; + case INDEX_op_or_i32: + case INDEX_op_and_i32: + case INDEX_op_xor_i32: case INDEX_op_add_i32: case INDEX_op_sub_i32: case INDEX_op_mul_i32: #if TCG_TARGET_REG_BITS == 64 + case INDEX_op_and_i64: + case INDEX_op_or_i64: + case INDEX_op_xor_i64: case INDEX_op_add_i64: case INDEX_op_sub_i64: case INDEX_op_mul_i64: