From patchwork Tue Sep 10 17:24:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dusan Stojkovic X-Patchwork-Id: 1983416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rt-rk.com header.i=@rt-rk.com header.a=rsa-sha256 header.s=s2021 header.b=Fhxjiy3G; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4X39ZQ1wrHz1y1S for ; Wed, 11 Sep 2024 03:25:17 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B6CE03858282 for ; Tue, 10 Sep 2024 17:25:14 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx08-0061a602.pphosted.com (mx08-0061a602.pphosted.com [205.220.185.213]) by sourceware.org (Postfix) with ESMTPS id D0B6C3858424 for ; Tue, 10 Sep 2024 17:24:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D0B6C3858424 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=rt-rk.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rt-rk.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D0B6C3858424 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.185.213 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1725989078; cv=pass; b=bVZFpYyusDyzhxlRahbOYFlHQ68TsfqAKs7zvjJ1ixUj3qScFtuh1ugINdu6ZRpqeEvY/COiGTtG75fMtJz6JVrdA1wQXieIpBmjvOwbgAZMuoRIVh6/jYu3X2r61Wzo8cXZVgouc3Wr1Ng1dw0xo3ELPbEtSCg0NFMXrMd8Dq4= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1725989078; c=relaxed/simple; bh=gbB+tgHtHVZFZngmJvEFccAPFPXFfkkxyqztlaQuaK4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=S2cWRAGJ4r6sLogqnvMwRAa2HzIw7xlms63UCVmvnTXjEr+/RLu2tp/m5hIYW5ORvEUlyexOktcU+61RhQ6c8gk1ilM9yIGvCnpX88oc8OB0G79u+fEPy/J5Dx8uxuqJasWNUazaNw9S1R0Z8rDwHRL0Y+lq1rm9GGlQJpw7Vvg= ARC-Authentication-Results: i=2; server2.sourceware.org Received: from pps.filterd (m0278994.ppops.net [127.0.0.1]) by mx07-0061a602.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 48AGAdik030482; Tue, 10 Sep 2024 17:24:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rt-rk.com; h=cc :content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to; s=s2021; bh=WsvniXsKX7Pr461BI5m5MhCVXt DTK+4mwvhycZdG0Sw=; b=Fhxjiy3G7RV1MltigB63cHYN2TWv+K8l45gXYMcnkc bA9BKA/9+s09mhi+e2IY9VoJea+9ko/h2TbNuhS1FIWD7W3b1vWHUirVtbqCOrg0 WhiMZSKHVfZxU0NjC9hRBw25RDebsigP1gxoLYyGnEF6kEkQsXPNZYDscqVcOKM3 erqgygoYgkYEwqi5Qdg8AdMyCj4mhyAOJg/pyEJJUJQys7DMGJWYTX2BsMEGyEFO BMTyz/4t+gIrIsEMpgPIMmymAebSESqTXAa+3etETdEd+7BFPyHLGB5Su+aPueXH D/OudDCK6JneR0pEFQPYD6+jdZ8MM+Mrk1I9LrX4TedA== Received: from eur02-am0-obe.outbound.protection.outlook.com (mail-am0eur02lp2240.outbound.protection.outlook.com [104.47.11.240]) by mx07-0061a602.pphosted.com (PPS) with ESMTPS id 41gc204k3s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 10 Sep 2024 17:24:34 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wtopv75avAhiPQgg+N70CotmSdVEqh8X107/iPs67f1Zf8gW7q3/UKRWWhcGiSyuFfBL4fLbLCukKpV+Ct76adGczcu3G1qd/hquyblv3rcQBr6JKq4OHyuFiwssF0nwP37nOJCRMlzSPofnU/NdXPiRbAqblfAUydyiNLq++m6Mf+OJwd4lo2JLhVMlxp7L2cXn7WXYCADNcT46Ke7+Q/OXmfpLQdjV7JY34CyHOtK81f05lB6e9qZhP8hkgwV4d8lVPfprQRTF9lIxDdEKe5FFAKEXZCvUtjx3Y63EzmP0qu0jQyWTU48Udfu9IVSXjtQyrkh9ob0mpgqRBp1anA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WsvniXsKX7Pr461BI5m5MhCVXtDTK+4mwvhycZdG0Sw=; b=siG/bzha51FXJOQuKUIQQkBnjWyQXedas3Cqm54uYX4/2uDn19KzOsEYl7wLJR62nJayksPPMlOA0kPOdlsQN//SSabP+pcIug6C+nxCt2P/446ZrMhmYTDdv3o97kGZqOehN69/L1kcUfQP0wnF2Fo19vlGa6OwntT6kCKsXHCbBPPK71rpdFCKPxq8crEh0QTi/1cAFBfZAsXtnAN6CWnwDv2OUERnJN5otaFb7cQtJQxge9Jve8J+oHLF1dbs1aOK+vtaBqMLsJfNKLyqQb25pl98ZuQVLjuERb4rvki9iSFZVbpHxLoDinZ2QtnMui2o0KpJ7ysH6yx0jyCPUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=rt-rk.com; dmarc=pass action=none header.from=rt-rk.com; dkim=pass header.d=rt-rk.com; arc=none Received: from PR3PR08MB5738.eurprd08.prod.outlook.com (2603:10a6:102:81::7) by PA4PR08MB7667.eurprd08.prod.outlook.com (2603:10a6:102:264::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.16; Tue, 10 Sep 2024 17:24:31 +0000 Received: from PR3PR08MB5738.eurprd08.prod.outlook.com ([fe80::1ff6:cc35:8eb0:bd1b]) by PR3PR08MB5738.eurprd08.prod.outlook.com ([fe80::1ff6:cc35:8eb0:bd1b%4]) with mapi id 15.20.7939.010; Tue, 10 Sep 2024 17:24:31 +0000 From: Dusan Stojkovic To: GCC Patches CC: Jeff Law , Robin Dapp , Mile Davidovic , Jovan Vukic Subject: [PATCH] RISC-V: Align vconfig for TARGER_SFB_ALU Thread-Topic: [PATCH] RISC-V: Align vconfig for TARGER_SFB_ALU Thread-Index: AdsDnX7O/udwMb4nTAatkr84IIgP8w== Date: Tue, 10 Sep 2024 17:24:31 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PR3PR08MB5738:EE_|PA4PR08MB7667:EE_ x-ms-office365-filtering-correlation-id: 611e11de-1f42-4ce8-2fdc-08dcd1bd6e76 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; ARA:13230040|366016|1800799024|376014|38070700018; x-microsoft-antispam-message-info: B/FniSubJd3vgab7hNROtFzMP47TPoL+Su5hHOMTxbF8Q4GG5H4Bq74otL/WzT13GyxzNB/ni7mBRYm3rOKUFDFJdG/FpPcj/X4SQKuLlrUsfXk0NFvDGqhYvqHsze04QTUzJQ/JyKHdQmJZX956R1SoTiutOnN5JG99tJdRHINNMAKFGYrZ4DhQmM+fAB3F8sVlE2skIBHHK0treDxwZwblpJlWbEDJTW1+cRQ+U/QzbGjnJjFG56pagj+UxdfDbjRFw7Cz6Ndih2RS88L95zGmDFa+quX8+rbXnA981PX+s+tdCSkz4iaaTPv8GAjQdNf2gG5A6YpQoniooSEdCzoWB43LkljNSwqkLM+I1Bd1tTbJZzk1vPV83iC4ym8qY+VLiA6iNljybbEf2G5PxXn/lJAgG30tes0lS6jt/IAUiYxuNXf2nwkHDUqZ72ZxXXqeBJtxn/9yYHFGk5Sc8pxqkudUSKJnVFtAnbKYBYvnsKdejewwXn4LRhrL9CK4TJdP1yfUmevzaC4A6UYE/gUsRDUstQW/DRsANr1dFC5pxlplf84OMaSb9eeOJBA7X3WjfEgJAdKZlYP6Ir9Xq9Onp0iIzcflH2aTDp69zrRuEyfwt5sxjPdcrag8FvfVtgzHdHxwxZ4XWqmeIuFYOSjv6RGDFXEIdmnTRTu0SuVafIoAiHNc63v+zl+Ygzi+/iZNyipGc62cMMky0jQ7//kUg/bB1DhdzUN3hVf0++wysB1JBEXbjbxkIyvOTB0mK9LDoHrMtVyHyq8kWTSj8X4u6d7pwhRu5M25ce0VXzfU912YvmHFGR7MMFrRTgezXQ79oJiudQPfxuAryVOoG4RnexLikuMMm/qBESRx0lECVNFAu1ghnLfG4/0bkRSg0sEbkxjoI3abieOOCjpDgRr5cGk/Ab3hkeMVIte58vez6uojMpRZIqxuX2rYte5OoP3Txoes9G7GNQ0CehQTk9b51Tb1BSsP59839L9mifk4nMhOOcu4ewMOJaK4JS3LpMuOCC+BbWKKrHcMn8WFXRO9LfaprHkV8dxQqbChw21LcTBnwIhVfQg8tNl1iFChZ7w8NHOHUxQYWVf+ZPooRc32KSn18uMH/t2RPUeTLpDWga3bSeowILxiw+9JY3YwiD/PjeK77mrADvAgOZImlAOpG5JjXaMCjzEofeLud2hm7ilHAGW3thuMo6mHLJ2/GO9/9qN1320NBu6fBZERpP7ZVAtpjmWH7nxLwp8sF+/kRBgIy0LbF7LkiwltqMpn3AiLN6CN1QMLVpn5wr0NrjEjBVgzXP+0DaNt39Fg1U22vQQ4iW/Oht21m08poTDYAtLmnCR3xOvG07niSdDMOJ4FzesmP+BGgzDQY6o7oJ+oMKSCCzyifNn8RPPu0TObghYUpVyCgJRIYeurtTIZCQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PR3PR08MB5738.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(1800799024)(376014)(38070700018); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 8I1RBEMtt2WVFhXib1E56QebpIWX3S+GxteEx97rRo2QUeGMJwzMZnmYR2XSUGvY2XkL12mdPo5M8yBF2S3McSFTagYu5Vh2Rdn6JLOjSxNzfpHRYfrQ7qZksdZUAWV7PnQNToGC8+lH9WmObkkRlxyK8d9uW2AuMHZVw80OTI9kAzYincaS9rOzRoRQKZdM35kSwnHEXSbhZKzIFkIQgTFD6/Varx836inm7L8QAL/uTovel3khkxQY5DUyKMrOSgkvs0YusKJDt/UFalFI24Tc+hBFFPDmP2bjxTyDYksdHztTaNfXDmPfck3XRiATUV65YPYC91QCuuCbJfjAWx8ISpvX+EEmEDbqMtBEQNhij3yND79YAlAsxz5yvvlfemQ2T2LmTstrqSzFC2i6ZbnR0DBbhvCzdp7iRC9jDxPRVvxgLf1Pfp22iBh9HObhvY3XVt2wOP6k3p8AMtaU+5lbGoAdMGa9AoqVmKqN2SAViIP7Vu7SNAymqgrf0wZyoeSZgMpQINa5ddKJCLScUsoqoHVRiyVMPY6WgD60VDEziJPmtu2uIH6uSObm/qDQC+4UxaOlOXecNaz4BDK13pUlT0qyfHfQvJMq2+05iNI2KfzaZJcd+qeKECA4xFe/pD/nkbvnxk+Bq6IKDfvRMrtRx7NoJPOxvpwotsLyTulzmZOs2HC+9ooy+O3aFEm2hCAouBqR6tvfp9z4f3BeE0zwVRMMCdJmPTajr8/mWMfeut77KpSrIqqQNeVfWZjvSzzi5M6ly6vNTF/qWhUEYHBO+CnI2jhMN3yZG2aSKfjQvP7fDg5VnpLrFIkKA1YQQV+bZcL23v054sCHXnsYDoQLhjHFAupNZIkYdC2azxHObf1wtmlOnaW5Ziy45lrdxoDEK+sGQJ8DPTrTX05xffD4cYUcLbzNiXY9q5tcunIqwa1Wf+qJ7MRkRfpx1ZoRb6512c37xRp01iTESTa+edEFtyL8Z0w7AEa7VrjJwkLmCUmb1qJSao1/0+HRT0mWYB4nhzz7uY0CbaJST1a8jTnx3TvVS4xOhqYrWGIfiodRuAzD6iFSuDEC8dUHUiaKAkWZ/ZqnQk+LMRaWDN5fkOo0idSrY14hTlib2VaXj1Nc3YYmv5pcNsN+WoedirmrmvdLFCSQosepZJGSU5pXqFuJ2fP49k+LCiOPyRep1HqbrPFySH2uIglpAXLSB4uENmmcjtGazePBAPlWUfOGA82/9B9gdSpmV6VgEiORyWITPt46hY4MfpU7GNOVJQv6Pq0KP0PKnFciqMrZP+0R46l4MkthkXSl00KK8EGBzI7kcnZDYThkyBiVQ8OJRGWXWDM1V2SGE8S+7gZCTmeeVBA08R6p4jI0d1YbON8SQfyH8OZOuxJCS/RfXqVjdXq9DCX/elCMSOo/R6ada4AzaQm3S1C77/dTMMvZ1aFO24xJQTa8PlOyBS+F+lyEi+2th9vOQJkK2p/J4tJj6rq9XZlVhZJYmuKh3ha0EaXEb6fW7LzyUeLv0QkTDK/roZeu/loJk2Wrmmae8kXr7rxaH0zpL3oE8i24bVsEn0D3WToYE79AYM698WCZL9WJ9FSz MIME-Version: 1.0 X-OriginatorOrg: rt-rk.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PR3PR08MB5738.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 611e11de-1f42-4ce8-2fdc-08dcd1bd6e76 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Sep 2024 17:24:31.1742 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9bc3ed46-a3ca-43f0-b84e-9a557209a7df X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4tTup5+kLg5F/IFe4KrypH/EBGlrS/sEGSe+BJ7N3Y31YHn5j4MVT178Mg0cWBUrvJSfQ52DTeuy6gUpBeUxQvP9HWMF8w4+P1Jywa9eOjg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB7667 X-Authority-Analysis: v=2.4 cv=SKYQV/vH c=1 sm=1 tr=0 ts=66e080d2 cx=c_pps a=8EcF5w7+36eTGL4nqHYRog==:117 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=EaEq8P2WXUwA:10 a=bp5mhLeJ-vUA:10 a=wT45_P3iAAAA:8 a=ruVQfP2mWXFz3Xhqq7sA:9 a=CjuIK1q_8ugA:10 a=RJRP_u8kRGsxlTjV8B5_:22 X-Proofpoint-ORIG-GUID: S2VmSHXTHDv0HNMVeT60qW2uNV2xYShO X-Proofpoint-GUID: S2VmSHXTHDv0HNMVeT60qW2uNV2xYShO X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org This patch addresses a missed opportunity to fuse vsetvl_infos. Instead of checking whether demands for merging configurations of vsetvl_info are all met, the demands are checked individually. The case in question occurs because of the conditional move instruction which sifive-7, sifive-p400 and sifive-p600 support. Firstly, the conditional move generated rearranges the CFG. Secondly, because the conditional move generated uses the same register in the if_then_else pattern as vsetvli before it curr_info and prev_info won't be merged. Tested for tune={sifive-7-series, sifive-p400-series, sifive-p600-series} and arch={rv64gcv, rv32gcv} making no new regressions. The fusion performed also makes the following tests pass: * vsetvlmax-9.c * vsetvlmax-10.c * vsetvlmax-11.c * vsetvlmax-15.c for all tune configurations mentioned. Specifically, the scan-assembler-times vsetvli\\s+[a-x0-9]+,\\s*zero,\\s*e32,\\s*m1,\\s*t[au],\\s*m[au] 1 tests in previously mentioned files are now passing. 2024-09-10 Dusan Stojkovic PR target/113035 - RISC-V: regression testsuite errors -mtune=sifive-7-series PR target/113035 gcc\ChangeLog: * config/riscv/riscv-vsetvl.cc (pre_vsetvl::earliest_fuse_vsetvl_info): --- gcc/config/riscv/riscv-vsetvl.cc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.43.0 CONFIDENTIALITY: The contents of this e-mail are confidential and intended only for the above addressee(s). If you are not the intended recipient, or the person responsible for delivering it to the intended recipient, copying or delivering it to anyone else or using it in any unauthorized manner is prohibited and may be unlawful. If you receive this e-mail by mistake, please notify the sender and the systems administrator at straymail@rt-rk.com immediately. diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc index 017efa8bc17..f93e0c313b6 100644 --- a/gcc/config/riscv/riscv-vsetvl.cc +++ b/gcc/config/riscv/riscv-vsetvl.cc @@ -3052,6 +3052,22 @@ pre_vsetvl::earliest_fuse_vsetvl_info (int iter) else { vsetvl_info &prev_info = src_block_info.get_exit_info (); + if (TARGET_SFB_ALU + && prev_info.valid_p () + && curr_info.valid_p () + && prev_info.vl_used_by_non_rvv_insn_p () + && !curr_info.vl_used_by_non_rvv_insn_p ()) + { + // Try to merge each demand individually + if (m_dem.sew_lmul_compatible_p (prev_info, curr_info)) + { + m_dem.merge_sew_lmul (prev_info, curr_info); + } + if (m_dem.policy_compatible_p (prev_info, curr_info)) + { + m_dem.merge_policy (prev_info, curr_info); + } + } if (!prev_info.valid_p () || m_dem.available_p (prev_info, curr_info) || !m_dem.compatible_p (prev_info, curr_info))