From 8fccb0a6b606aacc1bcb3e02b400c5d6455196cc Mon Sep 17 00:00:00 2001
From: Uros Bizjak <ubizjak@gmail.com>
Date: Tue, 21 Nov 2017 18:35:23 +0100
Subject: [PATCH] i386.md (*bswap<mode>2_movbe): Add integer suffix to movbe
 mnemonic.

	* config/i386/i386.md (*bswap<mode>2_movbe): Add
	integer suffix to movbe mnemonic.
	(*bswaphi2_movbe): Ditto.
	(bswaphi_lowpart): Merge with *bswaphi_lowpart_1.

testsuite/ChangeLog:

	* gcc.target/i386/movbe-1.c: Update scan string for movbe
	with integer suffix.
	* gcc.target/i386/movbe-2.c: Ditto.
	* gcc.target/i386/movbe-3.c: Ditto.
	* gcc.target/i386/movbe-4.c: Ditto.
	* gcc.target/i386/movbe-5.c: Ditto.

From-SVN: r255017
---
 gcc/testsuite/ChangeLog                 | 9 +++++++++
 gcc/testsuite/gcc.target/i386/movbe-1.c | 2 +-
 gcc/testsuite/gcc.target/i386/movbe-2.c | 4 ++--
 gcc/testsuite/gcc.target/i386/movbe-3.c | 2 +-
 gcc/testsuite/gcc.target/i386/movbe-4.c | 2 +-
 gcc/testsuite/gcc.target/i386/movbe-5.c | 3 ++-
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8a376ff1702..030435bad3f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2017-11-21  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.target/i386/movbe-1.c: Update scan string for movbe
+	with integer suffix.
+	* gcc.target/i386/movbe-2.c: Ditto.
+	* gcc.target/i386/movbe-3.c: Ditto.
+	* gcc.target/i386/movbe-4.c: Ditto.
+	* gcc.target/i386/movbe-5.c: Ditto.
+
 2017-11-21  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/83020
diff --git a/gcc/testsuite/gcc.target/i386/movbe-1.c b/gcc/testsuite/gcc.target/i386/movbe-1.c
index 391d4ad9814..053095ca691 100644
--- a/gcc/testsuite/gcc.target/i386/movbe-1.c
+++ b/gcc/testsuite/gcc.target/i386/movbe-1.c
@@ -15,4 +15,4 @@ bar ()
   return __builtin_bswap32 (x);
 }
 
-/* { dg-final { scan-assembler-times "movbe\[ \t\]" 2 } } */
+/* { dg-final { scan-assembler-times "movbel\[ \t\]" 2 } } */
diff --git a/gcc/testsuite/gcc.target/i386/movbe-2.c b/gcc/testsuite/gcc.target/i386/movbe-2.c
index c198609b722..af3b3ca9ae0 100644
--- a/gcc/testsuite/gcc.target/i386/movbe-2.c
+++ b/gcc/testsuite/gcc.target/i386/movbe-2.c
@@ -15,5 +15,5 @@ bar ()
   return __builtin_bswap64 (x);
 }
 
-/* { dg-final { scan-assembler-times "movbe\[ \t\]" 4 { target ia32 } } } */
-/* { dg-final { scan-assembler-times "movbe\[ \t\]" 2 { target { ! ia32 } } } } */
+/* { dg-final { scan-assembler-times "movbel\[ \t\]" 4 { target ia32 } } } */
+/* { dg-final { scan-assembler-times "movbeq\[ \t\]" 2 { target { ! ia32 } } } } */
diff --git a/gcc/testsuite/gcc.target/i386/movbe-3.c b/gcc/testsuite/gcc.target/i386/movbe-3.c
index 985bc1eb29e..e02a3016ef1 100644
--- a/gcc/testsuite/gcc.target/i386/movbe-3.c
+++ b/gcc/testsuite/gcc.target/i386/movbe-3.c
@@ -16,4 +16,4 @@ void set (struct S *s, int i)
   s->i = i;
 }
 
-/* { dg-final { scan-assembler-times "movbe\[ \t\]" 2 } } */
+/* { dg-final { scan-assembler-times "movbel\[ \t\]" 2 } } */
diff --git a/gcc/testsuite/gcc.target/i386/movbe-4.c b/gcc/testsuite/gcc.target/i386/movbe-4.c
index 906709167e1..966bdf52ba0 100644
--- a/gcc/testsuite/gcc.target/i386/movbe-4.c
+++ b/gcc/testsuite/gcc.target/i386/movbe-4.c
@@ -17,4 +17,4 @@ bar ()
   return __builtin_bswap32 (x);
 }
 
-/* { dg-final { scan-assembler-times "movbe\[ \t\]" 2 } } */
+/* { dg-final { scan-assembler-times "movbel\[ \t\]" 2 } } */
diff --git a/gcc/testsuite/gcc.target/i386/movbe-5.c b/gcc/testsuite/gcc.target/i386/movbe-5.c
index 72e4165391d..b1ab1215268 100644
--- a/gcc/testsuite/gcc.target/i386/movbe-5.c
+++ b/gcc/testsuite/gcc.target/i386/movbe-5.c
@@ -1,7 +1,6 @@
 /* PR tree-optimization/78821 */
 /* { dg-do compile } */
 /* { dg-options "-O2 -mmovbe" } */
-/* { dg-final { scan-assembler-times "movbe\[ \t\]" 2 } } */
 
 unsigned short
 foo (unsigned short *buf)
@@ -16,3 +15,5 @@ bar (char *buf, unsigned int data)
   buf[0] = data >> 8;
   buf[1] = data;
 }
+
+/* { dg-final { scan-assembler-times "movbew\[ \t\]" 2 } } */
-- 
2.30.2