Since MOVDIRI and MOVDIR64B write to memory, similar to UNSPEC_MOVNT,
use SET operation in MOVDIRI and MOVDIR64B patterns with UNSPEC instead
of UNSPECV.
gcc/
PR target/97184
* config/i386/i386.md (UNSPECV_MOVDIRI): Renamed to ...
(UNSPEC_MOVDIRI): This.
(UNSPECV_MOVDIR64B): Renamed to ...
(UNSPEC_MOVDIR64B): This.
(movdiri): Use SET operation.
(@movdir64b_): Likewise.
gcc/testsuite/
PR target/97184
* gcc.target/i386/movdir64b.c: New test.
* gcc.target/i386/movdiri32.c: Likewise.
* gcc.target/i386/movdiri64.c: Likewise.
* testsuite/lib/target-supports.exp
(check_effective_target_movdir): New.
---
gcc/config/i386/i386.md | 20 ++--
gcc/testsuite/gcc.target/i386/movdir64b.c | 23 +++
gcc/testsuite/gcc.target/i386/movdiri32.c | 20
gcc/testsuite/gcc.target/i386/movdiri64.c | 20
gcc/testsuite/lib/target-supports.exp | 17 +
5 files changed, 90 insertions(+), 10 deletions(-)
create mode 100644 gcc/testsuite/gcc.target/i386/movdir64b.c
create mode 100644 gcc/testsuite/gcc.target/i386/movdiri32.c
create mode 100644 gcc/testsuite/gcc.target/i386/movdiri64.c
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 93aae8123fd..9dd12cf8643 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -186,6 +186,10 @@ (define_c_enum "unspec" [
;; IRET support
UNSPEC_INTERRUPT_RETURN
+
+ ;; For MOVDIRI and MOVDIR64B support
+ UNSPEC_MOVDIRI
+ UNSPEC_MOVDIR64B
])
(define_c_enum "unspecv" [
@@ -280,10 +284,6 @@ (define_c_enum "unspecv" [
UNSPECV_SETSSBSY
UNSPECV_CLRSSBSY
- ;; For MOVDIRI and MOVDIR64B support
- UNSPECV_MOVDIRI
- UNSPECV_MOVDIR64B
-
;; For TSXLDTRK support
UNSPECV_XSUSLDTRK
UNSPECV_XRESLDTRK
@@ -21531,17 +21531,17 @@ (define_insn "wbnoinvd"
;; MOVDIRI and MOVDIR64B
(define_insn "movdiri"
- [(unspec_volatile:SWI48 [(match_operand:SWI48 0 "memory_operand" "m")
- (match_operand:SWI48 1 "register_operand" "r")]
- UNSPECV_MOVDIRI)]
+ [(set (match_operand:SWI48 0 "memory_operand" "=m")
+ (unspec:SWI48 [(match_operand:SWI48 1 "register_operand" "r")]
+ UNSPEC_MOVDIRI))]
"TARGET_MOVDIRI"
"movdiri\t{%1, %0|%0, %1}"
[(set_attr "type" "other")])
(define_insn "@movdir64b_"
- [(unspec_volatile:XI [(match_operand:P 0 "register_operand" "r")
- (match_operand:XI 1 "memory_operand")]
- UNSPECV_MOVDIR64B)]
+ [(set (mem:XI (match_operand:P 0 "register_operand" "r"))
+ (unspec:XI [(match_operand:XI 1 "memory_operand" "m")]
+ UNSPEC_MOVDIR64B))]
"TARGET_MOVDIR64B"
"movdir64b\t{%1, %0|%0, %1}"
[(set_attr "type" "other")])
diff --git a/gcc/testsuite/gcc.target/i386/movdir64b.c
b/gcc/testsuite/gcc.target/i386/movdir64b.c
new file mode 100644
index 000..70d872ec5d5
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/movdir64b.c
@@ -0,0 +1,23 @@
+/* { dg-do run { target movdir } } */
+/* { dg-options "-mmovdir64b -O2" } */
+
+#include
+#include
+
+unsigned long long int src[8] = {1, 2, 3, 4, 5, 6, 7, 8};
+unsigned long long int dest[8] __attribute__ ((aligned (64)))
+ = {-1, -1, -1, -1, -1, -1, -1, -1};
+
+int
+main ()
+{
+ if (!__builtin_cpu_supports ("movdir64b"))
+return 0;
+
+ _movdir64b (dest, src);
+
+ if (memcmp (dest, src, sizeof (dest)) != 0)
+abort ();
+
+ return 0;
+}
diff --git a/gcc/testsuite/gcc.target/i386/movdiri32.c
b/gcc/testsuite/gcc.target/i386/movdiri32.c
new file mode 100644
index 000..604fa0dd9e9
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/movdiri32.c
@@ -0,0 +1,20 @@
+/* { dg-do run { target movdir } } */
+/* { dg-options "-mmovdiri -O2" } */
+
+#include
+
+unsigned int dest = -1;
+
+int
+main ()
+{
+ if (!__builtin_cpu_supports ("movdiri"))
+return 0;
+
+ _directstoreu_u32 (, 0xbadbeef);
+
+ if (dest != 0xbadbeef)
+abort ();
+
+ return 0;
+}
diff --git a/gcc/testsuite/gcc.target/i386/movdiri64.c
b/gcc/testsuite/gcc.target/i386/movdiri64.c
new file mode 100644
index 000..551b98e8d08
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/movdiri64.c
@@ -0,0 +1,20 @@
+/* { dg-do run { target { movdir && { ! ia32 } } } } */
+/* { dg-options "-mmovdiri -O2" } */
+
+#include
+
+unsigned long long int dest = -1LL;
+
+int
+main ()
+{
+ if (!__builtin_cpu_supports ("movdiri"))
+return 0;
+
+ _directstoreu_u64 (, 0x12345678badbeef);
+
+ if (dest != 0x12345678badbeef)
+abort ();
+
+ return 0;
+}
diff --git a/gcc/testsuite/lib/target-supports.exp
b/gcc/testsuite/lib/target-supports.exp
index 0a00972edb5..2ccb4e61bc9 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -10519,3 +10519,20 @@ proc check_effective_target_ident_directive {} {
int i;