[ARM] Implement support for ACLE Coprocessor MCRR and MRRC intrinsics
authorAndre Vieira <andre.simoesdiasvieira@arm.com>
Fri, 6 Jan 2017 17:49:12 +0000 (17:49 +0000)
committerAndre Vieira <avieira@gcc.gnu.org>
Fri, 6 Jan 2017 17:49:12 +0000 (17:49 +0000)
gcc/ChangeLog:
2017-01-06  Andre Vieira  <andre.simoesdiasvieira@arm.com>

* config/arm/arm.md (<mcrr>): New.
(<mrrc>): New.
* config/arm/arm.c (arm_arch5te): New.
(arm_option_override): Set arm_arch5te.
(arm_coproc_builtin_available): Add support for mcrr, mcrr2, mrrc
and mrrc2.
* config/arm/arm-builtins.c (MCRR_QUALIFIERS): Define to...
(arm_mcrr_qualifiers): ... this. New.
(MRRC_QUALIFIERS): Define to...
(arm_mrrc_qualifiers): ... this. New.
* config/arm/arm_acle.h (__arm_mcrr, __arm_mcrr2, __arm_mrrc,
__arm_mrrc2): New.
* config/arm/arm_acle_builtins.def (mcrr, mcrr2, mrrc, mrrc2): New.
* config/arm/iterators.md (MCRRI, mcrr, MCRR): New.
(MRRCI, mrrc, MRRC): New.
* config/arm/unspecs.md (VUNSPEC_MCRR, VUNSPEC_MCRR2, VUNSPEC_MRRC,
VUNSPEC_MRRC2): New.

gcc/testsuite/ChangeLog:
2017-01-06  Andre Vieira  <andre.simoesdiasvieira@arm.com>

* gcc.target/arm/acle/mcrr: New.
* gcc.target/arm/acle/mcrr2: New.
* gcc.target/arm/acle/mrrc: New.
* gcc.target/arm/acle/mrrc2: New.

From-SVN: r244175

14 files changed:
gcc/ChangeLog
gcc/config/arm/arm-builtins.c
gcc/config/arm/arm.c
gcc/config/arm/arm.md
gcc/config/arm/arm_acle.h
gcc/config/arm/arm_acle_builtins.def
gcc/config/arm/iterators.md
gcc/config/arm/unspecs.md
gcc/testsuite/ChangeLog
gcc/testsuite/gcc.target/arm/acle/mcrr.c [new file with mode: 0644]
gcc/testsuite/gcc.target/arm/acle/mcrr2.c [new file with mode: 0644]
gcc/testsuite/gcc.target/arm/acle/mrrc.c [new file with mode: 0644]
gcc/testsuite/gcc.target/arm/acle/mrrc2.c [new file with mode: 0644]
gcc/testsuite/lib/target-supports.exp

index c860f363c1a1dbb4910123a63671854f2a51bd92..5f4577d47358a7ad60a58ac23cbddb83c8c8e14f 100644 (file)
@@ -1,3 +1,23 @@
+2017-01-06  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+       * config/arm/arm.md (<mcrr>): New.
+       (<mrrc>): New.
+       * config/arm/arm.c (arm_arch5te): New.
+       (arm_option_override): Set arm_arch5te.
+       (arm_coproc_builtin_available): Add support for mcrr, mcrr2, mrrc
+       and mrrc2.
+       * config/arm/arm-builtins.c (MCRR_QUALIFIERS): Define to...
+       (arm_mcrr_qualifiers): ... this. New.
+       (MRRC_QUALIFIERS): Define to...
+       (arm_mrrc_qualifiers): ... this. New.
+       * config/arm/arm_acle.h (__arm_mcrr, __arm_mcrr2, __arm_mrrc,
+       __arm_mrrc2): New.
+       * config/arm/arm_acle_builtins.def (mcrr, mcrr2, mrrc, mrrc2): New.
+       * config/arm/iterators.md (MCRRI, mcrr, MCRR): New.
+       (MRRCI, mrrc, MRRC): New.
+       * config/arm/unspecs.md (VUNSPEC_MCRR, VUNSPEC_MCRR2, VUNSPEC_MRRC,
+       VUNSPEC_MRRC2): New.
+
 2017-01-06  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
        * config/arm/arm.md (<mcr>): New.
index 1a983b27961e96cfab651244af3ba1fb44b87d2e..689219c1923bc0f720f70870bfde8b60f7514167 100644 (file)
@@ -217,6 +217,24 @@ arm_mrc_qualifiers[SIMD_MAX_BUILTIN_ARGS]
       qualifier_unsigned_immediate, qualifier_unsigned_immediate };
 #define MRC_QUALIFIERS \
   (arm_mrc_qualifiers)
+
+/* void (unsigned immediate, unsigned immediate,  T, unsigned immediate).  */
+static enum arm_type_qualifiers
+arm_mcrr_qualifiers[SIMD_MAX_BUILTIN_ARGS]
+  = { qualifier_void, qualifier_unsigned_immediate,
+      qualifier_unsigned_immediate, qualifier_none,
+      qualifier_unsigned_immediate };
+#define MCRR_QUALIFIERS \
+  (arm_mcrr_qualifiers)
+
+/* T (unsigned immediate, unsigned immediate, unsigned immediate).  */
+static enum arm_type_qualifiers
+arm_mrrc_qualifiers[SIMD_MAX_BUILTIN_ARGS]
+  = { qualifier_none, qualifier_unsigned_immediate,
+      qualifier_unsigned_immediate, qualifier_unsigned_immediate };
+#define MRRC_QUALIFIERS \
+  (arm_mrrc_qualifiers)
+
 /* The first argument (return type) of a store should be void type,
    which we represent with qualifier_void.  Their first operand will be
    a DImode pointer to the location to store to, so we must use
index e376ab3f4bfc0d4c47e99e1f7f681960f7609f17..ccdf1ab80242b996d5770a5b4da2c669491c00aa 100644 (file)
@@ -814,6 +814,9 @@ int arm_arch5 = 0;
 /* Nonzero if this chip supports the ARM Architecture 5E extensions.  */
 int arm_arch5e = 0;
 
+/* Nonzero if this chip supports the ARM Architecture 5TE extensions.  */
+int arm_arch5te = 0;
+
 /* Nonzero if this chip supports the ARM Architecture 6 extensions.  */
 int arm_arch6 = 0;
 
@@ -3372,6 +3375,8 @@ arm_option_override (void)
   arm_arch4t = arm_arch4 && bitmap_bit_p (arm_active_target.isa, isa_bit_thumb);
   arm_arch5 = bitmap_bit_p (arm_active_target.isa, isa_bit_ARMv5);
   arm_arch5e = bitmap_bit_p (arm_active_target.isa, isa_bit_ARMv5e);
+  arm_arch5te = arm_arch5e
+    && bitmap_bit_p (arm_active_target.isa, isa_bit_thumb);
   arm_arch6 = bitmap_bit_p (arm_active_target.isa, isa_bit_ARMv6);
   arm_arch6k = bitmap_bit_p (arm_active_target.isa, isa_bit_ARMv6k);
   arm_arch_notm = bitmap_bit_p (arm_active_target.isa, isa_bit_notm);
@@ -30925,6 +30930,18 @@ arm_coproc_builtin_available (enum unspecv builtin)
        if (arm_arch5)
          return true;
        break;
+      case VUNSPEC_MCRR:
+      case VUNSPEC_MRRC:
+       /* Only present in ARMv5TE, ARMv6 (but not ARMv6-M), ARMv7* and
+          ARMv8-{A,M}.  */
+       if (arm_arch6 || arm_arch5te)
+         return true;
+       break;
+      case VUNSPEC_MCRR2:
+      case VUNSPEC_MRRC2:
+       if (arm_arch6)
+         return true;
+       break;
       default:
        gcc_unreachable ();
     }
index 15926f13bac7beb55f8942cf4c1923cf875a782f..446fb226f6a48755786da73f621ef8d433d001cb 100644 (file)
   [(set_attr "length" "4")
    (set_attr "type" "coproc")])
 
+(define_insn "<mcrr>"
+  [(unspec_volatile [(match_operand:SI 0 "immediate_operand" "n")
+                    (match_operand:SI 1 "immediate_operand" "n")
+                    (match_operand:DI 2 "s_register_operand" "r")
+                    (match_operand:SI 3 "immediate_operand" "n")] MCRRI)
+   (use (match_dup 2))]
+  "arm_coproc_builtin_available (VUNSPEC_<MCRR>)"
+{
+  arm_const_bounds (operands[0], 0, 16);
+  arm_const_bounds (operands[1], 0, 8);
+  arm_const_bounds (operands[3], 0, (1 << 5));
+  return "<mcrr>\\tp%c0, %1, %Q2, %R2, CR%c3";
+}
+  [(set_attr "length" "4")
+   (set_attr "type" "coproc")])
+
+(define_insn "<mrrc>"
+  [(set (match_operand:DI 0 "s_register_operand" "=r")
+       (unspec_volatile [(match_operand:SI 1 "immediate_operand" "n")
+                         (match_operand:SI 2 "immediate_operand" "n")
+                         (match_operand:SI 3 "immediate_operand" "n")] MRRCI))]
+  "arm_coproc_builtin_available (VUNSPEC_<MRRC>)"
+{
+  arm_const_bounds (operands[1], 0, 16);
+  arm_const_bounds (operands[2], 0, 8);
+  arm_const_bounds (operands[3], 0, (1 << 5));
+  return "<mrrc>\\tp%c1, %2, %Q0, %R0, CR%c3";
+}
+  [(set_attr "length" "4")
+   (set_attr "type" "coproc")])
+
 ;; Vector bits common to IWMMXT and Neon
 (include "vec-common.md")
 ;; Load the Intel Wireless Multimedia Extension patterns
index a218547bac9ec761487a260bca71a8fe195bc08e..972e28edb86c1f137e16982acc6f346e0eac04fb 100644 (file)
@@ -136,6 +136,40 @@ __arm_mrc2 (const unsigned int __coproc, const unsigned int __opc1,
 {
   return __builtin_arm_mrc2 (__coproc, __opc1, __CRn, __CRm, __opc2);
 }
+
+#if __ARM_ARCH >= 6 ||  defined (__ARM_ARCH_5TE__)
+
+__extension__ static __inline void __attribute__ ((__always_inline__))
+__arm_mcrr (const unsigned int __coproc, const unsigned int __opc1,
+           uint64_t __value, const unsigned int __CRm)
+{
+  return __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm);
+}
+
+__extension__ static __inline uint64_t __attribute__ ((__always_inline__))
+__arm_mrrc (const unsigned int __coproc, const unsigned int __opc1,
+           const unsigned int __CRm)
+{
+  return __builtin_arm_mrrc (__coproc, __opc1, __CRm);
+}
+
+#if __ARM_ARCH >= 6
+
+__extension__ static __inline void __attribute__ ((__always_inline__))
+__arm_mcrr2 (const unsigned int __coproc, const unsigned int __opc1,
+           uint64_t __value, const unsigned int __CRm)
+{
+  return __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm);
+}
+
+__extension__ static __inline uint64_t __attribute__ ((__always_inline__))
+__arm_mrrc2 (const unsigned int __coproc, const unsigned int __opc1,
+            const unsigned int __CRm)
+{
+  return __builtin_arm_mrrc2 (__coproc, __opc1,  __CRm);
+}
+#endif /* __ARM_ARCH >= 6.  */
+#endif /* __ARM_ARCH >= 6 ||  defined (__ARM_ARCH_5TE__).  */
 #endif /*  __ARM_ARCH >= 5.  */
 #endif /* (!__thumb__ || __thumb2__) &&  __ARM_ARCH >= 4.  */
 
index d258f8a3748f6b4f0aeb3d4a28c6d4d79597f69c..bd1f66272c9c9832a74081838ee81be26bd8ee50 100644 (file)
@@ -38,3 +38,7 @@ VAR1 (MCR, mcr, void)
 VAR1 (MCR, mcr2, void)
 VAR1 (MRC, mrc, si)
 VAR1 (MRC, mrc2, si)
+VAR1 (MCRR, mcrr, void)
+VAR1 (MCRR, mcrr2, void)
+VAR1 (MRRC, mrrc, di)
+VAR1 (MRRC, mrrc2, di)
index d34a705cd428821c0e2a48a4df428c0aeb61cdda..e2e588688eb04c158d1c146bca12d84cfb5ff130 100644 (file)
 
 (define_int_attr mrc [(VUNSPEC_MRC "mrc") (VUNSPEC_MRC2 "mrc2")])
 (define_int_attr MRC [(VUNSPEC_MRC "MRC") (VUNSPEC_MRC2 "MRC2")])
+
+;; An iterator for the MCRR coprocessor instructions
+(define_int_iterator MCRRI [VUNSPEC_MCRR VUNSPEC_MCRR2])
+
+(define_int_attr mcrr [(VUNSPEC_MCRR "mcrr") (VUNSPEC_MCRR2 "mcrr2")])
+(define_int_attr MCRR [(VUNSPEC_MCRR "MCRR") (VUNSPEC_MCRR2 "MCRR2")])
+
+;; An iterator for the MRRC coprocessor instructions
+(define_int_iterator MRRCI [VUNSPEC_MRRC VUNSPEC_MRRC2])
+
+(define_int_attr mrrc [(VUNSPEC_MRRC "mrrc") (VUNSPEC_MRRC2 "mrrc2")])
+(define_int_attr MRRC [(VUNSPEC_MRRC "MRRC") (VUNSPEC_MRRC2 "MRRC2")])
index 6bde96e357917a9c1c2eb4d292bc71797232df29..99cfa41b08dad24a85e78f069331e83c03c8bce1 100644 (file)
   VUNSPEC_MCR2         ; Represent the coprocessor mcr2 instruction.
   VUNSPEC_MRC          ; Represent the coprocessor mrc instruction.
   VUNSPEC_MRC2         ; Represent the coprocessor mrc2 instruction.
+  VUNSPEC_MCRR         ; Represent the coprocessor mcrr instruction.
+  VUNSPEC_MCRR2                ; Represent the coprocessor mcrr2 instruction.
+  VUNSPEC_MRRC         ; Represent the coprocessor mrrc instruction.
+  VUNSPEC_MRRC2                ; Represent the coprocessor mrrc2 instruction.
 ])
 
 ;; Enumerators for NEON unspecs.
index cd61f81e57824135e429f7fcce4563101cfeedfa..213f434a567f563d1e58b2ccfb1fa51b8d20685d 100644 (file)
@@ -1,3 +1,10 @@
+2017-01-06  Andre Vieira  <andre.simoesdiasvieira@arm.com>
+
+       * gcc.target/arm/acle/mcrr: New.
+       * gcc.target/arm/acle/mcrr2: New.
+       * gcc.target/arm/acle/mrrc: New.
+       * gcc.target/arm/acle/mrrc2: New.
+
 2017-01-06  Andre Vieira  <andre.simoesdiasvieira@arm.com>
 
        * gcc.target/arm/acle/mcr.c: New.
diff --git a/gcc/testsuite/gcc.target/arm/acle/mcrr.c b/gcc/testsuite/gcc.target/arm/acle/mcrr.c
new file mode 100644 (file)
index 0000000..dcc223c
--- /dev/null
@@ -0,0 +1,16 @@
+/* Test the mcrr ACLE intrinsic.  */
+
+/* { dg-do assemble } */
+/* { dg-options "-save-temps" } */
+/* { dg-require-effective-target arm_coproc3_ok } */
+
+#include "arm_acle.h"
+
+void test_mcrr (uint64_t a)
+{
+  a += 77;
+  __arm_mcrr (10, 5, a, 3);
+}
+
+/* { dg-final { scan-assembler "add\[^\n\]*#77\n" } } */
+/* { dg-final { scan-assembler "mcrr\tp10, #5, r\[r0-9\]*, r\[r0-9\]*, CR3\n" } } */
diff --git a/gcc/testsuite/gcc.target/arm/acle/mcrr2.c b/gcc/testsuite/gcc.target/arm/acle/mcrr2.c
new file mode 100644 (file)
index 0000000..10f2014
--- /dev/null
@@ -0,0 +1,16 @@
+/* Test the mcrr2 ACLE intrinsic.  */
+
+/* { dg-do assemble } */
+/* { dg-options "-save-temps" } */
+/* { dg-require-effective-target arm_coproc4_ok } */
+
+#include "arm_acle.h"
+
+void test_mcrr2 (uint64_t a)
+{
+  a += 77;
+  __arm_mcrr2 (10, 5, a, 3);
+}
+
+/* { dg-final { scan-assembler "add\[^\n\]*#77\n" } } */
+/* { dg-final { scan-assembler "mcrr2\tp10, #5, r\[r0-9\]*, r\[r0-9\]*, CR3\n" } } */
diff --git a/gcc/testsuite/gcc.target/arm/acle/mrrc.c b/gcc/testsuite/gcc.target/arm/acle/mrrc.c
new file mode 100644 (file)
index 0000000..28c3b8e
--- /dev/null
@@ -0,0 +1,14 @@
+/* Test the mrrc ACLE intrinsic.  */
+
+/* { dg-do assemble } */
+/* { dg-options "-save-temps" } */
+/* { dg-require-effective-target arm_coproc3_ok } */
+
+#include "arm_acle.h"
+
+uint64_t test_mrrc (void)
+{
+  return __arm_mrrc (10, 5, 3);
+}
+
+/* { dg-final { scan-assembler "mrrc\tp10, #5, r\[r0-9\]*, r\[r0-9\]*, CR3\n" } } */
diff --git a/gcc/testsuite/gcc.target/arm/acle/mrrc2.c b/gcc/testsuite/gcc.target/arm/acle/mrrc2.c
new file mode 100644 (file)
index 0000000..5b7aab0
--- /dev/null
@@ -0,0 +1,14 @@
+/* Test the mrrc2 ACLE intrinsic.  */
+
+/* { dg-do assemble } */
+/* { dg-options "-save-temps" } */
+/* { dg-require-effective-target arm_coproc4_ok } */
+
+#include "arm_acle.h"
+
+uint64_t test_mrrc2 (void)
+{
+  return __arm_mrrc2 (10, 5, 3);
+}
+
+/* { dg-final { scan-assembler "mrrc2\tp10, #5, r\[r0-9\]*, r\[r0-9\]*, CR3\n" } } */
index 342304da4b5fd02c70956496bcd03cdabaf78b01..b88d13c13f277e8cdb88b5dc8545ffa01408a0fa 100644 (file)
@@ -8279,7 +8279,7 @@ proc check_effective_target_arm_coproc2_ok { } {
 
 # Return 1 if the target supports all coprocessor instructions checked by
 # check_effective_target_arm_coproc2_ok in addition the following: mcrr and
-mrrc.
+mrrc.
 proc check_effective_target_arm_coproc3_ok_nocache { } {
     if { ![check_effective_target_arm_coproc2_ok] } {
        return 0