From nobody Fri Dec 19 20:23:01 2025 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=1733844787; cv=none; d=zohomail.com; s=zohoarc; b=bWo4IHKhplD09BCyjJoWO9CAKRryeESJQPlS4NUIYvPPhJHfj6hEgkDlwyDX10XwTtTByJvhinkTJb/c91YBlQY5H9azpkLWbXEQ6++eImlojSTaCCjTnBT6R3hfKhkFTiRU7jRE9Fa2SxnhsfktztokbFuheLn45gDJjnie5N4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1733844787; h=Content-Transfer-Encoding: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:Cc; bh=kk1vW6jFHzIeel5bbAGFsFlrjy89Dvl21DC4rV/7wrE=; b=DS0hvkrBKFVPDvjeGoms3VtwGVa+eHVlEFDlpb3MvxpOJA+bAjhANXEAvxUS4w1jSB1lgiuTwiSpGPAL/YI6BDcESfKpWdIcCYwrjFsM88V9e0iar87BC0VQKnj48yl2mwiuHQ5K6PJ6YPVA5Aajw2hBQS99faNgyyRvtrVBH5A= 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 173384478703384.13687560490109; Tue, 10 Dec 2024 07:33:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tL29k-0007Je-F3; Tue, 10 Dec 2024 10:28:12 -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 1tL29f-0006V2-4h for qemu-devel@nongnu.org; Tue, 10 Dec 2024 10:28:07 -0500 Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tL29c-0000K9-JO for qemu-devel@nongnu.org; Tue, 10 Dec 2024 10:28:06 -0500 Received: by mail-ot1-x329.google.com with SMTP id 46e09a7af769-71de334f141so734479a34.0 for ; Tue, 10 Dec 2024 07:28:04 -0800 (PST) Received: from stoup.. ([187.217.227.247]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-71dc4a0267esm2785955a34.52.2024.12.10.07.28.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 07:28:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1733844483; x=1734449283; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kk1vW6jFHzIeel5bbAGFsFlrjy89Dvl21DC4rV/7wrE=; b=O2TTLg33l3CZia6oKueByDTLbwShjORKW/YGyNTkTooKLM8es5hmcCnfiUkvK+5Uqm tV7e5Dpic1A6rgq/B39X5O+rPdPR5c+NYTWdcJ0kfmLsgayzW2aYp8oqi8zdOxp5WQeh zAO+cyamMYb5Rm7dp5NSDYKx0xMTo4eSH97xr7HS5bRj33SebSrr/fJBu8gymxz+jr+J 9zCcdRPmPC4LOQs7HYwYpJVUj4xT0PNlEt01/danOkxTKVIYtJJWwikQOpoE21WP1i9l hhVL0xKLbPwxGTczhgXfLD2MLQJXblxkmdPfqI+oaiuvBLtG5q0ikDZRHMDWJS2iLnnc 8CgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733844483; x=1734449283; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kk1vW6jFHzIeel5bbAGFsFlrjy89Dvl21DC4rV/7wrE=; b=n3vLs2MWA1gVzz09Fc2xWFf1qaXxgw861+Bli4i1GiNsbaJT96HP5oCBLoxC8UWZzH 2UfuQLkp06hksFpq2pN2E16ZfHr2wvl/KGcq/ZUXSMW7cLZOgcVb0Crv23vWkFV/KRmC KWKGoNBq6m1OSoFk8BugXR5yeEZnxmXpLy2P0pat8+uTdZMy1JW0vYMNEq0Um0VyDTeg nrWl3NwaGlBcXjQnh8OrGA0SeS7I2QE0wLpa6zFTnxI7LGAeNdaqS0vGKP9pbv82xLVj cYYfTX0IoxRunyx8AcWyHoyDPnDEHWHxTLsuwz8b5LhOZIPkHbx5Z5XB8CzOglrkjD0B 6BIA== X-Gm-Message-State: AOJu0YwUviPm0mbhFlZtaE7IlyFixhchjmPDCrpbOX9/kTKO9uVFJCc3 aRgmUcFePOqUb21Ilwsp1dYDbEEFsINWcexwHihyxIdOjjan5qC7X3PvsFmGwpL7kykeazoHi24 KL2DNhyzC X-Gm-Gg: ASbGncsJgoA5+RzFXlyjSLzbh78xPaOVP+WT9f8LEUSDY9enVishAvYjb+fHyGpAwIb mGkS9ObVVOcNO5SZay642pfkcLAr6ZrvVzYg5f6VvjZnBu3RRSWsSjdQa4fFGxJ2W/oUBMUeoOM ZeoIUSYoY7AdfZeWXhArbQUWL2wmcaE80chTCwe1a+HdoknbWJBTj/sh0F0QZdq5POV+pNTuLs+ r/Q82397wkCc+Cq1ETf0jqkYTUdOXZizajeeBdvK3iorFnS3iKvGnooADbCyA== X-Google-Smtp-Source: AGHT+IG2x8ffnGKfRMw8yvwTviJAAdFIa7OQv9xtk4G0/JfOS3qxmbwwoKQ7xNTa/ZylQwbeZopWEQ== X-Received: by 2002:a05:6830:927:b0:718:1863:a3fa with SMTP id 46e09a7af769-71e021ac7e8mr2409944a34.10.1733844482995; Tue, 10 Dec 2024 07:28:02 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 45/46] tcg/optimize: Move fold_bitsel_vec into alphabetic sort Date: Tue, 10 Dec 2024 09:24:00 -0600 Message-ID: <20241210152401.1823648-46-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241210152401.1823648-1-richard.henderson@linaro.org> References: <20241210152401.1823648-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::329; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x329.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1733844788043116600 Content-Type: text/plain; charset="utf-8" The big comment just above says functions should be sorted. Add forward declarations as needed. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- tcg/optimize.c | 114 +++++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 55 deletions(-) diff --git a/tcg/optimize.c b/tcg/optimize.c index eb6e93809e..54082042aa 100644 --- a/tcg/optimize.c +++ b/tcg/optimize.c @@ -1191,6 +1191,10 @@ static bool fold_xx_to_x(OptContext *ctx, TCGOp *op) * 3) those that produce information about the result value. */ =20 +static bool fold_or(OptContext *ctx, TCGOp *op); +static bool fold_orc(OptContext *ctx, TCGOp *op); +static bool fold_xor(OptContext *ctx, TCGOp *op); + static bool fold_add(OptContext *ctx, TCGOp *op) { if (fold_const2_commutative(ctx, op) || @@ -1347,6 +1351,61 @@ static bool fold_andc(OptContext *ctx, TCGOp *op) return fold_masks_zsa(ctx, op, z_mask, s_mask, a_mask); } =20 +static bool fold_bitsel_vec(OptContext *ctx, TCGOp *op) +{ + /* If true and false values are the same, eliminate the cmp. */ + if (args_are_copies(op->args[2], op->args[3])) { + return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[2]); + } + + if (arg_is_const(op->args[2]) && arg_is_const(op->args[3])) { + uint64_t tv =3D arg_info(op->args[2])->val; + uint64_t fv =3D arg_info(op->args[3])->val; + + if (tv =3D=3D -1 && fv =3D=3D 0) { + return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[1]); + } + if (tv =3D=3D 0 && fv =3D=3D -1) { + if (TCG_TARGET_HAS_not_vec) { + op->opc =3D INDEX_op_not_vec; + return fold_not(ctx, op); + } else { + op->opc =3D INDEX_op_xor_vec; + op->args[2] =3D arg_new_constant(ctx, -1); + return fold_xor(ctx, op); + } + } + } + if (arg_is_const(op->args[2])) { + uint64_t tv =3D arg_info(op->args[2])->val; + if (tv =3D=3D -1) { + op->opc =3D INDEX_op_or_vec; + op->args[2] =3D op->args[3]; + return fold_or(ctx, op); + } + if (tv =3D=3D 0 && TCG_TARGET_HAS_andc_vec) { + op->opc =3D INDEX_op_andc_vec; + op->args[2] =3D op->args[1]; + op->args[1] =3D op->args[3]; + return fold_andc(ctx, op); + } + } + if (arg_is_const(op->args[3])) { + uint64_t fv =3D arg_info(op->args[3])->val; + if (fv =3D=3D 0) { + op->opc =3D INDEX_op_and_vec; + return fold_and(ctx, op); + } + if (fv =3D=3D -1 && TCG_TARGET_HAS_orc_vec) { + op->opc =3D INDEX_op_orc_vec; + op->args[2] =3D op->args[1]; + op->args[1] =3D op->args[3]; + return fold_orc(ctx, op); + } + } + return finish_folding(ctx, op); +} + static bool fold_brcond(OptContext *ctx, TCGOp *op) { int i =3D do_constant_folding_cond1(ctx, op, NO_DEST, &op->args[0], @@ -2758,61 +2817,6 @@ static bool fold_xor(OptContext *ctx, TCGOp *op) return fold_masks_zs(ctx, op, z_mask, s_mask); } =20 -static bool fold_bitsel_vec(OptContext *ctx, TCGOp *op) -{ - /* If true and false values are the same, eliminate the cmp. */ - if (args_are_copies(op->args[2], op->args[3])) { - return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[2]); - } - - if (arg_is_const(op->args[2]) && arg_is_const(op->args[3])) { - uint64_t tv =3D arg_info(op->args[2])->val; - uint64_t fv =3D arg_info(op->args[3])->val; - - if (tv =3D=3D -1 && fv =3D=3D 0) { - return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[1]); - } - if (tv =3D=3D 0 && fv =3D=3D -1) { - if (TCG_TARGET_HAS_not_vec) { - op->opc =3D INDEX_op_not_vec; - return fold_not(ctx, op); - } else { - op->opc =3D INDEX_op_xor_vec; - op->args[2] =3D arg_new_constant(ctx, -1); - return fold_xor(ctx, op); - } - } - } - if (arg_is_const(op->args[2])) { - uint64_t tv =3D arg_info(op->args[2])->val; - if (tv =3D=3D -1) { - op->opc =3D INDEX_op_or_vec; - op->args[2] =3D op->args[3]; - return fold_or(ctx, op); - } - if (tv =3D=3D 0 && TCG_TARGET_HAS_andc_vec) { - op->opc =3D INDEX_op_andc_vec; - op->args[2] =3D op->args[1]; - op->args[1] =3D op->args[3]; - return fold_andc(ctx, op); - } - } - if (arg_is_const(op->args[3])) { - uint64_t fv =3D arg_info(op->args[3])->val; - if (fv =3D=3D 0) { - op->opc =3D INDEX_op_and_vec; - return fold_and(ctx, op); - } - if (fv =3D=3D -1 && TCG_TARGET_HAS_orc_vec) { - op->opc =3D INDEX_op_orc_vec; - op->args[2] =3D op->args[1]; - op->args[1] =3D op->args[3]; - return fold_orc(ctx, op); - } - } - return finish_folding(ctx, op); -} - /* Propagate constants and copies, fold constant expressions. */ void tcg_optimize(TCGContext *s) { --=20 2.43.0