From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yw1-x1131.google.com (mail-yw1-x1131.google.com [IPv6:2607:f8b0:4864:20::1131]) by sourceware.org (Postfix) with ESMTPS id 12B863858C53 for ; Wed, 8 Nov 2023 08:22:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 12B863858C53 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 12B863858C53 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::1131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699431780; cv=none; b=Rar3OOrg3ilApsXLrTYOJeVO9OxJkO/QSAXgS6IhFYGt4XdLsuRwpZ+Hc4QA5mtOJvLTDYQuKJ9LtEWrijcbkZOs/R44g6zy8L6a+lDkjXu9RRResWRwJcswjRE0gARrKrDcPxmprG8XqCq19y6pbNUIacOLVmxDt0skzhYCmYA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699431780; c=relaxed/simple; bh=vQn2wKYFgvbZYCevrMO8Lf8cfqsIfVralASeZy38YVs=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=hke5/XmFJB57JDAE6tU7tVIeEoXw8ym+BDi+qNK1tV0S0jaacRS4BgfTUAIHaRakfGOAQttzgerLUaRXdenrGCqu3E6tUVDrhyWnbnSD76vlKiiqZmBzxPKgIR2SeubFUfTag4AJDlyAceymlVlkJqSKNuXd4CMnlZZbELsgXUo= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yw1-x1131.google.com with SMTP id 00721157ae682-5a7eef0b931so78267907b3.0 for ; Wed, 08 Nov 2023 00:22:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699431777; x=1700036577; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=M8KQNPBgIsmSqMhgkNyR3BRmpuYo6u6QzA+fatkt1aw=; b=TlrxnIQyYxUz2K9BfCeiWJo7gS2C7LoASjG4oXhogegJDoKvVUB/ZEDrFk+495bNGF 6NpTeGS1AADv1Hn+D251iHlfB0KLafKlCyJq0+4jqrAdC+R30WTOu6B+oP+WcA8t/WGn SV/2wCGxjjcs7/rkDUuz4iq9SRlSlAZJl5hIy1OFPQQdxWUmZaME/fr/vHIzwThlO1Zi j1bjFNZkmIwcUaIYwY3Osnv21uz/W47esmMlREDpMbMqOBtTAW36EaAT51lierl9bGzy wrFgK8tay9UfzoB55tmo4duaXPSOzAyeL942ligwP330NJCC8UW59ZjJZ+IfXZsKDvfp cSMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699431777; x=1700036577; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M8KQNPBgIsmSqMhgkNyR3BRmpuYo6u6QzA+fatkt1aw=; b=Z5stHNto7k7VMpQxy5EWB1TIsF/CH3p1IPMvfupUhnMketqorglkFq5bOsoPprzs7v DT6eAOsqAMFwCEUGcN/+fEzgUANvFy86w4kfm5um9FMTA1DqDqVG6E+r3X0d+tBIeyib +9suvFML/rBmEPgWXq77UG6PQg2IOkVJExWwVwKtGF4wrcA8/wZzFj0JfJQ78c40SD/u eVU3eOOazOKDcKTj2Yj6FxBjXGC1KUmONYqfgsuW7Zrf9g1qOkVhP3wXwyxiOh6YJ/B2 cnIaCcg8R2c+Z+bOCPzyK5RT6f3nAl62iiUi3uoVGW0hG4OmxvAw+UTiJRqZ295zU1iR rWGQ== X-Gm-Message-State: AOJu0YxrC6L2d35x1z7ztYHvwUn6qv0YrdoI/YtsvQDB1HGDUSOULIb4 4Urr5rRM73hZCVC8Ns0jPa3F2AY/MNy4bmBIpfw= X-Google-Smtp-Source: AGHT+IFhGgyAgJf+pds4/uxFkFmVKvUte8ZrQcLryTxXJz5HIgFFcI+Jj+4bc0zTDKDz1VjVOxgT3Mz9qJGjOQvl7IY= X-Received: by 2002:a81:c242:0:b0:594:e148:3c42 with SMTP id t2-20020a81c242000000b00594e1483c42mr901678ywg.52.1699431777414; Wed, 08 Nov 2023 00:22:57 -0800 (PST) MIME-Version: 1.0 References: <20231030104145.169132-1-hongtao.liu@intel.com> <20231107060539.443303-1-hongtao.liu@intel.com> In-Reply-To: From: Hongtao Liu Date: Wed, 8 Nov 2023 16:22:45 +0800 Message-ID: Subject: Re: [V2 PATCH] Handle bitop with INTEGER_CST in analyze_and_compute_bitop_with_inv_effect. To: Richard Biener Cc: liuhongt , gcc-patches@gcc.gnu.org, hjl.tools@gmail.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,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 List-Id: On Wed, Nov 8, 2023 at 3:53=E2=80=AFPM Richard Biener wrote: > > On Wed, Nov 8, 2023 at 2:18=E2=80=AFAM Hongtao Liu w= rote: > > > > On Tue, Nov 7, 2023 at 10:34=E2=80=AFPM Richard Biener > > wrote: > > > > > > On Tue, Nov 7, 2023 at 2:03=E2=80=AFPM Hongtao Liu wrote: > > > > > > > > On Tue, Nov 7, 2023 at 4:10=E2=80=AFPM Richard Biener > > > > wrote: > > > > > > > > > > On Tue, Nov 7, 2023 at 7:08=E2=80=AFAM liuhongt wrote: > > > > > > > > > > > > analyze_and_compute_bitop_with_inv_effect assumes the first ope= rand is > > > > > > loop invariant which is not the case when it's INTEGER_CST. > > > > > > > > > > > > Bootstrapped and regtseted on x86_64-pc-linux-gnu{-m32,}. > > > > > > Ok for trunk? > > > > > > > > > > So this addresses a missed optimization, right? It seems to me t= hat > > > > > even with two SSA names we are only "lucky" when rhs1 is the inva= riant > > > > > one. So instead of swapping this way I'd do > > > > Yes, it's a miss optimization. > > > > And I think expr_invariant_in_loop_p (loop, match_op[1]) should be > > > > enough, if match_op[1] is a loop invariant.it must be false for the > > > > below conditions(there couldn't be any header_phi from its > > > > definition). > > > > > > Yes, all I said is that when you now care for op1 being INTEGER_CST > > > it could also be an invariant SSA name and thus only after swapping o= p0/op1 > > > we could have a successful match, no? > > Sorry, the commit message is a little bit misleading. > > At first, I just wanted to handle the INTEGER_CST case (with TREE_CODE > > (match_op[1]) =3D=3D INTEGER_CST), but then I realized that this could > > probably be extended to the normal SSA_NAME case as well, so I used > > expr_invariant_in_loop_p, which should theoretically be able to handle > > the SSA_NAME case as well. > > > > if (expr_invariant_in_loop_p (loop, match_op[1])) is true, w/o > > swapping it must return NULL_TREE for below conditions. > > if (expr_invariant_in_loop_p (loop, match_op[1])) is false, w/ > > swapping it must return NULL_TREE too. > > So it can cover the both cases you mentioned, no need for a loop to > > iterate 2 match_ops for all conditions. > > Sorry if it appears we're going in circles ;) > > > 3692 if (TREE_CODE (match_op[1]) !=3D SSA_NAME > > 3693 || !expr_invariant_in_loop_p (loop, match_op[0]) > > 3694 || !(header_phi =3D dyn_cast (SSA_NAME_DEF_STMT (mat= ch_op[1]))) > > but this only checks match_op[1] (an SSA name at this point) for being de= fined > by the header PHI. What if expr_invariant_in_loop_p (loop, mach_op[1]) > and header_phi =3D dyn_cast (SSA_NAME_DEF_STMT (match_op[0])) > which I think can happen when both ops are SSA name? The whole condition is like 3692 if (TREE_CODE (match_op[1]) !=3D SSA_NAME 3693 || !expr_invariant_in_loop_p (loop, match_op[0]) 3694 || !(header_phi =3D dyn_cast (SSA_NAME_DEF_STMT (match_o= p[1]))) 3695 || gimple_bb (header_phi) !=3D loop->header ----- This would be true if match_op[1] is SSA_NAME and expr_invariant_in_loop_p 3696 || gimple_phi_num_args (header_phi) !=3D 2) If expr_invariant_in_loop_p (loop, mach_op[1]) is true and it's an SSA_NAME according to code in expr_invariant_in_loop_p, def_bb of gphi is either NULL or not belong to this loop, either case will make will make gimple_bb (header_phi) !=3D loop->header true. 1857 if (TREE_CODE (expr) =3D=3D SSA_NAME) 1858 { 1859 def_bb =3D gimple_bb (SSA_NAME_DEF_STMT (expr)); 1860 if (def_bb 1861 && flow_bb_inside_loop_p (loop, def_bb)) -- def_bb is NULL or it doesn't belong to the loop 1862 return false; 1863 1864 return true; 1865 } 1866 1867 if (!EXPR_P (expr)) > > The only canonicalization we have is that constant operands are put secon= d so > it would have been more natural to write the matching with the other oper= and > order (but likely you'd have been unlucky for the existing testcases then= ). > > > 3695 || gimple_bb (header_phi) !=3D loop->header > > 3696 || gimple_phi_num_args (header_phi) !=3D 2) > > 3697 return NULL_TREE; > > 3698 > > 3699 if (PHI_ARG_DEF_FROM_EDGE (header_phi, loop_latch_edge (loop)) != =3D phidef) > > 3700 return NULL_TREE; > > > > > > > > > > > > > > > > > unsigned i; > > > > > for (i =3D 0; i < 2; ++i) > > > > > if (TREE_CODE (match_op[i]) =3D=3D SSA_NAME > > > > > && ...) > > > > > break; /* found! */ > > > > > > > > > > if (i =3D=3D 2) > > > > > return NULL_TREE; > > > > > if (i =3D=3D 0) > > > > > std::swap (match_op[0], match_op[1]); > > > > > > > > > > to also handle a "swapped" pair of SSA names? > > > > > > > > > > > gcc/ChangeLog: > > > > > > > > > > > > PR tree-optimization/105735 > > > > > > PR tree-optimization/111972 > > > > > > * tree-scalar-evolution.cc > > > > > > (analyze_and_compute_bitop_with_inv_effect): Handle bit= op with > > > > > > INTEGER_CST. > > > > > > > > > > > > gcc/testsuite/ChangeLog: > > > > > > > > > > > > * gcc.target/i386/pr105735-3.c: New test. > > > > > > --- > > > > > > gcc/testsuite/gcc.target/i386/pr105735-3.c | 87 ++++++++++++++= ++++++++ > > > > > > gcc/tree-scalar-evolution.cc | 3 + > > > > > > 2 files changed, 90 insertions(+) > > > > > > create mode 100644 gcc/testsuite/gcc.target/i386/pr105735-3.c > > > > > > > > > > > > diff --git a/gcc/testsuite/gcc.target/i386/pr105735-3.c b/gcc/t= estsuite/gcc.target/i386/pr105735-3.c > > > > > > new file mode 100644 > > > > > > index 00000000000..9e268a1a997 > > > > > > --- /dev/null > > > > > > +++ b/gcc/testsuite/gcc.target/i386/pr105735-3.c > > > > > > @@ -0,0 +1,87 @@ > > > > > > +/* { dg-do compile } */ > > > > > > +/* { dg-options "-O1 -fdump-tree-sccp-details" } */ > > > > > > +/* { dg-final { scan-tree-dump-times {final value replacement}= 8 "sccp" } } */ > > > > > > + > > > > > > +unsigned int > > > > > > +__attribute__((noipa)) > > > > > > +foo (unsigned int tmp) > > > > > > +{ > > > > > > + for (int bit =3D 0; bit < 64; bit++) > > > > > > + tmp &=3D 11304; > > > > > > + return tmp; > > > > > > +} > > > > > > + > > > > > > +unsigned int > > > > > > +__attribute__((noipa)) > > > > > > +foo1 (unsigned int tmp) > > > > > > +{ > > > > > > + for (int bit =3D 63; bit >=3D 0; bit -=3D3) > > > > > > + tmp &=3D 11304; > > > > > > + return tmp; > > > > > > +} > > > > > > + > > > > > > +unsigned int > > > > > > +__attribute__((noipa)) > > > > > > +foo2 (unsigned int tmp) > > > > > > +{ > > > > > > + for (int bit =3D 0; bit < 64; bit++) > > > > > > + tmp |=3D 11304; > > > > > > + return tmp; > > > > > > +} > > > > > > + > > > > > > +unsigned int > > > > > > +__attribute__((noipa)) > > > > > > +foo3 (unsigned int tmp) > > > > > > +{ > > > > > > + for (int bit =3D 63; bit >=3D 0; bit -=3D3) > > > > > > + tmp |=3D 11304; > > > > > > + return tmp; > > > > > > +} > > > > > > + > > > > > > +unsigned int > > > > > > +__attribute__((noipa)) > > > > > > +foo4 (unsigned int tmp) > > > > > > +{ > > > > > > + for (int bit =3D 0; bit < 64; bit++) > > > > > > + tmp ^=3D 11304; > > > > > > + return tmp; > > > > > > +} > > > > > > + > > > > > > +unsigned int > > > > > > +__attribute__((noipa)) > > > > > > +foo5 (unsigned int tmp) > > > > > > +{ > > > > > > + for (int bit =3D 0; bit < 63; bit++) > > > > > > + tmp ^=3D 11304; > > > > > > + return tmp; > > > > > > +} > > > > > > + > > > > > > +unsigned int > > > > > > +__attribute__((noipa)) > > > > > > +f (unsigned int tmp, int bit) > > > > > > +{ > > > > > > + unsigned int res =3D tmp; > > > > > > + for (int i =3D 0; i < bit; i++) > > > > > > + res &=3D 11304; > > > > > > + return res; > > > > > > +} > > > > > > + > > > > > > +unsigned int > > > > > > +__attribute__((noipa)) > > > > > > +f1 (unsigned int tmp, int bit) > > > > > > +{ > > > > > > + unsigned int res =3D tmp; > > > > > > + for (int i =3D 0; i < bit; i++) > > > > > > + res |=3D 11304; > > > > > > + return res; > > > > > > +} > > > > > > + > > > > > > +unsigned int > > > > > > +__attribute__((noipa)) > > > > > > +f2 (unsigned int tmp, int bit) > > > > > > +{ > > > > > > + unsigned int res =3D tmp; > > > > > > + for (int i =3D 0; i < bit; i++) > > > > > > + res ^=3D 11304; > > > > > > + return res; > > > > > > +} > > > > > > diff --git a/gcc/tree-scalar-evolution.cc b/gcc/tree-scalar-evo= lution.cc > > > > > > index 70b17c5bca1..f61277c32df 100644 > > > > > > --- a/gcc/tree-scalar-evolution.cc > > > > > > +++ b/gcc/tree-scalar-evolution.cc > > > > > > @@ -3689,6 +3689,9 @@ analyze_and_compute_bitop_with_inv_effect= (class loop* loop, tree phidef, > > > > > > match_op[0] =3D gimple_assign_rhs1 (def); > > > > > > match_op[1] =3D gimple_assign_rhs2 (def); > > > > > > > > > > > > + if (expr_invariant_in_loop_p (loop, match_op[1])) > > > > > > + std::swap (match_op[0], match_op[1]); > > > > > > + > > > > > > if (TREE_CODE (match_op[1]) !=3D SSA_NAME > > > > > > || !expr_invariant_in_loop_p (loop, match_op[0]) > > > > > > || !(header_phi =3D dyn_cast (SSA_NAME_DEF_STMT= (match_op[1]))) > > > > > > -- > > > > > > 2.31.1 > > > > > > > > > > > > > > > > > > > > > > -- > > > > BR, > > > > Hongtao > > > > > > > > -- > > BR, > > Hongtao --=20 BR, Hongtao