Hi,
The attached patch fixes PR 63260. On SH the fabs and fneg insns do not
use the FPSCR settings, so we don't need to do mode switches for them.
Tested on sh-sim with
make -k check RUNTESTFLAGS="--target_board=sh-sim
\{-m2e/-ml,-m4/-ml,-m4/-mb}"
and by Kaz with 'make -k check-gcc'.
There are some new failures when testing on sh-sim, due to the
implementation of the fabs and fneg insns there. A GDB patch has been
submitted here:
https://sourceware.org/ml/gdb-patches/2014-10/msg00334.html
Committed as r216173.
Cheers,
Oleg
gcc/ChangeLog:
PR target/63260
* config/sh/sh.md (negsf2, negsf2_i, negdf2, negdf2_i, abssf2,
abssf2_i, absdf2, absdf2_i): Remove fp_mode attribute. Remove use
of FPSCR.
(negsf2_i): Rename to *negsf2_i.
(abssf2_i): Rename to *abssf2_i.
(negdf2_i): Rename to *negdf2_i.
(absdf2_i): Rename to *absdf2_i.
gcc/testsuite/ChangeLog:
PR target/63260
* gcc.target/sh/pr63260.c: New.
Index: gcc/config/sh/sh.md
===================================================================
--- gcc/config/sh/sh.md (revision 216172)
+++ gcc/config/sh/sh.md (working copy)
@@ -12792,16 +12792,9 @@
})
(define_expand "negsf2"
- [(set (match_operand:SF 0 "fp_arith_reg_operand" "")
- (neg:SF (match_operand:SF 1 "fp_arith_reg_operand" "")))]
- "TARGET_SH2E || TARGET_SHMEDIA_FPU"
-{
- if (TARGET_SH2E)
- {
- expand_sf_unop (&gen_negsf2_i, operands);
- DONE;
- }
-})
+ [(set (match_operand:SF 0 "fp_arith_reg_operand")
+ (neg:SF (match_operand:SF 1 "fp_arith_reg_operand")))]
+ "TARGET_SH2E || TARGET_SHMEDIA_FPU")
(define_insn "*negsf2_media"
[(set (match_operand:SF 0 "fp_arith_reg_operand" "=f")
@@ -12810,14 +12803,12 @@
"fneg.s %1, %0"
[(set_attr "type" "fmove_media")])
-(define_insn "negsf2_i"
+(define_insn "*negsf2_i"
[(set (match_operand:SF 0 "fp_arith_reg_operand" "=f")
- (neg:SF (match_operand:SF 1 "fp_arith_reg_operand" "0")))
- (use (match_operand:PSI 2 "fpscr_operand" "c"))]
+ (neg:SF (match_operand:SF 1 "fp_arith_reg_operand" "0")))]
"TARGET_SH2E"
"fneg %0"
- [(set_attr "type" "fmove")
- (set_attr "fp_mode" "single")])
+ [(set_attr "type" "fmove")])
(define_expand "sqrtsf2"
[(set (match_operand:SF 0 "fp_arith_reg_operand" "")
@@ -12916,16 +12907,9 @@
(set_attr "fp_mode" "single")])
(define_expand "abssf2"
- [(set (match_operand:SF 0 "fp_arith_reg_operand" "")
- (abs:SF (match_operand:SF 1 "fp_arith_reg_operand" "")))]
- "TARGET_SH2E || TARGET_SHMEDIA_FPU"
-{
- if (TARGET_SH2E)
- {
- expand_sf_unop (&gen_abssf2_i, operands);
- DONE;
- }
-})
+ [(set (match_operand:SF 0 "fp_arith_reg_operand")
+ (abs:SF (match_operand:SF 1 "fp_arith_reg_operand")))]
+ "TARGET_SH2E || TARGET_SHMEDIA_FPU")
(define_insn "*abssf2_media"
[(set (match_operand:SF 0 "fp_arith_reg_operand" "=f")
@@ -12934,14 +12918,12 @@
"fabs.s %1, %0"
[(set_attr "type" "fmove_media")])
-(define_insn "abssf2_i"
+(define_insn "*abssf2_i"
[(set (match_operand:SF 0 "fp_arith_reg_operand" "=f")
- (abs:SF (match_operand:SF 1 "fp_arith_reg_operand" "0")))
- (use (match_operand:PSI 2 "fpscr_operand" "c"))]
+ (abs:SF (match_operand:SF 1 "fp_arith_reg_operand" "0")))]
"TARGET_SH2E"
"fabs %0"
- [(set_attr "type" "fmove")
- (set_attr "fp_mode" "single")])
+ [(set_attr "type" "fmove")])
(define_expand "adddf3"
[(set (match_operand:DF 0 "fp_arith_reg_operand" "")
@@ -13247,14 +13229,7 @@
(define_expand "negdf2"
[(set (match_operand:DF 0 "fp_arith_reg_operand")
(neg:DF (match_operand:DF 1 "fp_arith_reg_operand")))]
- "(TARGET_SH4 || TARGET_SH2A_DOUBLE) || TARGET_SHMEDIA_FPU"
-{
- if (TARGET_SH4 || TARGET_SH2A_DOUBLE)
- {
- expand_df_unop (&gen_negdf2_i, operands);
- DONE;
- }
-})
+ "(TARGET_SH4 || TARGET_SH2A_DOUBLE) || TARGET_SHMEDIA_FPU")
(define_insn "*negdf2_media"
[(set (match_operand:DF 0 "fp_arith_reg_operand" "=f")
@@ -13263,14 +13238,12 @@
"fneg.d %1, %0"
[(set_attr "type" "fmove_media")])
-(define_insn "negdf2_i"
+(define_insn "*negdf2_i"
[(set (match_operand:DF 0 "fp_arith_reg_operand" "=f")
- (neg:DF (match_operand:DF 1 "fp_arith_reg_operand" "0")))
- (use (match_operand:PSI 2 "fpscr_operand" "c"))]
+ (neg:DF (match_operand:DF 1 "fp_arith_reg_operand" "0")))]
"(TARGET_SH4 || TARGET_SH2A_DOUBLE)"
"fneg %0"
- [(set_attr "type" "fmove")
- (set_attr "fp_mode" "double")])
+ [(set_attr "type" "fmove")])
(define_expand "sqrtdf2"
[(set (match_operand:DF 0 "fp_arith_reg_operand")
@@ -13303,14 +13276,7 @@
(define_expand "absdf2"
[(set (match_operand:DF 0 "fp_arith_reg_operand")
(abs:DF (match_operand:DF 1 "fp_arith_reg_operand")))]
- "(TARGET_SH4 || TARGET_SH2A_DOUBLE) || TARGET_SHMEDIA_FPU"
-{
- if (TARGET_SH4 || TARGET_SH2A_DOUBLE)
- {
- expand_df_unop (&gen_absdf2_i, operands);
- DONE;
- }
-})
+ "(TARGET_SH4 || TARGET_SH2A_DOUBLE) || TARGET_SHMEDIA_FPU")
(define_insn "*absdf2_media"
[(set (match_operand:DF 0 "fp_arith_reg_operand" "=f")
@@ -13319,14 +13285,12 @@
"fabs.d %1, %0"
[(set_attr "type" "fmove_media")])
-(define_insn "absdf2_i"
+(define_insn "*absdf2_i"
[(set (match_operand:DF 0 "fp_arith_reg_operand" "=f")
- (abs:DF (match_operand:DF 1 "fp_arith_reg_operand" "0")))
- (use (match_operand:PSI 2 "fpscr_operand" "c"))]
+ (abs:DF (match_operand:DF 1 "fp_arith_reg_operand" "0")))]
"(TARGET_SH4 || TARGET_SH2A_DOUBLE)"
"fabs %0"
- [(set_attr "type" "fmove")
- (set_attr "fp_mode" "double")])
+ [(set_attr "type" "fmove")])
(define_expand "extendsfdf2"
[(set (match_operand:DF 0 "fp_arith_reg_operand" "")
Index: gcc/ChangeLog
===================================================================
--- gcc/ChangeLog (revision 216172)
+++ gcc/ChangeLog (working copy)
@@ -1,3 +1,14 @@
+2014-10-14 Oleg Endo <olege...@gcc.gnu.org>
+
+ PR target/63260
+ * config/sh/sh.md (negsf2, negsf2_i, negdf2, negdf2_i, abssf2,
+ abssf2_i, absdf2, absdf2_i): Remove fp_mode attribute. Remove use
+ of FPSCR.
+ (negsf2_i): Rename to *negsf2_i.
+ (abssf2_i): Rename to *abssf2_i.
+ (negdf2_i): Rename to *negdf2_i.
+ (absdf2_i): Rename to *absdf2_i.
+
2014-10-14 Felix Yang <felix.y...@huawei.com>
Jeff Law <l...@redhat.com>
Index: gcc/testsuite/gcc.target/sh/pr63260.c
===================================================================
--- gcc/testsuite/gcc.target/sh/pr63260.c (revision 0)
+++ gcc/testsuite/gcc.target/sh/pr63260.c (revision 0)
@@ -0,0 +1,30 @@
+/* Check that there is no FPSCR precision mode change generated for fneg and
+ fabs instructions. */
+/* { dg-do compile } */
+/* { dg-options "-O1" } */
+/* { dg-skip-if "" { "sh*-*-*" } { "-m5*"} { "" } } */
+/* { dg-final { scan-assembler-not "fpscr|fpchg" } } */
+
+float
+test_0 (float x)
+{
+ return -x;
+}
+
+double
+test_1 (double x)
+{
+ return -x;
+}
+
+float
+test_2 (float x)
+{
+ return __builtin_fabs (x);
+}
+
+double
+test_3 (double x)
+{
+ return __builtin_abs (x);
+}
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog (revision 216172)
+++ gcc/testsuite/ChangeLog (working copy)
@@ -1,3 +1,8 @@
+2014-10-14 Oleg Endo <olege...@gcc.gnu.org>
+
+ PR target/63260
+ * gcc.target/sh/pr63260.c: New.
+
2014-10-13 Richard Henderson <r...@redhat.com>
* g++.dg/torture/20141013.C: New.
@@ -30,8 +35,8 @@
PR target/59401
PR target/54760
- * gcc.target/pr54760-5.c: New.
- * gcc.target/pr54760-6.c: New.
+ * gcc.target/sh/pr54760-5.c: New.
+ * gcc.target/sh/pr54760-6.c: New.
* gcc.target/sh/pr59401-1.c: New.
2014-10-11 Francois-Xavier Coudert <fxcoud...@gcc.gnu.org>
