From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2054.outbound.protection.outlook.com [40.107.20.54]) by sourceware.org (Postfix) with ESMTPS id 420983858C66 for ; Tue, 23 Jan 2024 16:03:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 420983858C66 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 420983858C66 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.20.54 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1706025844; cv=pass; b=HPR2JbiKaIqOme9RfUwmKeD2ljEzY2UtL2UOM0iq6mevHYsLw8ACRdeFgTSL2NyMc8E2B6c6ZF/BcngA2vFBgaJUNgshldn/6hdgA+vsR3MhwKPPN9br2L5HN/ADlfsHJeM0rb3OJpo1tfGSJAp0LW7WhD7neJqUaYRTHIYmpgQ= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1706025844; c=relaxed/simple; bh=xHRy8xjB+C/cT6nDWgaSwtjsKvguPu8UwVBERTyetxw=; h=DKIM-Signature:DKIM-Signature:Date:From:To:Subject:Message-ID: MIME-Version; b=clYLDYw1TFaG0OTT/bONU7TVL47FPX+S8W6iFw0TccTWWZ9AI8yQp88MzwlYTK+EjVvSpO0ntMAWP5R6aXziCSYRq1FOhLUd/Ev//ycpUWGeA2KOxb0BK2rPM4Tvi7GmCFPvkZ56sWEGGzGnInqrPPNeaJb/IRE92IbAK8fFS4E= ARC-Authentication-Results: i=3; server2.sourceware.org ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=AgHOj8LrKw2xLyqN4bMA4qimxhV6c7A7sqIFgK14qYt42O+NhcDLs8w0bDqIJqAy385NZCXzoiv158h4n9hWjwYClC40HEEEKAlJOlo0BbGEIZN+aK4yZeyWQLSJfx69Z7D8d3LvUx8pj0w2KffwMWzeZD4lT3TYrDVwgvUqqt7pnB/FquMJwOShkvErAtgp0SLFimy/a6Djsyme8R7R9eAam9yk+ij7SHSiCS88ZMQ9xF7nvKTK1uspeMrX6r7b+v8fRb8O3g4I6QWHUDp7zMUpObxi+ytX9TYjJEsmi/L+WdQ9m/gZxPmdb1Kek5BsxDQIAUHd6kxy/ncR4vdDSA== 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=ima1v6JoL9gSNHAx+SHaIwhZz0mOK22qq0XkJ9Jy6XY=; b=eMxZ4MrSolHAs2b26KouT1KHwF4xKmTtKG4SKukQaXIW1b+E4EgzALn5RbhcqFTgfkYbni8YrqnNpQfGtW4cayjtxmzzOQBLeaZq55GwJ6hWrwzzkJ7MB2ALkQduh39BEUfNg9lP64d8YUfteF17Z4+ccMUtwI6rxmqrXxEtRPYTPXCsj3jH3y1HJtRqMrmHsZqHR+QkqYBR3ZgRCPDTM7LCovDc6414OdQR1v6IFlCgibse9VXZ9sSDQs7JUXqfbkayOcy2XpG0cfpt6Mn5EcSeECv1K2Qw8449I8LXzyDhlkO1QCk62fmpeiBz6WRZClm6AYM0SMWJH6q1VXEsJQ== 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]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ima1v6JoL9gSNHAx+SHaIwhZz0mOK22qq0XkJ9Jy6XY=; b=Joj1RyqkxW2U1eWAElWp1rerqXY+KVOHQkmlcg23/rAqe7E5k8z4B4dFnUTl8MOtbbPSAbrekDPhkjbgK3rbYPMZJkbd3SnWn5T3jbvE4VLueTskax9KRiyD/gHTSC4ZSBIpV8NQI0kN9VYBCaYJhC/sQSTLWjApbCVvxb0mDCw= Received: from AM0PR07CA0024.eurprd07.prod.outlook.com (2603:10a6:208:ac::37) by DU5PR08MB10678.eurprd08.prod.outlook.com (2603:10a6:10:528::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.32; Tue, 23 Jan 2024 16:03:56 +0000 Received: from AM4PEPF00027A5E.eurprd04.prod.outlook.com (2603:10a6:208:ac:cafe::50) by AM0PR07CA0024.outlook.office365.com (2603:10a6:208:ac::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.20 via Frontend Transport; Tue, 23 Jan 2024 16:03:56 +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 AM4PEPF00027A5E.mail.protection.outlook.com (10.167.16.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.16 via Frontend Transport; Tue, 23 Jan 2024 16:03:56 +0000 Received: ("Tessian outbound a297577ee0df:v228"); Tue, 23 Jan 2024 16:03:55 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 2828603995d4d610 X-CR-MTA-TID: 64aa7808 Received: from d8ac124d1ed7.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id D900F12C-2759-4D8C-910F-B371393A4CC1.1; Tue, 23 Jan 2024 16:03:49 +0000 Received: from EUR03-AM7-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id d8ac124d1ed7.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 23 Jan 2024 16:03:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dFueHdKSzJaGnLC+dubRj2VMsPuLr57Q1vUTXgHENwHpI3/LuShLje+/0ybXrJ49acpCbTD4uNIc/1HMDf0VBQnOMtgkT0TerFTJTHHZOmCBXwUOqdClCFPq3sA4XE4Yc9iPOBwseiyw+tNI+AZNo+d7TywRUh7vDSOsbPsHfSTr0OH+uXlOVyuTxTi3gcNGFm5WSFREzeBDh0iHDqubXkV4MpEd8NNt/eFQoriJjBImj3sfLNBXfqqobLvjHoAmYhZydyN/6NGFlLbOMUz83qQRxsT4LecD+MmpMZ62TroojnN9SxUsZF33xYZwf4E6ulRTemz74u2trdKTybWGcw== 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=ima1v6JoL9gSNHAx+SHaIwhZz0mOK22qq0XkJ9Jy6XY=; b=ERsi/z/2/0Gasma1CVjLCJvxig9xRo9za2Ns5f72+YeI0ZEn/NMH4YkIItJ5GqxuJiSCIDFi2IiOKC1DTTcF+9QByJn7v48wLHNtoT3qBzwZQ0Hsei9sti1oebUrF4dbe9xw7XWyT4GV3EcGLlgoJdD8gU7oLMMd0SIL60tJoiOfL9hqWJUA2//od+CBVlLM3u2j455ymjoCmnD4qiQQs1W0YanX7CFZHC8dLsZijqUi8T7LWZ6F7jfmFmFarsqHjetarzraGA64NYGhdvJfWy0LeXCEz6qZ47at7GcTm4lrbhb0yoCwRnQc+Byqw3JRE9pI7GcMvtLJqP5oh8qP2w== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ima1v6JoL9gSNHAx+SHaIwhZz0mOK22qq0XkJ9Jy6XY=; b=Joj1RyqkxW2U1eWAElWp1rerqXY+KVOHQkmlcg23/rAqe7E5k8z4B4dFnUTl8MOtbbPSAbrekDPhkjbgK3rbYPMZJkbd3SnWn5T3jbvE4VLueTskax9KRiyD/gHTSC4ZSBIpV8NQI0kN9VYBCaYJhC/sQSTLWjApbCVvxb0mDCw= 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 PA4PR08MB6256.eurprd08.prod.outlook.com (2603:10a6:102:e6::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.37; Tue, 23 Jan 2024 16:03:47 +0000 Received: from VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::810c:8495:3f0a:ef8]) by VI1PR08MB5325.eurprd08.prod.outlook.com ([fe80::810c:8495:3f0a:ef8%7]) with mapi id 15.20.7202.035; Tue, 23 Jan 2024 16:03:47 +0000 Date: Tue, 23 Jan 2024 16:03:43 +0000 From: Tamar Christina To: gcc-patches@gcc.gnu.org Cc: nd@arm.com, rguenther@suse.de, jlaw@ventanamicro.com Subject: [PATCH]middle-end: rename main_exit_p in reduction code. Message-ID: Content-Type: multipart/mixed; boundary="51OGE8ZJHmGSazle" Content-Disposition: inline X-ClientProxiedBy: LO4P265CA0155.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:2c7::7) To VI1PR08MB5325.eurprd08.prod.outlook.com (2603:10a6:803:13e::17) MIME-Version: 1.0 X-MS-TrafficTypeDiagnostic: VI1PR08MB5325:EE_|PA4PR08MB6256:EE_|AM4PEPF00027A5E:EE_|DU5PR08MB10678:EE_ X-MS-Office365-Filtering-Correlation-Id: c0c53880-47d6-4c71-44c0-08dc1c2ce714 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: eKUxpgQPatvu//OSC+rmLBX5TrnJ0ifnBxisAEcy76TJOnKNUyBs4GbtQvRockIChHN/4panqbX7suI74cJiw7yRxgG3xi1a+M2Ra+V3WqW4GwyQOrAt+3LttLAEIRq1345hyzYM0czIBO/VrsqQWMZx7vkE/TM9tUp4xAMKFWdgoSv50RznFZXn4PWUEpscOLBYkKKefbOIqZombMGtUhI5AxmwTrfoTtbAH2FZHvQaXd5wXY1Dd9u4V83LL/GNZfoP7NAzMj3O6o+iz3TuBaxItSuBkHHRJbFOlVoziICflMB42JCa1aimCRP/RqSk2iDA113f8IvnA9SJaUjMEHUdlj+uPLR0JOguox+nE+Lmr98uhqbwb1djVUh2eY8n9oUaf71BUxIqeOhBp3dwiAMWAUiAFZAyywhivhUNYiAzKCgvvrhDFpgcDmmJdyBgtN9p0pj5ngs2FaGMYrBdiPnGLtP79Ls0qpTBvIvMIk+l4n+CbsPEWMMz8u82C+R9JGh2CpH2vCQUOJ3vLa3xEt9YNyClqWflgrqPfedUSQGidl3u1xYrOXhzx4p0x7TJX3cJBE+XVvWOrI9qnYVHfOoGB/3Ma7GXG9dDciP+iCuh+sp2lQrB2do63Ez/7v5HSfeAsClOaLpbj1E45MpxfA== 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:(13230031)(366004)(346002)(396003)(39860400002)(136003)(376002)(230922051799003)(186009)(64100799003)(1800799012)(451199024)(8676002)(6666004)(38100700002)(86362001)(66476007)(66556008)(316002)(2616005)(6916009)(66946007)(33964004)(41300700001)(36756003)(6512007)(44144004)(6506007)(26005)(44832011)(5660300002)(8936002)(4326008)(4743002)(83380400001)(235185007)(2906002)(478600001)(6486002)(4216001)(2700100001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6256 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: AM4PEPF00027A5E.eurprd04.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 475aca96-69ae-4c15-815c-08dc1c2ce1a1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BYZ+ejnbIq36Z5TRxvCkQzD55A3drpfHR4v87ppqku6bh4YPLnS2KxoWUZdY9myHM2utjIIOh+MxMwXt8eqtaeDF9hkJ/ZcHX4mkLACZLLeP2WQozBQc3cwfsgDWvIWLrLGYcK2m5wZFid5kTAHkJQHW/Sj434EOaE2YvvqQ5URqy+jsTPYpgr9MbENuJL3ziSWk6NlAlB21kkTSn9wCN1EtUNYXQ4gvce0Cg+tM0jaPYC71Ls+l6NGzjpKDIEs3ftuRR+S04l/K4DGGROfJk5fFURZ4+wWginQU3bBdkyi65FtXutb5EDi/8rCYVmyn46JoLZht5S7LYezAOXoMaO0wT/NS9D21yIF2mz/SGRy5muo1dVWtMkROroohzxAcbr5oq7jWAWxHyy5PB839CrhVHrNxJ3k2LFrSurSuF6gmawG99C1fzs3EhYIRyjON1IHReWynieV8plNbAXK7s8gHh1gP8GsaH4O0aJ+uxfn2CZTTabF/WYh3MQFMLy825JiJwoC52eQIyr+guwpMHOZd8vrA9vMVeb6NVXogcgVvH3Gqf6MD6YVBdfLVWQaHe9AGXuoV9IhoXdu0uM83YTsOIxHQ5XSdaAPqmCUBpWUPvM6UN2tsq2Wao1AoF3ktQMkY4cm3V6e3/dSPNCaja8Nmu6jQX2dozi2JcMhrhgQCu+eDoxaJwy4UK3LYBedXXhfFGRXE1DpJ5jb0bLHEGjUb2E70D2yT6KJQSlSKeT7Dk994Fn3fkEtSMKwN+bzmFC/k2AoVg56P0pRBucCsW+hxo+sHNYRUiriZBRpRSLw= 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:(13230031)(4636009)(396003)(346002)(136003)(376002)(39860400002)(230922051799003)(1800799012)(451199024)(64100799003)(82310400011)(186009)(46966006)(40470700004)(36840700001)(4743002)(83380400001)(107886003)(26005)(2616005)(44144004)(336012)(478600001)(36860700001)(6486002)(82740400003)(47076005)(6512007)(4326008)(8676002)(8936002)(44832011)(6666004)(81166007)(235185007)(70206006)(6506007)(316002)(2906002)(5660300002)(356005)(33964004)(70586007)(6916009)(41300700001)(86362001)(36756003)(40460700003)(40480700001)(4216001)(2700100001);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2024 16:03:56.0146 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c0c53880-47d6-4c71-44c0-08dc1c2ce714 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: AM4PEPF00027A5E.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU5PR08MB10678 X-Spam-Status: No, score=-12.1 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 List-Id: --51OGE8ZJHmGSazle Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Hi All, This renamed main_exit_p to last_val_reduc_p to more accurately reflect what the value is calculating. Ok for master if bootstrap passes? Incremental build shows it's fine. Thanks, Tamar gcc/ChangeLog: * tree-vect-loop.cc (vect_get_vect_def, vect_create_epilog_for_reduction): Rename main_exit_p to last_val_reduc_p. --- inline copy of patch -- diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc index 4da1421c8f09746ef4b293573e4f861b642349e1..21a997599f397ba6c2cd15c3b9c8b04513bc0c83 100644 --- a/gcc/tree-vect-loop.cc +++ b/gcc/tree-vect-loop.cc @@ -5892,25 +5892,26 @@ vect_create_partial_epilog (tree vec_def, tree vectype, code_helper code, } /* Retrieves the definining statement to be used for a reduction. - For MAIN_EXIT_P we use the current VEC_STMTs and otherwise we look at - the reduction definitions. */ + For LAST_VAL_REDUC_P we use the current VEC_STMTs which correspond to the + final value after vectorization and otherwise we look at the reduction + definitions to get the first. */ tree vect_get_vect_def (stmt_vec_info reduc_info, slp_tree slp_node, - slp_instance slp_node_instance, bool main_exit_p, unsigned i, - vec &vec_stmts) + slp_instance slp_node_instance, bool last_val_reduc_p, + unsigned i, vec &vec_stmts) { tree def; if (slp_node) { - if (!main_exit_p) + if (!last_val_reduc_p) slp_node = slp_node_instance->reduc_phis; def = vect_get_slp_vect_def (slp_node, i); } else { - if (!main_exit_p) + if (!last_val_reduc_p) reduc_info = STMT_VINFO_REDUC_DEF (vect_orig_stmt (reduc_info)); vec_stmts = STMT_VINFO_VEC_STMTS (reduc_info); def = gimple_get_lhs (vec_stmts[0]); @@ -5982,8 +5983,8 @@ vect_create_epilog_for_reduction (loop_vec_info loop_vinfo, loop-closed PHI of the inner loop which we remember as def for the reduction PHI generation. */ bool double_reduc = false; - bool main_exit_p = LOOP_VINFO_IV_EXIT (loop_vinfo) == loop_exit - && !LOOP_VINFO_EARLY_BREAKS_VECT_PEELED (loop_vinfo); + bool last_val_reduc_p = LOOP_VINFO_IV_EXIT (loop_vinfo) == loop_exit + && !LOOP_VINFO_EARLY_BREAKS_VECT_PEELED (loop_vinfo); stmt_vec_info rdef_info = stmt_info; if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_double_reduction_def) { @@ -6233,7 +6234,7 @@ vect_create_epilog_for_reduction (loop_vec_info loop_vinfo, { gimple_seq stmts = NULL; def = vect_get_vect_def (rdef_info, slp_node, slp_node_instance, - main_exit_p, i, vec_stmts); + last_val_reduc_p, i, vec_stmts); for (j = 0; j < ncopies; j++) { tree new_def = copy_ssa_name (def); -- --51OGE8ZJHmGSazle Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="rb18200.patch" diff --git a/gcc/tree-vect-loop.cc b/gcc/tree-vect-loop.cc index 4da1421c8f09746ef4b293573e4f861b642349e1..21a997599f397ba6c2cd15c3b9c8b04513bc0c83 100644 --- a/gcc/tree-vect-loop.cc +++ b/gcc/tree-vect-loop.cc @@ -5892,25 +5892,26 @@ vect_create_partial_epilog (tree vec_def, tree vectype, code_helper code, } /* Retrieves the definining statement to be used for a reduction. - For MAIN_EXIT_P we use the current VEC_STMTs and otherwise we look at - the reduction definitions. */ + For LAST_VAL_REDUC_P we use the current VEC_STMTs which correspond to the + final value after vectorization and otherwise we look at the reduction + definitions to get the first. */ tree vect_get_vect_def (stmt_vec_info reduc_info, slp_tree slp_node, - slp_instance slp_node_instance, bool main_exit_p, unsigned i, - vec &vec_stmts) + slp_instance slp_node_instance, bool last_val_reduc_p, + unsigned i, vec &vec_stmts) { tree def; if (slp_node) { - if (!main_exit_p) + if (!last_val_reduc_p) slp_node = slp_node_instance->reduc_phis; def = vect_get_slp_vect_def (slp_node, i); } else { - if (!main_exit_p) + if (!last_val_reduc_p) reduc_info = STMT_VINFO_REDUC_DEF (vect_orig_stmt (reduc_info)); vec_stmts = STMT_VINFO_VEC_STMTS (reduc_info); def = gimple_get_lhs (vec_stmts[0]); @@ -5982,8 +5983,8 @@ vect_create_epilog_for_reduction (loop_vec_info loop_vinfo, loop-closed PHI of the inner loop which we remember as def for the reduction PHI generation. */ bool double_reduc = false; - bool main_exit_p = LOOP_VINFO_IV_EXIT (loop_vinfo) == loop_exit - && !LOOP_VINFO_EARLY_BREAKS_VECT_PEELED (loop_vinfo); + bool last_val_reduc_p = LOOP_VINFO_IV_EXIT (loop_vinfo) == loop_exit + && !LOOP_VINFO_EARLY_BREAKS_VECT_PEELED (loop_vinfo); stmt_vec_info rdef_info = stmt_info; if (STMT_VINFO_DEF_TYPE (stmt_info) == vect_double_reduction_def) { @@ -6233,7 +6234,7 @@ vect_create_epilog_for_reduction (loop_vec_info loop_vinfo, { gimple_seq stmts = NULL; def = vect_get_vect_def (rdef_info, slp_node, slp_node_instance, - main_exit_p, i, vec_stmts); + last_val_reduc_p, i, vec_stmts); for (j = 0; j < ncopies; j++) { tree new_def = copy_ssa_name (def); --51OGE8ZJHmGSazle--