From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2087.outbound.protection.outlook.com [40.107.21.87]) by sourceware.org (Postfix) with ESMTPS id 250743858C53 for ; Fri, 5 Aug 2022 13:15:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 250743858C53 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=Sr7zOlp0N0ZHFPgwRv+DMiRhe386/TDtEQH+wfLCJIWkDEIWZOlV3suPKLsbkVQh2Z2yqVgXTZAIAeqzxXm/LMxm9SOK/GmaM2ALE/bdBwkNTxb/7gMDFNjI804FVVpYLe4rcL8LRAbpdq6fZO9fWy/1MJcPR0nSyT+Q4ifcnpRjrd/ntOBn0TjsonvRUzTlUhek0/Mm2YlrfmMegfiGAOUnIAoFB0b+ynxPNIpL1srTJLSdh6GxvHneF2aehw/356Vjw9+fzo7r5ObDApf8B20kns+i7I7+ASDzFW/QtvizAG/C1DP72M9aY5xi5sefFCYEd/NSaWXisabVpDlFXA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=FyDqBDzIwcEJ/lCXccO2XIFOPHzY44M3HXqiwHu4Rl8=; b=FjhKbVIR1RZpClmBD9QubzVeV0Yk0a/Ft5IYLsai4jejNOL8fvU6jIo/dSc27Deix00VVRdB9OxJJfu7Ro2kY81uPpGv0LRR0gNaA81mZUZHT0cDOqLSDKhJDCyswhwOClsIvXV3AQGXOosYX1pyqGoTa2RN/SBQK+UJSl/hlDN+ONBM+Nas/MJzV/lcz1BVqAc6temMqYvrSGreHX6CKuX/QwpFd9JBITM7K3Fg1CrJVnTHqQ7K6rgwGDz3rIYHmJnbCgAWuILtM1xLMHzc4RbfgMmJuEF1GnMCnMO9BoqXmSzRRiJQjt/CtfjzFnqvIu6481aicRjlzjMOX4o4bg== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) Received: from DB6PR07CA0060.eurprd07.prod.outlook.com (2603:10a6:6:2a::22) by DB9PR08MB6553.eurprd08.prod.outlook.com (2603:10a6:10:25b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Fri, 5 Aug 2022 13:15:33 +0000 Received: from DBAEUR03FT028.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:2a:cafe::a0) by DB6PR07CA0060.outlook.office365.com (2603:10a6:6:2a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16 via Frontend Transport; Fri, 5 Aug 2022 13:15:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DBAEUR03FT028.mail.protection.outlook.com (100.127.142.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.12 via Frontend Transport; Fri, 5 Aug 2022 13:15:33 +0000 Received: ("Tessian outbound c883b5ba7b70:v123"); Fri, 05 Aug 2022 13:15:33 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: ffdb85aad4085c69 X-CR-MTA-TID: 64aa7808 Received: from acdbe22a573b.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id D8CFB054-A6C2-46B7-AA7D-F598E52B1704.1; Fri, 05 Aug 2022 13:15:26 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id acdbe22a573b.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 05 Aug 2022 13:15:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q3NavNTxww34nl9e/NQlpI6R6tIqEp2ywb2Ie3Y1mvsyfJ4cAMwqQVosmdoSIZ08MkuAIHdvIaRSyABkkWnRwFfTrUlPkoznk3UTS/KfV1R0MZ0LLy2sNl57+fPlxlOqLiXiOKBboKXRux6jMQy0OJ/Ux/c2vKqfRnpLgMsZkeXkVrnxeayDyLuB2GNHgxMfqkLvdXZyOv2ep1XkbbJr0Dm+LZPiTsA7fHPw6DbsaZ9R0sIijixvLyvsjAjIHqqx/UPKrf3yGq+4tSXF7+D/99N7SUZQYOHQnrSyjY3652pSB+yjrWZfNUf5w8BsZvSkv7X5HrkVdnUL1tXdfHTt7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=FyDqBDzIwcEJ/lCXccO2XIFOPHzY44M3HXqiwHu4Rl8=; b=VqklXF7GQjrxmumgSRsDZgnkJBmbhFSqX8Nl0b5HVkawuuvyz0tH18uCU7RfSooQQ7NUppqegspqRgedoBDEu4DqhZsG5BeK8bF5t1VfurjGkKYkgUZNOZ2eQQsbnAAp6F2/ME+Ohtjfou4YiPGXWuID6VSyWsMBcYp7RceVdUDz9qlpu260yw+r/ioJ0T886aIE/KtLAlfNhvCPa6uCExjTieQ2LLzh/OyjkKd2rIgFVMVDkx7FuVVuEhyasR9QO2AYlzAUUbGD2CXSAY9nQrXdyN/5Mg5vR/2+M4UUTpothoBkGdodYe2nM+wb1OSgT84LSPCyw8CE0jpGY/g7aA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) by PA4PR08MB6032.eurprd08.prod.outlook.com (2603:10a6:102:e4::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Fri, 5 Aug 2022 13:15:25 +0000 Received: from VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::3858:80b1:39b:1584]) by VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::3858:80b1:39b:1584%7]) with mapi id 15.20.5504.016; Fri, 5 Aug 2022 13:15:25 +0000 Date: Fri, 5 Aug 2022 14:15:22 +0100 From: Tamar Christina To: gcc-patches@gcc.gnu.org Cc: nd@arm.com, rguenther@suse.de Subject: [PATCH]middle-end Guard value_replacement and store_elim from seeing diamonds. Message-ID: Content-Type: multipart/mixed; boundary="dduR9FU3my/RXIF5" Content-Disposition: inline X-ClientProxiedBy: LO4P123CA0572.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:276::22) To VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 3efb61fa-4331-43fe-00c0-08da76e493f0 X-MS-TrafficTypeDiagnostic: PA4PR08MB6032:EE_|DBAEUR03FT028:EE_|DB9PR08MB6553:EE_ x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: VAfPEiHhCLqnwmt2S/hzBpSN5wZlnHMrbmXdU5lFtIwlXcWiX0JQth+8xhrSt8SZlqYJQCvfQT0XW6Rz6QFz4R6GlDT/QXk8yH4Kno9tvFLGslTcVEZAKbsyzvDODoK+RblNFwHEulj+WA+c7L0TK4FrPNZ/Oh2bDn0PihNBkYPSeaq9Iq8jLBow1GJkcXK0XpedIhd5WiYeGiYxljuZj/agguaoLG0ZQN90qvi9KtXrtLRWehBgny9cncApB9jFuqPIYRxnRcVGxRjFlThUyJyid69N407vtOO7zr7lXbthAc8X7qNpzUOKEGkDQqtInkoxlSuy1CqyYH7L8h0pzS22MZzSZ/0clS9d6rAOOu7Y+53NYTVu0yxLrKz3s7LHO4OUOTG3521O34WQbU6LpPr6SeuaLxRWpk9m4ZOWHKz419e5tlS1rJIosKB/h1woTS7B5M/L78WZDZktxgdwPpuxZXQklBRay5Tcwg6PgbdwS3sU//aqQ/SqpNArkhktw4RwHUWymHAx62gd1Pin0/OTHMLPLRgfdy2Y1haubU70VAtNjrLxTpGDpjsaNjwk8xRNLhZye1oqSblSrbF+f4mXhmUNcU3e4ERiEKfaNtoIYjn+IqFedFSlr5CWxHKfTB+6KElZ3P0i7u3xA+dTPgX1J+zJY/sIqOf7nddDNVvh8YqFqIKzUckMOC7cE6UEay0iDblxMMf9Uy1P3K/1eC/nZ+F8zg+UP0Pcg7jAeFyBxY+DRRLRl9n3V+BNQf2kCPe+AAgf75tKqPJoV0xQJdmN5Q9YBx6Hq1qecqenCYcRYN3E++4qqrrpiVEOuUrg X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR08MB5325.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(396003)(366004)(136003)(346002)(376002)(4743002)(478600001)(6486002)(6916009)(8676002)(6506007)(86362001)(4326008)(38100700002)(66946007)(66556008)(66476007)(33964004)(316002)(44144004)(2906002)(186003)(6512007)(41300700001)(2616005)(8936002)(26005)(5660300002)(235185007)(44832011)(6666004)(36756003)(4216001)(2700100001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6032 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT028.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 84d09a9a-61bf-4d2c-b0b8-08da76e48f0f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aMayU+HD1TqF6o6OUJ0MRRMikO4DjRz/8SDe7AJ2fZDvqZjVuTCK4adKpCQMjnzPv7TJ5FnLgD4W+HLvTfCEtHkQnCDiHVnN4TSGsoGeXldSN3Yh5I8zzBDXJ0cEQpxkHeCxCuijoHzWbUzN3lJByd97XYrQZ4YbQx2iCubeuulV07XzQHAQULjswbW5rKthPyQ/ZIFX8k6tvoUtm44OhWyR9hIsysidpwjnTTMUo0aCoGmZYA/f5+feYMkNlEDnCSqCR97PuA7ATK42CrnjRLJ+M4GI2ErVc5g2aCs4qy9uDVDkrSsqmSN3+hMvl2uWn4ktXkdVrYSkoWi324qYuSYvCuOQdw30dn5a+xmLCAinm76voijKrHYmXSUky5PkPp9FxH8MhkXcy5j1hHNgtF0J0OiiBUkTujHL4NHREuoyoNIog2kgMs1hNNBvpHINZndG8TVsTI0OlK3ux4VbRQqNwhanYXUNASg8xa8KvRWaVhoRjo1AIeiYnw/7XwMue3JZps2KNbhvLBlONEf87aqbR0YdXQXd8L+5wL+6EQpZBP3O8CkOmBQkQ2j91cvh3J6GZJBy8YqVWghIVltdaO78cbXYLEQbBmxBz7YjbdJzXO6VoK67jRz14QDXYN7gG2SiGEZHGhGq1aQfZxyuAmBbqSwPz4dAAhvIE7jCTMyUjsi7c+HUK3M7M9BxOEcGz2mLjFDJj5VDn3H+dEE+Vwdym1IteICRQXtvcSKV7d57g4BaxzDGFhiwzm35Njo1KDRCNJRs7fsweXn1Nls/LeiWtG62osfyFqyAOcWMWWHiO26xtvryrFJA/JGAc+6U6MwCKF1mWL3tJnW1H9d87QodvXLVT6KhXpjmaeJGUAE= X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230016)(4636009)(396003)(39860400002)(136003)(346002)(376002)(40470700004)(36840700001)(46966006)(6916009)(2906002)(316002)(36860700001)(82740400003)(70586007)(356005)(70206006)(81166007)(8676002)(4326008)(6666004)(44144004)(41300700001)(33964004)(8936002)(6506007)(478600001)(6486002)(4743002)(26005)(336012)(47076005)(6512007)(40460700003)(5660300002)(235185007)(186003)(44832011)(2616005)(107886003)(36756003)(86362001)(40480700001)(82310400005)(4216001)(2700100001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2022 13:15:33.2947 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3efb61fa-4331-43fe-00c0-08da76e493f0 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT028.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6553 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 13:15:40 -0000 --dduR9FU3my/RXIF5 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Hi All, This excludes value_replacement and store_elim from diamonds as they don't handle the form properly. Bootstrapped Regtested on aarch64-none-linux-gnu, x86_64-pc-linux-gnu and no issues. Ok for master? Thanks, Tamar gcc/ChangeLog: PR middle-end/106534 * tree-ssa-phiopt.cc (tree_ssa_phiopt_worker): Guard the value_replacement and store_elim from diamonds. --- inline copy of patch -- diff --git a/gcc/tree-ssa-phiopt.cc b/gcc/tree-ssa-phiopt.cc index bdbf52916b0f88ee4f475e1fa306046d61f13d53..1e002c608591836ffb001724b3f469a8d042ae5e 100644 --- a/gcc/tree-ssa-phiopt.cc +++ b/gcc/tree-ssa-phiopt.cc @@ -283,7 +283,7 @@ tree_ssa_phiopt_worker (bool do_store_elim, bool do_hoist_loads, bool early_p) || (e1->flags & EDGE_FALLTHRU) == 0) continue; - if (do_store_elim) + if (do_store_elim && !diamond_p) { /* Also make sure that bb1 only have one predecessor and that it is bb. */ @@ -310,7 +310,7 @@ tree_ssa_phiopt_worker (bool do_store_elim, bool do_hoist_loads, bool early_p) /* Value replacement can work with more than one PHI so try that first. */ - if (!early_p) + if (!early_p && !diamond_p) for (gsi = gsi_start (phis); !gsi_end_p (gsi); gsi_next (&gsi)) { phi = as_a (gsi_stmt (gsi)); -- --dduR9FU3my/RXIF5 Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="rb16124.patch" diff --git a/gcc/tree-ssa-phiopt.cc b/gcc/tree-ssa-phiopt.cc index bdbf52916b0f88ee4f475e1fa306046d61f13d53..1e002c608591836ffb001724b3f469a8d042ae5e 100644 --- a/gcc/tree-ssa-phiopt.cc +++ b/gcc/tree-ssa-phiopt.cc @@ -283,7 +283,7 @@ tree_ssa_phiopt_worker (bool do_store_elim, bool do_hoist_loads, bool early_p) || (e1->flags & EDGE_FALLTHRU) == 0) continue; - if (do_store_elim) + if (do_store_elim && !diamond_p) { /* Also make sure that bb1 only have one predecessor and that it is bb. */ @@ -310,7 +310,7 @@ tree_ssa_phiopt_worker (bool do_store_elim, bool do_hoist_loads, bool early_p) /* Value replacement can work with more than one PHI so try that first. */ - if (!early_p) + if (!early_p && !diamond_p) for (gsi = gsi_start (phis); !gsi_end_p (gsi); gsi_next (&gsi)) { phi = as_a (gsi_stmt (gsi)); --dduR9FU3my/RXIF5--