From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by sourceware.org (Postfix) with ESMTPS id 78C5C3858D20 for ; Mon, 8 Apr 2024 10:47:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 78C5C3858D20 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 78C5C3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::12f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712573260; cv=none; b=DjAqOGMQUUqkyuBdxWJaY05L4SYF2zOtGmhJqKSvYgrZOSfp/ujO506wVgC0gtP/fJ45DRqGYhTHuwv6n5NQYQjW+xkVCwLcQDWyrvSx/K/fyw6Ulp3oTWiAUUmPyVrHatBqrw+Sp7792dr+ZL8HcIFuVdxuyIimCgjklAW1QC8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712573260; c=relaxed/simple; bh=pAfAr1LWjjbSB3iGap9hxIo3eIgzmq+l6QCtqpvg46w=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=l6ZIQ4Ytt3zOcrMW1yo3p2VW9v/FIFxfHYk3oP9sY0V/hFIa7yquM6WcXMEbLgBZJ3r3yJAFxZrsA0Pwnu2mXERJnBtQz633pYOFrRth3k4G1e4UV1NPUcsMOJECtfqxKSGy/qZVORkaRsMAPR9foyrGbU4+KpEFc17hFzuU8XI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-516db2214e6so2310470e87.1 for ; Mon, 08 Apr 2024 03:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712573257; x=1713178057; 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=h+z+QjyW8rZFitO3CtZe4VznkMa+uJS5iwO5soXqFB4=; b=nNkdXyeLpj3SF2EWJdI9yK11DYTBT14edpyJfN2l2l5Lv7mO+DPYy25qHCE5iiuz9q Y2dwjSvWFHir33EARezO3/M7p3+lLNxIyqrQGZrBLa1B+jD37CAp4/4OhNr/lNeFIDhP rzNUgwtPAMvHIS2VL5+Hk6fxW60BexVuP9fydxqQ23kKqCgvnUodSURnbs0V3MKlo0oY DwWqu5hZaZMYnb8efiiOc/W3gG0GRrbLNRR9i3szTGubmLiRYWAWtt7HwC8U+K2qFcr3 t9y3RULYbSF4HpcSWpOIFIaqQtJiPX7rO6RkiF3oEMTbbKO7JQxVTFlc6+VY8NxHAp9X yHsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712573257; x=1713178057; 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=h+z+QjyW8rZFitO3CtZe4VznkMa+uJS5iwO5soXqFB4=; b=twtf+TTDCQm2gOy6fXMqc22tMkp26RY4C5VoGy4NQDyeQRqW+2nqHxAyOGsAj7D2zT EqmC7t2jPNon4W6T6++mi6x5DNCuwDq/egEK1xMhVETxmckHBCZIkGw6r35k0buJyH+i Cl7krE0Z/P9ZX1Vhw1hyWjURfVMI1Rvd3enyaR6/7V5pHf0h27t/c3g8+JbZlQrsBWqD JBukmcWli0cCgW11/SvSZQ0Vxs1upr6jhanhWNCA8HEc253zSK/TlkwzLEnuWBQFbKoc TYpKt8GzFfPzIU7EtjohSl62pXPponz6ayuvxt1b4iITtJ5nutWd9DeDmJF5p11v2xp4 TdHA== X-Gm-Message-State: AOJu0YzXYi5yd2Dz6S0r6OLbIiEyUqjYxtojsUmMZnrNEz4RJ/CTx5oO +KHss28JzHhFLVURnA4ukLILqu0ZcTf8HafIJmpIaOqnyYjX1WlFnlaA0xC0CptyhRRyoe1TPGz C3Fpk+s0eVdgobMBnWkv/sjE1xxhcv1AB X-Google-Smtp-Source: AGHT+IHZo2RXya1RHlrPawKzwQHUyxhuNgviRiGRXAIOzqQAG7c/eNTCc/A4eSUnUHV+im2HTZgYHK0Dg9HXwQ7yhI4= X-Received: by 2002:ac2:560a:0:b0:513:a479:3ad9 with SMTP id v10-20020ac2560a000000b00513a4793ad9mr5047730lfd.55.1712573256682; Mon, 08 Apr 2024 03:47:36 -0700 (PDT) MIME-Version: 1.0 References: <8bc0fa05-e254-6c85-f48b-e7d353eb9a18@linux.ibm.com> In-Reply-To: <8bc0fa05-e254-6c85-f48b-e7d353eb9a18@linux.ibm.com> From: Richard Biener Date: Mon, 8 Apr 2024 12:47:25 +0200 Message-ID: Subject: Re: [PATCH] rs6000: Fix wrong align passed to build_aligned_type [PR88309] To: "Kewen.Lin" Cc: GCC Patches , Segher Boessenkool , David Edelsohn , Peter Bergner , Andrew Pinski Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.6 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 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 Mon, Apr 8, 2024 at 11:22=E2=80=AFAM Kewen.Lin wro= te: > > Hi, > > As the comments in PR88309 show, there are two oversights > in rs6000_gimple_fold_builtin that pass align in bytes to > build_aligned_type but which actually requires align in > bits, it causes unexpected ICE or hanging in function > is_miss_rate_acceptable due to zero align_unit value. > > This patch is to fix them by converting bytes to bits, add > an assertion on positive align_unit value and notes function > build_aligned_type requires align measured in bits in its > function comment. > > Bootstrapped and regtested on x86_64-redhat-linux, > powerpc64-linux-gnu P8/P9 and powerpc64le-linux-gnu P9 and P10. > > Is it (the generic part code change) ok for trunk? OK > BR, > Kewen > ----- > PR target/88309 > > Co-authored-by: Andrew Pinski > > gcc/ChangeLog: > > * config/rs6000/rs6000-builtin.cc (rs6000_gimple_fold_builtin): F= ix > wrong align passed to function build_aligned_type. > * tree-ssa-loop-prefetch.cc (is_miss_rate_acceptable): Add an > assertion to ensure align_unit should be positive. > * tree.cc (build_qualified_type): Update function comments. > > gcc/testsuite/ChangeLog: > > * gcc.target/powerpc/pr88309.c: New test. > --- > gcc/config/rs6000/rs6000-builtin.cc | 4 ++-- > gcc/testsuite/gcc.target/powerpc/pr88309.c | 27 ++++++++++++++++++++++ > gcc/tree-ssa-loop-prefetch.cc | 2 ++ > gcc/tree.cc | 3 ++- > 4 files changed, 33 insertions(+), 3 deletions(-) > create mode 100644 gcc/testsuite/gcc.target/powerpc/pr88309.c > > diff --git a/gcc/config/rs6000/rs6000-builtin.cc b/gcc/config/rs6000/rs60= 00-builtin.cc > index 6698274031b..e7d6204074c 100644 > --- a/gcc/config/rs6000/rs6000-builtin.cc > +++ b/gcc/config/rs6000/rs6000-builtin.cc > @@ -1900,7 +1900,7 @@ rs6000_gimple_fold_builtin (gimple_stmt_iterator *g= si) > tree lhs_type =3D TREE_TYPE (lhs); > /* In GIMPLE the type of the MEM_REF specifies the alignment. Th= e > required alignment (power) is 4 bytes regardless of data type. = */ > - tree align_ltype =3D build_aligned_type (lhs_type, 4); > + tree align_ltype =3D build_aligned_type (lhs_type, 32); > /* POINTER_PLUS_EXPR wants the offset to be of type 'sizetype'. = Create > the tree using the value from arg0. The resulting type will m= atch > the type of arg1. */ > @@ -1944,7 +1944,7 @@ rs6000_gimple_fold_builtin (gimple_stmt_iterator *g= si) > tree arg2_type =3D ptr_type_node; > /* In GIMPLE the type of the MEM_REF specifies the alignment. Th= e > required alignment (power) is 4 bytes regardless of data type.= */ > - tree align_stype =3D build_aligned_type (arg0_type, 4); > + tree align_stype =3D build_aligned_type (arg0_type, 32); > /* POINTER_PLUS_EXPR wants the offset to be of type 'sizetype'. = Create > the tree using the value from arg1. */ > gimple_seq stmts =3D NULL; > diff --git a/gcc/testsuite/gcc.target/powerpc/pr88309.c b/gcc/testsuite/g= cc.target/powerpc/pr88309.c > new file mode 100644 > index 00000000000..c0078cf2b8c > --- /dev/null > +++ b/gcc/testsuite/gcc.target/powerpc/pr88309.c > @@ -0,0 +1,27 @@ > +/* { dg-require-effective-target powerpc_vsx_ok } */ > +/* { dg-options "-mvsx -O2 -fprefetch-loop-arrays" } */ > + > +/* Verify there is no ICE or hanging. */ > + > +#include > + > +void b(float *c, vector float a, vector float, vector float) > +{ > + vector float d; > + vector char ahbc; > + vec_xst(vec_perm(a, d, ahbc), 0, c); > +} > + > +vector float e(vector unsigned); > + > +void f() { > + float *dst; > + int g =3D 0; > + for (;; g +=3D 16) { > + vector unsigned m, i; > + vector unsigned n, j; > + vector unsigned k, l; > + b(dst + g * 3, e(m), e(n), e(k)); > + b(dst + (g + 4) * 3, e(i), e(j), e(l)); > + } > +} > diff --git a/gcc/tree-ssa-loop-prefetch.cc b/gcc/tree-ssa-loop-prefetch.c= c > index bbd98e03254..70073cc4fe4 100644 > --- a/gcc/tree-ssa-loop-prefetch.cc > +++ b/gcc/tree-ssa-loop-prefetch.cc > @@ -739,6 +739,8 @@ is_miss_rate_acceptable (unsigned HOST_WIDE_INT cache= _line_size, > if (delta >=3D (HOST_WIDE_INT) cache_line_size) > return false; > > + gcc_assert (align_unit > 0); > + > miss_positions =3D 0; > total_positions =3D (cache_line_size / align_unit) * distinct_iters; > max_allowed_miss_positions =3D (ACCEPTABLE_MISS_RATE * total_positions= ) / 1000; > diff --git a/gcc/tree.cc b/gcc/tree.cc > index f801712c9dd..6f8400e6640 100644 > --- a/gcc/tree.cc > +++ b/gcc/tree.cc > @@ -5689,7 +5689,8 @@ build_qualified_type (tree type, int type_quals MEM= _STAT_DECL) > return t; > } > > -/* Create a variant of type T with alignment ALIGN. */ > +/* Create a variant of type T with alignment ALIGN which > + is measured in bits. */ > > tree > build_aligned_type (tree type, unsigned int align) > -- > 2.43.0