From nobody Tue Feb 10 08:03:58 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1770182797; cv=none; d=zohomail.com; s=zohoarc; b=ZeJxNbbLR9noJDC3d+0cljyi8rwmCyCbK5ccvJA0Hle8Y67o3BJvgbOuRdgJGcOlS+cy55sUiBNW5/2NQWV9wtgyIMN0DtUQD1UVkjloSSAMNh70q4LGGIq+RKYDaZetsn3zHyyqREhMqrXB4+wa6I5EeRTfHha+VsdBXZp9Pj8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770182797; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Aa9mZAXen3GNDGFdJHfEPbpr07SEJ40e/xyiM/mpQH8=; b=l9xU1HYINhZ5meNc0E63SMjQadUREx1ArCdYS6v3BcfZo9MX8T0eCZW6xc/uAMt4oHohaCslkrKlFmt4z06cwR95rKBz7FUVnswYj82cXxY4eOwjQThgmM/u8IsihOFuHIXM5z+9tVrzbaUK3SjWCAtGdA9iz+/+C2j9t+hsV6A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770182797097769.5862578898989; Tue, 3 Feb 2026 21:26:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vnVO8-0000Zh-TI; Wed, 04 Feb 2026 00:25:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vnVO2-0000Vo-RG for qemu-devel@nongnu.org; Wed, 04 Feb 2026 00:25:11 -0500 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vnVO1-0003HD-0d for qemu-devel@nongnu.org; Wed, 04 Feb 2026 00:25:10 -0500 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-3530715386cso4756484a91.2 for ; Tue, 03 Feb 2026 21:25:08 -0800 (PST) Received: from stoup.. (bg30dhzlx7lnyrq74wrz.ip6.superloop.au. [2401:d002:dc0f:2100:1bc:fe1e:491:928e]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a933965c3esm10062015ad.67.2026.02.03.21.25.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Feb 2026 21:25:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770182708; x=1770787508; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Aa9mZAXen3GNDGFdJHfEPbpr07SEJ40e/xyiM/mpQH8=; b=bASyJfjlHoRAy+6kI3xSDUSNrSzYYfZd98VvzbxmrfaKRd8NO9cofmE1tFA3iGzFic QeG755C1Afk5R+U6yhEc0+hT/9KHwhv3aYy2yawD+iHuR9JS4a7k09VC3i73nRQ9iP1U ifObuum5PhgSxRjtBW+7Gjyz+QP1rnlM2N8CZ/30KrYFupkRem4nBIeEuJlgwkDmMEqi 3LDjM3nDPV5XcOnaQjcp3MCEJgVO+uWRSMtBXTnd2giP9mtm2w3elNAjzQkQWZQEYX7P 82kuxQojaDdpz+mgdwaHn2BxqXf3l8y/b0mx1DZkuQQ4kC/MTjRYOqdrZqRsvCu9vMTO 2wkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770182708; x=1770787508; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Aa9mZAXen3GNDGFdJHfEPbpr07SEJ40e/xyiM/mpQH8=; b=Pk3EvNdHI2ofUCsjZroW7Pd4MHIfSIgsrgMpZ2017dTRTCkghmBprRWw13mwSY64lD AqGoG/JWs/bnOHOkYw60SYCheIqlIPawxBGjUPcO+2AqI4MrAInWIo6SqIyzOne6FWd8 lIDBF4bfKes3BtbYgqxa0uKYr6lA62fDUaT37RzK8e44JbjPK3Stsj9O5TA4D6bBPz7O ElH9I35pkp5lGa2AjP4N1guB1B/a86W2MK8wo/R1YleizV704KMJnguha3Nswbhuesu6 uNwKupzlYirZhHLF3eAEqsGBL+JzXWh9vVrxkx7SOYXQS0MSmR1/BpsRtNqjsxs8/edU QJEg== X-Gm-Message-State: AOJu0Yx2iZjUrpZhfbrTSBglxL8MWVCkwT33FN98dvxVs/3W/fY379Ez fy8hLNWQq5Mu7I7+gGN8TdESUmJwM414jnE2nbxjD9TquwzHYeocqAFiQ9yI9HunXHJS94S4aX5 jsB9s1WY= X-Gm-Gg: AZuq6aLMs/X/l9Dm8EU0eAdCGqf7qJrjD//1bEJroccb5S5HZAYDzMN813rgN9bL3Gh H+wXkQyLgUgHo6WUgRyhmRMabme6+y6mchcA9PPTt5j3zD+dMEC0KXQRJmeRutMAco7k+0Olz4T odMAFGzEyVFD26LSSota1XoIueyIJq+QBkt3yp6ZrR2IHCeTxgcbe1BcjGRF7M4fjbdGVob1zMu cCD1UieOEWLeGIPcg1frcDCdIGHNxxeejTthTU4XumDYaDSawidCgwtjeVZ/W4fN9Ze+z4ZQ6Hj kcjC4p3jG/T3Ee+5Zl0TzWSlv+Kh0BuciDiFDwMCmL5jvAm6bTadVbtQ2N4ahTiTPRZxammmxQ5 Vpa/8sYluuwYtOCFQ9KehaZLGLUQxeTggYjKbOs2BDhYQ4yUNo+S968Dit9dWw397qTLHYtU+B0 kLzYt1B7I0L6lkBAEu6/W5Fy0G03+UdBSSXfjrqhCulEOjYLCBvOc2bjd4CJg= X-Received: by 2002:a17:90b:1643:b0:345:badf:f1b7 with SMTP id 98e67ed59e1d1-354871db4e8mr1497664a91.28.1770182707562; Tue, 03 Feb 2026 21:25:07 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Manos Pitsidianakis Subject: [PATCH v2 2/6] tcg/optimize: Lower unsupported extract2 during optimize Date: Wed, 4 Feb 2026 15:24:52 +1000 Message-ID: <20260204052456.970605-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260204052456.970605-1-richard.henderson@linaro.org> References: <20260204052456.970605-1-richard.henderson@linaro.org> MIME-Version: 1.0 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::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.google.com 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, 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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1770182799859154100 Content-Type: text/plain; charset="utf-8" The expansions that we chose in tcg-op.c may be less than optimial. Delay lowering until optimize, so that we have propagated constants and have computed known zero/one masks. Reviewed-by: Manos Pitsidianakis Signed-off-by: Richard Henderson --- tcg/optimize.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++---- tcg/tcg-op.c | 9 ++------ 2 files changed, 60 insertions(+), 12 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 890c8068fb..e6a16921c9 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -1933,21 +1933,74 @@ static bool fold_extract2(OptContext *ctx, TCGOp *o= p) uint64_t z2 =3D t2->z_mask; uint64_t o1 =3D t1->o_mask; uint64_t o2 =3D t2->o_mask; + uint64_t zr, or; int shr =3D op->args[3]; + int shl; =20 if (ctx->type =3D=3D TCG_TYPE_I32) { z1 =3D (uint32_t)z1 >> shr; o1 =3D (uint32_t)o1 >> shr; - z2 =3D (uint64_t)((int32_t)z2 << (32 - shr)); - o2 =3D (uint64_t)((int32_t)o2 << (32 - shr)); + shl =3D 32 - shr; + z2 =3D (uint64_t)((int32_t)z2 << shl); + o2 =3D (uint64_t)((int32_t)o2 << shl); } else { z1 >>=3D shr; o1 >>=3D shr; - z2 <<=3D 64 - shr; - o2 <<=3D 64 - shr; + shl =3D 64 - shr; + z2 <<=3D shl; + o2 <<=3D shl; + } + zr =3D z1 | z2; + or =3D o1 | o2; + + if (zr =3D=3D or) { + return tcg_opt_gen_movi(ctx, op, op->args[0], zr); } =20 - return fold_masks_zo(ctx, op, z1 | z2, o1 | o2); + if (z2 =3D=3D 0) { + /* High part zeros folds to simple right shift. */ + op->opc =3D INDEX_op_shr; + op->args[2] =3D arg_new_constant(ctx, shr); + } else if (z1 =3D=3D 0) { + /* Low part zeros folds to simple left shift. */ + op->opc =3D INDEX_op_shl; + op->args[1] =3D op->args[2]; + op->args[2] =3D arg_new_constant(ctx, shl); + } else if (!tcg_op_supported(INDEX_op_extract2, ctx->type, 0)) { + TCGArg tmp =3D arg_new_temp(ctx); + TCGOp *op2 =3D opt_insert_before(ctx, op, INDEX_op_shr, 3); + + op2->args[0] =3D tmp; + op2->args[1] =3D op->args[1]; + op2->args[2] =3D arg_new_constant(ctx, shr); + + if (TCG_TARGET_deposit_valid(ctx->type, shl, shr)) { + /* + * Deposit has more arguments than extract2, + * so we need to create a new TCGOp. + */ + op2 =3D opt_insert_before(ctx, op, INDEX_op_deposit, 5); + op2->args[0] =3D op->args[0]; + op2->args[1] =3D tmp; + op2->args[2] =3D op->args[2]; + op2->args[3] =3D shl; + op2->args[4] =3D shr; + + tcg_op_remove(ctx->tcg, op); + op =3D op2; + } else { + op2 =3D opt_insert_before(ctx, op, INDEX_op_shl, 3); + op2->args[0] =3D op->args[0]; + op2->args[1] =3D op->args[2]; + op2->args[2] =3D arg_new_constant(ctx, shl); + + op->opc =3D INDEX_op_or; + op->args[1] =3D op->args[0]; + op->args[2] =3D tmp; + } + } + + return fold_masks_zo(ctx, op, zr, or); } =20 static bool fold_exts(OptContext *ctx, TCGOp *op) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 96f72ba381..8a4fd14ad5 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -1000,13 +1000,8 @@ void tcg_gen_extract2_i32(TCGv_i32 ret, TCGv_i32 al,= TCGv_i32 ah, tcg_gen_mov_i32(ret, ah); } else if (al =3D=3D ah) { tcg_gen_rotri_i32(ret, al, ofs); - } else if (tcg_op_supported(INDEX_op_extract2, TCG_TYPE_I32, 0)) { - tcg_gen_op4i_i32(INDEX_op_extract2, ret, al, ah, ofs); } else { - TCGv_i32 t0 =3D tcg_temp_ebb_new_i32(); - tcg_gen_shri_i32(t0, al, ofs); - tcg_gen_deposit_i32(ret, t0, ah, 32 - ofs, ofs); - tcg_temp_free_i32(t0); + tcg_gen_op4i_i32(INDEX_op_extract2, ret, al, ah, ofs); } } =20 @@ -2221,7 +2216,7 @@ void tcg_gen_extract2_i64(TCGv_i64 ret, TCGv_i64 al, = TCGv_i64 ah, tcg_gen_mov_i64(ret, ah); } else if (al =3D=3D ah) { tcg_gen_rotri_i64(ret, al, ofs); - } else if (tcg_op_supported(INDEX_op_extract2, TCG_TYPE_I64, 0)) { + } else if (TCG_TARGET_REG_BITS =3D=3D 64) { tcg_gen_op4i_i64(INDEX_op_extract2, ret, al, ah, ofs); } else { TCGv_i64 t0 =3D tcg_temp_ebb_new_i64(); --=20 2.43.0