public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-1403] RISC-V: Allow all const_vec_duplicates as constants.
@ 2023-05-30  9:57 Robin Dapp
  0 siblings, 0 replies; only message in thread
From: Robin Dapp @ 2023-05-30  9:57 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:32a0266cc54a404007fca0d44dc9a299bbe70c1f

commit r14-1403-g32a0266cc54a404007fca0d44dc9a299bbe70c1f
Author: Robin Dapp <rdapp@ventanamicro.com>
Date:   Mon May 22 20:41:59 2023 +0200

    RISC-V: Allow all const_vec_duplicates as constants.
    
    As we can always broadcast an integer constant to a vector register
    allow them in riscv_const_insns.  We need as many instructions as
    it takes to generate the constant and one vmv.vx.
    
    gcc/ChangeLog:
    
            * config/riscv/riscv.cc (riscv_const_insns): Allow
            const_vec_duplicates.
    
    gcc/testsuite/ChangeLog:
    
            * gcc.target/riscv/rvv/autovec/vmv-imm-fixed-rv32.c: Add vmv.v.x
            tests.
            * gcc.target/riscv/rvv/autovec/vmv-imm-fixed-rv64.c: Dito.
            * gcc.target/riscv/rvv/autovec/vmv-imm-run.c: Dito.
            * gcc.target/riscv/rvv/autovec/vmv-imm-rv32.c: Dito.
            * gcc.target/riscv/rvv/autovec/vmv-imm-rv64.c: Dito.
            * gcc.target/riscv/rvv/autovec/vmv-imm-template.h: Dito.

Diff:
---
 gcc/config/riscv/riscv.cc                          | 23 +++++--
 .../riscv/rvv/autovec/vmv-imm-fixed-rv32.c         |  3 +-
 .../riscv/rvv/autovec/vmv-imm-fixed-rv64.c         |  3 +-
 .../gcc.target/riscv/rvv/autovec/vmv-imm-run.c     |  8 +++
 .../gcc.target/riscv/rvv/autovec/vmv-imm-rv32.c    |  3 +-
 .../gcc.target/riscv/rvv/autovec/vmv-imm-rv64.c    |  3 +-
 .../riscv/rvv/autovec/vmv-imm-template.h           | 74 ++++++++++++----------
 7 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc
index 37e08c04ec6..85db1e3c86b 100644
--- a/gcc/config/riscv/riscv.cc
+++ b/gcc/config/riscv/riscv.cc
@@ -1295,12 +1295,23 @@ riscv_const_insns (rtx x)
 		 * accurately according to BASE && STEP.  */
 		return 1;
 	      }
-	    /* Constants from -16 to 15 can be loaded with vmv.v.i.
-	       The Wc0, Wc1 constraints are already covered by the
-	       vi constraint so we do not need to check them here
-	       separately.  */
-	    if (satisfies_constraint_vi (x))
-	      return 1;
+
+	    rtx elt;
+	    if (const_vec_duplicate_p (x, &elt))
+	      {
+		/* Constants from -16 to 15 can be loaded with vmv.v.i.
+		   The Wc0, Wc1 constraints are already covered by the
+		   vi constraint so we do not need to check them here
+		   separately.  */
+		if (satisfies_constraint_vi (x))
+		  return 1;
+
+		/* A const duplicate vector can always be broadcast from
+		   a general-purpose register.  This means we need as many
+		   insns as it takes to load the constant into the GPR
+		   and one vmv.v.x.  */
+		return 1 + riscv_integer_cost (INTVAL (elt));
+	      }
 	  }
 
 	/* TODO: We may support more const vector in the future.  */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-fixed-rv32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-fixed-rv32.c
index 631ea3bf268..e8d017f7339 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-fixed-rv32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-fixed-rv32.c
@@ -3,4 +3,5 @@
 
 #include "vmv-imm-template.h"
 
-/* { dg-final { scan-assembler-times "vmv.v.i" 32 } } */
+/* { dg-final { scan-assembler-times {vmv.v.i} 32 } } */
+/* { dg-final { scan-assembler-times {vmv.v.x} 8 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-fixed-rv64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-fixed-rv64.c
index 7ded6cc18d2..f85ad4117d3 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-fixed-rv64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-fixed-rv64.c
@@ -3,4 +3,5 @@
 
 #include "vmv-imm-template.h"
 
-/* { dg-final { scan-assembler-times "vmv.v.i" 32 } } */
+/* { dg-final { scan-assembler-times {vmv.v.i} 32 } } */
+/* { dg-final { scan-assembler-times {vmv.v.x} 8 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-run.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-run.c
index 6764110d461..faa6c907337 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-run.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-run.c
@@ -54,4 +54,12 @@ int main ()
   TEST_POS(uint64_t, 13)
   TEST_POS(uint64_t, 14)
   TEST_POS(uint64_t, 15)
+  TEST_POS(uint32_t, 16)
+  TEST_POS(uint32_t, 123)
+  TEST_POS(uint32_t, 255)
+  TEST_POS(uint32_t, 999)
+  TEST_POS(uint32_t, 32701)
+  TEST_POS(uint32_t, 65535)
+  TEST_POS(uint32_t, 65536)
+  TEST_POS(uint32_t, 923423)
 }
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-rv32.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-rv32.c
index c419256cd45..6843bc6018d 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-rv32.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-rv32.c
@@ -3,4 +3,5 @@
 
 #include "vmv-imm-template.h"
 
-/* { dg-final { scan-assembler-times "vmv.v.i" 32 } } */
+/* { dg-final { scan-assembler-times {vmv.v.i} 32 } } */
+/* { dg-final { scan-assembler-times {vmv.v.x} 8 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-rv64.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-rv64.c
index e386166f95e..39fb2a6cc7b 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-rv64.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-rv64.c
@@ -3,4 +3,5 @@
 
 #include "vmv-imm-template.h"
 
-/* { dg-final { scan-assembler-times "vmv.v.i" 32 } } */
+/* { dg-final { scan-assembler-times {vmv.v.i} 32 } } */
+/* { dg-final { scan-assembler-times {vmv.v.x} 8 } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-template.h b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-template.h
index 855343d7e3e..84b26e0f1c2 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-template.h
+++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/vmv-imm-template.h
@@ -17,38 +17,46 @@
       dst[i] = -VAL;					\
   }
 
-#define TEST_ALL()	\
-VMV_NEG(int8_t,16)	\
-VMV_NEG(int8_t,15)    	\
-VMV_NEG(int8_t,14)    	\
-VMV_NEG(int8_t,13)    	\
-VMV_NEG(int16_t,12)     \
-VMV_NEG(int16_t,11)     \
-VMV_NEG(int16_t,10)     \
-VMV_NEG(int16_t,9)	\
-VMV_NEG(int32_t,8)	\
-VMV_NEG(int32_t,7)	\
-VMV_NEG(int32_t,6)	\
-VMV_NEG(int32_t,5)	\
-VMV_NEG(int64_t,4)	\
-VMV_NEG(int64_t,3)	\
-VMV_NEG(int64_t,2)	\
-VMV_NEG(int64_t,1)	\
-VMV_POS(uint8_t,0)	\
-VMV_POS(uint8_t,1)	\
-VMV_POS(uint8_t,2)	\
-VMV_POS(uint8_t,3)	\
-VMV_POS(uint16_t,4)	\
-VMV_POS(uint16_t,5)	\
-VMV_POS(uint16_t,6)	\
-VMV_POS(uint16_t,7)	\
-VMV_POS(uint32_t,8)	\
-VMV_POS(uint32_t,9)	\
-VMV_POS(uint32_t,10)	\
-VMV_POS(uint32_t,11)	\
-VMV_POS(uint64_t,12)	\
-VMV_POS(uint64_t,13)	\
-VMV_POS(uint64_t,14)	\
-VMV_POS(uint64_t,15)
+#define TEST_ALL()	  \
+VMV_NEG(int8_t,16)	  \
+VMV_NEG(int8_t,15)    	  \
+VMV_NEG(int8_t,14)    	  \
+VMV_NEG(int8_t,13)    	  \
+VMV_NEG(int16_t,12)       \
+VMV_NEG(int16_t,11)       \
+VMV_NEG(int16_t,10)       \
+VMV_NEG(int16_t,9)	  \
+VMV_NEG(int32_t,8)	  \
+VMV_NEG(int32_t,7)	  \
+VMV_NEG(int32_t,6)	  \
+VMV_NEG(int32_t,5)	  \
+VMV_NEG(int64_t,4)	  \
+VMV_NEG(int64_t,3)	  \
+VMV_NEG(int64_t,2)	  \
+VMV_NEG(int64_t,1)	  \
+VMV_POS(uint8_t,0)	  \
+VMV_POS(uint8_t,1)	  \
+VMV_POS(uint8_t,2)	  \
+VMV_POS(uint8_t,3)	  \
+VMV_POS(uint16_t,4)	  \
+VMV_POS(uint16_t,5)	  \
+VMV_POS(uint16_t,6)	  \
+VMV_POS(uint16_t,7)	  \
+VMV_POS(uint32_t,8)	  \
+VMV_POS(uint32_t,9)	  \
+VMV_POS(uint32_t,10)	  \
+VMV_POS(uint32_t,11)	  \
+VMV_POS(uint64_t,12)	  \
+VMV_POS(uint64_t,13)	  \
+VMV_POS(uint64_t,14)	  \
+VMV_POS(uint64_t,15)	  \
+VMV_POS(uint32_t,16)	  \
+VMV_POS(uint32_t,123)     \
+VMV_POS(uint32_t,255)     \
+VMV_POS(uint32_t,999)     \
+VMV_POS(uint32_t,32701)   \
+VMV_POS(uint32_t,65535)   \
+VMV_POS(uint32_t,65536)   \
+VMV_POS(uint32_t,923423)  \
 
 TEST_ALL()

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-05-30  9:57 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-30  9:57 [gcc r14-1403] RISC-V: Allow all const_vec_duplicates as constants Robin Dapp

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).