From nobody Fri May 9 19:04:44 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=fail;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=fail(p=none dis=none) header.from=linaro.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1635391326633490.1328355379321;
Wed, 27 Oct 2021 20:22:06 -0700 (PDT)
Received: from localhost ([::1]:60306 helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces+importer=patchew.org@nongnu.org>)
id 1mfvzR-0006R0-J8
for importer@patchew.org; Wed, 27 Oct 2021 23:22:05 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:59828)
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)
id 1mfvPk-0001b0-PJ
for qemu-devel@nongnu.org; Wed, 27 Oct 2021 22:45:12 -0400
Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]:36720)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)
id 1mfvPc-00069b-UL
for qemu-devel@nongnu.org; Wed, 27 Oct 2021 22:45:12 -0400
Received: by mail-pf1-x435.google.com with SMTP id m26so4592324pff.3
for <qemu-devel@nongnu.org>; Wed, 27 Oct 2021 19:45:03 -0700 (PDT)
Received: from localhost.localdomain ([71.212.134.125])
by smtp.gmail.com with ESMTPSA id z8sm995907pgc.53.2021.10.27.19.45.02
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 27 Oct 2021 19:45:02 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=sNZW+SE7IkpCycmJxNFsxBL0QVYPzgqHpcz72Yg09Ec=;
b=iNMGiY029Ki4blk7okmvkzQpTXVGtcOHSBhZokZoEJ81Z5Iter9gafLLy1l+f/V0L6
CaU1sitrQPY/wSuVmJNQOTrqBQZmyIvCMGV7XahfOKblR9ofi1peZ0ucmUaHQ0QYyNqZ
AAJGt7ZB5PSHtLZ8oavm9E3nUER2rDoeMKDoPpOCTss6CPFcsFBUHmsmIuHX9hXggL0V
J4mXQxobCj7t3Hgo+Nk4zPa55uaMxsDKauhiOOOMTFgTDrdyYp/ne0WX9syhVl9VgfWm
uyz85KoCr0SGPXWTrMz6eg6zRrrqL1CIlJoPM549JtmP8pCQjVKDuvRZXtM8kQE1u9GC
g/lg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=sNZW+SE7IkpCycmJxNFsxBL0QVYPzgqHpcz72Yg09Ec=;
b=LZHQVDO20gCxykZUMRkn3c5t8K3uxErFo0lC+dHnd2AoZaWC9dt2xQ+a3mfH6BVqB/
lHMTH9Y3wOK1tlrKhwQ6UDVxL1eUlWLZghu9QitMUS6cNH5n9avqAKHPYWAi61VTANfh
ZylpGJIaJAnLvJhZKxYnOM1yARpWE6zCUnE9f2RVpo2rzhV+xg3Tr9XUFd9LgsOMQrhg
m4akaO8slKmts1e1wJuOYuAFgR9Uj5j0n2OslVIzb2CwMK7freqymt4c0/YYBSlTVRUX
lYWZGGuc5AiZxbz4Rf43gDMQ751fih7Ja7R3jmslxmtmGsluiJiMf911QJMjIE2z3zbb
bq3g==
X-Gm-Message-State: AOAM530jZkfqKgZ7CZfNBqj926BrjGQdPC5h4lb8lO9DgYeniCO/jucD
ftDJLRL7NJEnauf9mYaNXRrZb6L850WNrw==
X-Google-Smtp-Source:
ABdhPJykIU+nq60VYxdsB7QEi5y5hK6hODQrNDhIDGE3OofFidcuRat53MJs3qjvpp71Ovu6GN6noQ==
X-Received: by 2002:a62:b606:0:b0:47b:e32f:9ca with SMTP id
j6-20020a62b606000000b0047be32f09camr1472162pff.57.1635389102679;
Wed, 27 Oct 2021 19:45:02 -0700 (PDT)
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 45/56] tcg/optimize: Expand fold_addsub2_i32 to 64-bit ops
Date: Wed, 27 Oct 2021 19:41:20 -0700
Message-Id: <20211028024131.1492790-46-richard.henderson@linaro.org>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20211028024131.1492790-1-richard.henderson@linaro.org>
References: <20211028024131.1492790-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2607:f8b0:4864:20::435;
envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x435.google.com
X-Spam_score_int: -1
X-Spam_score: -0.2
X-Spam_bar: /
X-Spam_report: (-0.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1,
DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001,
SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Cc: Luis Pires <luis.pires@eldorado.org.br>,
=?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <f4bug@amsat.org>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+importer=patchew.org@nongnu.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1635391327806100001
Rename to fold_addsub2.
Use Int128 to implement the wider operation.
Reviewed-by: Alex Benn=C3=A9e <alex.bennee@linaro.org>
Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/optimize.c | 65 ++++++++++++++++++++++++++++++++++----------------
1 file changed, 44 insertions(+), 21 deletions(-)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index e2ecad2884..f723deaafe 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -24,6 +24,7 @@
*/
=20
#include "qemu/osdep.h"
+#include "qemu/int128.h"
#include "tcg/tcg-op.h"
#include "tcg-internal.h"
=20
@@ -838,37 +839,59 @@ static bool fold_add(OptContext *ctx, TCGOp *op)
return false;
}
=20
-static bool fold_addsub2_i32(OptContext *ctx, TCGOp *op, bool add)
+static bool fold_addsub2(OptContext *ctx, TCGOp *op, bool add)
{
if (arg_is_const(op->args[2]) && arg_is_const(op->args[3]) &&
arg_is_const(op->args[4]) && arg_is_const(op->args[5])) {
- uint32_t al =3D arg_info(op->args[2])->val;
- uint32_t ah =3D arg_info(op->args[3])->val;
- uint32_t bl =3D arg_info(op->args[4])->val;
- uint32_t bh =3D arg_info(op->args[5])->val;
- uint64_t a =3D ((uint64_t)ah << 32) | al;
- uint64_t b =3D ((uint64_t)bh << 32) | bl;
+ uint64_t al =3D arg_info(op->args[2])->val;
+ uint64_t ah =3D arg_info(op->args[3])->val;
+ uint64_t bl =3D arg_info(op->args[4])->val;
+ uint64_t bh =3D arg_info(op->args[5])->val;
TCGArg rl, rh;
- TCGOp *op2 =3D tcg_op_insert_before(ctx->tcg, op, INDEX_op_mov_i32=
);
+ TCGOp *op2;
=20
- if (add) {
- a +=3D b;
+ if (ctx->type =3D=3D TCG_TYPE_I32) {
+ uint64_t a =3D deposit64(al, 32, 32, ah);
+ uint64_t b =3D deposit64(bl, 32, 32, bh);
+
+ if (add) {
+ a +=3D b;
+ } else {
+ a -=3D b;
+ }
+
+ al =3D sextract64(a, 0, 32);
+ ah =3D sextract64(a, 32, 32);
} else {
- a -=3D b;
+ Int128 a =3D int128_make128(al, ah);
+ Int128 b =3D int128_make128(bl, bh);
+
+ if (add) {
+ a =3D int128_add(a, b);
+ } else {
+ a =3D int128_sub(a, b);
+ }
+
+ al =3D int128_getlo(a);
+ ah =3D int128_gethi(a);
}
=20
rl =3D op->args[0];
rh =3D op->args[1];
- tcg_opt_gen_movi(ctx, op, rl, (int32_t)a);
- tcg_opt_gen_movi(ctx, op2, rh, (int32_t)(a >> 32));
+
+ /* The proper opcode is supplied by tcg_opt_gen_mov. */
+ op2 =3D tcg_op_insert_before(ctx->tcg, op, 0);
+
+ tcg_opt_gen_movi(ctx, op, rl, al);
+ tcg_opt_gen_movi(ctx, op2, rh, ah);
return true;
}
return false;
}
=20
-static bool fold_add2_i32(OptContext *ctx, TCGOp *op)
+static bool fold_add2(OptContext *ctx, TCGOp *op)
{
- return fold_addsub2_i32(ctx, op, true);
+ return fold_addsub2(ctx, op, true);
}
=20
static bool fold_and(OptContext *ctx, TCGOp *op)
@@ -1725,9 +1748,9 @@ static bool fold_sub(OptContext *ctx, TCGOp *op)
return false;
}
=20
-static bool fold_sub2_i32(OptContext *ctx, TCGOp *op)
+static bool fold_sub2(OptContext *ctx, TCGOp *op)
{
- return fold_addsub2_i32(ctx, op, false);
+ return fold_addsub2(ctx, op, false);
}
=20
static bool fold_tcg_ld(OptContext *ctx, TCGOp *op)
@@ -1873,8 +1896,8 @@ void tcg_optimize(TCGContext *s)
CASE_OP_32_64_VEC(add):
done =3D fold_add(&ctx, op);
break;
- case INDEX_op_add2_i32:
- done =3D fold_add2_i32(&ctx, op);
+ CASE_OP_32_64(add2):
+ done =3D fold_add2(&ctx, op);
break;
CASE_OP_32_64_VEC(and):
done =3D fold_and(&ctx, op);
@@ -2011,8 +2034,8 @@ void tcg_optimize(TCGContext *s)
CASE_OP_32_64_VEC(sub):
done =3D fold_sub(&ctx, op);
break;
- case INDEX_op_sub2_i32:
- done =3D fold_sub2_i32(&ctx, op);
+ CASE_OP_32_64(sub2):
+ done =3D fold_sub2(&ctx, op);
break;
CASE_OP_32_64_VEC(xor):
done =3D fold_xor(&ctx, op);
--=20
2.25.1