From nobody Sat Apr 11 23:07:26 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=1772500137; cv=none; d=zohomail.com; s=zohoarc; b=hZ/DtaEeOQfZk/I+ScJA6su+i7+G6TPeqhOY5GqfYFtb6fItiw3Dg4gb8aVylPJx4iqzp1xtZvVYs/Eb9OfHO2jaN7nEYQ9n+GsMffk9JlfyaSPtljpovOAtklP8Ow6+Vmvj7i+awxX7hPFIrixg0Lp2Ld1I4rnVZJ/KRwQz5yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772500137; 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=eHJ/eVj2wNNCKYeA+lB5DwgkkKexFySSKIuwu8LcZP4=; b=Q64+IBKaJTRNsXdpAeuDxgMu9BwbTgR3SgnkwptN26B68nstljnohIsrgMcjJKKtHH12U0P17jR7yXSOtc1u2sGuF93+SHjQvvMHXOwoMgUFdm21sDq20aP2WbsyTJf2GFCElYwAaXSh1fWR7Kt5+8hSWt7t9LH7yCAD9+p0qPo= 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 1772500137446148.40866175516555; Mon, 2 Mar 2026 17:08:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxEFi-0000Dt-D8; Mon, 02 Mar 2026 20:08:46 -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 1vxEFg-0000CQ-0b for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:44 -0500 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxEFe-00070x-GY for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:43 -0500 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-8274936d2c0so4959548b3a.3 for ; Mon, 02 Mar 2026 17:08:42 -0800 (PST) Received: from stoup.. ([180.233.125.15]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d94de6sm14484988b3a.24.2026.03.02.17.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 17:08:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772500121; x=1773104921; 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=eHJ/eVj2wNNCKYeA+lB5DwgkkKexFySSKIuwu8LcZP4=; b=vZAQHzk8f4HaXsfFm0AfurPdaV/rVibz4BAh6yLgmNrIiqJ2SqPdFUSnjNiS1BEse3 p3n1Px0kcCXczgugHS147o6+LFkcEzz9sTUmVaHFFzpYV1WRvrRdsTllgAwBn/tZep/x yB1Jd2uQ2f5T5ZA+E4dYbb1T+yOAGucTZ/vkog2A821Q1/FW43AbXLI4wnV27XliMBYT XSUOKLA8cg8YLRVtdRYG1B2iFXU3r3j3bVKxLEgMMINsXWAkaCpc+5YM1OLtQQ2VT2cz NjtDEt0z9H4dO9r5ruW0JI4IqY8ll5VzJtqNLSOmt+iHFFAL+5SOJ+Zbl+V7fhh1Yp5t gg6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772500121; x=1773104921; 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=eHJ/eVj2wNNCKYeA+lB5DwgkkKexFySSKIuwu8LcZP4=; b=N/IltUaPv6+aV/bpMz9Cxxpm0X/7vkwP1DX0p058LvZxY+0s2u/ou1GIqR507m3qVb iM8dLW0A2EZr7PyvSb5T/fMJm+vKoATDoTyUT5ysUZraVQijvv1lRfgEm4Dl2DR+EOJu QFNGPR2j9nFe0V9Vp5CuJ3Wm3cK6vbwmCFfTLYVKYlgDBTT+haTImAUbzgx9uGX7tzVY rLgcqTDb4arYNFcjPL4abFU7luanJ5fZ51DVvJfSjC4AsAl6T54OsHkqleXfflGs6dIx ykvGxQzdI5//r4ZoCLXFknbRtFVYtovb8LX9qDtwa4wTn0HwXdRaJy7Ar5EdmINMKobB MsCw== X-Gm-Message-State: AOJu0YwFawxApMdJtqSE+pCYeuj7kw8O77zxhjAJS7+c3aARJrF2sPEB yIVXzLFs1vVYtMUzW+zASemfLpLp9JmEUPaoKq1KG6sqFsHXZcmRXL1EhvBdigQSwr0l/HWkGQW HQzL6z5U= X-Gm-Gg: ATEYQzwFdc+QeRnCQIJ36lITlfMswUTWHMrYl25i6OxUWhr7Vxg1wN/fV2aygKWtLZP XiGp9ZFRhwEn8bPdfCJohHpR5yI44y9IixWvYvNn9h5GUJXVOipdHsERLXhkCjiAzwxYO/+2vLP Yj3Y+6GuRaQkvRpfqZIONNJ5se9XYtrw+Qm7tnv+qw12tXJ9djn4uip6BtcOG04kJt0an1fjueP aRfsBxelCKgS9vjHEBIL1zfDUto3kA9VR0+HQFw2GA4GKEr3bmmjeAJ4ZuRFf1jPXw5dOrRiueN ZWabf1OWooYw11grFxS2NmkagV/xyqH5UFpW3ZNjF3A5aJmLjlUkfWZZMF96prVyimGdtQeWBcn ihlMYbDPAoJZUq8fCw3k58LVUQkIK4LYj0BrlJ6ShIf9gyvsHL6ZNYC048DMTMjKVpL9VUTYHIB B7r8/hjKFlVmeyrO0AKCZyHoAoL1sDcg== X-Received: by 2002:a05:6a00:ad86:b0:81f:9bc0:e45e with SMTP id d2e1a72fcca58-8274da23639mr11134212b3a.65.1772500120776; Mon, 02 Mar 2026 17:08:40 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, jim.macarthur@linaro.org Subject: [PATCH v3 1/7] tcg: Drop extract+shl expansions in tcg_gen_deposit_z_* Date: Tue, 3 Mar 2026 12:08:26 +1100 Message-ID: <20260303010833.1115741-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260303010833.1115741-1-richard.henderson@linaro.org> References: <20260303010833.1115741-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::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.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: 1772500142436139100 Content-Type: text/plain; charset="utf-8" The extract+shl expansion is handled in tcg_gen_andi_* by preferring supported extract. The shl+extract expansion is simply removed for now; it was only present for slightly smaller code generation on x86. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/tcg-op.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 8d67acc4fc..b95b07efb5 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -937,21 +937,6 @@ void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg, TCGv_i32 zero =3D tcg_constant_i32(0); tcg_gen_op5ii_i32(INDEX_op_deposit, ret, zero, arg, ofs, len); } else { - /* - * To help two-operand hosts we prefer to zero-extend first, - * which allows ARG to stay live. - */ - if (TCG_TARGET_extract_valid(TCG_TYPE_I32, 0, len)) { - tcg_gen_extract_i32(ret, arg, 0, len); - tcg_gen_shli_i32(ret, ret, ofs); - return; - } - /* Otherwise prefer zero-extension over AND for code size. */ - if (TCG_TARGET_extract_valid(TCG_TYPE_I32, 0, ofs + len)) { - tcg_gen_shli_i32(ret, arg, ofs); - tcg_gen_extract_i32(ret, ret, 0, ofs + len); - return; - } tcg_gen_andi_i32(ret, arg, (1u << len) - 1); tcg_gen_shli_i32(ret, ret, ofs); } @@ -2210,21 +2195,6 @@ void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 ar= g, TCGv_i64 zero =3D tcg_constant_i64(0); tcg_gen_op5ii_i64(INDEX_op_deposit, ret, zero, arg, ofs, len); } else { - /* - * To help two-operand hosts we prefer to zero-extend first, - * which allows ARG to stay live. - */ - if (TCG_TARGET_extract_valid(TCG_TYPE_I64, 0, len)) { - tcg_gen_extract_i64(ret, arg, 0, len); - tcg_gen_shli_i64(ret, ret, ofs); - return; - } - /* Otherwise prefer zero-extension over AND for code size. */ - if (TCG_TARGET_extract_valid(TCG_TYPE_I64, 0, ofs + len)) { - tcg_gen_shli_i64(ret, arg, ofs); - tcg_gen_extract_i64(ret, ret, 0, ofs + len); - return; - } tcg_gen_andi_i64(ret, arg, (1ull << len) - 1); tcg_gen_shli_i64(ret, ret, ofs); } --=20 2.43.0 From nobody Sat Apr 11 23:07:26 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=1772500167; cv=none; d=zohomail.com; s=zohoarc; b=gWTC3Fs8rAhZfXB5sB3Vb5XYaVYoQ8QM82NAjGXGTNeV2vsHaqNf77IYrhUrE0TP+1fh/iJ+AIYLaqwF24Z7tA43uyGz4aAaHpUzgu8/sKlN6nP+lrN6ll+SsarM9YNIn9DVaEyvRbe0pUQc9aFb631GWP0UE6uieE9DrhLQ7/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772500167; 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=Ep4G4BLNwlEA/4u+aLTe3Bc1f2kKgbSUaJgl+b2hJIs=; b=F85QpkdCHFInfvsIcGVImaRfVp0wQAP/W2976vWNFyoOzkPahup9QSvVWeZn8G8KIP+vrxnztsq4+hgno8vvykV9+3HLDYBAQy+DjUKzIVJCvh0flBxcN6xDc//uoRVueUMoQ8MLeq1xeEA2KCfkD0ClF2sAVXKX/djjN6DJpyE= 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 1772500167301609.2722070059139; Mon, 2 Mar 2026 17:09:27 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxEFk-0000EE-77; Mon, 02 Mar 2026 20:08:48 -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 1vxEFj-0000E3-6y for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:47 -0500 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxEFh-00071O-0z for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:46 -0500 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-827390e8a3cso3289336b3a.0 for ; Mon, 02 Mar 2026 17:08:44 -0800 (PST) Received: from stoup.. ([180.233.125.15]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d94de6sm14484988b3a.24.2026.03.02.17.08.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 17:08:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772500124; x=1773104924; 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=Ep4G4BLNwlEA/4u+aLTe3Bc1f2kKgbSUaJgl+b2hJIs=; b=sVT8ukjXBuMayAwz6nsSVhmN1j5pWGf+ojXF1VsCVhWywjTI1Dkk5BfXnpKyTtd3vr QeuEnsSncITE85/IaFsbrxStXiHo+EVV/KmWeQwKKaXSG8eN/ApkalYjjI/a9gKiBIja YeH99jb6LSDSUzCEZyPRkqe5X/H5OB/nKRnkbJza6iJiRRFADteAdBiIO3iptI9I6GBh voXl0UL5f6ZsB0/im7C8cgjUx0NGVFLztmxpdgAtUMHmF9VA/giD2gdHn9dH3YcgjQw7 Jn3TCwKFgN9rx35ecHUaT7bZgjmfNzZcRI41zVoNI1J1xKXD+iXRKU/KzPyHFJHTYoh1 vacg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772500124; x=1773104924; 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=Ep4G4BLNwlEA/4u+aLTe3Bc1f2kKgbSUaJgl+b2hJIs=; b=aXv7skouCA3rrFbYo+4HBHTDRx4pkFUxYFTmMhWZ3dDZFiM6nByBdVrFCHKmREl72R xBFUURjGqksEDx0xzJRe9xQC+XqRGOQK77aMTJm5FJ0Mll1QonGzCj01GspRYMea2qil O6eFxp8Vg0kFz8sGqWg/4Iz03TM0Ob5Nl13odGSntKpgtoiVLYvirIA5fxs0tF/Wi92H CEct7265XaXe7/lN2TbB8VRs2twqrDAcJwA2Dyl4FZcjh9tCnVRuzipwhoBk4Sy9HU/h daV34EYAQw7EE6EVG+nZmM3cp4LjKADhEXABvSzNjRyDOvGKoFcZ/0GMNYekojt5E1bC RL9w== X-Gm-Message-State: AOJu0YygSJdoSJ4wCPhfhJpCay2AzisJ1ccQIwbxkoiNFxBTU1zIO0TY Zy5Z6JiSPjJBu/4oJQJ03dsLYpE+4xS2O2wV8e16Ld0l+CvnBgChjJxC9m9tWu6LIUJ+zjJjfXW ZEGZIRw8= X-Gm-Gg: ATEYQzywu6oCf634ZZX22eEW1ks7SgUjRkS7K1rkpvb3WpvqLuupZhGzUCqxL4AklVo ouPqyUc3uUqybjzm0UfbKF2a7QwRnVQKzy/zRrC9e/LlP1pr+IEGsUwOXYJ3TrYwVmuKih2RxMV sxVW7DlINTu2sxKgJ+sNzcNJCfiCC0J3pZFvCr5o2gPXlPV5vT2502vQVMD78lZ5OZIT+g03ob/ W/eaBBm/2j7WV1FgeHqYGFD6YhOPEkQPP/Cuj8FXWRFfSEY4G0UXY5HEL4Rz2VlLwitBk5mchfd +1K4HzU4GeUNwk57xvT+M/jPNXOMcTwNU66BkOE+ugUy62hqphzOrteAUvaBvJ/oBHnSVbHWWXI E4If+pl0fuOIFigU1cPXyTud6dJBfQ+QILBMmBT8LfTDH/GGXomCfNoJF7gr6w8kUb+V3ve6cjk JZjbdLr/+nXzzBOwfp0lLfTZMRm2TWBXF8V+D9jlbv X-Received: by 2002:a05:6a00:9083:b0:824:3ef6:a815 with SMTP id d2e1a72fcca58-8295d87b143mr377487b3a.8.1772500123378; Mon, 02 Mar 2026 17:08:43 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, jim.macarthur@linaro.org Subject: [PATCH v3 2/7] tcg/optimize: Lower unsupported deposit during optimize Date: Tue, 3 Mar 2026 12:08:27 +1100 Message-ID: <20260303010833.1115741-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260303010833.1115741-1-richard.henderson@linaro.org> References: <20260303010833.1115741-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::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.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: 1772500168501139100 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: Jim MacArthur Signed-off-by: Richard Henderson --- tcg/optimize.c | 179 +++++++++++++++++++++++++++++++++++++++++++------ tcg/tcg-op.c | 83 ++--------------------- 2 files changed, 163 insertions(+), 99 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 801a0a2c68..42637c12fa 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -1652,12 +1652,17 @@ static bool fold_ctpop(OptContext *ctx, TCGOp *op) =20 static bool fold_deposit(OptContext *ctx, TCGOp *op) { - TempOptInfo *t1 =3D arg_info(op->args[1]); - TempOptInfo *t2 =3D arg_info(op->args[2]); + TCGArg ret =3D op->args[0]; + TCGArg arg1 =3D op->args[1]; + TCGArg arg2 =3D op->args[2]; int ofs =3D op->args[3]; int len =3D op->args[4]; - int width =3D 8 * tcg_type_size(ctx->type); - uint64_t z_mask, o_mask, s_mask; + TempOptInfo *t1 =3D arg_info(arg1); + TempOptInfo *t2 =3D arg_info(arg2); + int width; + uint64_t z_mask, o_mask, s_mask, type_mask, len_mask; + TCGOp *op2; + bool valid; =20 if (ti_is_const(t1) && ti_is_const(t2)) { return tcg_opt_gen_movi(ctx, op, op->args[0], @@ -1665,35 +1670,167 @@ static bool fold_deposit(OptContext *ctx, TCGOp *o= p) ti_const_val(t2))); } =20 - /* Inserting a value into zero at offset 0. */ - if (ti_is_const_val(t1, 0) && ofs =3D=3D 0) { - uint64_t mask =3D MAKE_64BIT_MASK(0, len); + width =3D 8 * tcg_type_size(ctx->type); + type_mask =3D MAKE_64BIT_MASK(0, width); + len_mask =3D MAKE_64BIT_MASK(0, len); =20 + /* Inserting all-zero into a value. */ + if ((t2->z_mask & len_mask) =3D=3D 0) { op->opc =3D INDEX_op_and; - op->args[1] =3D op->args[2]; - op->args[2] =3D arg_new_constant(ctx, mask); + op->args[2] =3D arg_new_constant(ctx, ~(len_mask << ofs)); return fold_and(ctx, op); } =20 - /* Inserting zero into a value. */ - if (ti_is_const_val(t2, 0)) { - uint64_t mask =3D deposit64(-1, ofs, len, 0); - - op->opc =3D INDEX_op_and; - op->args[2] =3D arg_new_constant(ctx, mask); - return fold_and(ctx, op); + /* Inserting all-one into a value. */ + if ((t2->o_mask & len_mask) =3D=3D len_mask) { + op->opc =3D INDEX_op_or; + op->args[2] =3D arg_new_constant(ctx, len_mask << ofs); + return fold_or(ctx, op); } =20 - /* The s_mask from the top portion of the deposit is still valid. */ - if (ofs + len =3D=3D width) { - s_mask =3D t2->s_mask << ofs; - } else { - s_mask =3D t1->s_mask & ~MAKE_64BIT_MASK(0, ofs + len); + valid =3D TCG_TARGET_deposit_valid(ctx->type, ofs, len); + + /* Lower invalid deposit of constant as AND + OR. */ + if (!valid && ti_is_const(t2)) { + uint64_t ins_val =3D (ti_const_val(t2) & len_mask) << ofs; + + op2 =3D opt_insert_before(ctx, op, INDEX_op_and, 3); + op2->args[0] =3D ret; + op2->args[1] =3D arg1; + op2->args[2] =3D arg_new_constant(ctx, ~(len_mask << ofs)); + fold_and(ctx, op2); + + op->opc =3D INDEX_op_or; + op->args[1] =3D ret; + op->args[2] =3D arg_new_constant(ctx, ins_val); + return fold_or(ctx, op); } =20 + /* + * Compute result masks before calling other fold_* subroutines + * which could modify the masks of our inputs. + */ z_mask =3D deposit64(t1->z_mask, ofs, len, t2->z_mask); o_mask =3D deposit64(t1->o_mask, ofs, len, t2->o_mask); + if (ofs + len < width) { + s_mask =3D t1->s_mask & ~MAKE_64BIT_MASK(0, ofs + len); + } else { + s_mask =3D t2->s_mask << ofs; + } =20 + /* Inserting a value into zero. */ + if (ti_is_const_val(t1, 0)) { + uint64_t need_mask; + + /* Always lower deposit into zero at 0 as AND. */ + if (ofs =3D=3D 0) { + op->opc =3D INDEX_op_and; + op->args[1] =3D arg2; + op->args[2] =3D arg_new_constant(ctx, len_mask); + return fold_and(ctx, op); + } + + /* + * If the portion of the value outside len that remains after + * shifting is zero, we can elide the mask and just shift. + */ + need_mask =3D t2->z_mask & ~len_mask; + need_mask =3D (need_mask << ofs) & type_mask; + if (!need_mask) { + op->opc =3D INDEX_op_shl; + op->args[1] =3D arg2; + op->args[2] =3D arg_new_constant(ctx, ofs); + goto done; + } + + /* Lower invalid deposit into zero as AND + SHL. */ + if (!valid) { + op2 =3D opt_insert_before(ctx, op, INDEX_op_and, 3); + op2->args[0] =3D ret; + op2->args[1] =3D arg2; + op2->args[2] =3D arg_new_constant(ctx, len_mask); + fold_and(ctx, op2); + + op->opc =3D INDEX_op_shl; + op->args[1] =3D ret; + op->args[2] =3D arg_new_constant(ctx, ofs); + goto done; + } + } + + /* After special cases, lower invalid deposit. */ + if (!valid) { + TCGArg tmp; + + if (tcg_op_supported(INDEX_op_extract2, ctx->type, 0)) { + if (ofs =3D=3D 0 && tcg_op_supported(INDEX_op_rotl, ctx->type,= 0)) { + /* + * ret =3D arg2:arg1 >> len + * ret =3D rotl(ret, len) + */ + op2 =3D opt_insert_before(ctx, op, INDEX_op_extract2, 4); + op2->args[0] =3D ret; + op2->args[1] =3D arg1; + op2->args[2] =3D arg2; + op2->args[3] =3D len; + + op->opc =3D INDEX_op_rotl; + op->args[1] =3D ret; + op->args[2] =3D arg_new_constant(ctx, len); + goto done; + } + if (ofs + len =3D=3D width) { + /* + * tmp =3D arg1 << len + * ret =3D arg2:tmp >> len + */ + tmp =3D ret =3D=3D arg2 ? arg_new_temp(ctx) : ret; + + op2 =3D opt_insert_before(ctx, op, INDEX_op_shl, 4); + op2->args[0] =3D tmp; + op2->args[1] =3D arg1; + op2->args[2] =3D arg_new_constant(ctx, len); + + op->opc =3D INDEX_op_extract2; + op->args[0] =3D ret; + op->args[1] =3D tmp; + op->args[2] =3D arg2; + op->args[3] =3D len; + goto done; + } + } + + /* + * tmp =3D arg2 & mask + * ret =3D arg1 & ~(mask << ofs) + * tmp =3D tmp << ofs + * ret =3D ret | tmp + */ + tmp =3D arg_new_temp(ctx); + + op2 =3D opt_insert_before(ctx, op, INDEX_op_and, 3); + op2->args[0] =3D tmp; + op2->args[1] =3D arg2; + op2->args[2] =3D arg_new_constant(ctx, len_mask); + fold_and(ctx, op2); + + op2 =3D opt_insert_before(ctx, op, INDEX_op_shl, 3); + op2->args[0] =3D tmp; + op2->args[1] =3D tmp; + op2->args[2] =3D arg_new_constant(ctx, ofs); + + op2 =3D opt_insert_before(ctx, op, INDEX_op_and, 3); + op2->args[0] =3D ret; + op2->args[1] =3D arg1; + op2->args[2] =3D arg_new_constant(ctx, ~(len_mask << ofs)); + fold_and(ctx, op2); + + op->opc =3D INDEX_op_or; + op->args[1] =3D ret; + op->args[2] =3D tmp; + } + + done: return fold_masks_zos(ctx, op, z_mask, o_mask, s_mask); } =20 diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index b95b07efb5..96f72ba381 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -876,9 +876,6 @@ void tcg_gen_rotri_i32(TCGv_i32 ret, TCGv_i32 arg1, int= 32_t arg2) void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2, unsigned int ofs, unsigned int len) { - uint32_t mask; - TCGv_i32 t1; - tcg_debug_assert(ofs < 32); tcg_debug_assert(len > 0); tcg_debug_assert(len <=3D 32); @@ -886,39 +883,9 @@ void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, = TCGv_i32 arg2, =20 if (len =3D=3D 32) { tcg_gen_mov_i32(ret, arg2); - return; - } - if (TCG_TARGET_deposit_valid(TCG_TYPE_I32, ofs, len)) { - tcg_gen_op5ii_i32(INDEX_op_deposit, ret, arg1, arg2, ofs, len); - return; - } - - t1 =3D tcg_temp_ebb_new_i32(); - - if (tcg_op_supported(INDEX_op_extract2, TCG_TYPE_I32, 0)) { - if (ofs + len =3D=3D 32) { - tcg_gen_shli_i32(t1, arg1, len); - tcg_gen_extract2_i32(ret, t1, arg2, len); - goto done; - } - if (ofs =3D=3D 0) { - tcg_gen_extract2_i32(ret, arg1, arg2, len); - tcg_gen_rotli_i32(ret, ret, len); - goto done; - } - } - - mask =3D (1u << len) - 1; - if (ofs + len < 32) { - tcg_gen_andi_i32(t1, arg2, mask); - tcg_gen_shli_i32(t1, t1, ofs); } else { - tcg_gen_shli_i32(t1, arg2, ofs); + tcg_gen_op5ii_i32(INDEX_op_deposit, ret, arg1, arg2, ofs, len); } - tcg_gen_andi_i32(ret, arg1, ~(mask << ofs)); - tcg_gen_or_i32(ret, ret, t1); - done: - tcg_temp_free_i32(t1); } =20 void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg, @@ -932,13 +899,10 @@ void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg, if (ofs + len =3D=3D 32) { tcg_gen_shli_i32(ret, arg, ofs); } else if (ofs =3D=3D 0) { - tcg_gen_andi_i32(ret, arg, (1u << len) - 1); - } else if (TCG_TARGET_deposit_valid(TCG_TYPE_I32, ofs, len)) { + tcg_gen_extract_i32(ret, arg, 0, len); + } else { TCGv_i32 zero =3D tcg_constant_i32(0); tcg_gen_op5ii_i32(INDEX_op_deposit, ret, zero, arg, ofs, len); - } else { - tcg_gen_andi_i32(ret, arg, (1u << len) - 1); - tcg_gen_shli_i32(ret, ret, ofs); } } =20 @@ -2133,9 +2097,6 @@ void tcg_gen_rotri_i64(TCGv_i64 ret, TCGv_i64 arg1, i= nt64_t arg2) void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2, unsigned int ofs, unsigned int len) { - uint64_t mask; - TCGv_i64 t1; - tcg_debug_assert(ofs < 64); tcg_debug_assert(len > 0); tcg_debug_assert(len <=3D 64); @@ -2143,40 +2104,9 @@ void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1= , TCGv_i64 arg2, =20 if (len =3D=3D 64) { tcg_gen_mov_i64(ret, arg2); - return; - } - - if (TCG_TARGET_deposit_valid(TCG_TYPE_I64, ofs, len)) { - tcg_gen_op5ii_i64(INDEX_op_deposit, ret, arg1, arg2, ofs, len); - return; - } - - t1 =3D tcg_temp_ebb_new_i64(); - - if (tcg_op_supported(INDEX_op_extract2, TCG_TYPE_I64, 0)) { - if (ofs + len =3D=3D 64) { - tcg_gen_shli_i64(t1, arg1, len); - tcg_gen_extract2_i64(ret, t1, arg2, len); - goto done; - } - if (ofs =3D=3D 0) { - tcg_gen_extract2_i64(ret, arg1, arg2, len); - tcg_gen_rotli_i64(ret, ret, len); - goto done; - } - } - - mask =3D (1ull << len) - 1; - if (ofs + len < 64) { - tcg_gen_andi_i64(t1, arg2, mask); - tcg_gen_shli_i64(t1, t1, ofs); } else { - tcg_gen_shli_i64(t1, arg2, ofs); + tcg_gen_op5ii_i64(INDEX_op_deposit, ret, arg1, arg2, ofs, len); } - tcg_gen_andi_i64(ret, arg1, ~(mask << ofs)); - tcg_gen_or_i64(ret, ret, t1); - done: - tcg_temp_free_i64(t1); } =20 void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 arg, @@ -2191,12 +2121,9 @@ void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 ar= g, tcg_gen_shli_i64(ret, arg, ofs); } else if (ofs =3D=3D 0) { tcg_gen_andi_i64(ret, arg, (1ull << len) - 1); - } else if (TCG_TARGET_deposit_valid(TCG_TYPE_I64, ofs, len)) { + } else { TCGv_i64 zero =3D tcg_constant_i64(0); tcg_gen_op5ii_i64(INDEX_op_deposit, ret, zero, arg, ofs, len); - } else { - tcg_gen_andi_i64(ret, arg, (1ull << len) - 1); - tcg_gen_shli_i64(ret, ret, ofs); } } =20 --=20 2.43.0 From nobody Sat Apr 11 23:07:26 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=1772500171; cv=none; d=zohomail.com; s=zohoarc; b=I37zhS3PT6TCQdYDstbpp+DquUeAl0QkpMZDUcxHHINQdjJtZPskOkGcR9M6T5u76k6S9avtYfSxqpO+NLcUW8hy4gWX3g6H33ciXal/zHxc7PredmFcsFJflyq5nmFHpnacf+lBgnfe5YZWTYG+DUIPA6nU6H7Vy5zoGicXfmw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772500171; 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=i3/78IdtRTsOqh21jFMFzpUC2ndX+m3gcPFQQTfoeDI=; b=PYjDNn1TrlF4irQiqxY2kQvVBfe+mz2glEGQ5Gstmok77dI4okS2naN2+gNhICareolifB1RYZ37c54YXwA9t73RtDAMDL2W7ZOlVKZpoIi/SUoBOJpYP6ATG2K/g1+bDWwBWbXIv2POQ688WfhG6PQiJdDfHuudl+cp5ica9ZU= 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 1772500171621374.7515753844416; Mon, 2 Mar 2026 17:09:31 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxEFm-0000Em-FY; Mon, 02 Mar 2026 20:08:50 -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 1vxEFl-0000Ea-Mc for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:49 -0500 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxEFk-00071r-08 for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:49 -0500 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-824ba8f0acaso2596461b3a.1 for ; Mon, 02 Mar 2026 17:08:47 -0800 (PST) Received: from stoup.. ([180.233.125.15]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d94de6sm14484988b3a.24.2026.03.02.17.08.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 17:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772500126; x=1773104926; 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=i3/78IdtRTsOqh21jFMFzpUC2ndX+m3gcPFQQTfoeDI=; b=A4MOVPgptsVtaT7UvLrdCG1VDHXheP07gpCDlhULRJ/SxymvL1cUrbUqAj7AM0tcJa MaB2nq+KQLj5trrpmPjWOJigI5d5T+ajlTJBM+m6ubX0i166mIwkwEF4yofkPsYoNyGw +DjilHr8358r2yWExklSF56GMvuYD4W+kdjkwQP2NTcC1Yk7bRFMlACOzMaELHQRvRUS 4Xo3wdB4nFUK/D0HXpDNFPABaig5B1hvALeTKhQZYp5Y5321O0Q6wkxPtw2czhgLQArN QAwsP6hjMSg7HGL+PgjPdwk21UU9ZgmDBdW147xcdV9j6tk8oK0mzaqdR++aFLtStrTD q2Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772500126; x=1773104926; 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=i3/78IdtRTsOqh21jFMFzpUC2ndX+m3gcPFQQTfoeDI=; b=h0bSxtDOZ3ONtTCQHPFkVA+auzqKZC+Z00GMHfNSXsovFeGGTr7BGD256NJ2syQ9KM QBXMVq7/c8utzNwSBdxLMlL5d/Cka9OvV4mnOUQa/JbcXOPum9hA41vflP8ddNsM6U7m 2RjeJEh8CInSbjijIs16AaETgD5kjr3ZJqWUPeCYE51E+RHjn1lVJZBZN6tH1reZQIVN fQIK/eV/cOOPsQtxq/iX9tTPlXhl1+14Ma673T2ddEBHguUV1gbWJ8K1xKJ6qn4IiE4U 4SUuga3jhHWjxZuvJFa8v/Q8AjQeejgTnxJs7B5klWD0bX0AHspSc7TNsfExo6ri2v9d /0HQ== X-Gm-Message-State: AOJu0YysDMO9K07EC1CW+VxVbR7BqbYdsS17aw1h/oAEn+9JbZEQsUoC vTxmmuxQUvFxVuh6T9iFmOhxZBVknpwm3QSTrtGLxR4NiRmv8oNpaNoPpGYNPw2k6azbXjt0wV/ uPv82Sas= X-Gm-Gg: ATEYQzwxZ4GOJVnN2L8GuNIVZSFirI57aqIvAbIdWEUSR0g6AKuWpwIMGgNVqIfb5Us BwVWKsHlzccKDXWt/JXXXMoJusHgqzY57LlIA7ev8o/xhJqMEiQDdiz/P4AuK1g48eFUFNFNWm8 nEl7YYKz83XsbAKIvk3u2nX11Ruf1ijzIaZbWZ8K7/TpKUWIT+uF8dIIX/pS1MGksgVZE36JaP7 kerO5ZfA6UgALs3Qbk/923ORwHq82/cHA2UNdRtWifrcV83nKLgcFoFTMh7Ge302f6D4n+JxPT8 53hzbdkKDs/vFXGfUY3Uvc31X5Qnyqn2M3tANiNhAy+6LfLXZkS+S9usTwrOLex2rgyM/b2xKMY LV1aowJpSwhIVyRXvq8ILIQlEegmuGjBfrwTcFmQKBqeZHW0eIEHdjlBzTxIh/h4d5DOsXygTh1 xgmYbD7PlnK9S/c5DB6v7TETpF0RS6Zg== X-Received: by 2002:a05:6a00:3a03:b0:81f:49cc:ea11 with SMTP id d2e1a72fcca58-8274da2a022mr10143435b3a.65.1772500126311; Mon, 02 Mar 2026 17:08:46 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, jim.macarthur@linaro.org, Manos Pitsidianakis Subject: [PATCH v3 3/7] tcg/optimize: Lower unsupported extract2 during optimize Date: Tue, 3 Mar 2026 12:08:28 +1100 Message-ID: <20260303010833.1115741-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260303010833.1115741-1-richard.henderson@linaro.org> References: <20260303010833.1115741-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::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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: 1772500173202158500 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: Jim MacArthur Reviewed-by: Manos Pitsidianakis Signed-off-by: Richard Henderson --- tcg/optimize.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++---- tcg/tcg-op.c | 14 ++--------- 2 files changed, 60 insertions(+), 17 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 42637c12fa..59761c2c84 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -1918,21 +1918,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..fc2254f54a 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,13 +2216,8 @@ 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)) { - tcg_gen_op4i_i64(INDEX_op_extract2, ret, al, ah, ofs); } else { - TCGv_i64 t0 =3D tcg_temp_ebb_new_i64(); - tcg_gen_shri_i64(t0, al, ofs); - tcg_gen_deposit_i64(ret, t0, ah, 64 - ofs, ofs); - tcg_temp_free_i64(t0); + tcg_gen_op4i_i64(INDEX_op_extract2, ret, al, ah, ofs); } } =20 --=20 2.43.0 From nobody Sat Apr 11 23:07:26 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=1772500172; cv=none; d=zohomail.com; s=zohoarc; b=PTY0bhOZjhM+piNvVV5P1UJyIcSypI2CN0hy3i+3gSDrcdKLlJgSmUN0PPqgR0xT/6ipUPB/NsMxM6UZrYd68dnZmFhj+3QfGpn8AaMJw37zHZ5GPCDZskji3fsomeM9T3hiIoTPWqoSZbI/oiXj/47tnDKOppNsTgMHX+Vb2To= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772500172; 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=tP5/W1kiTCmuQM9EHfOiY2ySSiL3wae69p6z7AYvXAU=; b=k8dIjRaJRqcxFqSTgH+rm+uk+26aB80wxYRWt0+68EPLc1QiO0Lcqm2jDZig+/gvdLr0yiZxYbFMMOIv/Sl/7kYsMBqj0tjow9/hXANVlCYdq0FbUvgDqwh2EbV/JpgpstDPhvWGVIeehvcw99UF6vhPhseG5zkFaknQp+CRatM= 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 1772500172786660.1631470039018; Mon, 2 Mar 2026 17:09:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxEFq-0000Fe-Tl; Mon, 02 Mar 2026 20:08:54 -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 1vxEFp-0000FA-8m for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:53 -0500 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxEFm-000725-CO for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:52 -0500 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-8273e0fb87aso2749181b3a.1 for ; Mon, 02 Mar 2026 17:08:49 -0800 (PST) Received: from stoup.. ([180.233.125.15]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d94de6sm14484988b3a.24.2026.03.02.17.08.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 17:08:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772500129; x=1773104929; 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=tP5/W1kiTCmuQM9EHfOiY2ySSiL3wae69p6z7AYvXAU=; b=hb2ogS+pO9z+0l8/wyfshMu/jt0F9lk51jz7QhRJAMhVKM0aiFVUxFEzoeVVqqEXio Q1g1CdwgSGcitTD30NBVm59aAOTw/tBNbMpAQM5oePTgxs7q/ct33X9jg5JQ7+JomMmo 5o6uvFkkVJxkc7KetwYGghOQj27bfG4Dd6gQEqNQcVMVqdnzL9WGrIrE99gJSDwZH5bJ m6MX35yMAOCdirqobahKQO9DgwpBGAPv7k9GG4Tr32s3yAD8zkWjun6afOgKIo8Ca7Bg 9viE/JRtd6mQ778xTfAfzTJeG3xvQA17Zso0Uksmhf7KFpYUe77sAvqzxFZz9lV8cThu iymQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772500129; x=1773104929; 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=tP5/W1kiTCmuQM9EHfOiY2ySSiL3wae69p6z7AYvXAU=; b=AUHmPxyQsbGqFfbDktAejspQCkCM31rCrsG8/qHcnaPAAAy0bA8QLTlK1b/YBL9f+L 2Sl1oXw2/7V85btKm2aqDLK87h4PTLLV5H63JeR4Hx3mBdihtGFMRwdvpAD5XrLtiK2n Py3b6O+mWTqkUvMP/FRPRZVIKrz+U6p9izOqMl76noLydtOFRVeyRVNnDnSnKOA+6BZP aY7uFAgzTFFfN2H5Y7LrU9JIe7qvsjlL0pCCX+pkk/50M0gYf6qwHTa5QmcA7lltNlXc aCGXMOHntV/F5J0j+7K8+sL5MVJUDK+rOagaU2B60nlHmgv+xB1LdfrHNpmMg0RxX/uR c5aQ== X-Gm-Message-State: AOJu0Yy1qiu/svZSOujEnebDFfd8pw7BbpsLgrQbDcAsaeantm2Qnmzn rrJW0ocwnl9mKpWI1rHRetTH/DdTrXN5b7U5FT34F//p2f4A9HVNuEaJlQTZyh4zPRwXLUhFouM R3PODHXA= X-Gm-Gg: ATEYQzw0AvCjkV7t9/cl160qWHbhbenBJEqkGJuNgjYE0NrvKKizn9X/9idB6eHWsKo 69Kk2cKK2b6lLeW+i8h5cxIereqPly/QjCYIy8e+Zb0wZfHMR7Eb7vHdyYrcM++Kqa51hqlJhz0 f7CerwbDkQD/aLE+iEns4DKTTjRYzNu8jtJjoUEIaj8sWqWhXfQ2R2OOXIwmaq32YuG/lM6Fx8+ aKMUgzBf5MjgPDiE7phSrWVmuRtYtzGfbvyj52Xj5ZX6B22+TRfiT++CNEc0E/d34L0y6RJ1tdF DzuJu5IMxYJO9kWqw9q5/GzFpuE15TOcNMwOQUVSupBE6mITm75egB/XuSM85RGiVfUxfYKm/Mm nI9L5GJ2OSIcPSyqoAYobb9uJgD9qH1W1KtGKOW0klJsc4JfKjgwVO2OVv21MHh9VtJwu2EIRd4 PDVTMw9S0cy1ecCW/lcUg9wbheQTGG2g== X-Received: by 2002:a05:6a00:f8d:b0:824:3cf6:3fb4 with SMTP id d2e1a72fcca58-8274da11634mr10406730b3a.32.1772500128905; Mon, 02 Mar 2026 17:08:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, jim.macarthur@linaro.org Subject: [PATCH v3 4/7] tcg: Expand missing rotri with extract2 Date: Tue, 3 Mar 2026 12:08:29 +1100 Message-ID: <20260303010833.1115741-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260303010833.1115741-1-richard.henderson@linaro.org> References: <20260303010833.1115741-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::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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: 1772500173157158500 Content-Type: text/plain; charset="utf-8" Use extract2 to implement rotri. To make this easier, redefine rotli in terms of rotri, rather than the reverse. Reviewed-by: Jim MacArthur Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/tcg-op.c | 52 ++++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index fc2254f54a..13a56d89fa 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -826,23 +826,12 @@ void tcg_gen_rotl_i32(TCGv_i32 ret, TCGv_i32 arg1, TC= Gv_i32 arg2) void tcg_gen_rotli_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2) { tcg_debug_assert(arg2 >=3D 0 && arg2 < 32); - /* some cases can be optimized here */ if (arg2 =3D=3D 0) { tcg_gen_mov_i32(ret, arg1); } else if (tcg_op_supported(INDEX_op_rotl, TCG_TYPE_I32, 0)) { - TCGv_i32 t0 =3D tcg_constant_i32(arg2); - tcg_gen_op3_i32(INDEX_op_rotl, ret, arg1, t0); - } else if (tcg_op_supported(INDEX_op_rotr, TCG_TYPE_I32, 0)) { - TCGv_i32 t0 =3D tcg_constant_i32(32 - arg2); - tcg_gen_op3_i32(INDEX_op_rotr, ret, arg1, t0); + tcg_gen_op3_i32(INDEX_op_rotl, ret, arg1, tcg_constant_i32(arg2)); } else { - TCGv_i32 t0 =3D tcg_temp_ebb_new_i32(); - TCGv_i32 t1 =3D tcg_temp_ebb_new_i32(); - tcg_gen_shli_i32(t0, arg1, arg2); - tcg_gen_shri_i32(t1, arg1, 32 - arg2); - tcg_gen_or_i32(ret, t0, t1); - tcg_temp_free_i32(t0); - tcg_temp_free_i32(t1); + tcg_gen_rotri_i32(ret, arg1, -arg2 & 31); } } =20 @@ -870,7 +859,16 @@ void tcg_gen_rotr_i32(TCGv_i32 ret, TCGv_i32 arg1, TCG= v_i32 arg2) void tcg_gen_rotri_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2) { tcg_debug_assert(arg2 >=3D 0 && arg2 < 32); - tcg_gen_rotli_i32(ret, arg1, -arg2 & 31); + if (arg2 =3D=3D 0) { + tcg_gen_mov_i32(ret, arg1); + } else if (tcg_op_supported(INDEX_op_rotr, TCG_TYPE_I32, 0)) { + tcg_gen_op3_i32(INDEX_op_rotr, ret, arg1, tcg_constant_i32(arg2)); + } else if (tcg_op_supported(INDEX_op_rotl, TCG_TYPE_I32, 0)) { + tcg_gen_op3_i32(INDEX_op_rotl, ret, arg1, tcg_constant_i32(32 - ar= g2)); + } else { + /* Do not recurse with the rotri simplification. */ + tcg_gen_op4i_i32(INDEX_op_extract2, ret, arg1, arg1, arg2); + } } =20 void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2, @@ -2042,23 +2040,12 @@ void tcg_gen_rotl_i64(TCGv_i64 ret, TCGv_i64 arg1, = TCGv_i64 arg2) void tcg_gen_rotli_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2) { tcg_debug_assert(arg2 >=3D 0 && arg2 < 64); - /* some cases can be optimized here */ if (arg2 =3D=3D 0) { tcg_gen_mov_i64(ret, arg1); } else if (tcg_op_supported(INDEX_op_rotl, TCG_TYPE_I64, 0)) { - TCGv_i64 t0 =3D tcg_constant_i64(arg2); - tcg_gen_op3_i64(INDEX_op_rotl, ret, arg1, t0); - } else if (tcg_op_supported(INDEX_op_rotr, TCG_TYPE_I64, 0)) { - TCGv_i64 t0 =3D tcg_constant_i64(64 - arg2); - tcg_gen_op3_i64(INDEX_op_rotr, ret, arg1, t0); + tcg_gen_op3_i64(INDEX_op_rotl, ret, arg1, tcg_constant_i64(arg2)); } else { - TCGv_i64 t0 =3D tcg_temp_ebb_new_i64(); - TCGv_i64 t1 =3D tcg_temp_ebb_new_i64(); - tcg_gen_shli_i64(t0, arg1, arg2); - tcg_gen_shri_i64(t1, arg1, 64 - arg2); - tcg_gen_or_i64(ret, t0, t1); - tcg_temp_free_i64(t0); - tcg_temp_free_i64(t1); + tcg_gen_rotri_i64(ret, arg1, -arg2 & 63); } } =20 @@ -2086,7 +2073,16 @@ void tcg_gen_rotr_i64(TCGv_i64 ret, TCGv_i64 arg1, T= CGv_i64 arg2) void tcg_gen_rotri_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2) { tcg_debug_assert(arg2 >=3D 0 && arg2 < 64); - tcg_gen_rotli_i64(ret, arg1, -arg2 & 63); + if (arg2 =3D=3D 0) { + tcg_gen_mov_i64(ret, arg1); + } else if (tcg_op_supported(INDEX_op_rotr, TCG_TYPE_I64, 0)) { + tcg_gen_op3_i64(INDEX_op_rotr, ret, arg1, tcg_constant_i64(arg2)); + } else if (tcg_op_supported(INDEX_op_rotl, TCG_TYPE_I64, 0)) { + tcg_gen_op3_i64(INDEX_op_rotl, ret, arg1, tcg_constant_i64(64 - ar= g2)); + } else { + /* Do not recurse with the rotri simplification. */ + tcg_gen_op4i_i64(INDEX_op_extract2, ret, arg1, arg1, arg2); + } } =20 void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2, --=20 2.43.0 From nobody Sat Apr 11 23:07:26 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=1772500196; cv=none; d=zohomail.com; s=zohoarc; b=nHIpCV+aakWGzdn7Kk812dpjs17K0nAnV6y6Cj+u89v1ag8ruZjvXGgyH4Wm/AVxBcdC2Kb6TmqZXkd3oHWVu7AdUUP05OfzEgpCJy9M1SpEMIYV3S3Yvg9Iu4wvk7X+SM7FjrEd7WqF7u+0FGZq6YcasO8FZpHtrxOkuoC6r+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772500196; 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=jULhy8lhH1tb2E9Kn0FQkgiY88soUrfUiGllYAB4CY0=; b=mu/HV/3Ka9xfVqMMafwtNwoRKb7S2RMT1+Kds4bFnd546E1EhPL/P4lBxPYni2LzOfncMoB97RCepLg4YaRtLBfkC/7yb98P1q29dQDXl1oEdsP6/5WRfx81wXk0KzvHpHVRQxam5298jHsrfXA4s1yqcaCSukhmWCgQffA8NKQ= 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 1772500196236849.6216320187871; Mon, 2 Mar 2026 17:09:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxEFs-0000G0-C2; Mon, 02 Mar 2026 20:08:56 -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 1vxEFq-0000FZ-NF for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:54 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxEFp-00072S-4p for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:54 -0500 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-c70bfef17a4so3077353a12.2 for ; Mon, 02 Mar 2026 17:08:52 -0800 (PST) Received: from stoup.. ([180.233.125.15]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d94de6sm14484988b3a.24.2026.03.02.17.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 17:08:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772500132; x=1773104932; 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=jULhy8lhH1tb2E9Kn0FQkgiY88soUrfUiGllYAB4CY0=; b=bdvUqmOQlWGcY5o2KTQRgpXWb3ZB1ZKLMJ7heJLHHws5j1OKYVF38HfOBfnwf20tmT bwsLgIkgiiWs9Jpzn8N1ikfRpbALdTKp7zQY1C3GFl/p7JBHhtev8CtkF9JaEH87Biyg Ac59mGMpIVKKo8BbfanRNANgsNfCk77iverXT0dRQ+OfArqo3BIizR7dYymt/v4IrLpq 60rC9ACMOWYSI5d0UH71w2CL6kRlLiavsPkYbMwXcrb84v4WGcVg67PMEMTI/HGcRqUR uJ1GIaz/b+9gXZE5CwbUJtPFc7WG68O+A6LpjyqFv/tkuxcpOWv+RU8yecDul3BvxVwd jFYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772500132; x=1773104932; 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=jULhy8lhH1tb2E9Kn0FQkgiY88soUrfUiGllYAB4CY0=; b=IryHlsU6GxJ5d+491y9VwfjarADbgX9WWIPy7z26Zt/Wr74KYIdJlEiAMCLEBSTocS +cwC5zCEAfEwav2jFDr5/OMGay/U9QB8hpc0DdVuIU2uIsYg6SHonUXYpnso90sultUD dFjgqvXPDCynMfZCXDreacKjqyObKdUi0yEjc9SlVT6djPqMl+hZtTstZScEAK5fBDCl kCQ4FURELTf2Hyi6TxuU1NNgcLGG/jlkWVf0KHPhDYuf5O+Y0B5mdu+riYJb/SbmTQ/I /4BoKgAZrzVpSH3yX8CVisDVKY/RJS3wipsw9+fOUJRXijmGwINjWJQhBWFlREU/7W+J eYVA== X-Gm-Message-State: AOJu0YzQMJ+TPWGinqPTJxRimJPk1MEGB/9Ns09EhQNCAf6tZe3ixIYg Kn/x7mbCvUbxdHALeIzKaHIzb8QzqUCELc4ed7lzkVXfotMEU7ys69xzos9yX+QheUv2T9RSfE6 SoRb0KjE= X-Gm-Gg: ATEYQzzCb4kod6lg//Zes0qevyEmC3ssBCx4trZpQjS/8SwnxC1XYCEIl7bwg2TnIat fgrNTcYiDMTl1k3DzlxLxgdkF6Pn/L9EnCUs5qofXPV+uCnF4C2ZZes3SUS6e1dZRm6DDrWXuhq P3g8ijR6R0nP3B4rky/7x+cKHEcal9z0+sCq96C5XntPLAm+CG3i0I+7EhzFgas3MTjY/aCE1TL AQc5uKzDtwjixFyMZUxOB4xrLBH+9olN9tPC6HuiJZdTp56tPxPQgBPrSQgMMms3Maou2lq8mB6 /dGKZD2P3qiRzFLB9U7SN96d77of4KJewllDuwCFBdQ+RRV6w5T/W9fsaObE0txcKqAXz1rdg7h 9VkZKBlQUgUuoPE9OxqD0mI+gXYUtt6+FNDMmWHxy57a8Chf7MYLv5TCdsUdPI5f31wyvtx7KRC g4963YlaXKRY4fqiaY/iLgu5IcgmJ9oA== X-Received: by 2002:a05:6a21:170b:b0:394:76a7:1cf1 with SMTP id adf61e73a8af0-395c3a0c99cmr13657978637.3.1772500131436; Mon, 02 Mar 2026 17:08:51 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, jim.macarthur@linaro.org Subject: [PATCH v3 5/7] tcg: Add tcg_op_imm_match Date: Tue, 3 Mar 2026 12:08:30 +1100 Message-ID: <20260303010833.1115741-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260303010833.1115741-1-richard.henderson@linaro.org> References: <20260303010833.1115741-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::52e; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52e.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: 1772500198789139101 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Create a function to test whether the second operand of a binary operation allows a given immediate. Reviewed-by: Jim MacArthur Signed-off-by: Paolo Bonzini [rth: Split out from a larger patch; keep the declaration internal.] Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/tcg-internal.h | 5 +++++ tcg/tcg.c | 21 +++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/tcg/tcg-internal.h b/tcg/tcg-internal.h index 2615684612..c0997ab224 100644 --- a/tcg/tcg-internal.h +++ b/tcg/tcg-internal.h @@ -100,4 +100,9 @@ TCGOp *tcg_op_insert_before(TCGContext *s, TCGOp *op, TCGOp *tcg_op_insert_after(TCGContext *s, TCGOp *op, TCGOpcode, TCGType, unsigned nargs); =20 +/* + * For a binary opcode OP, return true if the second input operand allows = IMM. + */ +bool tcg_op_imm_match(TCGOpcode op, TCGType type, tcg_target_ulong imm); + #endif /* TCG_INTERNAL_H */ diff --git a/tcg/tcg.c b/tcg/tcg.c index 3111e1f426..2ca44766f6 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3387,11 +3387,9 @@ static void process_constraint_sets(void) } } =20 -static const TCGArgConstraint *opcode_args_ct(const TCGOp *op) +static const TCGArgConstraint *op_args_ct(TCGOpcode opc, TCGType type, + unsigned flags) { - TCGOpcode opc =3D op->opc; - TCGType type =3D TCGOP_TYPE(op); - unsigned flags =3D TCGOP_FLAGS(op); const TCGOpDef *def =3D &tcg_op_defs[opc]; const TCGOutOp *outop =3D all_outop[opc]; TCGConstraintSetIndex con_set; @@ -3418,6 +3416,21 @@ static const TCGArgConstraint *opcode_args_ct(const = TCGOp *op) return all_cts[con_set]; } =20 +static const TCGArgConstraint *opcode_args_ct(const TCGOp *op) +{ + return op_args_ct(op->opc, TCGOP_TYPE(op), TCGOP_FLAGS(op)); +} + +bool tcg_op_imm_match(TCGOpcode opc, TCGType type, tcg_target_ulong imm) +{ + const TCGArgConstraint *args_ct =3D op_args_ct(opc, type, 0); + const TCGOpDef *def =3D &tcg_op_defs[opc]; + + tcg_debug_assert(def->nb_oargs =3D=3D 1); + tcg_debug_assert(def->nb_iargs =3D=3D 2); + return tcg_target_const_match(imm, args_ct[2].ct, type, 0, 0); +} + static void remove_label_use(TCGOp *op, int idx) { TCGLabel *label =3D arg_label(op->args[idx]); --=20 2.43.0 From nobody Sat Apr 11 23:07:26 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=1772500187; cv=none; d=zohomail.com; s=zohoarc; b=Pb10re7ZxNROySTWt0ljHNnTcnmuf4hVdLtMVic2BQNROgxng1PAP9RTl+wqrdot6147ZWwHwpmiqk0xRnXR5C85j17nNokjG6qXJ7KLWh96K+4VAIYnWarI4aEbDgYrS4HK7jJKXqAr5G92Gq+Fp81MtYyNa7bilFtzBAkPVz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772500187; 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=c4H0tu3d5++g1zytIQ8nF+cxa9Xqa73woawx4zTJDf8=; b=YtoIUzO5d609uVh9opauODlCEE783knNs1vLzdX3rDEaw3hzm/en4U6b+FQRv50/gGNzHFOgQqARsiXC3+ujCQ6yT56J3fAzlr6JEdvmfCv2QwSwE8Ga/KctGgHlEX3qdo+BXRgz8ZLXgSkMWYYdk+UuGE2rb6lNDBAKhYp69do= 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 1772500187856776.7135965102897; Mon, 2 Mar 2026 17:09:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxEFu-0000Jk-SU; Mon, 02 Mar 2026 20:08:58 -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 1vxEFt-0000Hf-1g for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:57 -0500 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxEFr-00072f-D1 for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:56 -0500 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-82742aa5a3eso2411480b3a.1 for ; Mon, 02 Mar 2026 17:08:55 -0800 (PST) Received: from stoup.. ([180.233.125.15]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d94de6sm14484988b3a.24.2026.03.02.17.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 17:08:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772500134; x=1773104934; 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=c4H0tu3d5++g1zytIQ8nF+cxa9Xqa73woawx4zTJDf8=; b=pPl/RzEcxUTo88HtbC6ajxSLjKbcqAGwrD7o5tzIqGcV89aN4M2FBVhHp7TRkbi6bp gjfeBSJ/Okfc9IDDpH27QkITDqxPanj0boBLefc2Xse25EI6jcPca5Yz01LJQ068Js+8 Zri0ygI57Q2HtigqVrnFAOZIvx/Pmjn+mhxpVf0DxS71Ju/g+xuR8k4W7WOPMNQcMSaf Wh8RKpLMaP4ihdn/EFmUil4PyY+yuNmMBk5VE5dcLPV4eolccVnkGx1oT+yDcknjH5w5 G1hLMak5bHLdmr9eiB17jn+30LOBVPYAhMrzEfaxjE99XHbQZ5duagdCarr/r+2PXIsq FUlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772500134; x=1773104934; 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=c4H0tu3d5++g1zytIQ8nF+cxa9Xqa73woawx4zTJDf8=; b=G+PFLb8jTM+mL0ozhnPxwP41wPkIESU5yeeQYmsEKgmhyIiGechItpwTAPeELj7F4N SkPxU89rUQPpItMTQMkZL0FA00lQ/S33MQQ9WieSmwM02w9nzbbD2bWbn4IZPmmt3o5C dAaY+cYemiZTXFTnlvv9VFlyHOBnizmg2nZl0mQyWkCm15xQR6r1uoF92y6UNNMOm44X E9kqocpuP6rtV1Hx5yOWPtUa/qT0WT3mq/JE6fDutMgdCzRGRX9O3ymGN6MT7G4lEwOs qcQwEvBXee7gM+eCbbhR0xxilpsHFY4ulbsKwMc5BFvgVQ77NQmrZDH9bK+PMSwIeUlm qKKg== X-Gm-Message-State: AOJu0Ywv22AxfFrA5PV9JG8wICwI+bkjeGfpSZmddsXXlJNP4o171sFd VeH3A2HWnO9wq9AHxRBBaFlYMHS3SwK5AviSPg893lR/swOmL+njpqLPL/wDeDhheKL38LStxm5 rA1V7UPk= X-Gm-Gg: ATEYQzy5BnV6rMvVtSAGFQiFkBrMJT/E6OY533M4LKEtF1EsI4RR3WApu+1tuJUdIxb Cmcd/6iEJSgP/2kkhPppMYsSYj96DaePyUMa2gfGMeawKdzZC3UGDq02ATnptu7Jqjo1pVWf7F4 c/H0v4jd1Iv9v6AqNKum5grGyBIhp9CGPlE4Bk0ORk9kl5y+V6JNHTVou2+PXAyWL5IoWj9HNrv Xn8XPcqmnKqyO38LZGHxGttH9Hl9MPGll8Lh7pxeTs3XakuMyrxe6bsrnVCF2xwgwOPoUVHl4Pi tPMNV5z7SmZp+qPIvB1l7UEpHz9fNuSL5+pU/IbRV3v3+8gzh11v+ZwXV5ffuh1F8KoA3JVWxEU 8STJ3PpT2ukM8XYP0B3EOn5aeD7k5mIY8ewp5gDdUJoEndBYquJzZjQQti8UuVCdgejqmHQyjlD 9l/ZuA59sw8mDWGmdWHSoQObTsg5OoreAc833/W3mb X-Received: by 2002:a05:6a00:2c94:b0:81f:4164:79b0 with SMTP id d2e1a72fcca58-8274d9e9b3bmr12625288b3a.31.1772500133894; Mon, 02 Mar 2026 17:08:53 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, jim.macarthur@linaro.org Subject: [PATCH v3 6/7] tcg: target-dependent lowering of extract to shr/and Date: Tue, 3 Mar 2026 12:08:31 +1100 Message-ID: <20260303010833.1115741-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260303010833.1115741-1-richard.henderson@linaro.org> References: <20260303010833.1115741-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::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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: 1772500189123158500 Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini Instead of assuming only small immediates are available for AND, consult the backend in order to decide between SHL/SHR and SHR/AND. Reviewed-by: Jim MacArthur Signed-off-by: Paolo Bonzini [rth: Split from a larger patch] Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/tcg-op.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c index 13a56d89fa..d8ae57d604 100644 --- a/tcg/tcg-op.c +++ b/tcg/tcg-op.c @@ -907,6 +907,8 @@ void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg, void tcg_gen_extract_i32(TCGv_i32 ret, TCGv_i32 arg, unsigned int ofs, unsigned int len) { + uint32_t mask; + tcg_debug_assert(ofs < 32); tcg_debug_assert(len > 0); tcg_debug_assert(len <=3D 32); @@ -922,8 +924,10 @@ void tcg_gen_extract_i32(TCGv_i32 ret, TCGv_i32 arg, tcg_gen_op4ii_i32(INDEX_op_extract, ret, arg, ofs, len); return; } + + mask =3D (1u << len) - 1; if (ofs =3D=3D 0) { - tcg_gen_andi_i32(ret, arg, (1u << len) - 1); + tcg_gen_andi_i32(ret, arg, mask); return; } =20 @@ -934,18 +938,12 @@ void tcg_gen_extract_i32(TCGv_i32 ret, TCGv_i32 arg, return; } =20 - /* ??? Ideally we'd know what values are available for immediate AND. - Assume that 8 bits are available, plus the special case of 16, - so that we get ext8u, ext16u. */ - switch (len) { - case 1 ... 8: case 16: + if (tcg_op_imm_match(INDEX_op_and, TCG_TYPE_I32, mask)) { tcg_gen_shri_i32(ret, arg, ofs); - tcg_gen_andi_i32(ret, ret, (1u << len) - 1); - break; - default: + tcg_gen_andi_i32(ret, ret, mask); + } else { tcg_gen_shli_i32(ret, arg, 32 - len - ofs); tcg_gen_shri_i32(ret, ret, 32 - len); - break; } } =20 @@ -2121,6 +2119,8 @@ void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 arg, void tcg_gen_extract_i64(TCGv_i64 ret, TCGv_i64 arg, unsigned int ofs, unsigned int len) { + uint64_t mask; + tcg_debug_assert(ofs < 64); tcg_debug_assert(len > 0); tcg_debug_assert(len <=3D 64); @@ -2136,8 +2136,10 @@ void tcg_gen_extract_i64(TCGv_i64 ret, TCGv_i64 arg, tcg_gen_op4ii_i64(INDEX_op_extract, ret, arg, ofs, len); return; } + + mask =3D (1ull << len) - 1; if (ofs =3D=3D 0) { - tcg_gen_andi_i64(ret, arg, (1ull << len) - 1); + tcg_gen_andi_i64(ret, arg, mask); return; } =20 @@ -2148,18 +2150,12 @@ void tcg_gen_extract_i64(TCGv_i64 ret, TCGv_i64 arg, return; } =20 - /* ??? Ideally we'd know what values are available for immediate AND. - Assume that 8 bits are available, plus the special cases of 16 and = 32, - so that we get ext8u, ext16u, and ext32u. */ - switch (len) { - case 1 ... 8: case 16: case 32: + if (tcg_op_imm_match(INDEX_op_and, TCG_TYPE_I64, mask)) { tcg_gen_shri_i64(ret, arg, ofs); - tcg_gen_andi_i64(ret, ret, (1ull << len) - 1); - break; - default: + tcg_gen_andi_i64(ret, ret, mask); + } else { tcg_gen_shli_i64(ret, arg, 64 - len - ofs); tcg_gen_shri_i64(ret, ret, 64 - len); - break; } } =20 --=20 2.43.0 From nobody Sat Apr 11 23:07:26 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=1772500194; cv=none; d=zohomail.com; s=zohoarc; b=DkuGvhb1QujnszOetRyOOZ7YRMmEtlROsLEW9TjPZM5sDg61oMvIfxxXt+K+//o4GgH7bJE55T5ervk/z9XN0NVp3OoqzHOWU9zwzZ3qZapUVvB6YLyZqeMjUe0nUkQphKGw8iUUbG9ktn35m8P7Hx3fd1/YnI+OroB9Ua9Leu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1772500194; 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=YtKLD5VhlXLsGWM2u+h1lyzJYi1swGBiHzUBqjwhzQE=; b=kW80ZTcuyscA7/4pNjXlUIn0Cqyh+30RK/a8e6j21gDWC2LShNKKGIRDmKK8meh1bFtvGAwzeVj4g/SxPf4iPBHiLHahh/ptejQXIZrc6c+8lFbXxfHeci97sSOHqmaQmxAP652epYtZXJKr7c51d6rjsSzCgcf7iXV7HjcUjL4= 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 1772500194650900.1681849772452; Mon, 2 Mar 2026 17:09:54 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vxEFw-0000KJ-DB; Mon, 02 Mar 2026 20:09:00 -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 1vxEFv-0000K3-AR for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:59 -0500 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vxEFt-000732-OI for qemu-devel@nongnu.org; Mon, 02 Mar 2026 20:08:59 -0500 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-824ba8f0acaso2596503b3a.1 for ; Mon, 02 Mar 2026 17:08:57 -0800 (PST) Received: from stoup.. ([180.233.125.15]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82739d94de6sm14484988b3a.24.2026.03.02.17.08.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 17:08:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1772500136; x=1773104936; 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=YtKLD5VhlXLsGWM2u+h1lyzJYi1swGBiHzUBqjwhzQE=; b=zCNwHXSxt0mVt9E48YuoBEhEL/zw4S+2yM+byJ3yaKx3Pu2lcSZhpO2snjDzzXHn1S x+fLDte8r54ygKnpMBm448fsQKhxIBHWd4iMP8XCfeCuFyJS6/lVVt8jxlkjAEp/yjin KnVIQ519EKqgtg1DzK831Wj+7CzC10LSd0W6IFQ7LQkAJ2AdFxr2ZPRpsn+peF1Cxwmc y9weLm3r8dwtc4r1qAsez+TBrI2r4PqMcbD7l3s5sPBz0V2M8+HDSHxJdjYDwKGzfk9S l4vSrfA94lVdx47SE+ZO9RlTjXsBv5ru6oTAtFKUYXQ0j5zSxZOH0JsDdyBxrGzZd1fo F9Wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772500136; x=1773104936; 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=YtKLD5VhlXLsGWM2u+h1lyzJYi1swGBiHzUBqjwhzQE=; b=HtRzBsiMOvlKCVrQiFtG6+hZf3nZ9KVmfzUC7VEMSJLAs5WQGnjjgAsR9fqKPC8BnQ wSwYhcsVkBx1bnYUgPSTrylPyf5hSh4FiozlymoS6sblYuFxmbBnj3G2jnhTIKtgSF4P EIemTaf0pMUhfbSFCWHTsDfYVb9uaNvdLYUFRgt6pur1kRIj5wwMxQvi9WYBRMJTRxh/ 9b4SkMfto5YCNEij2UoreRU5DlDpjh0Lal+pla1Q4q9eb2QMntrx+XSj0Ynak2XaRuKY 0Q3wmiUcDJTvChEkROvaadIawm+FJ4XMFB6dW7r4vLfHQ5/VRJLlG3Mne5v48NaPeCwO tcxA== X-Gm-Message-State: AOJu0YxE2MPD/ZXFIdSoQPaqzlWZNJPnOcDcvQ6SilUZvrSsAtYyn2gw w7QlhFc/ynPP1sgY7jSlNzeU73mn6IZ11Z9tOm/GUo7fEbZ3z8Gz0slVsyusPrGMtGebXkABGvR nN5mR2p8= X-Gm-Gg: ATEYQzxFEaBzPrWlswAW+lc2N6eI866tipRtztp7/QDxtlvVV57wccbIrxMoGbmKTwb rfyLc+OCNuHId19ohdxC9tVXIPrunVQk+uGRGElhFR224aARd/vk8Wk6RUN4iEub/GZ7tBqfBVE JGs31SYXVTuquLfpBf0W62SanPG/pNj7rlSHs4fPwP89CtfFTjs6c4TmbzaqR7akRzDWm9kjAa4 Qe9e2UhOrYw8x4QxxF6F9tKLxrZGS22RMJMdA54m5keRQwEOfzsdTpcKZyMWt+xy9anTNceRNxZ DjVkxEl2mIvJWiXm4xjVlHo1dympKTigr5zFFBUBtWoR//UnvzJMI9oWJ4A5eDovRqsP+GWLoCY R7TTDWtVFo1Upgr8Y3fUbFQsxqoA4W/0CKbj7YvNVJzEYjmLyAnUnQDTjDDQAc0LjhIuGb4h1i/ VAUFFZWqGLFHeohzVNrrLTq/aPePXVig== X-Received: by 2002:a05:6a00:228e:b0:827:433c:ba7e with SMTP id d2e1a72fcca58-8274d9ebdf0mr12827370b3a.41.1772500136339; Mon, 02 Mar 2026 17:08:56 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, jim.macarthur@linaro.org Subject: [PATCH v3 7/7] tcg/optimize: possibly expand deposit into zero with shifts Date: Tue, 3 Mar 2026 12:08:32 +1100 Message-ID: <20260303010833.1115741-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260303010833.1115741-1-richard.henderson@linaro.org> References: <20260303010833.1115741-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::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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: 1772500195065158500 Content-Type: text/plain; charset="utf-8" Use tcg_op_imm_match to choose between expanding with AND+SHL vs SHL+SHR. Suggested-by: Paolo Bonzini Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tcg/optimize.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index 59761c2c84..b1abec69a5 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -1743,14 +1743,38 @@ static bool fold_deposit(OptContext *ctx, TCGOp *op) goto done; } =20 - /* Lower invalid deposit into zero as AND + SHL. */ + /* Lower invalid deposit into zero as AND + SHL or SHL + SHR. */ if (!valid) { - op2 =3D opt_insert_before(ctx, op, INDEX_op_and, 3); - op2->args[0] =3D ret; - op2->args[1] =3D arg2; - op2->args[2] =3D arg_new_constant(ctx, len_mask); - fold_and(ctx, op2); + if (TCG_TARGET_extract_valid(ctx->type, 0, len)) { + /* EXTRACT (at 0) + SHL */ + op2 =3D opt_insert_before(ctx, op, INDEX_op_extract, 4); + op2->args[0] =3D ret; + op2->args[1] =3D arg2; + op2->args[2] =3D 0; + op2->args[3] =3D len; + } else if (tcg_op_imm_match(INDEX_op_and, ctx->type, len_mask)= ) { + /* AND + SHL */ + op2 =3D opt_insert_before(ctx, op, INDEX_op_and, 3); + op2->args[0] =3D ret; + op2->args[1] =3D arg2; + op2->args[2] =3D arg_new_constant(ctx, len_mask); + } else { + /* SHL + SHR */ + int shl =3D width - len; + int shr =3D width - len - ofs; =20 + op2 =3D opt_insert_before(ctx, op, INDEX_op_shl, 3); + op2->args[0] =3D ret; + op2->args[1] =3D arg2; + op2->args[2] =3D arg_new_constant(ctx, shl); + + op->opc =3D INDEX_op_shr; + op->args[1] =3D ret; + op->args[2] =3D arg_new_constant(ctx, shr); + goto done; + } + + /* Finish the (EXTRACT|AND) + SHL cases. */ op->opc =3D INDEX_op_shl; op->args[1] =3D ret; op->args[2] =3D arg_new_constant(ctx, ofs); --=20 2.43.0