From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id 41A803858C83; Fri, 21 Apr 2023 19:49:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 41A803858C83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682106582; bh=tC+aiXFril3aeeGK1XZpF42tF5c7FqPCdEAmxNcI3Bo=; h=From:To:Subject:Date:From; b=XossycwKvuLgt6LQS14LAB50k3QFXPh/kQlxvYgsy5mqd2BoZbIGe4mKQT8V169Wk DCo9C+GoRo6guBQULPmI4eXT3oYBmiSS4ej6ihbLWc6NfOyLUOmnhBdx6HGyKojC2s /wwlt8TOf18NCsGHgnt+qbqRd/EKbQqb5jBcCL7k= 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/work119)] Improve vec_extract of V4SF with variable element number. X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work119 X-Git-Oldrev: 87ef9d86fc6fd04eb87eebc4a74b22349b7235b3 X-Git-Newrev: 9675ccd544a0d07d4e319181cde1a88c7dac3f26 Message-Id: <20230421194942.41A803858C83@sourceware.org> Date: Fri, 21 Apr 2023 19:49:42 +0000 (GMT) List-Id: https://gcc.gnu.org/g:9675ccd544a0d07d4e319181cde1a88c7dac3f26 commit 9675ccd544a0d07d4e319181cde1a88c7dac3f26 Author: Michael Meissner Date: Fri Apr 21 15:49:24 2023 -0400 Improve vec_extract of V4SF with variable element number. This patch adds a combine insn that merges loading up a vec_extract of V4SFmode where the element number is variable combined with a conversion to DFmode. In addition, I changed the vec_extract of V4SFmode where the element number is variable without conversion to do the split before register allocation. I also set the length attribute for the length before the split is done. 2023-04-21 Michael Meissner gcc/ * config/rs6000/vsx.md (vsx_extract_v4sf_var_load): Allow split before register allocation. (vsx_extract_v4sf_var_load_to_df): New insn. gcc/testsuite/ * gcc.target/powerpc/vec-extract-mem-float-2.c: New test. Diff: --- gcc/config/rs6000/vsx.md | 31 ++++++++++++++++++---- .../gcc.target/powerpc/vec-extract-mem-float-2.c | 28 +++++++++++++++++++ 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/gcc/config/rs6000/vsx.md b/gcc/config/rs6000/vsx.md index c3848de5d4f..ea29df72ccc 100644 --- a/gcc/config/rs6000/vsx.md +++ b/gcc/config/rs6000/vsx.md @@ -3607,22 +3607,43 @@ DONE; }) -;; Variable V4SF extract from memory +;; V4SF extract from memory with variable element number. (define_insn_and_split "*vsx_extract_v4sf_var_load" [(set (match_operand:SF 0 "gpc_reg_operand" "=wa,?r") (unspec:SF [(match_operand:V4SF 1 "memory_operand" "Q,Q") (match_operand:DI 2 "gpc_reg_operand" "r,r")] UNSPEC_VSX_EXTRACT)) - (clobber (match_scratch:DI 3 "=&b,&b"))] - "VECTOR_MEM_VSX_P (V4SFmode) && TARGET_DIRECT_MOVE_64BIT" + (clobber (match_scratch:P 3 "=&b,&b"))] + "VECTOR_MEM_VSX_P (V4SFmode)" "#" - "&& reload_completed" + "&& 1" [(set (match_dup 0) (match_dup 4))] { operands[4] = rs6000_adjust_vec_address (operands[0], operands[1], operands[2], operands[3], SFmode); } - [(set_attr "type" "fpload,load")]) + [(set_attr "type" "fpload,load") + (set_attr "length" "12")]) + +;; V4SF extract from memory and convert to DFmode with variable element number. +(define_insn_and_split "*vsx_extract_v4sf_var_load_to_df" + [(set (match_operand:DF 0 "gpc_reg_operand" "=wa") + (float_extend:DF + (unspec:SF [(match_operand:V4SF 1 "memory_operand" "Q") + (match_operand:DI 2 "gpc_reg_operand" "r")] + UNSPEC_VSX_EXTRACT))) + (clobber (match_scratch:P 3 "=&b"))] + "VECTOR_MEM_VSX_P (V4SFmode)" + "#" + "&& 1" + [(set (match_dup 0) + (float_extend:DF (match_dup 4)))] +{ + operands[4] = rs6000_adjust_vec_address (operands[0], operands[1], operands[2], + operands[3], SFmode); +} + [(set_attr "type" "fpload") + (set_attr "length" "12")]) ;; Expand the builtin form of xxpermdi to canonical rtl. (define_expand "vsx_xxpermdi_" diff --git a/gcc/testsuite/gcc.target/powerpc/vec-extract-mem-float-2.c b/gcc/testsuite/gcc.target/powerpc/vec-extract-mem-float-2.c new file mode 100644 index 00000000000..a621e45e1ad --- /dev/null +++ b/gcc/testsuite/gcc.target/powerpc/vec-extract-mem-float-2.c @@ -0,0 +1,28 @@ +/* { dg-do compile { target lp64 } } */ +/* { dg-require-effective-target powerpc_p8vector_ok } */ +/* { dg-options "-O2 -mdejagnu-cpu=power8" } */ + +/* Test to verify that the vec_extract with variable element numbers can load + float (SF) variables directly using a single LFSX or LXSSPX instruction. + This includes loading a float and converting it to double. */ + +#include +#include + +float +extract_float_var (vector float *p, size_t n) +{ + return vec_extract (*p, n); /* lfsx or lxsspx. */ +} + +double +extract_float_to_double_var (vector float *p, size_t n) +{ + return vec_extract (*p, n); /* lfsx or lxsspx. */ +} + +/* { dg-final { scan-assembler-times {\mlfsx\M|\{mlxsspx\M} 2 } } */ +/* { dg-final { scan-assembler-not {\mlxv\M|\mlxvx\M} } } */ +/* { dg-final { scan-assembler-not {\mm[tf]vsr} } } */ +/* { dg-final { scan-assembler-not {\mvslo\M} } } */ +/* { dg-final { scan-assembler-not {\mxscvspdp\M} } } */