From patchwork Sat May 24 15:53:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 352136 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 31B131400A8 for ; Sun, 25 May 2014 02:05:21 +1000 (EST) Received: from localhost ([::1]:48555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoERi-0002Xx-Gz for incoming@patchwork.ozlabs.org; Sat, 24 May 2014 12:05:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoEHd-0003sO-Vd for qemu-devel@nongnu.org; Sat, 24 May 2014 11:54:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WoEHX-0001Vf-Uj for qemu-devel@nongnu.org; Sat, 24 May 2014 11:54:53 -0400 Received: from mail-pa0-x229.google.com ([2607:f8b0:400e:c03::229]:36275) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WoEHX-0001TJ-Lg for qemu-devel@nongnu.org; Sat, 24 May 2014 11:54:47 -0400 Received: by mail-pa0-f41.google.com with SMTP id lj1so5527903pab.0 for ; Sat, 24 May 2014 08:54:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=sboUXlZi5tvSoeQnVWxe5CLKnsSaK/SYIyflFWn8lZc=; b=Ew4AIhN7f454p/4AVH3/cihuI8GzIv5goZ60MrcBfM5mrbWD+OuR7BFa+d3Fi2nqLV Tk+gNnDOCtj6uw1HQNciyefsh9oiKitnuCNkPVJkepk8zR3nbM/kudXD6Hl95rB3rGPk qiFdzW13XcsBI2DYe9ZqOEjzcbQsh7ZTpddx3UpMEmfchNDq7KlIqDV+WiG4+4H2hP1d nUSi/veiSbu5xy28B5GS0RiYgysJhDa+auruasBbFRM6IgEk9WYPFVqo9xRoPpDMAezg xPxvC+siBthRjUtM1awwdBvcQ69Bi9cG0Q0IUHMxrlIlu1DAUWkPLiDPRNCUkyxrUDq1 qdtg== X-Received: by 10.66.243.225 with SMTP id xb1mr15031568pac.49.1400946886307; Sat, 24 May 2014 08:54:46 -0700 (PDT) Received: from pike.twiddle.home (50-194-63-110-static.hfc.comcastbusiness.net. [50.194.63.110]) by mx.google.com with ESMTPSA id ie9sm30663048pad.29.2014.05.24.08.54.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 May 2014 08:54:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 24 May 2014 08:53:59 -0700 Message-Id: <1400946841-21079-23-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1400946841-21079-1-git-send-email-rth@twiddle.net> References: <1400946841-21079-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::229 Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PULL 22/24] tcg-mips: Simplify brcond2 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 Emitting a single branch instead of (up to) 3, using setcond2 to generate the composite compare. Reviewed-by: Paolo Bonzini Signed-off-by: Richard Henderson --- tcg/mips/tcg-target.c | 77 +++++++++++++-------------------------------------- 1 file changed, 20 insertions(+), 57 deletions(-) diff --git a/tcg/mips/tcg-target.c b/tcg/mips/tcg-target.c index ccf262b..0e5ecf4 100644 --- a/tcg/mips/tcg-target.c +++ b/tcg/mips/tcg-target.c @@ -764,70 +764,33 @@ static void tcg_out_setcond2(TCGContext *s, TCGCond cond, TCGReg ret, } } -/* XXX: we implement it at the target level to avoid having to - handle cross basic blocks temporaries */ -static void tcg_out_brcond2(TCGContext *s, TCGCond cond, TCGArg arg1, - TCGArg arg2, TCGArg arg3, TCGArg arg4, - int label_index) +static void tcg_out_brcond2(TCGContext *s, TCGCond cond, TCGReg al, TCGReg ah, + TCGReg bl, TCGReg bh, int label_index) { - tcg_insn_unit *label_ptr; + TCGCond b_cond = TCG_COND_NE; + TCGReg tmp = TCG_TMP1; - switch(cond) { - case TCG_COND_NE: - tcg_out_brcond(s, TCG_COND_NE, arg2, arg4, label_index); - tcg_out_brcond(s, TCG_COND_NE, arg1, arg3, label_index); - return; - case TCG_COND_EQ: - break; - case TCG_COND_LT: - case TCG_COND_LE: - tcg_out_brcond(s, TCG_COND_LT, arg2, arg4, label_index); - break; - case TCG_COND_GT: - case TCG_COND_GE: - tcg_out_brcond(s, TCG_COND_GT, arg2, arg4, label_index); - break; - case TCG_COND_LTU: - case TCG_COND_LEU: - tcg_out_brcond(s, TCG_COND_LTU, arg2, arg4, label_index); - break; - case TCG_COND_GTU: - case TCG_COND_GEU: - tcg_out_brcond(s, TCG_COND_GTU, arg2, arg4, label_index); + /* With branches, we emit between 4 and 9 insns with 2 or 3 branches. + With setcond, we emit between 3 and 10 insns and only 1 branch, + which ought to get better branch prediction. */ + switch (cond) { + case TCG_COND_EQ: + case TCG_COND_NE: + b_cond = cond; + tmp = tcg_out_reduce_eq2(s, TCG_TMP0, TCG_TMP1, al, ah, bl, bh); break; - default: - tcg_abort(); - } - - label_ptr = s->code_ptr; - tcg_out_opc_br(s, OPC_BNE, arg2, arg4); - tcg_out_nop(s); - switch(cond) { - case TCG_COND_EQ: - tcg_out_brcond(s, TCG_COND_EQ, arg1, arg3, label_index); - break; - case TCG_COND_LT: - case TCG_COND_LTU: - tcg_out_brcond(s, TCG_COND_LTU, arg1, arg3, label_index); - break; - case TCG_COND_LE: - case TCG_COND_LEU: - tcg_out_brcond(s, TCG_COND_LEU, arg1, arg3, label_index); - break; - case TCG_COND_GT: - case TCG_COND_GTU: - tcg_out_brcond(s, TCG_COND_GTU, arg1, arg3, label_index); - break; - case TCG_COND_GE: - case TCG_COND_GEU: - tcg_out_brcond(s, TCG_COND_GEU, arg1, arg3, label_index); - break; default: - tcg_abort(); + /* Minimize code size by prefering a compare not requiring INV. */ + if (mips_cmp_map[cond] & MIPS_CMP_INV) { + cond = tcg_invert_cond(cond); + b_cond = TCG_COND_EQ; + } + tcg_out_setcond2(s, cond, tmp, al, ah, bl, bh); + break; } - reloc_pc16(label_ptr, s->code_ptr); + tcg_out_brcond(s, b_cond, tmp, TCG_REG_ZERO, label_index); } static void tcg_out_movcond(TCGContext *s, TCGCond cond, TCGReg ret,