From patchwork Tue Nov 10 10:53:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuseppe Musacchio X-Patchwork-Id: 11893827 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B6E7697 for ; Tue, 10 Nov 2020 10:57:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EC8402076E for ; Tue, 10 Nov 2020 10:57:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mguOGh1S" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EC8402076E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRKs-0007JT-Qk for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 05:57:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRJB-0005E4-AO; Tue, 10 Nov 2020 05:55:29 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54681) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRJ9-00076v-KB; Tue, 10 Nov 2020 05:55:29 -0500 Received: by mail-wm1-x343.google.com with SMTP id d142so2538949wmd.4; Tue, 10 Nov 2020 02:55:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4K3U1NewmUjwvna+a3l1Z82sMILfAkInSo7TJ3mQ3Sw=; b=mguOGh1SWxZqFHxC6z+CQSImAPJEqfAbpzxMgZhNw8p4epQ32yyongPmbTYrwA3sRM EV+bd0lfAsl1tm/Y9D+CnQcWoUo7nnz3DhA+Yxl5EjDgdUWeE1cZ6AVMYGcZALn4aqTH eREZIlCNhhQQ+sxRzANYdkPvhITQxWHKWNxlSf1xRc2dF0Sl9o+GIlySphdnmZLq7VzW YUX2BWUZBBtOhUDo/Wk05NoJ4wxwAQp8qFxrRxsI+kSnu2qNlsBgqoFqbGbxqdQwu2li +GH0Fs5RsEPyJQ7ByjKsSS9HW1NKG9E5v80NjYm2txyR5UNoJ72zy42Yz9nN6toOe/Fr Ic4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4K3U1NewmUjwvna+a3l1Z82sMILfAkInSo7TJ3mQ3Sw=; b=DxavgXYIoj0ukjf/Pmao5VhEmB6F3mB8ly6foPIs6+Gm3mi6qyuqjR5Twpjt3GqwHZ 4wNOoRIFUL29n0Qqw/rbtJH9wam+hP5tb9k7J9r8gw7RmJGdHhozmkzRyKKCY9dnnKCx ag5jRHPFKjDDd+TbF5rpi0u5qseaszKEKYyCcKtDbWct5UfJgKadWAF3awDBpOugP2Bm DjGYTp8wA+k77e4VcC1zxfatJagmZwSjayv9w45u6oGIb3wYUq/66FhSNiW9taOQ/sTB XKMzMF+BVdBNuJkxtCPmtMrz6nlYs8ArjB4f1mrG1IJJr4pWk0b3376GaWpc+oOfNjA0 69yw== X-Gm-Message-State: AOAM5329AVa5IYnW/K3b30ZFZKJKs56YQZhYg50Lo+f07XQRn3swRTPl s/tVor+Gmc4/PLzGtsGpeoBuivo+7MABXw== X-Google-Smtp-Source: ABdhPJw8hG6ApJNMCk1njgOp5SLqEMq2D5qpFyW2e95wHWx7fV9gwXt33kFQDTtEXxp4z0erfhoRCw== X-Received: by 2002:a7b:c77a:: with SMTP id x26mr587252wmk.63.1605005725661; Tue, 10 Nov 2020 02:55:25 -0800 (PST) Received: from localhost.localdomain ([151.33.227.77]) by smtp.gmail.com with ESMTPSA id x6sm2567891wmc.48.2020.11.10.02.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:55:24 -0800 (PST) From: LemonBoy To: qemu-devel@nongnu.org Subject: [PATCH v2 1/4] ppc/translate: Fix unordered f64/f128 comparisons Date: Tue, 10 Nov 2020 11:53:18 +0100 Message-Id: <20201110105321.25889-2-thatlemon@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201110105321.25889-1-thatlemon@gmail.com> References: <20201110105321.25889-1-thatlemon@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::343; envelope-from=thatlemon@gmail.com; helo=mail-wm1-x343.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LemonBoy , richard.henderson@linaro.org, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" According to the PowerISA v3.1 reference, Table 68 "Actions for xscmpudp - Part 1: Compare Unordered", whenever one of the two operands is a NaN the SO bit is set while the other three bits are cleared. Apply the same change to xscmpuqp. The respective ordered counterparts are unaffected. Signed-off-by: Giuseppe Musacchio --- target/ppc/fpu_helper.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index 9b8c8b70b6..b07ff66375 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -2479,13 +2479,11 @@ void helper_##op(CPUPPCState *env, uint32_t opcode, \ if (float64_is_signaling_nan(xa->VsrD(0), &env->fp_status) || \ float64_is_signaling_nan(xb->VsrD(0), &env->fp_status)) { \ vxsnan_flag = true; \ - cc = CRF_SO; \ if (fpscr_ve == 0 && ordered) { \ vxvc_flag = true; \ } \ } else if (float64_is_quiet_nan(xa->VsrD(0), &env->fp_status) || \ float64_is_quiet_nan(xb->VsrD(0), &env->fp_status)) { \ - cc = CRF_SO; \ if (ordered) { \ vxvc_flag = true; \ } \ @@ -2497,12 +2495,19 @@ void helper_##op(CPUPPCState *env, uint32_t opcode, \ float_invalid_op_vxvc(env, 0, GETPC()); \ } \ \ - if (float64_lt(xa->VsrD(0), xb->VsrD(0), &env->fp_status)) { \ + switch (float64_compare(xa->VsrD(0), xb->VsrD(0), &env->fp_status)) {\ + case float_relation_less: \ cc |= CRF_LT; \ - } else if (!float64_le(xa->VsrD(0), xb->VsrD(0), &env->fp_status)) { \ - cc |= CRF_GT; \ - } else { \ + break; \ + case float_relation_equal: \ cc |= CRF_EQ; \ + break; \ + case float_relation_greater: \ + cc |= CRF_GT; \ + break; \ + case float_relation_unordered: \ + cc |= CRF_SO; \ + break; \ } \ \ env->fpscr &= ~FP_FPCC; \ @@ -2545,12 +2550,19 @@ void helper_##op(CPUPPCState *env, uint32_t opcode, \ float_invalid_op_vxvc(env, 0, GETPC()); \ } \ \ - if (float128_lt(xa->f128, xb->f128, &env->fp_status)) { \ + switch (float128_compare(xa->f128, xb->f128, &env->fp_status)) { \ + case float_relation_less: \ cc |= CRF_LT; \ - } else if (!float128_le(xa->f128, xb->f128, &env->fp_status)) { \ - cc |= CRF_GT; \ - } else { \ + break; \ + case float_relation_equal: \ cc |= CRF_EQ; \ + break; \ + case float_relation_greater: \ + cc |= CRF_GT; \ + break; \ + case float_relation_unordered: \ + cc |= CRF_SO; \ + break; \ } \ \ env->fpscr &= ~FP_FPCC; \ From patchwork Tue Nov 10 10:53:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuseppe Musacchio X-Patchwork-Id: 11893831 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02D55697 for ; Tue, 10 Nov 2020 10:59:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8F91B206F1 for ; Tue, 10 Nov 2020 10:59:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VO7olcL3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F91B206F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRMf-0001Jx-98 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 05:59:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRJD-0005IZ-61; Tue, 10 Nov 2020 05:55:31 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:39055) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRJA-00077S-VZ; Tue, 10 Nov 2020 05:55:30 -0500 Received: by mail-wm1-x342.google.com with SMTP id s13so2542621wmh.4; Tue, 10 Nov 2020 02:55:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4mDJE2ZKgDk5LfxW8ALd7hpN+PQvRWr/geM6EPNC0uM=; b=VO7olcL39DoBxfcIZLaihPTqQlVZAF7y1ZXJd3GBkoCoDJpPNjdgO14418XRv9dKxQ jyIO36F9PIPmHqE6P5DxynbK9UGrwT0ppNJyS4xouQ//AOdRz5EVb1rfs6pQk7S3/9lu FRB0jDu3vxvBnhOvDx3IgR+sb7sjo6sszkwAXU4g/OI5M8d43MlXGM8Zjk/8gfmHj1H2 q2PdB7Cji0I6IEA3u+KLROY7t+JSr0y73uTflnMXTU7qm7DACiAeaZiaI5dmuA8p138U UJpp7mrBprnV3T+HnQRkKFzxHStNPSj3pPUgYkovRGWypaL9ygl/BQHSkS0bvJUjjR1X OU+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4mDJE2ZKgDk5LfxW8ALd7hpN+PQvRWr/geM6EPNC0uM=; b=IU9LXNP69f5BiH624oGKXlchGq4ZncqcOezXdM5hPySflFkXx3+zfQR2ct5Vby3RhH vR+iin+feiBxv8GjJXBXp6/WCCsk4knmjnzixRaxQdFq6KuKhsxSWty24D8pDWtMFn8N PUl5DAbXBV1SRAy1Oj+84pQrwYw6S/GEnE5rzoQC9jPPXFPbegg2j2wkxjigPN4PU3pJ Zc4P1e09C4C5rk4kKRfv5+EQTT6Y0FBzjYe75suL/2rcs6k8gntA3s+aUougOHM6CA+V N374Kl4QyhkZ2oqxJg+MbekhQuig0u50C2QuchwUb8PSWsy6y03S+jw03pPR0jHtxuJX 6MOw== X-Gm-Message-State: AOAM5305+HAllftoWmsFhLub+iGUVcuRe2NBXGJFyeL8PmTsfGN1e+i3 xoN8NAwV/1yADVAEHK+TPBG73V6z3IkcUw== X-Google-Smtp-Source: ABdhPJwLSEsGQPG7DCrnJ0cq60wnxOb4rCYjY/ilPiBTXsGHtgL/4L7GhzFsSi5iPQ/2HGcRiHImcQ== X-Received: by 2002:a1c:4d4:: with SMTP id 203mr4173614wme.153.1605005726900; Tue, 10 Nov 2020 02:55:26 -0800 (PST) Received: from localhost.localdomain ([151.33.227.77]) by smtp.gmail.com with ESMTPSA id x6sm2567891wmc.48.2020.11.10.02.55.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:55:26 -0800 (PST) From: LemonBoy To: qemu-devel@nongnu.org Subject: [PATCH v2 2/4] ppc/translate: Turn the helper macros into functions Date: Tue, 10 Nov 2020 11:53:19 +0100 Message-Id: <20201110105321.25889-3-thatlemon@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201110105321.25889-1-thatlemon@gmail.com> References: <20201110105321.25889-1-thatlemon@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=thatlemon@gmail.com; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LemonBoy , richard.henderson@linaro.org, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Suggested-by: Richard Henderson Signed-off-by: Giuseppe Musacchio Reviewed-by: Richard Henderson --- target/ppc/fpu_helper.c | 220 +++++++++++++++++++++------------------- 1 file changed, 118 insertions(+), 102 deletions(-) diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index b07ff66375..c74c080c17 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -2467,113 +2467,129 @@ void helper_xscmpexpqp(CPUPPCState *env, uint32_t opcode, do_float_check_status(env, GETPC()); } -#define VSX_SCALAR_CMP(op, ordered) \ -void helper_##op(CPUPPCState *env, uint32_t opcode, \ - ppc_vsr_t *xa, ppc_vsr_t *xb) \ -{ \ - uint32_t cc = 0; \ - bool vxsnan_flag = false, vxvc_flag = false; \ - \ - helper_reset_fpstatus(env); \ - \ - if (float64_is_signaling_nan(xa->VsrD(0), &env->fp_status) || \ - float64_is_signaling_nan(xb->VsrD(0), &env->fp_status)) { \ - vxsnan_flag = true; \ - if (fpscr_ve == 0 && ordered) { \ - vxvc_flag = true; \ - } \ - } else if (float64_is_quiet_nan(xa->VsrD(0), &env->fp_status) || \ - float64_is_quiet_nan(xb->VsrD(0), &env->fp_status)) { \ - if (ordered) { \ - vxvc_flag = true; \ - } \ - } \ - if (vxsnan_flag) { \ - float_invalid_op_vxsnan(env, GETPC()); \ - } \ - if (vxvc_flag) { \ - float_invalid_op_vxvc(env, 0, GETPC()); \ - } \ - \ - switch (float64_compare(xa->VsrD(0), xb->VsrD(0), &env->fp_status)) {\ - case float_relation_less: \ - cc |= CRF_LT; \ - break; \ - case float_relation_equal: \ - cc |= CRF_EQ; \ - break; \ - case float_relation_greater: \ - cc |= CRF_GT; \ - break; \ - case float_relation_unordered: \ - cc |= CRF_SO; \ - break; \ - } \ - \ - env->fpscr &= ~FP_FPCC; \ - env->fpscr |= cc << FPSCR_FPCC; \ - env->crf[BF(opcode)] = cc; \ - \ - do_float_check_status(env, GETPC()); \ +static inline void do_scalar_cmp(CPUPPCState *env, ppc_vsr_t *xa, ppc_vsr_t *xb, + int crf_idx, bool ordered) +{ + uint32_t cc = 0; + bool vxsnan_flag = false, vxvc_flag = false; + + helper_reset_fpstatus(env); + + if (float64_is_signaling_nan(xa->VsrD(0), &env->fp_status) || + float64_is_signaling_nan(xb->VsrD(0), &env->fp_status)) { + vxsnan_flag = true; + if (fpscr_ve == 0 && ordered) { + vxvc_flag = true; + } + } else if (float64_is_quiet_nan(xa->VsrD(0), &env->fp_status) || + float64_is_quiet_nan(xb->VsrD(0), &env->fp_status)) { + if (ordered) { + vxvc_flag = true; + } + } + if (vxsnan_flag) { + float_invalid_op_vxsnan(env, GETPC()); + } + if (vxvc_flag) { + float_invalid_op_vxvc(env, 0, GETPC()); + } + + switch (float64_compare(xa->VsrD(0), xb->VsrD(0), &env->fp_status)) { + case float_relation_less: + cc |= CRF_LT; + break; + case float_relation_equal: + cc |= CRF_EQ; + break; + case float_relation_greater: + cc |= CRF_GT; + break; + case float_relation_unordered: + cc |= CRF_SO; + break; + } + + env->fpscr &= ~FP_FPCC; + env->fpscr |= cc << FPSCR_FPCC; + env->crf[crf_idx] = cc; + + do_float_check_status(env, GETPC()); +} + +void helper_xscmpodp(CPUPPCState *env, uint32_t opcode, ppc_vsr_t *xa, + ppc_vsr_t *xb) +{ + do_scalar_cmp(env, xa, xb, BF(opcode), true); +} + +void helper_xscmpudp(CPUPPCState *env, uint32_t opcode, ppc_vsr_t *xa, + ppc_vsr_t *xb) +{ + do_scalar_cmp(env, xa, xb, BF(opcode), false); } -VSX_SCALAR_CMP(xscmpodp, 1) -VSX_SCALAR_CMP(xscmpudp, 0) +static inline void do_scalar_cmpq(CPUPPCState *env, ppc_vsr_t *xa, + ppc_vsr_t *xb, int crf_idx, bool ordered) +{ + uint32_t cc = 0; + bool vxsnan_flag = false, vxvc_flag = false; + + helper_reset_fpstatus(env); + + if (float128_is_signaling_nan(xa->f128, &env->fp_status) || + float128_is_signaling_nan(xb->f128, &env->fp_status)) { + vxsnan_flag = true; + cc = CRF_SO; + if (fpscr_ve == 0 && ordered) { + vxvc_flag = true; + } + } else if (float128_is_quiet_nan(xa->f128, &env->fp_status) || + float128_is_quiet_nan(xb->f128, &env->fp_status)) { + cc = CRF_SO; + if (ordered) { + vxvc_flag = true; + } + } + if (vxsnan_flag) { + float_invalid_op_vxsnan(env, GETPC()); + } + if (vxvc_flag) { + float_invalid_op_vxvc(env, 0, GETPC()); + } + + switch (float128_compare(xa->f128, xb->f128, &env->fp_status)) { + case float_relation_less: + cc |= CRF_LT; + break; + case float_relation_equal: + cc |= CRF_EQ; + break; + case float_relation_greater: + cc |= CRF_GT; + break; + case float_relation_unordered: + cc |= CRF_SO; + break; + } -#define VSX_SCALAR_CMPQ(op, ordered) \ -void helper_##op(CPUPPCState *env, uint32_t opcode, \ - ppc_vsr_t *xa, ppc_vsr_t *xb) \ -{ \ - uint32_t cc = 0; \ - bool vxsnan_flag = false, vxvc_flag = false; \ - \ - helper_reset_fpstatus(env); \ - \ - if (float128_is_signaling_nan(xa->f128, &env->fp_status) || \ - float128_is_signaling_nan(xb->f128, &env->fp_status)) { \ - vxsnan_flag = true; \ - cc = CRF_SO; \ - if (fpscr_ve == 0 && ordered) { \ - vxvc_flag = true; \ - } \ - } else if (float128_is_quiet_nan(xa->f128, &env->fp_status) || \ - float128_is_quiet_nan(xb->f128, &env->fp_status)) { \ - cc = CRF_SO; \ - if (ordered) { \ - vxvc_flag = true; \ - } \ - } \ - if (vxsnan_flag) { \ - float_invalid_op_vxsnan(env, GETPC()); \ - } \ - if (vxvc_flag) { \ - float_invalid_op_vxvc(env, 0, GETPC()); \ - } \ - \ - switch (float128_compare(xa->f128, xb->f128, &env->fp_status)) { \ - case float_relation_less: \ - cc |= CRF_LT; \ - break; \ - case float_relation_equal: \ - cc |= CRF_EQ; \ - break; \ - case float_relation_greater: \ - cc |= CRF_GT; \ - break; \ - case float_relation_unordered: \ - cc |= CRF_SO; \ - break; \ - } \ - \ - env->fpscr &= ~FP_FPCC; \ - env->fpscr |= cc << FPSCR_FPCC; \ - env->crf[BF(opcode)] = cc; \ - \ - do_float_check_status(env, GETPC()); \ + env->fpscr &= ~FP_FPCC; + env->fpscr |= cc << FPSCR_FPCC; + env->crf[crf_idx] = cc; + + do_float_check_status(env, GETPC()); +} + +void helper_xscmpoqp(CPUPPCState *env, uint32_t opcode, ppc_vsr_t *xa, + ppc_vsr_t *xb) +{ + do_scalar_cmpq(env, xa, xb, BF(opcode), true); } -VSX_SCALAR_CMPQ(xscmpoqp, 1) -VSX_SCALAR_CMPQ(xscmpuqp, 0) +void helper_xscmpuqp(CPUPPCState *env, uint32_t opcode, ppc_vsr_t *xa, + ppc_vsr_t *xb) +{ + do_scalar_cmpq(env, xa, xb, BF(opcode), false); +} /* * VSX_MAX_MIN - VSX floating point maximum/minimum From patchwork Tue Nov 10 10:53:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuseppe Musacchio X-Patchwork-Id: 11893825 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40807697 for ; Tue, 10 Nov 2020 10:57:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C95CF20795 for ; Tue, 10 Nov 2020 10:57:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="byVtpDEk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C95CF20795 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:59486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRKm-00076D-P1 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 05:57:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRJE-0005Kh-3k; Tue, 10 Nov 2020 05:55:32 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:34945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRJB-000787-Uz; Tue, 10 Nov 2020 05:55:31 -0500 Received: by mail-wm1-x344.google.com with SMTP id w24so2567562wmi.0; Tue, 10 Nov 2020 02:55:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HLZxyyzJDYkGmst/aSo5y9dTOYqo1Jsa9SrqA3ZLEWU=; b=byVtpDEk7b6wSFLgy/j1qucas/1uRTYuRX9NgfzeoHx8fLUviVRn65vM6QIfHOnKS8 Ha2qaLNu+vq2UtLfqrjsf0xJ/Cp/uF+eitHULQVzz8i0r7pi5gFFIZscT3k0YiKE8+d5 fQOcXsxM7HhCDYubTjevSU3srZk4BTZSZ7Goztq7Bw2Z/uIJgXpOmShFEoxCD2yWTt+1 K4rlI/gia58eJhTcGLYw6Y5YMu2cxCF83EXccU7kOtW5gn6tX5E0/HcWmE9Wrtc/AMyB giafSZmU1Sx5l5/95zuAZVjqp5wxw0JwCrBnOs5BUmLuSujgzw7NzZWAw4fKL2XNL/Ag F15w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HLZxyyzJDYkGmst/aSo5y9dTOYqo1Jsa9SrqA3ZLEWU=; b=AY9MjpwuNjDt9QJG++1bw4EMlqMPYtdVsMaFWt3rVBzA/1RCphu/rGOer9+dAiaCEa Gt8gMAV1J0auTzjiEwEZpvgnpJqqws46W2zKVCQ0xLIMMEOLbw4nuAMx0jjH/04n7AF2 supxT+pz8cCD6ZfYH1uKxDU9g1Vg6Vl7FrP57hZ0YxyEctUs/Aj9q1Gl8wsWuVcRW/9V 02oM701pb3uL0y8U9fboHcyM9fbHdPkzQPtdNoS6/rKDCXC1xVeS2xCAMt78aV8SLRhE AVrjwazMtUYuXnRAi/GhdGu5cAbm84lCC0bc0FCBP3xh0zI/5vhiZmsg+ZpMYSgcReaa 2L+g== X-Gm-Message-State: AOAM532iGjNZm0V9lGHI6uv+Vjo8YcCevzyvEA+5K7dCmE61Kr1aYmnl JFPn16GfnZo1O8kFJxLjc8zfcTP2dfAu9A== X-Google-Smtp-Source: ABdhPJyiBbhtnZXyYKBihwDWGpZnuUGXRJ3wQ9XLQpEWjgvuFVcOIv34gIoKYCXpzhSw6hXSvp13Wg== X-Received: by 2002:a1c:99d3:: with SMTP id b202mr4066923wme.0.1605005727867; Tue, 10 Nov 2020 02:55:27 -0800 (PST) Received: from localhost.localdomain ([151.33.227.77]) by smtp.gmail.com with ESMTPSA id x6sm2567891wmc.48.2020.11.10.02.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:55:27 -0800 (PST) From: LemonBoy To: qemu-devel@nongnu.org Subject: [PATCH v2 3/4] ppc/translate: Delay NaN checking after comparison Date: Tue, 10 Nov 2020 11:53:20 +0100 Message-Id: <20201110105321.25889-4-thatlemon@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201110105321.25889-1-thatlemon@gmail.com> References: <20201110105321.25889-1-thatlemon@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=thatlemon@gmail.com; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LemonBoy , richard.henderson@linaro.org, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Since we always perform a comparison between the two operands avoid checking for NaN unless the result states they're unordered. Suggested-by: Richard Henderson Signed-off-by: Giuseppe Musacchio Reviewed-by: Richard Henderson --- target/ppc/fpu_helper.c | 82 +++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index c74c080c17..315959f681 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -2475,25 +2475,6 @@ static inline void do_scalar_cmp(CPUPPCState *env, ppc_vsr_t *xa, ppc_vsr_t *xb, helper_reset_fpstatus(env); - if (float64_is_signaling_nan(xa->VsrD(0), &env->fp_status) || - float64_is_signaling_nan(xb->VsrD(0), &env->fp_status)) { - vxsnan_flag = true; - if (fpscr_ve == 0 && ordered) { - vxvc_flag = true; - } - } else if (float64_is_quiet_nan(xa->VsrD(0), &env->fp_status) || - float64_is_quiet_nan(xb->VsrD(0), &env->fp_status)) { - if (ordered) { - vxvc_flag = true; - } - } - if (vxsnan_flag) { - float_invalid_op_vxsnan(env, GETPC()); - } - if (vxvc_flag) { - float_invalid_op_vxvc(env, 0, GETPC()); - } - switch (float64_compare(xa->VsrD(0), xb->VsrD(0), &env->fp_status)) { case float_relation_less: cc |= CRF_LT; @@ -2506,6 +2487,27 @@ static inline void do_scalar_cmp(CPUPPCState *env, ppc_vsr_t *xa, ppc_vsr_t *xb, break; case float_relation_unordered: cc |= CRF_SO; + + if (float64_is_signaling_nan(xa->VsrD(0), &env->fp_status) || + float64_is_signaling_nan(xb->VsrD(0), &env->fp_status)) { + vxsnan_flag = true; + if (fpscr_ve == 0 && ordered) { + vxvc_flag = true; + } + } else if (float64_is_quiet_nan(xa->VsrD(0), &env->fp_status) || + float64_is_quiet_nan(xb->VsrD(0), &env->fp_status)) { + if (ordered) { + vxvc_flag = true; + } + } + + if (vxsnan_flag) { + float_invalid_op_vxsnan(env, GETPC()); + } + if (vxvc_flag) { + float_invalid_op_vxvc(env, 0, GETPC()); + } + break; } @@ -2536,27 +2538,6 @@ static inline void do_scalar_cmpq(CPUPPCState *env, ppc_vsr_t *xa, helper_reset_fpstatus(env); - if (float128_is_signaling_nan(xa->f128, &env->fp_status) || - float128_is_signaling_nan(xb->f128, &env->fp_status)) { - vxsnan_flag = true; - cc = CRF_SO; - if (fpscr_ve == 0 && ordered) { - vxvc_flag = true; - } - } else if (float128_is_quiet_nan(xa->f128, &env->fp_status) || - float128_is_quiet_nan(xb->f128, &env->fp_status)) { - cc = CRF_SO; - if (ordered) { - vxvc_flag = true; - } - } - if (vxsnan_flag) { - float_invalid_op_vxsnan(env, GETPC()); - } - if (vxvc_flag) { - float_invalid_op_vxvc(env, 0, GETPC()); - } - switch (float128_compare(xa->f128, xb->f128, &env->fp_status)) { case float_relation_less: cc |= CRF_LT; @@ -2569,6 +2550,27 @@ static inline void do_scalar_cmpq(CPUPPCState *env, ppc_vsr_t *xa, break; case float_relation_unordered: cc |= CRF_SO; + + if (float128_is_signaling_nan(xa->f128, &env->fp_status) || + float128_is_signaling_nan(xb->f128, &env->fp_status)) { + vxsnan_flag = true; + if (fpscr_ve == 0 && ordered) { + vxvc_flag = true; + } + } else if (float128_is_quiet_nan(xa->f128, &env->fp_status) || + float128_is_quiet_nan(xb->f128, &env->fp_status)) { + if (ordered) { + vxvc_flag = true; + } + } + + if (vxsnan_flag) { + float_invalid_op_vxsnan(env, GETPC()); + } + if (vxvc_flag) { + float_invalid_op_vxvc(env, 0, GETPC()); + } + break; } From patchwork Tue Nov 10 10:53:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuseppe Musacchio X-Patchwork-Id: 11893833 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0107815E6 for ; Tue, 10 Nov 2020 10:59:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9EA81206F1 for ; Tue, 10 Nov 2020 10:59:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BWC4wXHJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9EA81206F1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:37974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRMi-0001Qt-HN for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 Nov 2020 05:59:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRJF-0005Lb-46; Tue, 10 Nov 2020 05:55:33 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:46510) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kcRJD-00078P-6j; Tue, 10 Nov 2020 05:55:32 -0500 Received: by mail-wr1-x442.google.com with SMTP id d12so10651875wrr.13; Tue, 10 Nov 2020 02:55:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FP2chADdb4fP7ale0Ec6mavOF6tnDZOuScUYkQlkT1E=; b=BWC4wXHJ5n2nIFcyZATL9pgdxrBs1+IvLAcGHB0t0DTOJXTv4h7A796UMOj3pY82vY 4r/fGwdLNAtugZm452oPthVgtXDDK7VkmlYhmtDT4HV5MqsRbqKBvx8zZC3pUViRdakG LcQVa4FgzUl4H8dFkOybEjiVMNjlXMYWy8Fkygbrsc+FuytYAi1+EJKZup7+wlzSO5nW 0d5mC7iOVUluVyVSlgJsBlohzzOu7S/HACayi69eOArLqqvYDHtRsF+8TvPGyioVk9qg ywtwvKbIbBNsQ/2jTRDqnN+t9K9vZ4fXQfSQs4k651IeT0W7rrXqkw1o/oGYDarinFRP RxAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FP2chADdb4fP7ale0Ec6mavOF6tnDZOuScUYkQlkT1E=; b=FKFKtX7gOhGz6rGzD1+Br9G05ifoZPFDZFSmbrF08lgMeSBRJ2T9BQ9pRzYxbXyUOj eUQHS3AMYsrKC7sLxDfG5K+HDxjCE3HRk9exfu62GMPDhmH3Uj1bGS6Qji3aCVzbKHKG dbhhIYAN6wUpOu3AlJAuXOJh0besC6nxfZO1R5CaWEfaauqdQixzu9GiUGBc+OW5nyG7 VHFDf3KVm+lkX+4jiKCRRCa5EQzucBHrDCNxePvwA27Lbzh+QJtM57iOn7cjnhetKLuY VOgw2pUgBCfrPPENlWfhLL4DPP5N2zAZqoKwm8rUi2Qqy85/O7oMMGkkOOGXtSalmhoc iOIw== X-Gm-Message-State: AOAM531f/jWLKx82H6laAY3RaVpnyG/Eu1D7v8V8EP9nPuhHZ02zqCek +TV/JX0yruCXJqpkHax0Aj7ZHG7Kj9Xb2g== X-Google-Smtp-Source: ABdhPJwK7Zv13skUXat8Rp7Jn8DqojUfQf0lQc1lh9aqDklM7TRQiIDU84DK7HUn06htJO+obYid7w== X-Received: by 2002:a5d:6050:: with SMTP id j16mr25053658wrt.158.1605005729062; Tue, 10 Nov 2020 02:55:29 -0800 (PST) Received: from localhost.localdomain ([151.33.227.77]) by smtp.gmail.com with ESMTPSA id x6sm2567891wmc.48.2020.11.10.02.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:55:28 -0800 (PST) From: LemonBoy To: qemu-devel@nongnu.org Subject: [PATCH v2 4/4] ppc/translate: Raise exceptions after setting the cc Date: Tue, 10 Nov 2020 11:53:21 +0100 Message-Id: <20201110105321.25889-5-thatlemon@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201110105321.25889-1-thatlemon@gmail.com> References: <20201110105321.25889-1-thatlemon@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=thatlemon@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: LemonBoy , richard.henderson@linaro.org, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" The PowerISA reference states that the comparison operators update the FPCC, CR and FPSCR and, if VE=1, jump to the exception handler. Moving the exception-triggering code after the CC update sequence solves the problem. Signed-off-by: Giuseppe Musacchio Reviewed-by: Richard Henderson --- target/ppc/fpu_helper.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/target/ppc/fpu_helper.c b/target/ppc/fpu_helper.c index 315959f681..c851ac8f5a 100644 --- a/target/ppc/fpu_helper.c +++ b/target/ppc/fpu_helper.c @@ -2501,13 +2501,6 @@ static inline void do_scalar_cmp(CPUPPCState *env, ppc_vsr_t *xa, ppc_vsr_t *xb, } } - if (vxsnan_flag) { - float_invalid_op_vxsnan(env, GETPC()); - } - if (vxvc_flag) { - float_invalid_op_vxvc(env, 0, GETPC()); - } - break; } @@ -2515,6 +2508,13 @@ static inline void do_scalar_cmp(CPUPPCState *env, ppc_vsr_t *xa, ppc_vsr_t *xb, env->fpscr |= cc << FPSCR_FPCC; env->crf[crf_idx] = cc; + if (vxsnan_flag) { + float_invalid_op_vxsnan(env, GETPC()); + } + if (vxvc_flag) { + float_invalid_op_vxvc(env, 0, GETPC()); + } + do_float_check_status(env, GETPC()); } @@ -2564,13 +2564,6 @@ static inline void do_scalar_cmpq(CPUPPCState *env, ppc_vsr_t *xa, } } - if (vxsnan_flag) { - float_invalid_op_vxsnan(env, GETPC()); - } - if (vxvc_flag) { - float_invalid_op_vxvc(env, 0, GETPC()); - } - break; } @@ -2578,6 +2571,13 @@ static inline void do_scalar_cmpq(CPUPPCState *env, ppc_vsr_t *xa, env->fpscr |= cc << FPSCR_FPCC; env->crf[crf_idx] = cc; + if (vxsnan_flag) { + float_invalid_op_vxsnan(env, GETPC()); + } + if (vxvc_flag) { + float_invalid_op_vxvc(env, 0, GETPC()); + } + do_float_check_status(env, GETPC()); }