From patchwork Tue Jun 3 08:09:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 893843 Delivered-To: patch@linaro.org Received: by 2002:adf:a2d4:0:b0:3a4:ee3f:8f15 with SMTP id t20csp179873wra; Tue, 3 Jun 2025 01:12:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUb1ykB47G+KpsXHL8sYX7k8Nri7JDJRAPYG45+nlwDhQgABUu9lYdJ5WMR/jX+Y2JnuUnYRA==@linaro.org X-Google-Smtp-Source: AGHT+IHGEu/ik9Z0w+Zsd6z1g8gKNetoRYzsE5A4/VNEW049qEbYwpV7dzQ9Z+KU2ZPPejhokbM4 X-Received: by 2002:a05:622a:4d4b:b0:477:4df:9a58 with SMTP id d75a77b69052e-4a443c6ef39mr265477231cf.18.1748938349042; Tue, 03 Jun 2025 01:12:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1748938349; cv=none; d=google.com; s=arc-20240605; b=c33TfQa/FW4oQi09Wv8giG3D5bvuXaAO97qlzwaqX7ky4bX8W0vj3TI6ABxpokTyaP qvPs1g6siavgCyAPeLPN1m77s9X14mzSIh1GBlSD/Hi4fa6GH6+2AIzSgbOpkAfFXG0X 565yDRvLTb+TOhPxrh1KgcMKyc4dpYB+QU+Y+8IZGn28X0vWbNVtB0y6mEZr2IkDpVod x78QT5q40tbh35AYliqfsh9cuTfMJ1mSAmCEhELrt6LkmqfODH6yJhwA1T9zHmzrvVeL vLdCcaVBhtrHoc5EHGFtG1BJQyLeDTaDre/GqyO/WFQPwvG012S0pOmAwMT66SagC56y CJpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jLyCJWwAAJN3vJgUym1RFGXdMsRqGuFjKTLnad9b308=; fh=3mEp7FusppN5Drq2PN08R8D/9xXM9YdbtG5TkJxJBiE=; b=CfpG4qukAAy6guafdygtaXSgED8qH3LKwobNByTaphAWnq841fV1yn7U6yajxBQxQ+ 8gVvOXrZIOrlRiF3m6qu6GEULUOq1Q+d49QDPTOT7Y7XbTNiaWmFuwV4a2nAKwN8/Kjj o5ZMYMUG2KzKso527PRRnxpEl+R1L75XFkNly3bvhZWbNMQ91iH/QSY3m8oRMyOI/jyr gx9kV0ILsuEzGL9UHwf/J4mp2HOLSbzUb7I8N6GpLViK5UPdNOTFnPefL+xQed52uiKh MipCrjuGOOJ6LsEto0eyrkKJm13SGgevzyz71GEGxJA7ugLeFYgyDrSovvX/QwVDgE9k fiZw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="k/LSsmkY"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4a435a5e495si124462351cf.491.2025.06.03.01.12.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Jun 2025 01:12:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="k/LSsmkY"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uMMk5-0004vY-9e; Tue, 03 Jun 2025 04:11:29 -0400 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 1uMMk2-0004VO-5V for qemu-devel@nongnu.org; Tue, 03 Jun 2025 04:11:26 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uMMjx-0005qg-8v for qemu-devel@nongnu.org; Tue, 03 Jun 2025 04:11:25 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-451dbe494d6so19978025e9.1 for ; Tue, 03 Jun 2025 01:11:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748938279; x=1749543079; 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=jLyCJWwAAJN3vJgUym1RFGXdMsRqGuFjKTLnad9b308=; b=k/LSsmkYguol8tAhKuR2EhnDRvpYUMcUJot2em8CjMu7O2HeL5t7PK/LTmczuJEww6 Kvgr4v8yzta1YrFULbgfNb3MpeOjH05lAXLpNLVIy7Oajz1l4/xkFpuyIpUC22tImcKI vXvuuOegECqos3fD6yoe7W6F/L/s3wuXZRmtlDyp/j+QJWx0aOX8f3aBgdeQuLZfVENf KdfdcTIifQ1S3LuzWXjdNHP/7fTTODVi5WbUdFgo1wqzYTbvOywHNeBI40oya16D/2xu TAph0B4R9zz6pNGR5h5sOAizawD78oTirn9d+ql63G6ByI3A7JCgixl12vJmBD6JiCcw k1Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748938279; x=1749543079; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jLyCJWwAAJN3vJgUym1RFGXdMsRqGuFjKTLnad9b308=; b=jxytURGaIxfm+lWrvr6QjHV8cqEv7ylYe8BBsJxC/llnP9R7J6ZTImltrX2AxSVrA3 Na4GGbSX14jUKfrmpPdmGsAT52RhX0VKhIJ14SXu08Hp14uZQrPQFUnEmrapU0yL2/nv yamQKaEWrJta47ghRZRMaoHK7dWW5FAvFTFlQQ6J7CKIC6D0wiFwwI0ppRraxLDINhUf F1RxcJwz5f/0Va2VexUGgY57UMbLVQJDQymJqzdeiz4lxCCDNITfRiui9kxg3pR5G7xL 41sqCWDR4IZLyzOogqsV/ZDAfKypG3I4W0pbwVZTfEEEJfQJ183mK7SgtB/PzydGcFOe KQug== X-Gm-Message-State: AOJu0YxGL3xC6aOseAjjJ06JgwsIKuEgWUiMxpYvqK+NSQj6T77e8bsf EQW/XpzFwnYdzhztwKvnk+05sJum7IcQ4pWsSF6EE6OraxTzYKEsxA1IUdbAB6I+kL/MMfrjF5B Hd50aJSI= X-Gm-Gg: ASbGncuAXBo4+OH1WyTx5Gkcqa4ry/1kFd0mzoJU56aYITrDe1VnySjUEhNBnA2pfCs ir8yhf5siM1jpOCWuifWVRX34v8Xagobh6Pb4rWn555j1ELhNCwgXvIe+bb4LxZM6v7N5i5/7R0 EZ1QXyKdGsmxbIluzZAFJXlg1/qm/mppLRRZyWOlJ0LSnIpPdPcvL41R+NuMTflbNjOyfOFEH7A u+CDWhKtmygi1TOaWeyGFvBmcPac3xG5RJ9yE+CqcsaXBUdxtAN1p4VaCwdcewQPW0DYj9FQsdH M3g8MLKmqtfnSxOaUc8jT0yMF4PeqnPlSu9tLrt4mLPIEP+AZNrMu5ruIN+vNG5vTrE89rlZkiv gasCC1KBck1mO X-Received: by 2002:a05:600c:3e8f:b0:441:b698:3431 with SMTP id 5b1f17b1804b1-451221a1bb4mr76609435e9.28.1748938279338; Tue, 03 Jun 2025 01:11:19 -0700 (PDT) Received: from stoup.lan (host-80-41-64-133.as13285.net. [80.41.64.133]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4f009ff7asm17668852f8f.90.2025.06.03.01.11.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jun 2025 01:11:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com Subject: [PATCH v2 20/27] tcg/optimize: Build and use o_bits in fold_sextract Date: Tue, 3 Jun 2025 09:09:01 +0100 Message-ID: <20250603080908.559594-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250603080908.559594-1-richard.henderson@linaro.org> References: <20250603080908.559594-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32a.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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org This was the last use of fold_affected_mask, now fully replaced by fold_masks_zosa. Signed-off-by: Richard Henderson --- tcg/optimize.c | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index abcbee9111..673849f07a 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -1121,22 +1121,6 @@ static bool fold_masks_s(OptContext *ctx, TCGOp *op, uint64_t s_mask) return fold_masks_zosa(ctx, op, -1, 0, s_mask, -1); } -/* - * An "affected" mask bit is 0 if and only if the result is identical - * to the first input. Thus if the entire mask is 0, the operation - * is equivalent to a copy. - */ -static bool fold_affected_mask(OptContext *ctx, TCGOp *op, uint64_t a_mask) -{ - if (ctx->type == TCG_TYPE_I32) { - a_mask = (uint32_t)a_mask; - } - if (a_mask == 0) { - return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[1]); - } - return false; -} - /* * Convert @op to NOT, if NOT is supported by the host. * Return true f the conversion is successful, which will still @@ -2669,7 +2653,7 @@ static bool fold_setcond2(OptContext *ctx, TCGOp *op) static bool fold_sextract(OptContext *ctx, TCGOp *op) { - uint64_t z_mask, s_mask, s_mask_old; + uint64_t z_mask, o_mask, s_mask, a_mask; TempOptInfo *t1 = arg_info(op->args[1]); int pos = op->args[2]; int len = op->args[3]; @@ -2679,16 +2663,14 @@ static bool fold_sextract(OptContext *ctx, TCGOp *op) sextract64(ti_const_val(t1), pos, len)); } - s_mask_old = t1->s_mask; - s_mask = s_mask_old >> pos; + s_mask = t1->s_mask >> pos; s_mask |= -1ull << (len - 1); - - if (pos == 0 && fold_affected_mask(ctx, op, s_mask & ~s_mask_old)) { - return true; - } + a_mask = pos ? -1 : s_mask & ~t1->s_mask; z_mask = sextract64(t1->z_mask, pos, len); - return fold_masks_zs(ctx, op, z_mask, s_mask); + o_mask = sextract64(t1->o_mask, pos, len); + + return fold_masks_zosa(ctx, op, z_mask, o_mask, s_mask, a_mask); } static bool fold_shift(OptContext *ctx, TCGOp *op)