From patchwork Wed Jun 28 12:33:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 113826 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8889218vqr; Wed, 28 Jun 2023 05:34:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4JZzxBI6QVsF0EXA56WsB7idh9rffuI6iXNiMyZaeUilQO5CVOZdoBQSo4qoD/mQttXF7N X-Received: by 2002:a17:907:702:b0:982:be38:a5df with SMTP id xb2-20020a170907070200b00982be38a5dfmr29317233ejb.63.1687955684858; Wed, 28 Jun 2023 05:34:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687955684; cv=none; d=google.com; s=arc-20160816; b=oe29sIp+zTbymkbhb6XYOmzn3TOakpxBe+E23i91Iy0r4yZD8v4fqqNjnmVUxRF5ur 2jTSpRNheQrLs/yXnH9mou4qcUTdn7PXQq5324WdZ3qxc5VqnqfsjbDkoRgF/Xq08bhx Lv/LEedWMHH3BPZp+6L1Vmb0z8PF5i+23aiQlcg9f5IIqCyHmLkPqP6fDbzFG6SX7kpk h2AkixKnHmegNM1R+2boGZwZBMTNhMbc/fyEgW3y4VmIeDQchDFTb4i5Nn1uEPKO4YjW ERneqWvcFbD3diVLq6zMOJzpWYLR72uPXDYQct86x4KLA6VVU6jmKeCO26KQAPwoUBiw nnbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:sender:errors-to:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :mime-version:user-agent:subject:to:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=+/VXvN1qxAzXt3otExelkzZ0yM7sRriIkf51BkKJCAg=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=CuCexHjxPZtzdERO0iV5j+spgB32HBn6+YWslzK/ds4AGLgdeIBB4WrH1tIae43pxY Tx2Cr5pk+O+E2t2PQ6xIyQa1W08RYTNirFrnXay5mcXxvNUGVEv2x8Qp9mBL6JxsIAmL enF1GGv1oq1Y7UHYEPROTujJNWnuRPErDrAduEpl3T6RF+qVYIkqqeAIRccwccujF4A8 eRilcWCIQetG8x3P7FQ1t1aTIQDZXEPzUyUV9etwsG6eYEhrI6GUERkkggo6IwEYKPn8 iaT30D3QhMqu+P0kVidMpTDaKTwXeOeZLNr3U8iISbvyb2gdaWhddhbTHCntJ8z2MhOG eh4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="M/3AIgxi"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id n5-20020a170906118500b0098897133349si5551601eja.77.2023.06.28.05.34.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 05:34:44 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b="M/3AIgxi"; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E814E385840E for ; Wed, 28 Jun 2023 12:34:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E814E385840E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687955682; bh=+/VXvN1qxAzXt3otExelkzZ0yM7sRriIkf51BkKJCAg=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=M/3AIgxi1LnTr9Zef12Aw27//pyHJ4wBVLS0eJWDtjzcj/u4LMtPAuTj5Af2lLQsd qRKD0vs3KMkLhQnVnMw/BN9EGOF9VFMIeeCHmTXcB4CfBvx6+D63Ge6R3K9YJ/LT6h xcFdPYgm1Hs6CbSIznvULRX8RuOpx7WONs7x23JQ= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id DFDC53858D37 for ; Wed, 28 Jun 2023 12:33:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DFDC53858D37 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 1B7472189F for ; Wed, 28 Jun 2023 12:33:59 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 112EB2C308 for ; Wed, 28 Jun 2023 12:33:59 +0000 (UTC) Date: Wed, 28 Jun 2023 12:33:59 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH] tree-optimization/110451 - hoist invariant compare after interchange User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" Message-Id: <20230628123442.E814E385840E@sourceware.org> X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769949820158043202?= X-GMAIL-MSGID: =?utf-8?q?1769949820158043202?= The following adjusts the cost model of invariant motion to consider [VEC_]COND_EXPRs and comparisons producing a data value as expensive. For 503.bwaves_r this avoids an unnecessarily high vectorization factor because of an integer comparison besides data operations on double. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. PR tree-optimization/110451 * tree-ssa-loop-im.cc (stmt_cost): [VEC_]COND_EXPR and tcc_comparison are expensive. * gfortran.dg/vect/pr110451.f: New testcase. --- gcc/testsuite/gfortran.dg/vect/pr110451.f | 51 +++++++++++++++++++++++ gcc/tree-ssa-loop-im.cc | 11 ++++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/vect/pr110451.f diff --git a/gcc/testsuite/gfortran.dg/vect/pr110451.f b/gcc/testsuite/gfortran.dg/vect/pr110451.f new file mode 100644 index 00000000000..ba77b0dd174 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/vect/pr110451.f @@ -0,0 +1,51 @@ +! { dg-do compile } +! { dg-require-effective-target vect_condition } +! { dg-require-effective-target vect_double } +! { dg-additional-options "-ffast-math -floop-interchange -fdump-tree-linterchange-details -fdump-tree-vect-details" } +! { dg-additional-options "-mprefer-vector-width=128" { target x86_64-*-* i?86-*-* } } + + subroutine mat_times_vec(y,x,a,axp,ayp,azp,axm,aym,azm, + $ nb,nx,ny,nz) + implicit none + integer nb,nx,ny,nz,i,j,k,m,l,kit,im1,ip1,jm1,jp1,km1,kp1 + + real*8 y(nb,nx,ny,nz),x(nb,nx,ny,nz) + + real*8 a(nb,nb,nx,ny,nz), + 1 axp(nb,nb,nx,ny,nz),ayp(nb,nb,nx,ny,nz),azp(nb,nb,nx,ny,nz), + 2 axm(nb,nb,nx,ny,nz),aym(nb,nb,nx,ny,nz),azm(nb,nb,nx,ny,nz) + + + do k=1,nz + km1=mod(k+nz-2,nz)+1 + kp1=mod(k,nz)+1 + do j=1,ny + jm1=mod(j+ny-2,ny)+1 + jp1=mod(j,ny)+1 + do i=1,nx + im1=mod(i+nx-2,nx)+1 + ip1=mod(i,nx)+1 + do l=1,nb + y(l,i,j,k)=0.0d0 + do m=1,nb + y(l,i,j,k)=y(l,i,j,k)+ + 1 a(l,m,i,j,k)*x(m,i,j,k)+ + 2 axp(l,m,i,j,k)*x(m,ip1,j,k)+ + 3 ayp(l,m,i,j,k)*x(m,i,jp1,k)+ + 4 azp(l,m,i,j,k)*x(m,i,j,kp1)+ + 5 axm(l,m,i,j,k)*x(m,im1,j,k)+ + 6 aym(l,m,i,j,k)*x(m,i,jm1,k)+ + 7 azm(l,m,i,j,k)*x(m,i,j,km1) + enddo + enddo + enddo + enddo + enddo + return + end + +! loop interchange adds a conditional on m != 1 in the innermost loop +! verify that is hoisted and thus not affecting the vectorization factor + +! { dg-final { scan-tree-dump-times "is interchanged" 1 "linterchange" } } +! { dg-final { scan-tree-dump "vectorization factor = 2" "vect" { target x86_64-*-* i?86-*-* } } } diff --git a/gcc/tree-ssa-loop-im.cc b/gcc/tree-ssa-loop-im.cc index 86ce6acb023..f5b01e986ae 100644 --- a/gcc/tree-ssa-loop-im.cc +++ b/gcc/tree-ssa-loop-im.cc @@ -617,7 +617,8 @@ stmt_cost (gimple *stmt) if (gimple_code (stmt) != GIMPLE_ASSIGN) return 1; - switch (gimple_assign_rhs_code (stmt)) + enum tree_code code = gimple_assign_rhs_code (stmt); + switch (code) { case MULT_EXPR: case WIDEN_MULT_EXPR: @@ -645,6 +646,11 @@ stmt_cost (gimple *stmt) /* Shifts and rotates are usually expensive. */ return LIM_EXPENSIVE; + case COND_EXPR: + case VEC_COND_EXPR: + /* Conditionals are expensive. */ + return LIM_EXPENSIVE; + case CONSTRUCTOR: /* Make vector construction cost proportional to the number of elements. */ @@ -658,6 +664,9 @@ stmt_cost (gimple *stmt) return 0; default: + /* Comparisons are usually expensive. */ + if (TREE_CODE_CLASS (code) == tcc_comparison) + return LIM_EXPENSIVE; return 1; } }