From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by sourceware.org (Postfix) with ESMTPS id 4BBB43858C60 for ; Mon, 23 Oct 2023 07:47:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4BBB43858C60 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 4BBB43858C60 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698047236; cv=none; b=IL69f6TDKUqjYzvZJF/xYR7j6a3Cc/XjufOAqIyxbUIcI4rOHfsF0gWAvVtZ2lQGSDON03kaidcoRIQuAMMvduLqAErVreTGbTnhhlYfK7KrPwGqBbeg3S0SuScR6pSseqIcwg63BQeEw1OSd+E2+of3M7Vjta4enBoDJpn6T1Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1698047236; c=relaxed/simple; bh=pv33OAyYYBmwCx3qDk/R5gsm9TXhSrU8jb3dicrsRgw=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=UaXYxz9+wevNtA6zAzX2JucArr4yRLsIADBs0o2pNDMEYtH9hbTtdIAVEqHnhO7uG3Qi1szQAnlnmaTnOQbVCSswIN7FFkbnMKpjvLpHmI7JKx1MkT5GTQezORUsWjqJtUe3Rs8OzaPwJCbQniaQhkPGJkdwQQBg2IEvHDOWniY= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-507be298d2aso4300315e87.1 for ; Mon, 23 Oct 2023 00:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698047233; x=1698652033; 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=3eRrJBa+w5OplkBYpMfnYLd7lxsCvcTUM1hiY0nDPFI=; b=BQFUHRoEvjkdZovS2dbhqBIkYFuVdZ2FQtoWLc8OcIrCB3lMJqe7TjokF+ojCcmMqw 7il//5H7RUdguA+ZqXFNy+tUXlER2RwrtWaU1dD4HNiTeHCnslWvQ5mILt9OqDi3zSr8 bb0zchAlmRPO5tYIL+IYWT1Ew420PsnLgLsTYvDbZIuZwoWJO0cPS+XLPMmJNgVJy9U2 /LKIGGBFI8uIToHvBiFxHgtc7Fm1t3rikvAURoNpPPR7m5Xe3+A4i8YaPpe+5czsCwax XBYKFEkdByYpzU3ZusmSvDv6bvo5Acl5bnWDwrDe5SQe76jwEWlo1aatmZ4H5VIcdtOF aCoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698047233; x=1698652033; 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=3eRrJBa+w5OplkBYpMfnYLd7lxsCvcTUM1hiY0nDPFI=; b=DUfUPROgnOTQhL1X1qqeC1+ziBmTC3DzIShmNwwGXILkcVD5tVhvjkL+H0ah1uAsW7 fZ7FM4nEpEWO9n9iX69iNGcvnVhazvhbXrwH+qSkN33GNotzZ+V9qUthAFAerDXRNZPQ +mHKBjwGgcGxorqLaphYB3imejuI7oObzzVSWwdLeG3prCME4xLZ3PDAz8IFm4hGFjiT YhObNeWhLIW+IlbuY43HqLMNNJKpPusra65wia6OB4o0AjMPHacEKV4JoT2MaJSUxzah lWSKQD7LPgKb7ruOAyQUU+hWMjNYojPNYERLSqydzDUq5yZU/5fYW++zE/0oC6AoklBU OS9w== X-Gm-Message-State: AOJu0YyzI7DB7Q4CygQfH80dSoXLQprZefhBEvNUgUgAjPsSUc7lRcQL iP3IhJzZysPQ/IMICZGbtG2jOo4R1xJ7PBn7ZoIoM4SX X-Google-Smtp-Source: AGHT+IHJpfUoeWZVxVgleoXulcGmvRRABE+PHvH9zhNsBjnptep+fzyfdSwpu6MtOpa60qwyFgL6R1xGhbcVa8kLW7M= X-Received: by 2002:a19:645c:0:b0:505:6c99:bd7c with SMTP id b28-20020a19645c000000b005056c99bd7cmr4980530lfj.57.1698047232470; Mon, 23 Oct 2023 00:47:12 -0700 (PDT) MIME-Version: 1.0 References: <20231022001232.2713374-1-pinskia@gmail.com> In-Reply-To: <20231022001232.2713374-1-pinskia@gmail.com> From: Richard Biener Date: Mon, 23 Oct 2023 09:44:08 +0200 Message-ID: Subject: Re: [PATCHv2] move the (a-b) CMP 0 ? (a-b) : (b-a) optimization from fold_cond_expr_with_comparison to match To: Andrew Pinski Cc: gcc-patches@gcc.gnu.org, Andrew Pinski Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP 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 Sun, Oct 22, 2023 at 2:13=E2=80=AFAM Andrew Pinski w= rote: > > From: Andrew Pinski > > This patch moves the `(a-b) CMP 0 ? (a-b) : (b-a)` optimization > from fold_cond_expr_with_comparison to match. > > Bootstrapped and tested on x86_64-linux-gnu. OK. > Changes in: > v2: Removes `(a =3D=3D b) ? 0 : (b - a)` handling since it was handled > via r14-3606-g3d86e7f4a8ae > Change zerop to integer_zerop for `(a - b) =3D=3D 0 ? 0 : (b - a)`, > Add `(a - b) !=3D 0 ? (a - b) : 0` handling. > > gcc/ChangeLog: > > * match.pd (`(A - B) CMP 0 ? (A - B) : (B - A)`): > New patterns. > > gcc/testsuite/ChangeLog: > > * gcc.dg/tree-ssa/phi-opt-38.c: New test. > --- > gcc/match.pd | 46 ++++++++++++++++++++-- > gcc/testsuite/gcc.dg/tree-ssa/phi-opt-38.c | 45 +++++++++++++++++++++ > 2 files changed, 88 insertions(+), 3 deletions(-) > create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/phi-opt-38.c > > diff --git a/gcc/match.pd b/gcc/match.pd > index a56838fb388..ce8d159d260 100644 > --- a/gcc/match.pd > +++ b/gcc/match.pd > @@ -5650,9 +5650,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) > (cnd (logical_inverted_value truth_valued_p@0) @1 @2) > (cnd @0 @2 @1))) > > -/* abs/negative simplifications moved from fold_cond_expr_with_compariso= n, > - Need to handle (A - B) case as fold_cond_expr_with_comparison does. > - Need to handle UN* comparisons. > +/* abs/negative simplifications moved from fold_cond_expr_with_compariso= n. > > None of these transformations work for modes with signed > zeros. If A is +/-0, the first two transformations will > @@ -5717,6 +5715,48 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) > (convert (negate (absu:utype @0)))) > (negate (abs @0))))) > ) > + > + /* (A - B) =3D=3D 0 ? (A - B) : (B - A) same as (B - A) */ > + (for cmp (eq uneq) > + (simplify > + (cnd (cmp (minus@0 @1 @2) zerop) @0 (minus@3 @2 @1)) > + (if (!HONOR_SIGNED_ZEROS (type)) > + @3)) > + (simplify > + (cnd (cmp (minus@0 @1 @2) integer_zerop) integer_zerop (minus@3 @2 @1= )) > + @3) > + ) > + /* (A - B) !=3D 0 ? (A - B) : (B - A) same as (A - B) */ > + (for cmp (ne ltgt) > + (simplify > + (cnd (cmp (minus@0 @1 @2) zerop) @0 (minus @2 @1)) > + (if (!HONOR_SIGNED_ZEROS (type)) > + @0)) > + (simplify > + (cnd (cmp (minus@0 @1 @2) integer_zerop) @0 integer_zerop) > + @0) > + ) > + /* (A - B) >=3D/> 0 ? (A - B) : (B - A) same as abs (A - B) */ > + (for cmp (ge gt) > + (simplify > + (cnd (cmp (minus@0 @1 @2) zerop) @0 (minus @2 @1)) > + (if (!HONOR_SIGNED_ZEROS (type) > + && !TYPE_UNSIGNED (type)) > + (abs @0)))) > + /* (A - B) <=3D/< 0 ? (A - B) : (B - A) same as -abs (A - B) */ > + (for cmp (le lt) > + (simplify > + (cnd (cmp (minus@0 @1 @2) zerop) @0 (minus @2 @1)) > + (if (!HONOR_SIGNED_ZEROS (type) > + && !TYPE_UNSIGNED (type)) > + (if (ANY_INTEGRAL_TYPE_P (type) > + && !TYPE_OVERFLOW_WRAPS (type)) > + (with { > + tree utype =3D unsigned_type_for (type); > + } > + (convert (negate (absu:utype @0)))) > + (negate (abs @0))))) > + ) > ) > > /* -(type)!A -> (type)A - 1. */ > diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-38.c b/gcc/testsuite/g= cc.dg/tree-ssa/phi-opt-38.c > new file mode 100644 > index 00000000000..0f0e3170f8d > --- /dev/null > +++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-38.c > @@ -0,0 +1,45 @@ > +/* { dg-options "-O2 -fno-signed-zeros -fdump-tree-phiopt" } */ > +int minus1(int a, int b) > +{ > + int c =3D a - b; > + if (c =3D=3D 0) c =3D b - a; > + return c; > +} > +int minus2(int a, int b) > +{ > + int c =3D a - b; > + if (c !=3D 0) c =3D b - a; > + return c; > +} > +int minus3(int a, int b) > +{ > + int c =3D a - b; > + if (c =3D=3D 0) c =3D 0; > + else c =3D b - a; > + return c; > +} > +int minus4(int a, int b) > +{ > + int c; > + if (a =3D=3D b) c =3D 0; > + else > + c =3D b - a; > + return c; > +} > +int abs0(int a, int b) > +{ > + int c =3D a - b; > + if (c <=3D 0) c =3D b - a; > + return c; > +} > +int negabs(int a, int b) > +{ > + int c =3D a - b; > + if (c >=3D 0) c =3D b - a; > + return c; > +} > + > +/* The above should be optimized at phiopt1 except for negabs which has = to wait > + until phiopt2 as -abs is not acceptable in early phiopt. */ > +/* { dg-final { scan-tree-dump-times "if" 1 "phiopt1" } } */ > +/* { dg-final { scan-tree-dump-not "if" "phiopt2" } } */ > -- > 2.39.3 >