From e5aac417cb727715f1d592aca1e05b25e4de1ba8 Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Mon, 6 Jul 2015 17:29:33 +0000 Subject: [PATCH] config.gcc: Add fused-madd.opt. 2015-07-06 Steve Ellcey * config.gcc : Add fused-madd.opt. * config/mips/mips.opt (mfused-madd): Remove. * config/mips/mips.c (mips_rtx_costs): Update cost calculations. * config/mips/mips.h (TARGET_MIPS8000): New. (ISA_HAS_FP_MADD4_MSUB4): Remove. (ISA_HAS_FP_MADDF_MSUBF): Remove. (ISA_HAS_FP_MADD3_MSUB3): Remove. (ISA_HAS_NMADD4_NMSUB4): Remove. (ISA_HAS_NMADD3_NMSUB3): Remove. (ISA_HAS_FUSED_MADD4): New. (ISA_HAS_UNFUSED_MADD4): New. (ISA_HAS_FUSED_MADDF): New. (ISA_HAS_FUSED_MADD3): New. * config/mips/mips.md: (fma4) Change from insn to expand. (*fma4_madd3) New. (*fma4_madd4) New. (*fma4_maddf) New. (fms4) New. (*fms4_msub3) New. (*fms4_msub4) New. (fnma4) New. (*fnma4_nmadd3) New. (*fnma4_nmadd4) New. (fnms4) New. (*fnms4_nmsub3) New. (*fnms4_nmsub4) New. (*madd4) Modify to be unfused only. (*msub4) Modify to be unfused only. (*nmadd4) Modify to be unfused only. (*nmsub4) Modify to be unfused only. (*madd3) Remove. (*msub3) Remove. (*nmadd3) Remove. (*nmsub3) Remove. (*nmadd3_fastmath) Remove. (*nmsub3_fastmath) Remove. (*nmadd4_fastmath) Update condition. (*nmsub4_fastmath) Update condition. From-SVN: r225468 --- gcc/ChangeLog | 41 ++++++ gcc/config.gcc | 2 +- gcc/config/mips/mips.c | 26 ++-- gcc/config/mips/mips.h | 26 ++-- gcc/config/mips/mips.md | 265 +++++++++++++++++++++++++-------------- gcc/config/mips/mips.opt | 4 - 6 files changed, 234 insertions(+), 130 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fe64509b9af..7c73d50d052 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,44 @@ +2015-07-06 Steve Ellcey + + * config.gcc : Add fused-madd.opt. + * config/mips/mips.opt (mfused-madd): Remove. + * config/mips/mips.c (mips_rtx_costs): Update cost calculations. + * config/mips/mips.h (TARGET_MIPS8000): New. + (ISA_HAS_FP_MADD4_MSUB4): Remove. + (ISA_HAS_FP_MADDF_MSUBF): Remove. + (ISA_HAS_FP_MADD3_MSUB3): Remove. + (ISA_HAS_NMADD4_NMSUB4): Remove. + (ISA_HAS_NMADD3_NMSUB3): Remove. + (ISA_HAS_FUSED_MADD4): New. + (ISA_HAS_UNFUSED_MADD4): New. + (ISA_HAS_FUSED_MADDF): New. + (ISA_HAS_FUSED_MADD3): New. + * config/mips/mips.md: (fma4) Change from insn to expand. + (*fma4_madd3) New. + (*fma4_madd4) New. + (*fma4_maddf) New. + (fms4) New. + (*fms4_msub3) New. + (*fms4_msub4) New. + (fnma4) New. + (*fnma4_nmadd3) New. + (*fnma4_nmadd4) New. + (fnms4) New. + (*fnms4_nmsub3) New. + (*fnms4_nmsub4) New. + (*madd4) Modify to be unfused only. + (*msub4) Modify to be unfused only. + (*nmadd4) Modify to be unfused only. + (*nmsub4) Modify to be unfused only. + (*madd3) Remove. + (*msub3) Remove. + (*nmadd3) Remove. + (*nmsub3) Remove. + (*nmadd3_fastmath) Remove. + (*nmsub3_fastmath) Remove. + (*nmadd4_fastmath) Update condition. + (*nmsub4_fastmath) Update condition. + 2015-07-06 Alan Lawrence PR target/65956 diff --git a/gcc/config.gcc b/gcc/config.gcc index f0405fe2bcd..900aa18c95d 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -418,7 +418,7 @@ microblaze*-*-*) mips*-*-*) cpu_type=mips extra_headers="loongson.h" - extra_options="${extra_options} g.opt mips/mips-tables.opt" + extra_options="${extra_options} g.opt fused-madd.opt mips/mips-tables.opt" ;; nds32*) cpu_type=nds32 diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index 95a0ae3f44c..ce21a0fd215 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -4054,13 +4054,11 @@ mips_rtx_costs (rtx x, int code, int outer_code, int opno ATTRIBUTE_UNUSED, return true; case MINUS: - if (float_mode_p - && (ISA_HAS_NMADD4_NMSUB4 || ISA_HAS_NMADD3_NMSUB3) - && TARGET_FUSED_MADD - && !HONOR_SIGNED_ZEROS (mode)) + if (float_mode_p && ISA_HAS_UNFUSED_MADD4 && !HONOR_SIGNED_ZEROS (mode)) { - /* See if we can use NMADD or NMSUB. See mips.md for the - associated patterns. */ + /* See if we can use NMADD or NMSUB via the *nmadd4_fastmath + or *nmsub4_fastmath patterns. These patterns check for + HONOR_SIGNED_ZEROS so we check here too. */ rtx op0 = XEXP (x, 0); rtx op1 = XEXP (x, 1); if (GET_CODE (op0) == MULT && GET_CODE (XEXP (op0, 0)) == NEG) @@ -4087,9 +4085,7 @@ mips_rtx_costs (rtx x, int code, int outer_code, int opno ATTRIBUTE_UNUSED, { /* If this is part of a MADD or MSUB, treat the PLUS as being free. */ - if ((ISA_HAS_FP_MADD4_MSUB4 || ISA_HAS_FP_MADD3_MSUB3) - && TARGET_FUSED_MADD - && GET_CODE (XEXP (x, 0)) == MULT) + if (ISA_HAS_UNFUSED_MADD4 && GET_CODE (XEXP (x, 0)) == MULT) *total = 0; else *total = mips_cost->fp_add; @@ -4121,13 +4117,10 @@ mips_rtx_costs (rtx x, int code, int outer_code, int opno ATTRIBUTE_UNUSED, return true; case NEG: - if (float_mode_p - && (ISA_HAS_NMADD4_NMSUB4 || ISA_HAS_NMADD3_NMSUB3) - && TARGET_FUSED_MADD - && HONOR_SIGNED_ZEROS (mode)) + if (float_mode_p && ISA_HAS_UNFUSED_MADD4) { - /* See if we can use NMADD or NMSUB. See mips.md for the - associated patterns. */ + /* See if we can use NMADD or NMSUB via the *nmadd4 or + *nmsub4 patterns. */ rtx op = XEXP (x, 0); if ((GET_CODE (op) == PLUS || GET_CODE (op) == MINUS) && GET_CODE (XEXP (op, 0)) == MULT) @@ -4147,8 +4140,7 @@ mips_rtx_costs (rtx x, int code, int outer_code, int opno ATTRIBUTE_UNUSED, return false; case FMA: - if (ISA_HAS_FP_MADDF_MSUBF) - *total = mips_fp_mult_cost (mode); + *total = mips_fp_mult_cost (mode); return false; case MULT: diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index bceef31b4a3..7a6f9171ac7 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -236,6 +236,7 @@ struct mips_cpu_info { #define TARGET_MIPS5500 (mips_arch == PROCESSOR_R5500) #define TARGET_MIPS5900 (mips_arch == PROCESSOR_R5900) #define TARGET_MIPS7000 (mips_arch == PROCESSOR_R7000) +#define TARGET_MIPS8000 (mips_arch == PROCESSOR_R8000) #define TARGET_MIPS9000 (mips_arch == PROCESSOR_R9000) #define TARGET_OCTEON (mips_arch == PROCESSOR_OCTEON \ || mips_arch == PROCESSOR_OCTEON2 \ @@ -998,22 +999,21 @@ struct mips_cpu_info { /* Integer multiply-accumulate instructions should be generated. */ #define GENERATE_MADD_MSUB (TARGET_IMADD && !TARGET_MIPS16) -/* ISA has floating-point madd and msub instructions 'd = a * b [+-] c'. */ -#define ISA_HAS_FP_MADD4_MSUB4 ISA_HAS_FP4 +/* ISA has 4 operand fused madd instructions of the form + 'd = [+-] (a * b [+-] c)'. */ +#define ISA_HAS_FUSED_MADD4 TARGET_MIPS8000 -/* ISA has floating-point MADDF and MSUBF instructions 'd = d [+-] a * b'. */ -#define ISA_HAS_FP_MADDF_MSUBF (mips_isa_rev >= 6) +/* ISA has 4 operand unfused madd instructions of the form + 'd = [+-] (a * b [+-] c)'. */ +#define ISA_HAS_UNFUSED_MADD4 (ISA_HAS_FP4 && !TARGET_MIPS8000) -/* ISA has floating-point madd and msub instructions 'c = a * b [+-] c'. */ -#define ISA_HAS_FP_MADD3_MSUB3 TARGET_LOONGSON_2EF +/* ISA has 3 operand r6 fused madd instructions of the form + 'c = c [+-] (a * b)'. */ +#define ISA_HAS_FUSED_MADDF (mips_isa_rev >= 6) -/* ISA has floating-point nmadd and nmsub instructions - 'd = -((a * b) [+-] c)'. */ -#define ISA_HAS_NMADD4_NMSUB4 ISA_HAS_FP4 - -/* ISA has floating-point nmadd and nmsub instructions - 'c = -((a * b) [+-] c)'. */ -#define ISA_HAS_NMADD3_NMSUB3 TARGET_LOONGSON_2EF +/* ISA has 3 operand loongson fused madd instructions of the form + 'c = [+-] (a * b [+-] c)'. */ +#define ISA_HAS_FUSED_MADD3 TARGET_LOONGSON_2EF /* ISA has floating-point RECIP.fmt and RSQRT.fmt instructions. The MIPS64 rev. 1 ISA says that RECIP.D and RSQRT.D are unpredictable when diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md index f6912e11c2d..4f5692ce662 100644 --- a/gcc/config/mips/mips.md +++ b/gcc/config/mips/mips.md @@ -2475,164 +2475,239 @@ ;; Floating point multiply accumulate instructions. -;; The various multiply accumulate instructions can be used even when -;; HONOR_NANS is true because while IEEE 754-2008 requires the negate -;; operation to negate the sign of a NAN and the MIPS neg instruction does -;; not do this, the multiply and add (or minus) parts of these instructions -;; have no requirement on how the sign of a NAN is handled and so the final -;; sign bit of the entire operation is undefined. +(define_expand "fma4" + [(set (match_operand:ANYF 0 "register_operand") + (fma:ANYF (match_operand:ANYF 1 "register_operand") + (match_operand:ANYF 2 "register_operand") + (match_operand:ANYF 3 "register_operand")))] + "ISA_HAS_FUSED_MADDF || ISA_HAS_FUSED_MADD3 || ISA_HAS_FUSED_MADD4") -(define_insn "*madd4" +(define_insn "*fma4_madd3" [(set (match_operand:ANYF 0 "register_operand" "=f") - (plus:ANYF (mult:ANYF (match_operand:ANYF 1 "register_operand" "f") - (match_operand:ANYF 2 "register_operand" "f")) - (match_operand:ANYF 3 "register_operand" "f")))] - "ISA_HAS_FP_MADD4_MSUB4 && TARGET_FUSED_MADD" + (fma:ANYF (match_operand:ANYF 1 "register_operand" "f") + (match_operand:ANYF 2 "register_operand" "f") + (match_operand:ANYF 3 "register_operand" "0")))] + "ISA_HAS_FUSED_MADD3" + "madd.\t%0,%1,%2" + [(set_attr "type" "fmadd") + (set_attr "mode" "")]) + +(define_insn "*fma4_madd4" + [(set (match_operand:ANYF 0 "register_operand" "=f") + (fma:ANYF (match_operand:ANYF 1 "register_operand" "f") + (match_operand:ANYF 2 "register_operand" "f") + (match_operand:ANYF 3 "register_operand" "f")))] + "ISA_HAS_FUSED_MADD4" "madd.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "fma4" +(define_insn "*fma4_maddf" [(set (match_operand:ANYF 0 "register_operand" "=f") (fma:ANYF (match_operand:ANYF 1 "register_operand" "f") (match_operand:ANYF 2 "register_operand" "f") (match_operand:ANYF 3 "register_operand" "0")))] - "ISA_HAS_FP_MADDF_MSUBF" + "ISA_HAS_FUSED_MADDF" "maddf.\t%0,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*madd3" +;; The fms, fnma, and fnms instructions can be used even when HONOR_NANS +;; is true because while IEEE 754-2008 requires the negate operation to +;; negate the sign of a NAN and the MIPS neg instruction does not do this, +;; the fma part of the instruction has no requirement on how the sign of +;; a NAN is handled and so the final sign bit of the entire operation is +;; undefined. + +(define_expand "fms4" + [(set (match_operand:ANYF 0 "register_operand") + (fma:ANYF (match_operand:ANYF 1 "register_operand") + (match_operand:ANYF 2 "register_operand") + (neg:ANYF (match_operand:ANYF 3 "register_operand"))))] + "(ISA_HAS_FUSED_MADD3 || ISA_HAS_FUSED_MADD4)") + +(define_insn "*fms4_msub3" [(set (match_operand:ANYF 0 "register_operand" "=f") - (plus:ANYF (mult:ANYF (match_operand:ANYF 1 "register_operand" "f") - (match_operand:ANYF 2 "register_operand" "f")) - (match_operand:ANYF 3 "register_operand" "0")))] - "ISA_HAS_FP_MADD3_MSUB3 && TARGET_FUSED_MADD" - "madd.\t%0,%1,%2" + (fma:ANYF (match_operand:ANYF 1 "register_operand" "f") + (match_operand:ANYF 2 "register_operand" "f") + (neg:ANYF (match_operand:ANYF 3 "register_operand" "0"))))] + "ISA_HAS_FUSED_MADD3" + "msub.\t%0,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*msub4" +(define_insn "*fms4_msub4" [(set (match_operand:ANYF 0 "register_operand" "=f") - (minus:ANYF (mult:ANYF (match_operand:ANYF 1 "register_operand" "f") - (match_operand:ANYF 2 "register_operand" "f")) - (match_operand:ANYF 3 "register_operand" "f")))] - "ISA_HAS_FP_MADD4_MSUB4 && TARGET_FUSED_MADD" + (fma:ANYF (match_operand:ANYF 1 "register_operand" "f") + (match_operand:ANYF 2 "register_operand" "f") + (neg:ANYF (match_operand:ANYF 3 "register_operand" "f"))))] + "ISA_HAS_FUSED_MADD4" "msub.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*msub3" +;; fnma is defined in GCC as (fma (neg op1) op2 op3) +;; (-op1 * op2) + op3 ==> -(op1 * op2) + op3 ==> -((op1 * op2) - op3) +;; The mips nmsub instructions implement -((op1 * op2) - op3) +;; This transformation means we may return the wrong signed zero +;; so we check HONOR_SIGNED_ZEROS. + +(define_expand "fnma4" + [(set (match_operand:ANYF 0 "register_operand") + (fma:ANYF (neg:ANYF (match_operand:ANYF 1 "register_operand")) + (match_operand:ANYF 2 "register_operand") + (match_operand:ANYF 3 "register_operand")))] + "(ISA_HAS_FUSED_MADD3 || ISA_HAS_FUSED_MADD4) + && !HONOR_SIGNED_ZEROS (mode)") + +(define_insn "*fnma4_nmsub3" [(set (match_operand:ANYF 0 "register_operand" "=f") - (minus:ANYF (mult:ANYF (match_operand:ANYF 1 "register_operand" "f") - (match_operand:ANYF 2 "register_operand" "f")) - (match_operand:ANYF 3 "register_operand" "0")))] - "ISA_HAS_FP_MADD3_MSUB3 && TARGET_FUSED_MADD" - "msub.\t%0,%1,%2" + (fma:ANYF (neg:ANYF (match_operand:ANYF 1 "register_operand" "f")) + (match_operand:ANYF 2 "register_operand" "f") + (match_operand:ANYF 3 "register_operand" "0")))] + "ISA_HAS_FUSED_MADD3 && !HONOR_SIGNED_ZEROS (mode)" + "nmsub.\t%0,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*nmadd4" +(define_insn "*fnma4_nmsub4" [(set (match_operand:ANYF 0 "register_operand" "=f") - (neg:ANYF (plus:ANYF - (mult:ANYF (match_operand:ANYF 1 "register_operand" "f") - (match_operand:ANYF 2 "register_operand" "f")) - (match_operand:ANYF 3 "register_operand" "f"))))] - "ISA_HAS_NMADD4_NMSUB4 - && TARGET_FUSED_MADD - && HONOR_SIGNED_ZEROS (mode)" - "nmadd.\t%0,%3,%1,%2" + (fma:ANYF (neg:ANYF (match_operand:ANYF 1 "register_operand" "f")) + (match_operand:ANYF 2 "register_operand" "f") + (match_operand:ANYF 3 "register_operand" "f")))] + "ISA_HAS_FUSED_MADD4 && !HONOR_SIGNED_ZEROS (mode)" + "nmsub.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*nmadd3" +;; fnms is defined as: (fma (neg op1) op2 (neg op3)) +;; ((-op1) * op2) - op3 ==> -(op1 * op2) - op3 ==> -((op1 * op2) + op3) +;; The mips nmadd instructions implement -((op1 * op2) + op3) +;; This transformation means we may return the wrong signed zero +;; so we check HONOR_SIGNED_ZEROS. + +(define_expand "fnms4" + [(set (match_operand:ANYF 0 "register_operand") + (fma:ANYF + (neg:ANYF (match_operand:ANYF 1 "register_operand")) + (match_operand:ANYF 2 "register_operand") + (neg:ANYF (match_operand:ANYF 3 "register_operand"))))] + "(ISA_HAS_FUSED_MADD3 || ISA_HAS_FUSED_MADD4) + && !HONOR_SIGNED_ZEROS (mode)") + +(define_insn "*fnms4_nmadd3" [(set (match_operand:ANYF 0 "register_operand" "=f") - (neg:ANYF (plus:ANYF - (mult:ANYF (match_operand:ANYF 1 "register_operand" "f") - (match_operand:ANYF 2 "register_operand" "f")) - (match_operand:ANYF 3 "register_operand" "0"))))] - "ISA_HAS_NMADD3_NMSUB3 - && TARGET_FUSED_MADD - && HONOR_SIGNED_ZEROS (mode)" + (fma:ANYF + (neg:ANYF (match_operand:ANYF 1 "register_operand" "f")) + (match_operand:ANYF 2 "register_operand" "f") + (neg:ANYF (match_operand:ANYF 3 "register_operand" "0"))))] + "ISA_HAS_FUSED_MADD3 && !HONOR_SIGNED_ZEROS (mode)" "nmadd.\t%0,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*nmadd4_fastmath" +(define_insn "*fnms4_nmadd4" [(set (match_operand:ANYF 0 "register_operand" "=f") - (minus:ANYF - (mult:ANYF (neg:ANYF (match_operand:ANYF 1 "register_operand" "f")) - (match_operand:ANYF 2 "register_operand" "f")) - (match_operand:ANYF 3 "register_operand" "f")))] - "ISA_HAS_NMADD4_NMSUB4 - && TARGET_FUSED_MADD - && !HONOR_SIGNED_ZEROS (mode)" + (fma:ANYF + (neg:ANYF (match_operand:ANYF 1 "register_operand" "f")) + (match_operand:ANYF 2 "register_operand" "f") + (neg:ANYF (match_operand:ANYF 3 "register_operand" "f"))))] + "ISA_HAS_FUSED_MADD4 && !HONOR_SIGNED_ZEROS (mode)" "nmadd.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*nmadd3_fastmath" +;; Non-fused Floating point multiply accumulate instructions. + +;; These instructions are not fused and round in between the multiply +;; and the add (or subtract) so they are equivalent to the separate +;; multiply and add/sub instructions. + +(define_insn "*madd4" [(set (match_operand:ANYF 0 "register_operand" "=f") - (minus:ANYF - (mult:ANYF (neg:ANYF (match_operand:ANYF 1 "register_operand" "f")) - (match_operand:ANYF 2 "register_operand" "f")) - (match_operand:ANYF 3 "register_operand" "0")))] - "ISA_HAS_NMADD3_NMSUB3 - && TARGET_FUSED_MADD - && !HONOR_SIGNED_ZEROS (mode)" - "nmadd.\t%0,%1,%2" + (plus:ANYF (mult:ANYF (match_operand:ANYF 1 "register_operand" "f") + (match_operand:ANYF 2 "register_operand" "f")) + (match_operand:ANYF 3 "register_operand" "f")))] + "ISA_HAS_UNFUSED_MADD4" + "madd.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*nmsub4" +(define_insn "*msub4" [(set (match_operand:ANYF 0 "register_operand" "=f") - (neg:ANYF (minus:ANYF - (mult:ANYF (match_operand:ANYF 2 "register_operand" "f") - (match_operand:ANYF 3 "register_operand" "f")) - (match_operand:ANYF 1 "register_operand" "f"))))] - "ISA_HAS_NMADD4_NMSUB4 - && TARGET_FUSED_MADD - && HONOR_SIGNED_ZEROS (mode)" - "nmsub.\t%0,%1,%2,%3" + (minus:ANYF (mult:ANYF (match_operand:ANYF 1 "register_operand" "f") + (match_operand:ANYF 2 "register_operand" "f")) + (match_operand:ANYF 3 "register_operand" "f")))] + "ISA_HAS_UNFUSED_MADD4" + "msub.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*nmsub3" +;; Like with the fused fms, fnma, and fnms instructions, these unfused +;; instructions can be used even if HONOR_NANS is set because while +;; IEEE 754-2008 requires the negate operation to negate the sign of a +;; NAN and the MIPS neg instruction does not do this, the multiply and +;; add (or subtract) part of the instruction has no requirement on how +;; the sign of a NAN is handled and so the final sign bit of the entire +;; operation is undefined. + +(define_insn "*nmadd4" + [(set (match_operand:ANYF 0 "register_operand" "=f") + (neg:ANYF (plus:ANYF + (mult:ANYF (match_operand:ANYF 1 "register_operand" "f") + (match_operand:ANYF 2 "register_operand" "f")) + (match_operand:ANYF 3 "register_operand" "f"))))] + "ISA_HAS_UNFUSED_MADD4" + "nmadd.\t%0,%3,%1,%2" + [(set_attr "type" "fmadd") + (set_attr "mode" "")]) + +(define_insn "*nmsub4" [(set (match_operand:ANYF 0 "register_operand" "=f") (neg:ANYF (minus:ANYF - (mult:ANYF (match_operand:ANYF 2 "register_operand" "f") - (match_operand:ANYF 3 "register_operand" "f")) - (match_operand:ANYF 1 "register_operand" "0"))))] - "ISA_HAS_NMADD3_NMSUB3 - && TARGET_FUSED_MADD - && HONOR_SIGNED_ZEROS (mode)" - "nmsub.\t%0,%1,%2" + (mult:ANYF (match_operand:ANYF 1 "register_operand" "f") + (match_operand:ANYF 2 "register_operand" "f")) + (match_operand:ANYF 3 "register_operand" "f"))))] + "ISA_HAS_UNFUSED_MADD4" + "nmsub.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*nmsub4_fastmath" +;; Fast-math Non-fused Floating point multiply accumulate instructions. + +;; These instructions are not fused but the expressions they match are +;; not exactly what the instruction implements in the sense that they +;; may not generate the properly signed zeros. + +;; This instruction recognizes ((-op1) * op2) - op3 and generates an +;; nmadd which is really -((op1 * op2) + op3). They are equivalent +;; except for the sign bit when the result is zero or NaN. + +(define_insn "*nmadd4_fastmath" [(set (match_operand:ANYF 0 "register_operand" "=f") (minus:ANYF - (match_operand:ANYF 1 "register_operand" "f") - (mult:ANYF (match_operand:ANYF 2 "register_operand" "f") - (match_operand:ANYF 3 "register_operand" "f"))))] - "ISA_HAS_NMADD4_NMSUB4 - && TARGET_FUSED_MADD + (mult:ANYF (neg:ANYF (match_operand:ANYF 1 "register_operand" "f")) + (match_operand:ANYF 2 "register_operand" "f")) + (match_operand:ANYF 3 "register_operand" "f")))] + "ISA_HAS_UNFUSED_MADD4 && !HONOR_SIGNED_ZEROS (mode)" - "nmsub.\t%0,%1,%2,%3" + "nmadd.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") (set_attr "mode" "")]) -(define_insn "*nmsub3_fastmath" +;; This instruction recognizes (op1 - (op2 * op3) and generates an +;; nmsub which is really -((op2 * op3) - op1). They are equivalent +;; except for the sign bit when the result is zero or NaN. + +(define_insn "*nmsub4_fastmath" [(set (match_operand:ANYF 0 "register_operand" "=f") (minus:ANYF - (match_operand:ANYF 1 "register_operand" "f") - (mult:ANYF (match_operand:ANYF 2 "register_operand" "f") - (match_operand:ANYF 3 "register_operand" "0"))))] - "ISA_HAS_NMADD3_NMSUB3 - && TARGET_FUSED_MADD + (match_operand:ANYF 1 "register_operand" "f") + (mult:ANYF (match_operand:ANYF 2 "register_operand" "f") + (match_operand:ANYF 3 "register_operand" "f"))))] + "ISA_HAS_UNFUSED_MADD4 && !HONOR_SIGNED_ZEROS (mode)" - "nmsub.\t%0,%1,%2" + "nmsub.\t%0,%1,%2,%3" [(set_attr "type" "fmadd") (set_attr "mode" "")]) diff --git a/gcc/config/mips/mips.opt b/gcc/config/mips/mips.opt index a9baebe6a44..348c6e03f1e 100644 --- a/gcc/config/mips/mips.opt +++ b/gcc/config/mips/mips.opt @@ -209,10 +209,6 @@ mflush-func= Target RejectNegative Joined Var(mips_cache_flush_func) Init(CACHE_FLUSH_FUNC) -mflush-func=FUNC Use FUNC to flush the cache before calling stack trampolines -mfused-madd -Target Report Var(TARGET_FUSED_MADD) Init(1) -Generate floating-point multiply-add instructions - mabs= Target RejectNegative Joined Enum(mips_ieee_754_value) Var(mips_abs) Init(MIPS_IEEE_754_DEFAULT) -mabs=MODE Select the IEEE 754 ABS/NEG instruction execution mode -- 2.30.2