On Mon, Aug 2, 2021 at 7:47 PM H.J. Lu <hjl.to...@gmail.com> wrote:
>
> In 64-bit mode, use XMM31 for scratch SSE register to avoid vzeroupper
> if possible.
>
> gcc/
>
> * config/i386/i386.c (ix86_gen_scratch_sse_rtx): In 64-bit mode,
> try XMM31 to avoid vzeroupper.
>
> gcc/testsuite/
>
> * gcc.target/i386/avx-vzeroupper-14.c: Pass -mno-avx512f to
> disable XMM31.
> * gcc.target/i386/avx-vzeroupper-15.c: Likewise.
> * gcc.target/i386/pr82941-1.c: Updated. Check for vzeroupper.
> * gcc.target/i386/pr82942-1.c: Likewise.
> * gcc.target/i386/pr82990-1.c: Likewise.
> * gcc.target/i386/pr82990-3.c: Likewise.
> * gcc.target/i386/pr82990-5.c: Likewise.
> * gcc.target/i386/pr100865-4b.c: Likewise.
> * gcc.target/i386/pr100865-6b.c: Likewise.
> * gcc.target/i386/pr100865-7b.c: Likewise.
> * gcc.target/i386/pr100865-10b.c: Likewise.
> * gcc.target/i386/pr100865-8b.c: Updated.
> * gcc.target/i386/pr100865-9b.c: Likewise.
> * gcc.target/i386/pr100865-11b.c: Likewise.
> * gcc.target/i386/pr100865-12b.c: Likewise.
> ---
> gcc/config/i386/i386.c | 18 +++++++++++++++---
> .../gcc.target/i386/avx-vzeroupper-14.c | 2 +-
> .../gcc.target/i386/avx-vzeroupper-15.c | 2 +-
> gcc/testsuite/gcc.target/i386/pr100865-10b.c | 1 +
> gcc/testsuite/gcc.target/i386/pr100865-11b.c | 2 +-
> gcc/testsuite/gcc.target/i386/pr100865-12b.c | 2 +-
> gcc/testsuite/gcc.target/i386/pr100865-4b.c | 2 ++
> gcc/testsuite/gcc.target/i386/pr100865-6b.c | 5 ++++-
> gcc/testsuite/gcc.target/i386/pr100865-7b.c | 5 ++++-
> gcc/testsuite/gcc.target/i386/pr100865-8b.c | 2 +-
> gcc/testsuite/gcc.target/i386/pr100865-9b.c | 2 +-
> gcc/testsuite/gcc.target/i386/pr82941-1.c | 3 ++-
> gcc/testsuite/gcc.target/i386/pr82942-1.c | 3 ++-
> gcc/testsuite/gcc.target/i386/pr82990-1.c | 3 ++-
> gcc/testsuite/gcc.target/i386/pr82990-3.c | 3 ++-
> gcc/testsuite/gcc.target/i386/pr82990-5.c | 3 ++-
> 16 files changed, 42 insertions(+), 16 deletions(-)
>
> diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
> index 842eb0e6786..ec0690876b7 100644
> --- a/gcc/config/i386/i386.c
> +++ b/gcc/config/i386/i386.c
> @@ -23335,9 +23335,21 @@ rtx
> ix86_gen_scratch_sse_rtx (machine_mode mode)
> {
> if (TARGET_SSE && !lra_in_progress)
> - return gen_rtx_REG (mode, (TARGET_64BIT
> - ? LAST_REX_SSE_REG
> - : LAST_SSE_REG));
> + {
> + unsigned int regno;
> + if (TARGET_64BIT)
> + {
> + /* In 64-bit mode, use XMM31 to avoid vzeroupper and always
> + use XMM31 for CSE. */
> + if (ix86_hard_regno_mode_ok (LAST_EXT_REX_SSE_REG, mode))
> + regno = LAST_EXT_REX_SSE_REG;
> + else
> + regno = LAST_REX_SSE_REG;
> + }
> + else
> + regno = LAST_SSE_REG;
Assuming that ix86_hard_regno_mode_ok always returns false for XMM31
in 64bit mode, we can do:
/* Use XMM31 if available to avoid vzeroupper. */
if (ix86_hard_regno_mode_ok (LAST_EXT_REX_SSE_REG, mode))
regno = LAST_EXST_REX_SSE_REG;
else if (TARGET_64BIT)
regno = LAST_EXT_REX_SSE_REG;
else
regno = LAST_SSE_REG;
Uros.
> + return gen_rtx_REG (mode, regno);
> + }
> else
> return gen_reg_rtx (mode);
> }
> diff --git a/gcc/testsuite/gcc.target/i386/avx-vzeroupper-14.c
> b/gcc/testsuite/gcc.target/i386/avx-vzeroupper-14.c
> index a31b4a2a63a..9590f25da22 100644
> --- a/gcc/testsuite/gcc.target/i386/avx-vzeroupper-14.c
> +++ b/gcc/testsuite/gcc.target/i386/avx-vzeroupper-14.c
> @@ -1,5 +1,5 @@
> /* { dg-do compile } */
> -/* { dg-options "-O2 -mavx -mtune=generic -dp" } */
> +/* { dg-options "-O2 -mavx -mno-avx512f -mtune=generic -dp" } */
>
> #include <immintrin.h>
>
> diff --git a/gcc/testsuite/gcc.target/i386/avx-vzeroupper-15.c
> b/gcc/testsuite/gcc.target/i386/avx-vzeroupper-15.c
> index 803936eef01..36dcf7367f1 100644
> --- a/gcc/testsuite/gcc.target/i386/avx-vzeroupper-15.c
> +++ b/gcc/testsuite/gcc.target/i386/avx-vzeroupper-15.c
> @@ -1,5 +1,5 @@
> /* { dg-do compile } */
> -/* { dg-options "-O2 -mavx -mtune=generic -dp" } */
> +/* { dg-options "-O2 -mavx -mno-avx512f -mtune=generic -dp" } */
>
> #include <immintrin.h>
>
> diff --git a/gcc/testsuite/gcc.target/i386/pr100865-10b.c
> b/gcc/testsuite/gcc.target/i386/pr100865-10b.c
> index e5616d8d258..77ace86ffe8 100644
> --- a/gcc/testsuite/gcc.target/i386/pr100865-10b.c
> +++ b/gcc/testsuite/gcc.target/i386/pr100865-10b.c
> @@ -5,3 +5,4 @@
>
> /* { dg-final { scan-assembler-times "vpbroadcastb\[\\t \]+%(?:r|e)\[^\n\]*,
> %ymm\[0-9\]+" 1 } } */
> /* { dg-final { scan-assembler-times "vmovdqu8\[\\t \]%ymm\[0-9\]+, " 8 } }
> */
> +/* { dg-final { scan-assembler-not "vzeroupper" } } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr100865-11b.c
> b/gcc/testsuite/gcc.target/i386/pr100865-11b.c
> index 12d55b9a642..7e458e85cdd 100644
> --- a/gcc/testsuite/gcc.target/i386/pr100865-11b.c
> +++ b/gcc/testsuite/gcc.target/i386/pr100865-11b.c
> @@ -5,4 +5,4 @@
>
> /* { dg-final { scan-assembler-times "movabsq" 1 } } */
> /* { dg-final { scan-assembler-times "vpbroadcastq\[\\t \]+%(?:r|e)\[^\n\]*,
> %xmm\[0-9\]+" 1 } } */
> -/* { dg-final { scan-assembler-times "vmovdqa\[\\t \]%xmm\[0-9\]+, " 16 } }
> */
> +/* { dg-final { scan-assembler-times "vmovdqa64\[\\t \]%xmm\[0-9\]+, " 16 }
> } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr100865-12b.c
> b/gcc/testsuite/gcc.target/i386/pr100865-12b.c
> index 63a5629b90c..dee0cfb016a 100644
> --- a/gcc/testsuite/gcc.target/i386/pr100865-12b.c
> +++ b/gcc/testsuite/gcc.target/i386/pr100865-12b.c
> @@ -5,4 +5,4 @@
>
> /* { dg-final { scan-assembler-times "movabsq" 1 } } */
> /* { dg-final { scan-assembler-times "vpbroadcastq\[\\t \]+%(?:r|e)\[^\n\]*,
> %xmm\[0-9\]+" 1 } } */
> -/* { dg-final { scan-assembler-times "vmovdqa\[\\t \]%xmm\[0-9\]+, " 16 } }
> */
> +/* { dg-final { scan-assembler-times "vmovdqa64\[\\t \]%xmm\[0-9\]+, " 16 }
> } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr100865-4b.c
> b/gcc/testsuite/gcc.target/i386/pr100865-4b.c
> index 8e8a7eaaaff..80e9fdb12ea 100644
> --- a/gcc/testsuite/gcc.target/i386/pr100865-4b.c
> +++ b/gcc/testsuite/gcc.target/i386/pr100865-4b.c
> @@ -5,5 +5,7 @@
>
> /* { dg-final { scan-assembler-times "vpbroadcastb\[\\t \]+%(?:r|e)\[^\n\]*,
> %ymm\[0-9\]+" 1 } } */
> /* { dg-final { scan-assembler-times "vmovdqu8\[\\t \]%ymm\[0-9\]+, " 2 } }
> */
> +/* { dg-final { scan-assembler-times "vzeroupper" 1 { target ia32 } } } */
> +/* { dg-final { scan-assembler-not "vzeroupper" { target { ! ia32 } } } } */
> /* { dg-final { scan-assembler-not "vpbroadcastb\[\\t \]+%xmm\[0-9\]+,
> %ymm\[0-9\]+" } } */
> /* { dg-final { scan-assembler-not "vmovdqa" } } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr100865-6b.c
> b/gcc/testsuite/gcc.target/i386/pr100865-6b.c
> index 44e74c64e55..35f2e961d25 100644
> --- a/gcc/testsuite/gcc.target/i386/pr100865-6b.c
> +++ b/gcc/testsuite/gcc.target/i386/pr100865-6b.c
> @@ -4,6 +4,9 @@
> #include "pr100865-6a.c"
>
> /* { dg-final { scan-assembler-times "vpbroadcastd\[\\t \]+%(?:r|e)\[^\n\]*,
> %ymm\[0-9\]+" 1 } } */
> -/* { dg-final { scan-assembler-times "vmovdqu\[\\t \]%ymm\[0-9\]+, " 8 } } */
> +/* { dg-final { scan-assembler-times "vmovdqu\[\\t \]%ymm\[0-9\]+, " 8 {
> target ia32 } } } */
> +/* { dg-final { scan-assembler-times "vmovdqu32\[\\t \]%ymm\[0-9\]+, " 8 {
> target { ! ia32 } } } } */
> +/* { dg-final { scan-assembler-times "vzeroupper" 1 { target ia32 } } } */
> +/* { dg-final { scan-assembler-not "vzeroupper" { target { ! ia32 } } } } */
> /* { dg-final { scan-assembler-not "vpbroadcastd\[\\t \]+%xmm\[0-9\]+,
> %ymm\[0-9\]+" } } */
> /* { dg-final { scan-assembler-not "vmovdqa" } } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr100865-7b.c
> b/gcc/testsuite/gcc.target/i386/pr100865-7b.c
> index 0a68820aa32..ad267c43891 100644
> --- a/gcc/testsuite/gcc.target/i386/pr100865-7b.c
> +++ b/gcc/testsuite/gcc.target/i386/pr100865-7b.c
> @@ -5,5 +5,8 @@
>
> /* { dg-final { scan-assembler-times "vpbroadcastq\[\\t \]+%r\[^\n\]*,
> %ymm\[0-9\]+" 1 { target { ! ia32 } } } } */
> /* { dg-final { scan-assembler-times "vpbroadcastq\[\\t \]+\[^\n\]*,
> %ymm\[0-9\]+" 1 { target ia32 } } } */
> -/* { dg-final { scan-assembler-times "vmovdqu\[\\t \]%ymm\[0-9\]+, " 16 } }
> */
> +/* { dg-final { scan-assembler-times "vmovdqu\[\\t \]%ymm\[0-9\]+, " 16 {
> target ia32 } } } */
> +/* { dg-final { scan-assembler-times "vmovdqu64\[\\t \]%ymm\[0-9\]+, " 16 {
> target { ! ia32 } } } } */
> +/* { dg-final { scan-assembler-times "vzeroupper" 1 { target ia32 } } } */
> +/* { dg-final { scan-assembler-not "vzeroupper" { target { ! ia32 } } } } */
> /* { dg-final { scan-assembler-not "vmovdqa" } } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr100865-8b.c
> b/gcc/testsuite/gcc.target/i386/pr100865-8b.c
> index 99a10ad83bd..4b7dd7cee3e 100644
> --- a/gcc/testsuite/gcc.target/i386/pr100865-8b.c
> +++ b/gcc/testsuite/gcc.target/i386/pr100865-8b.c
> @@ -4,4 +4,4 @@
> #include "pr100865-8a.c"
>
> /* { dg-final { scan-assembler-times "vpbroadcastd\[\\t \]+%(?:r|e)\[^\n\]*,
> %xmm\[0-9\]+" 1 } } */
> -/* { dg-final { scan-assembler-times "vmovdqa\[\\t \]%xmm\[0-9\]+, " 16 } }
> */
> +/* { dg-final { scan-assembler-times "vmovdqa64\[\\t \]%xmm\[0-9\]+, " 16 }
> } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr100865-9b.c
> b/gcc/testsuite/gcc.target/i386/pr100865-9b.c
> index 14696248525..a315dde7c52 100644
> --- a/gcc/testsuite/gcc.target/i386/pr100865-9b.c
> +++ b/gcc/testsuite/gcc.target/i386/pr100865-9b.c
> @@ -4,4 +4,4 @@
> #include "pr100865-9a.c"
>
> /* { dg-final { scan-assembler-times "vpbroadcastw\[\\t \]+%(?:r|e)\[^\n\]*,
> %xmm\[0-9\]+" 1 } } */
> -/* { dg-final { scan-assembler-times "vmovdqa\[\\t \]%xmm\[0-9\]+, " 16 } }
> */
> +/* { dg-final { scan-assembler-times "vmovdqa64\[\\t \]%xmm\[0-9\]+, " 16 }
> } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr82941-1.c
> b/gcc/testsuite/gcc.target/i386/pr82941-1.c
> index d7e530d5116..c3be2f5b797 100644
> --- a/gcc/testsuite/gcc.target/i386/pr82941-1.c
> +++ b/gcc/testsuite/gcc.target/i386/pr82941-1.c
> @@ -11,4 +11,5 @@ pr82941 ()
> z = y;
> }
>
> -/* { dg-final { scan-assembler-times "vzeroupper" 1 } } */
> +/* { dg-final { scan-assembler-times "vzeroupper" 1 { target ia32 } } } */
> +/* { dg-final { scan-assembler-not "vzeroupper" { target { ! ia32 } } } } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr82942-1.c
> b/gcc/testsuite/gcc.target/i386/pr82942-1.c
> index 9cdf81a9d60..29ead049a67 100644
> --- a/gcc/testsuite/gcc.target/i386/pr82942-1.c
> +++ b/gcc/testsuite/gcc.target/i386/pr82942-1.c
> @@ -3,4 +3,5 @@
>
> #include "pr82941-1.c"
>
> -/* { dg-final { scan-assembler-times "vzeroupper" 1 } } */
> +/* { dg-final { scan-assembler-times "vzeroupper" 1 { target ia32 } } } */
> +/* { dg-final { scan-assembler-not "vzeroupper" { target { ! ia32 } } } } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr82990-1.c
> b/gcc/testsuite/gcc.target/i386/pr82990-1.c
> index ff1d6d40eb2..bbf580fea77 100644
> --- a/gcc/testsuite/gcc.target/i386/pr82990-1.c
> +++ b/gcc/testsuite/gcc.target/i386/pr82990-1.c
> @@ -11,4 +11,5 @@ pr82941 ()
> z = y;
> }
>
> -/* { dg-final { scan-assembler-times "vzeroupper" 1 } } */
> +/* { dg-final { scan-assembler-times "vzeroupper" 1 { target ia32 } } } */
> +/* { dg-final { scan-assembler-not "vzeroupper" { target { ! ia32 } } } } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr82990-3.c
> b/gcc/testsuite/gcc.target/i386/pr82990-3.c
> index 201fa98d8d4..89ddb20adb3 100644
> --- a/gcc/testsuite/gcc.target/i386/pr82990-3.c
> +++ b/gcc/testsuite/gcc.target/i386/pr82990-3.c
> @@ -3,4 +3,5 @@
>
> #include "pr82941-1.c"
>
> -/* { dg-final { scan-assembler-times "vzeroupper" 1 } } */
> +/* { dg-final { scan-assembler-times "vzeroupper" 1 { target ia32 } } } */
> +/* { dg-final { scan-assembler-not "vzeroupper" { target { ! ia32 } } } } */
> diff --git a/gcc/testsuite/gcc.target/i386/pr82990-5.c
> b/gcc/testsuite/gcc.target/i386/pr82990-5.c
> index 9932bdc5375..b9da0e706b1 100644
> --- a/gcc/testsuite/gcc.target/i386/pr82990-5.c
> +++ b/gcc/testsuite/gcc.target/i386/pr82990-5.c
> @@ -11,4 +11,5 @@ pr82941 ()
> z = y;
> }
>
> -/* { dg-final { scan-assembler-times "vzeroupper" 1 } } */
> +/* { dg-final { scan-assembler-times "vzeroupper" 1 { target ia32 } } } */
> +/* { dg-final { scan-assembler-not "vzeroupper" { target { ! ia32 } } } } */
> --
> 2.31.1
>
