From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id 5D7453898C6D; Thu, 31 Mar 2022 14:00:58 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5D7453898C6D Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Michael Meissner To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/meissner/heads/work084)] Revert patch. X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work084 X-Git-Oldrev: d09dcf3bcb6b162e71e11ea6e5db86cdb2a38557 X-Git-Newrev: 4270ed1887b785280ff58268bc6bab4a5356d519 Message-Id: <20220331140058.5D7453898C6D@sourceware.org> Date: Thu, 31 Mar 2022 14:00:58 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Mar 2022 14:00:58 -0000 https://gcc.gnu.org/g:4270ed1887b785280ff58268bc6bab4a5356d519 commit 4270ed1887b785280ff58268bc6bab4a5356d519 Author: Michael Meissner Date: Wed Mar 30 13:56:20 2022 -0400 Revert patch. 2022-03-29 Michael Meissner gcc/ PR target/99293 Revert patch. * config/rs6000/rs6000-p8swap.cc (rtx_is_swappable_p): Remove UNSPEC_VSX_XXSPLTD case. * config/rs6000/vsx.md (UNSPEC_VSX_XXSPLTD): Delete. (vsx_xxspltd_): Rewrite to use VEC_DUPLICATE. gcc/testsuite: PR target/99293 Revert patch. * gcc.target/powerpc/builtins-1.c: Update insn count. * gcc.target/powerpc/pr99293.c: New test. Diff: --- gcc/config/rs6000/rs6000-p8swap.cc | 1 + gcc/config/rs6000/vsx.md | 19 +++++++------- gcc/testsuite/gcc.target/powerpc/builtins-1.c | 2 +- gcc/testsuite/gcc.target/powerpc/pr99293.c | 36 --------------------------- 4 files changed, 11 insertions(+), 47 deletions(-) diff --git a/gcc/config/rs6000/rs6000-p8swap.cc b/gcc/config/rs6000/rs6000-p8swap.cc index 1973d9c8245..d301bc3fe59 100644 --- a/gcc/config/rs6000/rs6000-p8swap.cc +++ b/gcc/config/rs6000/rs6000-p8swap.cc @@ -805,6 +805,7 @@ rtx_is_swappable_p (rtx op, unsigned int *special) case UNSPEC_VUPKLU_V4SF: return 0; case UNSPEC_VSPLT_DIRECT: + case UNSPEC_VSX_XXSPLTD: *special = SH_SPLAT; return 1; case UNSPEC_REDUC_PLUS: diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md index a1a1ce95195..1b75538f42f 100644 --- a/gcc/config/rs6000/vsx.md +++ b/gcc/config/rs6000/vsx.md @@ -296,6 +296,7 @@ UNSPEC_VSX_XXPERM UNSPEC_VSX_XXSPLTW + UNSPEC_VSX_XXSPLTD UNSPEC_VSX_DIVSD UNSPEC_VSX_DIVUD UNSPEC_VSX_DIVSQ @@ -4672,18 +4673,16 @@ ;; V2DF/V2DI splat for use by vec_splat builtin (define_insn "vsx_xxspltd_" [(set (match_operand:VSX_D 0 "vsx_register_operand" "=wa") - (vec_duplicate:VSX_D - (vec_select: - (match_operand:VSX_D 1 "gpc_reg_operand" "wa") - (parallel [(match_operand:QI 2 "const_0_to_1_operand" "i")]))))] + (unspec:VSX_D [(match_operand:VSX_D 1 "vsx_register_operand" "wa") + (match_operand:QI 2 "u5bit_cint_operand" "i")] + UNSPEC_VSX_XXSPLTD))] "VECTOR_MEM_VSX_P (mode)" { - HOST_WIDE_INT dword = INTVAL (operands[2]); - if (!BYTES_BIG_ENDIAN) - dword = !dword; - - operands[3] = GEN_INT (3*dword); - return "xxpermdi %x0,%x1,%x1,%3"; + if ((BYTES_BIG_ENDIAN && INTVAL (operands[2]) == 0) + || (!BYTES_BIG_ENDIAN && INTVAL (operands[2]) == 1)) + return "xxpermdi %x0,%x1,%x1,0"; + else + return "xxpermdi %x0,%x1,%x1,3"; } [(set_attr "type" "vecperm")]) diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-1.c b/gcc/testsuite/gcc.target/powerpc/builtins-1.c index 98783668bce..28cd1aa6b1a 100644 --- a/gcc/testsuite/gcc.target/powerpc/builtins-1.c +++ b/gcc/testsuite/gcc.target/powerpc/builtins-1.c @@ -1035,4 +1035,4 @@ foo156 (vector unsigned short usa) /* { dg-final { scan-assembler-times {\mvmrglb\M} 3 } } */ /* { dg-final { scan-assembler-times {\mvmrgew\M} 4 } } */ /* { dg-final { scan-assembler-times {\mvsplth|xxsplth\M} 4 } } */ -/* { dg-final { scan-assembler-times {\mxxpermdi\M} 42 } } */ +/* { dg-final { scan-assembler-times {\mxxpermdi\M} 44 } } */ diff --git a/gcc/testsuite/gcc.target/powerpc/pr99293.c b/gcc/testsuite/gcc.target/powerpc/pr99293.c deleted file mode 100644 index 03c22f8f4de..00000000000 --- a/gcc/testsuite/gcc.target/powerpc/pr99293.c +++ /dev/null @@ -1,36 +0,0 @@ -/* { dg-do compile } */ -/* { dg-require-effective-target powerpc_vsx_ok } */ -/* { dg-options "-O2 -mvsx" } */ - -/* Test for PR 99263, which wants to do: - __builtin_vec_splats (__builtin_vec_extract (v, n)) - - where v is a V2DF or V2DI vector and n is either 0 or 1. Previously the - compiler would do a direct move to the GPR registers to select the item and - a direct move from the GPR registers to do the splat. */ - -vector long long -splat_dup_ll_0 (vector long long v) -{ - return __builtin_vec_splats (__builtin_vec_extract (v, 0)); -} - -vector long long -splat_dup_ll_1 (vector long long v) -{ - return __builtin_vec_splats (__builtin_vec_extract (v, 1)); -} - -vector double -splat_dup_d_0 (vector double v) -{ - return __builtin_vec_splats (__builtin_vec_extract (v, 0)); -} - -vector double -splat_dup_d_1 (vector double v) -{ - return __builtin_vec_splats (__builtin_vec_extract (v, 1)); -} - -/* { dg-final { scan-assembler-times {\mxxpermdi\M} 4 } } */