diff mbox

MIPS: MIPS32r2 FP indexed access instruction set support

Message ID alpine.DEB.1.10.1311201707530.21686@tp.orcam.me.uk
State Accepted
Headers show

Commit Message

Maciej W. Rozycki Nov. 20, 2013, 5:19 p.m. UTC 
On Sat, 16 Nov 2013, Richard Sandiford wrote:

> So the reasoning is that, after your RECIP.fmt patch, the only direct uses
> of ISA_HAS_FP4 for instruction selection are indexed loads and stores.
> That's why extending them to ISA_MIPS32R2 && !TARGET_FLOAT64 allows
> ISA_HAS_FP4 to be simplified.  But if we keep:
> 
> > @@ -906,16 +906,14 @@ struct mips_cpu_info {
> >  #define GENERATE_MADD_MSUB	(TARGET_IMADD && !TARGET_MIPS16)
> >  
> >  /* ISA has floating-point madd and msub instructions 'd = a * b [+-] c'.  */
> > -#define ISA_HAS_FP_MADD4_MSUB4  (ISA_HAS_FP4				\
> > -				 || (ISA_MIPS32R2 && !TARGET_MIPS16))
> > +#define ISA_HAS_FP_MADD4_MSUB4  ISA_HAS_FP4
> >  
> >  /* ISA has floating-point madd and msub instructions 'c = a * b [+-] c'.  */
> >  #define ISA_HAS_FP_MADD3_MSUB3  TARGET_LOONGSON_2EF
> >  
> >  /* ISA has floating-point nmadd and nmsub instructions
> >     'd = -((a * b) [+-] c)'.  */
> > -#define ISA_HAS_NMADD4_NMSUB4	(ISA_HAS_FP4				\
> > -				 || (ISA_MIPS32R2 && !TARGET_MIPS16))
> > +#define ISA_HAS_NMADD4_NMSUB4	ISA_HAS_FP4
> 
> then I think we should also have a macro like:
> 
> /* ISA has indexed floating-point loads and stores (LWXC1, LDXC1, SWXC1
>    and SDXC1).  */
> #define ISA_HAS_LXC1_SXC1	ISA_HAS_FP4
> 
> and add:
> 
>    Note that this macro should only be used by other ISA_HAS_* macros.
> 
> to the ISA_HAS_FP4 comment.

 Agreed, it makes sense to me indeed.

> OK with those changes, thanks.

 This is the final change I have applied.  I have verified that it still
makes the desired effect and successfully retested it for mips-linux-gnu,
o32 ABI.  Thanks for your review.

2013-11-20  Maciej W. Rozycki  <macro@codesourcery.com>

	gcc/
	* config/mips/mips.h (ISA_HAS_FP4): Remove TARGET_FLOAT64
	restriction for ISA_MIPS32R2.
	(ISA_HAS_LXC1_SXC1): New macro.
	(ISA_HAS_FP_MADD4_MSUB4): Remove ISA_MIPS32R2 special-casing.
	(ISA_HAS_NMADD4_NMSUB4): Likewise.
	(ISA_HAS_FP_RECIP_RSQRT): Likewise.
	(ISA_HAS_PREFETCHX): Redefine in terms of ISA_HAS_FP4.
	* config/mips/mips.md (*<ANYF:loadx>_<P:mode>): Use 
	ISA_HAS_LXC1_SXC1 rather than ISA_HAS_FP4.
	(*<ANYF:storex>_<P:mode>): Likewise.

  Maciej

gcc-mips32r2-index.patch
diff mbox

Patch

Index: gcc-fsf-trunk-quilt/gcc/config/mips/mips.h
===================================================================
--- gcc-fsf-trunk-quilt.orig/gcc/config/mips/mips.h	2013-11-19 02:01:22.000000000 +0000
+++ gcc-fsf-trunk-quilt/gcc/config/mips/mips.h	2013-11-19 02:14:49.678712529 +0000
@@ -882,13 +882,18 @@  struct mips_cpu_info {
 
 /* This is a catch all for other mips4 instructions: indexed load, the
    FP madd and msub instructions, and the FP recip and recip sqrt
-   instructions.  */
+   instructions.  Note that this macro should only be used by other
+   ISA_HAS_* macros.  */
 #define ISA_HAS_FP4		((ISA_MIPS4				\
-				  || (ISA_MIPS32R2 && TARGET_FLOAT64)	\
+				  || ISA_MIPS32R2			\
 				  || ISA_MIPS64				\
 				  || ISA_MIPS64R2)			\
 				 && !TARGET_MIPS16)
 
+/* ISA has floating-point indexed load and store instructions
+   (LWXC1, LDXC1, SWXC1 and SDXC1).  */
+#define ISA_HAS_LXC1_SXC1	ISA_HAS_FP4
+
 /* ISA has paired-single instructions.  */
 #define ISA_HAS_PAIRED_SINGLE	(ISA_MIPS32R2 || ISA_MIPS64 || ISA_MIPS64R2)
 
@@ -906,16 +911,14 @@  struct mips_cpu_info {
 #define GENERATE_MADD_MSUB	(TARGET_IMADD && !TARGET_MIPS16)
 
 /* ISA has floating-point madd and msub instructions 'd = a * b [+-] c'.  */
-#define ISA_HAS_FP_MADD4_MSUB4  (ISA_HAS_FP4				\
-				 || (ISA_MIPS32R2 && !TARGET_MIPS16))
+#define ISA_HAS_FP_MADD4_MSUB4  ISA_HAS_FP4
 
 /* ISA has floating-point madd and msub instructions 'c = a * b [+-] c'.  */
 #define ISA_HAS_FP_MADD3_MSUB3  TARGET_LOONGSON_2EF
 
 /* ISA has floating-point nmadd and nmsub instructions
    'd = -((a * b) [+-] c)'.  */
-#define ISA_HAS_NMADD4_NMSUB4	(ISA_HAS_FP4				\
-				 || (ISA_MIPS32R2 && !TARGET_MIPS16))
+#define ISA_HAS_NMADD4_NMSUB4	ISA_HAS_FP4
 
 /* ISA has floating-point nmadd and nmsub instructions
    'c = -((a * b) [+-] c)'.  */
@@ -926,7 +929,7 @@  struct mips_cpu_info {
    doubles are stored in pairs of FPRs, so for safety's sake, we apply
    this restriction to the MIPS IV ISA too.  */
 #define ISA_HAS_FP_RECIP_RSQRT(MODE)					\
-				((((ISA_HAS_FP4 || ISA_MIPS32R2)	\
+				(((ISA_HAS_FP4				\
 				   && ((MODE) == SFmode			\
 				       || ((TARGET_FLOAT64		\
 					    || ISA_MIPS32R2		\
@@ -1006,11 +1009,7 @@  struct mips_cpu_info {
    'prefx', along with TARGET_HARD_FLOAT and TARGET_DOUBLE_FLOAT.
    (prefx is a cop1x instruction, so can only be used if FP is
    enabled.)  */
-#define ISA_HAS_PREFETCHX	((ISA_MIPS4				\
-				  || ISA_MIPS32R2			\
-				  || ISA_MIPS64				\
-				  || ISA_MIPS64R2)			\
-				 && !TARGET_MIPS16)
+#define ISA_HAS_PREFETCHX	ISA_HAS_FP4
 
 /* True if trunc.w.s and trunc.w.d are real (not synthetic)
    instructions.  Both require TARGET_HARD_FLOAT, and trunc.w.d
Index: gcc-fsf-trunk-quilt/gcc/config/mips/mips.md
===================================================================
--- gcc-fsf-trunk-quilt.orig/gcc/config/mips/mips.md	2013-11-19 01:48:25.000000000 +0000
+++ gcc-fsf-trunk-quilt/gcc/config/mips/mips.md	2013-11-19 02:16:04.188764680 +0000
@@ -4440,7 +4440,7 @@ 
   [(set (match_operand:ANYF 0 "register_operand" "=f")
 	(mem:ANYF (plus:P (match_operand:P 1 "register_operand" "d")
 			  (match_operand:P 2 "register_operand" "d"))))]
-  "ISA_HAS_FP4"
+  "ISA_HAS_LXC1_SXC1"
   "<ANYF:loadx>\t%0,%1(%2)"
   [(set_attr "type" "fpidxload")
    (set_attr "mode" "<ANYF:UNITMODE>")])
@@ -4449,7 +4449,7 @@ 
   [(set (mem:ANYF (plus:P (match_operand:P 1 "register_operand" "d")
 			  (match_operand:P 2 "register_operand" "d")))
 	(match_operand:ANYF 0 "register_operand" "f"))]
-  "ISA_HAS_FP4"
+  "ISA_HAS_LXC1_SXC1"
   "<ANYF:storex>\t%0,%1(%2)"
   [(set_attr "type" "fpidxstore")
    (set_attr "mode" "<ANYF:UNITMODE>")])