From: krebbel <krebbel@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 13 Jan 2016 11:59:29 +0000 (+0000)
Subject: S/390: PR69247: Fix bswap hi splitter.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f704d701f1ccd1bf7a1fb47bb0207993d0ff9fdf;p=thirdparty%2Fgcc.git

S/390: PR69247: Fix bswap hi splitter.

gcc/ChangeLog:

2016-01-13  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>

	PR target/69247
	* config/s390/s390.md (bswaphi splitter): Use simplify_gen_subreg.

gcc/testsuite/ChangeLog:

2016-01-13  Jakub Jelinek  <jakub@redhat.com>

	PR target/69247
	* gcc.dg/pr69247.c: New test.




git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232318 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e7e3601058dd..ab61dff4b099 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-13  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
+
+	PR target/69247
+	* config/s390/s390.md (bswaphi splitter): Use simplify_gen_subreg.
+
 2016-01-13  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/69242
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index d6097c152f2c..3e340c350305 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -10522,11 +10522,9 @@
 	(bswap:HI (match_operand:HI 1 "register_operand" "")))]
   "TARGET_CPU_ZARCH"
   [(set (match_dup 2) (bswap:SI (match_dup 3)))
-   (set (match_dup 2) (lshiftrt:SI (match_dup 2)
-				   (const_int 16)))
-   (set (match_dup 0) (subreg:HI (match_dup 2) 2))]
+   (set (match_dup 2) (lshiftrt:SI (match_dup 2) (const_int 16)))]
 {
-  operands[2] = gen_reg_rtx (SImode);
+  operands[2] = simplify_gen_subreg (SImode, operands[0], HImode, 0);
   operands[3] = simplify_gen_subreg (SImode, operands[1], HImode, 0);
 })
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4568a636b626..59596d0955c0 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-13  Jakub Jelinek  <jakub@redhat.com>
+
+	PR target/69247
+	* gcc.dg/pr69247.c: New test.
+
 2016-01-13  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/69242
diff --git a/gcc/testsuite/gcc.dg/pr69247.c b/gcc/testsuite/gcc.dg/pr69247.c
new file mode 100644
index 000000000000..b7406e682232
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr69247.c
@@ -0,0 +1,14 @@
+/* PR target/69247 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+/* { dg-additional-options "-march=zEC12" { target s390*-*-* } } */
+
+void foo (short *);
+
+void
+bar (short x, int y)
+{
+  if (y)
+    x = x << 8 | (unsigned short) x >> 8;
+  foo (&x);
+}