From patchwork Tue Sep 29 16:48:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Hutton X-Patchwork-Id: 1373525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=kDMjtbwx; dkim-atps=neutral Received: from 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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C152L1KKvz9sSG for ; Wed, 30 Sep 2020 02:49:12 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4A44C394D8C5; Tue, 29 Sep 2020 16:49:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A44C394D8C5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1601398149; bh=7jJSb5/SrMbcHLJxKIlVCG94hKNTjP952aWPcMgnWmw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=kDMjtbwx6ygcxuW5j6wqgnFlzhN+WzOL+qn5Ci8dYU3pH58/hr/r2POrrolZRjL27 JPVmPiLgK/x78koxK5tjCSnDmuN7eZJOzMMvjcv79aqOMUmC0tU0q7jU20qwli2zIX Zi33CzadBCJVLNTFgPPf3CCuYIMmn9RP4YJGVIMU= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2052.outbound.protection.outlook.com [40.107.20.52]) by sourceware.org (Postfix) with ESMTPS id 703A5387089E for ; Tue, 29 Sep 2020 16:49:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 703A5387089E Received: from AM0PR05CA0092.eurprd05.prod.outlook.com (2603:10a6:208:136::32) by HE1PR0802MB2172.eurprd08.prod.outlook.com (2603:10a6:3:cb::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.23; Tue, 29 Sep 2020 16:49:03 +0000 Received: from AM5EUR03FT020.eop-EUR03.prod.protection.outlook.com (2603:10a6:208:136:cafe::ac) by AM0PR05CA0092.outlook.office365.com (2603:10a6:208:136::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.20 via Frontend Transport; Tue, 29 Sep 2020 16:49:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; gcc.gnu.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;gcc.gnu.org; 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; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM5EUR03FT020.mail.protection.outlook.com (10.152.16.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.21 via Frontend Transport; Tue, 29 Sep 2020 16:49:03 +0000 Received: ("Tessian outbound e8cdb8c6f386:v64"); Tue, 29 Sep 2020 16:49:03 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 0f164ae8c26e2860 X-CR-MTA-TID: 64aa7808 Received: from 7bb7bc69aa83.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 70D16610-280C-4C87-A3DF-6E9127806D2D.1; Tue, 29 Sep 2020 16:48:25 +0000 Received: from EUR02-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 7bb7bc69aa83.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 29 Sep 2020 16:48:25 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AtjkIcSwozLCxWsUJpahT3mNcGNswugcW008d73UKanz+u8vvFAva9fDB2nf2y3jP/hv6cQKwczEYGeOax22NXurr6yyYhOJaC0u9BVmsLMLDdV0yZwpW6b7jNtTJn0ixyRITQgqVz1ihWHyTk0mT3yjd1A2voKszZERBuEwy91N45KrnYCh2pBhpPuIrpyazkN93p0Q73zLh3aWvsfRPq/nQ+yRWD1IsldGir3gBfsdi+NT13WvBtClKtSLtg0nHS9LcQotJ0p7mo6lOOiMI+GT23UgufjjlOKjeigFL1Cdk3igRPUFcvupvuGPkR413pMmIk6LvhlPJtu+VU0fbg== 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-SenderADCheck; bh=7jJSb5/SrMbcHLJxKIlVCG94hKNTjP952aWPcMgnWmw=; b=ocuxpI0sPn7dMg3ufXn4oMZrJzydYA9wzrrOKQHgB8TGFj5MIFXbB22aXDOtjnfl2yeA62OCEZz0CbbrDPhEI/DcRvd+IOzLECmZlmOQNdKhdoOu1ZdgSoxV+ELqfjGTnT4kGsOZxAOy/dPxMIPElK1v46PyOPRCE24iSr6+b8R+jPypiBna0TykM+XnJzFYtahFbAjnLkNgmkYvFYMf0C11QRjViBTHodvdbP44dWMc73xdCIcMH3zYceYhRQAy0CdxMI6KbJXwZWR356hTKEJWjZ82NohuTEucrM/4Nu0crxTVjk5M9hXdGXEqGniqR7BRHDgPNVCUmLD7ZUel4Q== 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 Received: from DB6PR0802MB2200.eurprd08.prod.outlook.com (2603:10a6:4:83::20) by DB6PR08MB2934.eurprd08.prod.outlook.com (2603:10a6:6:19::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.20; Tue, 29 Sep 2020 16:48:24 +0000 Received: from DB6PR0802MB2200.eurprd08.prod.outlook.com ([fe80::b473:7ab4:6809:9726]) by DB6PR0802MB2200.eurprd08.prod.outlook.com ([fe80::b473:7ab4:6809:9726%12]) with mapi id 15.20.3412.029; Tue, 29 Sep 2020 16:48:24 +0000 To: GCC Patches Subject: [SLP][VECT] Add check to fix 96837 Thread-Topic: [SLP][VECT] Add check to fix 96837 Thread-Index: AQHWln/OStpM4E0W/kOLlzdixbX0Ew== Date: Tue, 29 Sep 2020 16:48:24 +0000 Message-ID: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: yes X-MS-TNEF-Correlator: Authentication-Results-Original: gcc.gnu.org; dkim=none (message not signed) header.d=none;gcc.gnu.org; dmarc=none action=none header.from=arm.com; x-originating-ip: [217.140.106.52] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 828b586b-c567-472d-1acd-08d864979265 x-ms-traffictypediagnostic: DB6PR08MB2934:|HE1PR0802MB2172: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:8273;OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 9A4AWSJhaRjr/oZS1krjwV1JO1RPMFKQBOPuNKIKZvotnkrX56zlCrOYirGwwCNOFC4yAOBcGK8TCoccujl+Anmr1mxkqjJTOfm//NZLebCK9R9SOIK2laUkPUPv3Z5/UQl8Xn5oyzFepd37sWg7/kAVI7SJwMofL+edGoR5NVH86ZuJ2eWOpzNQxJiBiNIIc1Jvp+YGDAidowkMN1K6H+n7DiV46CvPYlnUJ+UAFh4SRqU9LKWSivjI+iSWj7P0gKMDVF13Z2rJSMZadOrafBjZT+4gQEM4J+un7Ahho8lhskCXOgUj28Yo74BXVl0xuiSu+gwdnumRLw3XaIUwMV1O8k8aS0np29tX3Pkunh677yyisRnLs70vUCDdD+U/KT0Pdp/PL1FWrV5/lcsPdl7p0jduDpz0Q7EGeVc555LMHedrbW2FkuS+VftI+z1XTFU0OEKsJ9Jo4nBL1ZKdRg== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0802MB2200.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(39860400002)(136003)(396003)(376002)(366004)(66946007)(66616009)(4744005)(66446008)(99936003)(4326008)(91956017)(966005)(86362001)(2906002)(316002)(8936002)(33656002)(6916009)(8676002)(478600001)(64756008)(76116006)(66556008)(66476007)(6506007)(5660300002)(52536014)(186003)(7696005)(26005)(55016002)(9686003)(71200400001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: 67yZTZTDWtp0fELU+Xbghede7a6xki5lJ6pTZGEPDt5icC5VNYTnNMAq1NyImHkc2Pi4qJiAPmaASg4GB9S+pJUqKIJBmcRnrbAL87fnckLGc3RkXR0xWfYBv33dtbWVh5Qx2L3MSs8hw/yqz3j8jIX0b1Zo3oKYqr2324dxszdqJq96N6S9+kGPZQ/ONU+nMoFkAL2czlwN+wJjMpU7Iv8gpjjIdZmGGkFJulFErUtWSPp++S9tX+DnT5e3dNpPxarP3UYudHgzckdrJPh6MZbHZiUtxUc7hUlN1p4x4DAiMeyUT2WphqlS0istEx/fMNo29p7sUgAztUx7jdXMnC+Va96Wjr7lXXh2PAS2NsuNJOR4/W8yHlByuN4vehQXt554eXIQRUNW0liDPgtAsiKSaXCx4ukJLTIv3FugNo3/oJ3zelnRFTn2+17HTyPKcjRvx8/zY1/msWJ9GKn7nNl+U1BiIL30fBJyZSDfQPV6WGwaGhVf2Ezt5yUL3LEIaicSdCuIFhmMiCJboIXGtCvrGcHTc5hy0QsECHZcghls8eFg1CJyXZRMo2D9S5IvItbv6E3amslSdmBXoz4UyPPkOawYsF3aJpsK/YV1iLZIeghkRV9qU8agAozTb+EptG3dUYj79X9TTot+5BLwCQ== x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR08MB2934 Original-Authentication-Results: gcc.gnu.org; dkim=none (message not signed) header.d=none;gcc.gnu.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT020.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 75913289-5052-4f6a-f908-08d864977b24 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G6X1EzuaKymKPS4m34CRZ1GeA/Drh0y4pYlbvqRnrrp8TDxra6Pf8uu1bKVUjiJBBVpIViprvfQnZcnCbIcO8bBn8IVsbF2ErhANPJKYEWCz15ic7wydabH5E0GIQs9LwNn9izONZcdUCD9wF5L2DppeR/+ahuuMCs62t0xaDVpH0GqiJLuMYadfbdtShNoTufTvLqAjo+yio0P3wYBnAFOjNV4gSdS9MntBJY829djjd0q9ZHHGY3d15uAjLK/sg5EJ86B8Veq4tY+d0vlH/cEh7BRUnRn4oBn0cq/ZYjN++GNpyqQbveTsxcyd4SvR4POoYHpS0w8goXGzDiuaUjam1gsMl0jaRcxlMynrQn0Qc0UrfnJkJivbqzBs3ttC/RrOj8qrUdH112gwPm7uGE1p0TalvxPxLVoHaTyjBdNa7yBBrp0LKz4ZJIgkEOR8JY5Yyd6SyClEa+dq0lrEkV71QrwysU0PKpkOoYvCoz/c5Fs7gMLfESPwEgL8qQ7DZwoI86p3IgFCxPMav7OO5Q== 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:(4636009)(136003)(39850400004)(376002)(396003)(346002)(46966005)(356005)(55016002)(36906005)(7696005)(478600001)(316002)(2906002)(70206006)(70586007)(66616009)(6916009)(6506007)(9686003)(47076004)(5660300002)(52536014)(26005)(8936002)(235185007)(82740400003)(8676002)(82310400003)(86362001)(81166007)(4326008)(107886003)(186003)(33656002)(966005)(336012)(99936003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2020 16:49:03.1264 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 828b586b-c567-472d-1acd-08d864979265 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: AM5EUR03FT020.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2172 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_LOTSOFHASH, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-Patchwork-Original-From: Joel Hutton via Gcc-patches From: Joel Hutton Reply-To: Joel Hutton Cc: Richard Biener Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi All, The following patch adds a simple check to prevent slp stmts from vector constructors being rearranged. vect_attempt_slp_rearrange_stmts tries to rearrange to avoid a load permutation. This fixes PR target/96837 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96827 gcc/ChangeLog: 2020-09-29 Joel Hutton PR target/96837 * tree-vect-slp.c (vect_analyze_slp): Do not call vect_attempt_slp_rearrange_stmts for vector constructors. gcc/testsuite/ChangeLog: 2020-09-29 Joel Hutton PR target/96837 * gcc.dg/vect/bb-slp-49.c: New test. From 2c738e2c0eddbc4fcdbf8ff2443bb809b36c7e28 Mon Sep 17 00:00:00 2001 From: Joel Hutton Date: Tue, 29 Sep 2020 15:46:44 +0100 Subject: [PATCH] [SLP][VECT] Add check to fix 96827 Do not call vect_attempt_slp_rearrange_stmts if an slp instance is an SLP_INSTANCE_ROOT_STMT, i.e. if the tree is built from a constructor rather than a grouped store. This function is intended to rearrange stmts in a reduction chain so they do not require load permutation. Rearranging causes the resulting constructor to be in the wrong order. --- gcc/testsuite/gcc.dg/vect/bb-slp-49.c | 28 +++++++++++++++++++++++++++ gcc/tree-vect-slp.c | 3 ++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/vect/bb-slp-49.c diff --git a/gcc/testsuite/gcc.dg/vect/bb-slp-49.c b/gcc/testsuite/gcc.dg/vect/bb-slp-49.c new file mode 100644 index 0000000000000000000000000000000000000000..e7101fcff4627bb545549bdfefd33c2ed58aee7b --- /dev/null +++ b/gcc/testsuite/gcc.dg/vect/bb-slp-49.c @@ -0,0 +1,28 @@ +/* This checks that vectorized constructors have the correct ordering. */ +/* { dg-require-effective-target vect_int } */ + +typedef int V __attribute__((__vector_size__(16))); + +__attribute__((__noipa__)) void +foo (unsigned int x, V *y) +{ + unsigned int a[4] = { x + 0, x + 2, x + 4, x + 6 }; + for (unsigned int i = 0; i < 3; ++i) + if (a[i] == 1234) + a[i]--; + *y = (V) { a[3], a[2], a[1], a[0] }; +} + +int +main () +{ + V b; + foo (0, &b); + if (b[0] != 6 || b[1] != 4 || b[2] != 2 || b[3] != 0) + __builtin_abort (); + return 0; +} + +/* See that we vectorize an SLP instance. */ +/* { dg-final { scan-tree-dump "Analyzing vectorizable constructor" "slp1" } } */ +/* { dg-final { scan-tree-dump "vectorizing stmts using SLP" "slp1" } } */ diff --git a/gcc/tree-vect-slp.c b/gcc/tree-vect-slp.c index c44fd396bf0b69a4153e46026c545bebb3797551..7ba24e241deb76c0fd884ccfff04675d1b050ef7 100644 --- a/gcc/tree-vect-slp.c +++ b/gcc/tree-vect-slp.c @@ -2495,7 +2495,8 @@ vect_analyze_slp (vec_info *vinfo, unsigned max_tree_size) /* Reduction (there are no data-refs in the root). In reduction chain the order of the loads is not important. */ if (!STMT_VINFO_DATA_REF (stmt_info) - && !REDUC_GROUP_FIRST_ELEMENT (stmt_info)) + && !REDUC_GROUP_FIRST_ELEMENT (stmt_info) + && !SLP_INSTANCE_ROOT_STMT (instance)) vect_attempt_slp_rearrange_stmts (instance); } -- 2.17.1