public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
From: Uros Bizjak <ubizjak@gmail.com>
To: Jakub Jelinek <jakub@redhat.com>
Cc: Jeff Law <law@redhat.com>,
	"gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH] i386: Fix vph{add, subs?}[wd] 256-bit AVX2 RTL patterns [PR94460]
Date: Fri, 3 Apr 2020 19:18:49 +0200	[thread overview]
Message-ID: <CAFULd4aGMVYm2HqBEpaNPC223=AJqSWS736Wx3Nq-15b-ef6Jg@mail.gmail.com> (raw)
In-Reply-To: <20200403170612.GC2212@tucnak>

On Fri, Apr 3, 2020 at 7:06 PM Jakub Jelinek <jakub@redhat.com> wrote:
>
> Hi!
>
> The following testcase is miscompiled, because the AVX2 patterns don't
> describe correctly what the insn does.  E.g. vphaddd with %ymm* operands
> (the second pattern) instruction as per:
> https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm256_hadd_epi32&expand=2941
> does { a0+a1, a2+a3, b0+b1, b2+b3, a4+a5, a6+a7, b4+b5, b6+b7 }
> but our RTL pattern did
>      { a0+a1, a2+a3, a4+a5, a6+a7, b0+b1, b2+b3, b4+b5, b6+b7 }
> where the first and last 64 bits are the same and two middle 64 bits
> swapped.
> https://software.intel.com/sites/landingpage/IntrinsicsGuide/#text=_mm256_hadd_epi16&expand=2939
> similarly, insn does:
>      { a0+a1, a2+a3, a4+a5, a6+a7, b0+b1, b2+b3, b4+b5, b6+b7,
>        a8+a9, a10+a11, a12+a13, a14+a15, b8+b9, b10+b11, b12+b13, b14+b15 }
> but RTL pattern did
>      { a0+a1, a2+a3, a4+a5, a6+a7, a8+a9, a10+a11, a12+a13, a14+a15,
>        b0+b1, b2+b3, b4+b5, b6+b7, b8+b9, b10+b11, b12+b13, b14+b15 }
> again, first and last 64 bits are the same and the two middle 64 bits
> swapped.
>
> Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux, ok for
> trunk?
>
> As a follow-up for GCC11, I have simplification for the patterns.
>
> 2020-04-03  Jakub Jelinek  <jakub@redhat.com>
>
>         PR target/94460
>         * config/i386/sse.md (avx2_ph<plusminus_mnemonic>wv16hi3,
>         avx2_ph<plusminus_mnemonic>dv8si3): Fix up RTL pattern to do
>         second half of first lane from first lane of second operand and
>         first half of second lane from second lane of first operand.
>
>         * gcc.target/i386/avx2-pr94460.c: New test.

OK for trunk and backports.

Thanks,
Uros.

> --- gcc/config/i386/sse.md.jj   2020-03-30 18:04:31.942435289 +0200
> +++ gcc/config/i386/sse.md      2020-04-03 10:21:51.110564277 +0200
> @@ -16060,22 +16060,6 @@ (define_insn "avx2_ph<plusminus_mnemonic
>             (vec_concat:V4HI
>               (vec_concat:V2HI
>                 (ssse3_plusminus:HI
> -                 (vec_select:HI (match_dup 1) (parallel [(const_int 8)]))
> -                 (vec_select:HI (match_dup 1) (parallel [(const_int 9)])))
> -               (ssse3_plusminus:HI
> -                 (vec_select:HI (match_dup 1) (parallel [(const_int 10)]))
> -                 (vec_select:HI (match_dup 1) (parallel [(const_int 11)]))))
> -             (vec_concat:V2HI
> -               (ssse3_plusminus:HI
> -                 (vec_select:HI (match_dup 1) (parallel [(const_int 12)]))
> -                 (vec_select:HI (match_dup 1) (parallel [(const_int 13)])))
> -               (ssse3_plusminus:HI
> -                 (vec_select:HI (match_dup 1) (parallel [(const_int 14)]))
> -                 (vec_select:HI (match_dup 1) (parallel [(const_int 15)]))))))
> -         (vec_concat:V8HI
> -           (vec_concat:V4HI
> -             (vec_concat:V2HI
> -               (ssse3_plusminus:HI
>                   (vec_select:HI
>                     (match_operand:V16HI 2 "nonimmediate_operand" "xm")
>                     (parallel [(const_int 0)]))
> @@ -16089,7 +16073,23 @@ (define_insn "avx2_ph<plusminus_mnemonic
>                   (vec_select:HI (match_dup 2) (parallel [(const_int 5)])))
>                 (ssse3_plusminus:HI
>                   (vec_select:HI (match_dup 2) (parallel [(const_int 6)]))
> -                 (vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))
> +                 (vec_select:HI (match_dup 2) (parallel [(const_int 7)]))))))
> +         (vec_concat:V8HI
> +           (vec_concat:V4HI
> +             (vec_concat:V2HI
> +               (ssse3_plusminus:HI
> +                 (vec_select:HI (match_dup 1) (parallel [(const_int 8)]))
> +                 (vec_select:HI (match_dup 1) (parallel [(const_int 9)])))
> +               (ssse3_plusminus:HI
> +                 (vec_select:HI (match_dup 1) (parallel [(const_int 10)]))
> +                 (vec_select:HI (match_dup 1) (parallel [(const_int 11)]))))
> +             (vec_concat:V2HI
> +               (ssse3_plusminus:HI
> +                 (vec_select:HI (match_dup 1) (parallel [(const_int 12)]))
> +                 (vec_select:HI (match_dup 1) (parallel [(const_int 13)])))
> +               (ssse3_plusminus:HI
> +                 (vec_select:HI (match_dup 1) (parallel [(const_int 14)]))
> +                 (vec_select:HI (match_dup 1) (parallel [(const_int 15)])))))
>             (vec_concat:V4HI
>               (vec_concat:V2HI
>                 (ssse3_plusminus:HI
> @@ -16224,21 +16224,21 @@ (define_insn "avx2_ph<plusminus_mnemonic
>                 (vec_select:SI (match_dup 1) (parallel [(const_int 3)]))))
>             (vec_concat:V2SI
>               (plusminus:SI
> -               (vec_select:SI (match_dup 1) (parallel [(const_int 4)]))
> -               (vec_select:SI (match_dup 1) (parallel [(const_int 5)])))
> -             (plusminus:SI
> -               (vec_select:SI (match_dup 1) (parallel [(const_int 6)]))
> -               (vec_select:SI (match_dup 1) (parallel [(const_int 7)])))))
> -         (vec_concat:V4SI
> -           (vec_concat:V2SI
> -             (plusminus:SI
>                 (vec_select:SI
>                   (match_operand:V8SI 2 "nonimmediate_operand" "xm")
>                   (parallel [(const_int 0)]))
>                 (vec_select:SI (match_dup 2) (parallel [(const_int 1)])))
>               (plusminus:SI
>                 (vec_select:SI (match_dup 2) (parallel [(const_int 2)]))
> -               (vec_select:SI (match_dup 2) (parallel [(const_int 3)]))))
> +               (vec_select:SI (match_dup 2) (parallel [(const_int 3)])))))
> +         (vec_concat:V4SI
> +           (vec_concat:V2SI
> +             (plusminus:SI
> +               (vec_select:SI (match_dup 1) (parallel [(const_int 4)]))
> +               (vec_select:SI (match_dup 1) (parallel [(const_int 5)])))
> +             (plusminus:SI
> +               (vec_select:SI (match_dup 1) (parallel [(const_int 6)]))
> +               (vec_select:SI (match_dup 1) (parallel [(const_int 7)]))))
>             (vec_concat:V2SI
>               (plusminus:SI
>                 (vec_select:SI (match_dup 2) (parallel [(const_int 4)]))
> --- gcc/testsuite/gcc.target/i386/avx2-pr94460.c.jj     2020-04-03 11:21:20.932237701 +0200
> +++ gcc/testsuite/gcc.target/i386/avx2-pr94460.c        2020-04-03 11:20:55.566617063 +0200
> @@ -0,0 +1,31 @@
> +/* PR target/94460 */
> +/* { dg-do run { target { avx2 && int128 } } } */
> +/* { dg-options "-O2 -mavx2" } */
> +
> +#include <x86intrin.h>
> +#include "avx2-check.h"
> +
> +typedef __int128 v2ti __attribute__ ((__vector_size__ (32)));
> +
> +static inline v2ti
> +foo (__v16hi b)
> +{
> +  return (v2ti) _mm256_hsub_epi16 ((__m256i) b, (__m256i) b);
> +}
> +
> +static inline v2ti
> +bar (__v8si b)
> +{
> +  return (v2ti) _mm256_hsub_epi32 ((__m256i) b, (__m256i) b);
> +}
> +
> +static void
> +avx2_test (void)
> +{
> +  v2ti x = foo ((__v16hi) { 1 });
> +  if (x[0] != ((__int128)1 << 64 | 1) || x[1] != 0)
> +    abort ();
> +  x = bar ((__v8si) { 1 });
> +  if (x[0] != ((__int128)1 << 64 | 1) || x[1] != 0)
> +    abort ();
> +}
>
>         Jakub
>

      reply	other threads:[~2020-04-03 17:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-03 17:06 [PATCH] i386: Fix vph{add,subs?}[wd] " Jakub Jelinek
2020-04-03 17:18 ` Uros Bizjak [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAFULd4aGMVYm2HqBEpaNPC223=AJqSWS736Wx3Nq-15b-ef6Jg@mail.gmail.com' \
    --to=ubizjak@gmail.com \
    --cc=gcc-patches@gcc.gnu.org \
    --cc=jakub@redhat.com \
    --cc=law@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).