From patchwork Tue Oct 25 19:03:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 686661 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 3t3NJP2NRPz9s9x for ; Wed, 26 Oct 2016 06:19:49 +1100 (AEDT) Received: from localhost ([::1]:57690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz7GE-0002K9-PA for incoming@patchwork.ozlabs.org; Tue, 25 Oct 2016 15:19:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz717-0006HG-PT for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:04:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bz716-00087D-AY for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:04:09 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:59715) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bz715-00086I-WA for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:04:08 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101) with ESMTPSA (Nemesis) id 0MYNd3-1cTgjO0lZx-00V8He; Tue, 25 Oct 2016 21:03:43 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 25 Oct 2016 21:03:18 +0200 Message-Id: <1477422199-11208-23-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477422199-11208-1-git-send-email-laurent@vivier.eu> References: <1477422199-11208-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:3sWxxtJMjRsjIDQYQGsydEkZkDji92B9P8//vD+3bAeVtrqKqWw cWlSw342e3HiSfLFDwG+f9cHRvc187dx420P6BFzp4b7rqxEBQSXfwL7TwCFCIdquNTtF68 yOGlYX21Va8JxDEhBXPjy2IWBdbgbBOJ1r8pAyko3M5VvcCJnazw6Qu8Unfe4+Nww8gdE7n Mxpbfn/UDcSUOikozq+SQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:akpuQUZe2s0=:IEq+BbcewFIp1KC6cAP//5 0FK4It+6D2OXRk4TZE+RJ9p/iZrGEWzDEaWUCMYBzPZvsU/6ZHOwQEBdr4dNkoPqiRN4VXkjJ 5Roobv+aCG1GuB1UdwLacbbgRupl8UhaGJrqZ5v+j1IJa7KXDqMJLEaa3Jh63lFqe6Yio93Du 0mb1SZFPGi6PVHK+aRHQKBcvx8MX8nb0IJ0g4fATaxwSgQIK6H9vqAtwFvKtoGHoE5HvG5OIS k51iwxt4vCxsPGE7Dm+GwvUq6MneWI0X0vKf5iZiFUqK5/IbVI72OHstvo9N8BHZ1C9lDZ/FY Vi3TggfOMANMVluErtpxGSpvT+EhVY/1TgotEdG0+qMlzyWv7krsT3Jy3bY6nGFMOcHGHyfmz HKapqg+DcNM51hiX7jVV6v/KRXDCE0IS5nxwbNPYQANl1enU13fCbEKGU5yjAQEjRqL0ObApn +i892maAfE83dYpbJCXXWbBAwLRADKQa8tAd5+0NrGUpRFq0316FAmqLVBmF4YW4DJleuo9Cq 3RPAnjUq9Em6ZyT+X5Jhx2oVgiM1AaoWKpFRQwIyXcrQoDtk+C44UgXPE9c7k/H6v0psnTRes cahHixp9US+7ZD9UKfHtW1fxnjIcboGw/EFwCcq2hSF0aQnCXLhE8Xroc983/Fyq9n8qfK613 WlHuyQUcKzthLY0UUipb88adj/FTDbfJkab8tpkqudcDz8yYDhJ0I/ejfmDmc4LZedas= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 22/23] target-m68k: Optimize some comparisons X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , gerg@uclinux.org, schwab@linux-m68k.org, agraf@suse.de, Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson [laurent: fixed VC and VS: assign v1, not v2] Signed-off-by: Laurent Vivier --- target-m68k/translate.c | 109 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 103 insertions(+), 6 deletions(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 5cc5e14..52aa800 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -771,10 +771,43 @@ static void gen_cc_cond(DisasCompare *c, DisasContext *s, int cond) { TCGv tmp, tmp2; TCGCond tcond; + CCOp op = s->cc_op; - /* TODO: Optimize compare/branch pairs rather than always flushing - flag state to CC_OP_FLAGS. */ - gen_flush_flags(s); + /* The CC_OP_CMP form can handle most normal comparisons directly. */ + if (op == CC_OP_CMP) { + c->g1 = c->g2 = 1; + c->v1 = QREG_CC_N; + c->v2 = QREG_CC_V; + switch (cond) { + case 2: /* HI */ + case 3: /* LS */ + tcond = TCG_COND_LEU; + goto done; + case 4: /* CC */ + case 5: /* CS */ + tcond = TCG_COND_LTU; + goto done; + case 6: /* NE */ + case 7: /* EQ */ + tcond = TCG_COND_EQ; + goto done; + case 10: /* PL */ + case 11: /* MI */ + c->g1 = c->g2 = 0; + c->v2 = tcg_const_i32(0); + c->v1 = tmp = tcg_temp_new(); + tcg_gen_sub_i32(tmp, QREG_CC_N, QREG_CC_V); + /* fallthru */ + case 12: /* GE */ + case 13: /* LT */ + tcond = TCG_COND_LT; + goto done; + case 14: /* GT */ + case 15: /* LE */ + tcond = TCG_COND_LE; + goto done; + } + } c->g1 = 1; c->g2 = 0; @@ -785,7 +818,72 @@ static void gen_cc_cond(DisasCompare *c, DisasContext *s, int cond) case 1: /* F */ c->v1 = c->v2; tcond = TCG_COND_NEVER; + goto done; + case 14: /* GT (!(Z || (N ^ V))) */ + case 15: /* LE (Z || (N ^ V)) */ + /* Logic operations clear V, which simplifies LE to (Z || N), + and since Z and N are co-located, this becomes a normal + comparison vs N. */ + if (op == CC_OP_LOGIC) { + c->v1 = QREG_CC_N; + tcond = TCG_COND_LE; + goto done; + } + break; + case 12: /* GE (!(N ^ V)) */ + case 13: /* LT (N ^ V) */ + /* Logic operations clear V, which simplifies this to N. */ + if (op != CC_OP_LOGIC) { + break; + } + /* fallthru */ + case 10: /* PL (!N) */ + case 11: /* MI (N) */ + /* Several cases represent N normally. */ + if (op == CC_OP_ADD || op == CC_OP_SUB || op == CC_OP_LOGIC) { + c->v1 = QREG_CC_N; + tcond = TCG_COND_LT; + goto done; + } + break; + case 6: /* NE (!Z) */ + case 7: /* EQ (Z) */ + /* Some cases fold Z into N. */ + if (op == CC_OP_ADD || op == CC_OP_SUB || op == CC_OP_LOGIC) { + tcond = TCG_COND_EQ; + c->v1 = QREG_CC_N; + goto done; + } break; + case 4: /* CC (!C) */ + case 5: /* CS (C) */ + /* Some cases fold C into X. */ + if (op == CC_OP_ADD || op == CC_OP_SUB) { + tcond = TCG_COND_NE; + c->v1 = QREG_CC_X; + goto done; + } + /* fallthru */ + case 8: /* VC (!V) */ + case 9: /* VS (V) */ + /* Logic operations clear V and C. */ + if (op == CC_OP_LOGIC) { + tcond = TCG_COND_NEVER; + c->v1 = c->v2; + goto done; + } + break; + } + + /* Otherwise, flush flag state to CC_OP_FLAGS. */ + gen_flush_flags(s); + + switch (cond) { + case 0: /* T */ + case 1: /* F */ + default: + /* Invalid, or handled above. */ + abort(); case 2: /* HI (!C && !Z) -> !(C || Z)*/ case 3: /* LS (C || Z) */ c->v1 = tmp = tcg_temp_new(); @@ -833,10 +931,9 @@ static void gen_cc_cond(DisasCompare *c, DisasContext *s, int cond) tcg_temp_free(tmp2); tcond = TCG_COND_LT; break; - default: - /* Should ever happen. */ - abort(); } + + done: if ((cond & 1) == 0) { tcond = tcg_invert_cond(tcond); }