aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Leoshkevich <iii@linux.ibm.com>2019-10-15 10:22:35 +0000
committerIlya Leoshkevich <iii@gcc.gnu.org>2019-10-15 10:22:35 +0000
commit0d552c1b67132b349ec77f725ceb1568d72c6134 (patch)
tree172249d97b0a615879b188349eb7524d0514e464
parent14f020d16d55787f1ddbb8185247ea8dd65dfd9a (diff)
downloadgcc-0d552c1b67132b349ec77f725ceb1568d72c6134.zip
gcc-0d552c1b67132b349ec77f725ceb1568d72c6134.tar.gz
gcc-0d552c1b67132b349ec77f725ceb1568d72c6134.tar.bz2
[PATCH] S/390: Run %a0:DI splitters only after reload
gcc/ChangeLog: 2019-10-15 Ilya Leoshkevich <iii@linux.ibm.com> * config/s390/s390.md: Run %a0:DI splitters only after reload. gcc/testsuite/ChangeLog: 2019-10-15 Ilya Leoshkevich <iii@linux.ibm.com> * gcc.target/s390/load-thread-pointer-once.c: New test. From-SVN: r276989
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/config/s390/s390.md13
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.target/s390/load-thread-pointer-once.c12
4 files changed, 30 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6e16ee8..23213c7 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-15 Ilya Leoshkevich <iii@linux.ibm.com>
+
+ * config/s390/s390.md: Run %a0:DI splitters only after reload.
+
2019-10-15 Richard Biener <rguenther@suse.de>
PR tree-optimization/92094
diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md
index 4f7bde6..1e6439d 100644
--- a/gcc/config/s390/s390.md
+++ b/gcc/config/s390/s390.md
@@ -1860,10 +1860,17 @@
*,*,yes")
])
+; Splitters for loading/storing TLS pointers from/to %a0:DI.
+; Do this only during split2, which runs after reload. At the point when split1
+; runs, some of %a0:DI occurrences might be nested inside other rtxes and thus
+; not matched. As a result, only some occurrences will be split, which will
+; prevent CSE. At the point when split2 runs, reload will have ensured that no
+; nested references exist.
+
(define_split
[(set (match_operand:DI 0 "register_operand" "")
(match_operand:DI 1 "register_operand" ""))]
- "TARGET_ZARCH && ACCESS_REG_P (operands[1])"
+ "TARGET_ZARCH && ACCESS_REG_P (operands[1]) && reload_completed"
[(set (match_dup 2) (match_dup 3))
(set (match_dup 0) (ashift:DI (match_dup 0) (const_int 32)))
(set (strict_low_part (match_dup 2)) (match_dup 4))]
@@ -1873,7 +1880,7 @@
(define_split
[(set (match_operand:DI 0 "register_operand" "")
(match_operand:DI 1 "register_operand" ""))]
- "TARGET_ZARCH && ACCESS_REG_P (operands[0])
+ "TARGET_ZARCH && ACCESS_REG_P (operands[0]) && reload_completed
&& dead_or_set_p (insn, operands[1])"
[(set (match_dup 3) (match_dup 2))
(set (match_dup 1) (lshiftrt:DI (match_dup 1) (const_int 32)))
@@ -1884,7 +1891,7 @@
(define_split
[(set (match_operand:DI 0 "register_operand" "")
(match_operand:DI 1 "register_operand" ""))]
- "TARGET_ZARCH && ACCESS_REG_P (operands[0])
+ "TARGET_ZARCH && ACCESS_REG_P (operands[0]) && reload_completed
&& !dead_or_set_p (insn, operands[1])"
[(set (match_dup 3) (match_dup 2))
(set (match_dup 1) (rotate:DI (match_dup 1) (const_int 32)))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7fbb8dd..d70012a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-15 Ilya Leoshkevich <iii@linux.ibm.com>
+
+ * gcc.target/s390/load-thread-pointer-once.c: New test.
+
2019-10-15 Richard Biener <rguenther@suse.de>
PR tree-optimization/92094
diff --git a/gcc/testsuite/gcc.target/s390/load-thread-pointer-once.c b/gcc/testsuite/gcc.target/s390/load-thread-pointer-once.c
new file mode 100644
index 0000000..21a5bfa
--- /dev/null
+++ b/gcc/testsuite/gcc.target/s390/load-thread-pointer-once.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O3" } */
+
+__thread void *foo;
+
+void *bar()
+{
+ return (foo = __builtin_thread_pointer());
+}
+
+/* { dg-final { scan-assembler-times {\n\tear\t} 2 { target { lp64 } } } } */
+/* { dg-final { scan-assembler-times {\n\tear\t} 1 { target { ! lp64 } } } } */