From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by sourceware.org (Postfix) with ESMTPS id A38A63858D26 for ; Sat, 5 Nov 2022 11:45:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A38A63858D26 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-x633.google.com with SMTP id f27so19379586eje.1 for ; Sat, 05 Nov 2022 04:45:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=92AizJDV/da2sgQoxteHqaEUzJDJgJP8EJ3Q2zTFvHk=; b=N3vNkZ38omXksZLWaeXbyI/dWYz9EE60F2jM8WrnZ1Q/94wyhaORPpxnMw8ozRPw+t NxSExgwy+lZS0Xvll7kyn/UjvAPZxaG7WtSPMBl6u+xX43I0z22n2CSeYupJrLQmZfgV q6Y310z9JHe+ChO+m0JC0exDsKq8vWhBO+RLiWGL7dzlXtadjP7OnmOgcH0xr300cdvj EmIfC3YDBdsodSYQp4fo3osc5v3i7BlKmaSVF6mq/1OLgoY+eIdXWbm3T9shvtE8kFlK HJJHLVt1ElLzalnXRPI/d/n8k+GIK42Snaxt/iN8CaV6hXePHIdYMnQrnJMN+Dm4KXoj uP5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=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=92AizJDV/da2sgQoxteHqaEUzJDJgJP8EJ3Q2zTFvHk=; b=1tueBUSHlenvVSnpTvQIB0HmDp1+cyTRvWcS0mJPTVKmEXGyQ2gZJM67BIT8WLfZPx 0TK9tKv0RCdpfQ7sVNxPhmlXY/PJvaN2ZFwLo35BiCHd9ukBjA/3w8rGUFGJVyFVHm7T tT6+iLNI79ZJC4utWmTA+TWZVVTERHrfS7AarXeIL2p/bVFJDagD9Tf2P0xKjF8EBaCU N+BjAqLZlSZckTeOGweIeJcnVX+NDK7E0VVryspCPh0FFwfQONBq3ExlA9HIWQUk7qQm EXSOBdG2sP1hFJ5sPhXNB6/CMfafAed69zkCBTFev7HXMuUWSlGsRo9GKeiXo667RJmw K6HQ== X-Gm-Message-State: ACrzQf0ex6y8gpf/mQCoSvgd+dVx1eQCbyryRy5T/WsBVNoslG/Rkfua GUSzT8D80Mxqsw7hf1vtNdCz74n1C0aHWTz3HTMARbBH X-Google-Smtp-Source: AMsMyM5BIj8TBLoEb1uZGwVT/GHm6fjQ64RhHe7WZcu7K5r9WQw25YHXI12VxGrbCOAjCi2ODqQgZEpk2VH3y2ceSvg= X-Received: by 2002:a17:907:d93:b0:7ad:8319:d095 with SMTP id go19-20020a1709070d9300b007ad8319d095mr38061171ejc.511.1667648709172; Sat, 05 Nov 2022 04:45:09 -0700 (PDT) MIME-Version: 1.0 References: <1667425595-2654-1-git-send-email-apinski@marvell.com> <1667425595-2654-2-git-send-email-apinski@marvell.com> In-Reply-To: <1667425595-2654-2-git-send-email-apinski@marvell.com> From: Richard Biener Date: Sat, 5 Nov 2022 12:44:57 +0100 Message-ID: Subject: Re: [PATCH 1/2] Fix PR 105532: match.pd patterns calling tree_nonzero_bits with vector types To: apinski@marvell.com Cc: gcc-patches@gcc.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-8.2 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 Wed, Nov 2, 2022 at 10:47 PM apinski--- via Gcc-patches wrote: > > From: Andrew Pinski > > Even though this PR was reported with an ubsan issue, the problem is > tree_nonzero_bits is being called with an expression which is a vector type. It seems to me the semantics for vectors should be clear but the users didn't expect that result? > This fixes three patterns I noticed which does that. > And adds a testcase for one of the patterns. > > OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions OK. > gcc/ChangeLog: > > PR tree-optimization/105532 > * match.pd (~(X >> Y) -> ~X >> Y): Check if it is an integral > type before calling tree_nonzero_bits. > (popcount(X) + popcount(Y)): Likewise. > (popcount(X&C1)): Likewise. > > gcc/testsuite/ChangeLog: > > * gcc.c-torture/compile/vector-shift-1.c: New test. > --- > gcc/match.pd | 25 +++++++++++-------- > .../gcc.c-torture/compile/vector-shift-1.c | 8 ++++++ > 2 files changed, 22 insertions(+), 11 deletions(-) > create mode 100644 gcc/testsuite/gcc.c-torture/compile/vector-shift-1.c > > diff --git a/gcc/match.pd b/gcc/match.pd > index 194ba8f5188..5833e05a926 100644 > --- a/gcc/match.pd > +++ b/gcc/match.pd > @@ -1371,7 +1371,8 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) > /* For logical right shifts, this is possible only if @0 doesn't > have MSB set and the logical right shift is changed into > arithmetic shift. */ > - (if (!wi::neg_p (tree_nonzero_bits (@0))) > + (if (INTEGRAL_TYPE_P (type) > + && !wi::neg_p (tree_nonzero_bits (@0))) > (with { tree stype = signed_type_for (TREE_TYPE (@0)); } > (convert (rshift (bit_not! (convert:stype @0)) @1)))))) > > @@ -7518,7 +7519,8 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) > /* popcount(X) + popcount(Y) is popcount(X|Y) when X&Y must be zero. */ > (simplify > (plus (POPCOUNT:s @0) (POPCOUNT:s @1)) > - (if (wi::bit_and (tree_nonzero_bits (@0), tree_nonzero_bits (@1)) == 0) > + (if (INTEGRAL_TYPE_P (type) > + && wi::bit_and (tree_nonzero_bits (@0), tree_nonzero_bits (@1)) == 0) > (POPCOUNT (bit_ior @0 @1)))) > > /* popcount(X) == 0 is X == 0, and related (in)equalities. */ > @@ -7550,15 +7552,16 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) > (for pfun (POPCOUNT PARITY) > (simplify > (pfun @0) > - (with { wide_int nz = tree_nonzero_bits (@0); } > - (switch > - (if (nz == 1) > - (convert @0)) > - (if (wi::popcount (nz) == 1) > - (with { tree utype = unsigned_type_for (TREE_TYPE (@0)); } > - (convert (rshift:utype (convert:utype @0) > - { build_int_cst (integer_type_node, > - wi::ctz (nz)); })))))))) > + (if (INTEGRAL_TYPE_P (type)) > + (with { wide_int nz = tree_nonzero_bits (@0); } > + (switch > + (if (nz == 1) > + (convert @0)) > + (if (wi::popcount (nz) == 1) > + (with { tree utype = unsigned_type_for (TREE_TYPE (@0)); } > + (convert (rshift:utype (convert:utype @0) > + { build_int_cst (integer_type_node, > + wi::ctz (nz)); }))))))))) > > #if GIMPLE > /* 64- and 32-bits branchless implementations of popcount are detected: > diff --git a/gcc/testsuite/gcc.c-torture/compile/vector-shift-1.c b/gcc/testsuite/gcc.c-torture/compile/vector-shift-1.c > new file mode 100644 > index 00000000000..142ea56d5bb > --- /dev/null > +++ b/gcc/testsuite/gcc.c-torture/compile/vector-shift-1.c > @@ -0,0 +1,8 @@ > +typedef unsigned char __attribute__((__vector_size__ (1))) U; > + > +U > +foo (U u) > +{ > + u = u == u; > + return (~(u >> 255)); > +} > -- > 2.17.1 >