diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index e6e6c2d..1871f5c 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -12371,25 +12371,24 @@ mips_output_division (const char *division, rtx *operands) bool mips_linked_madd_p (rtx out_insn, rtx in_insn) { - rtx x; + enum attr_accum_in accum_in; + int accum_in_opnum; + rtx accum_in_op; - x = single_set (in_insn); - if (x == 0) + accum_in = get_attr_accum_in (in_insn); + if (accum_in == ACCUM_IN_NONE) return false; - x = SET_SRC (x); + accum_in_opnum = accum_in - ACCUM_IN_0; - if (GET_CODE (x) == PLUS - && GET_CODE (XEXP (x, 0)) == MULT - && reg_set_p (XEXP (x, 1), out_insn)) - return true; + extract_insn (in_insn); + gcc_assert (accum_in_opnum < recog_data.n_operands); + accum_in_op = recog_data.operand[accum_in_opnum]; + /* We take care in instruction definitions to make sure accum_in operand is + a register_operand or [a more restrictive] muldiv_target_operand. */ + gcc_assert (REG_P (accum_in_op)); - if (GET_CODE (x) == MINUS - && GET_CODE (XEXP (x, 1)) == MULT - && reg_set_p (XEXP (x, 0), out_insn)) - return true; - - return false; + return reg_set_p (accum_in_op, out_insn); } /* Helper function for 74k; returns true to enable the chained mult/madd diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md index 759958b..79c1f25 100644 --- a/gcc/config/mips/mips.md +++ b/gcc/config/mips/mips.md @@ -275,6 +275,10 @@ (define_attr "sync_memmodel" "" (const_int 10)) +;; Accumulator operand for madd patterns. +(define_attr "accum_in" "none,0,1,2,3,4,5" (const_string "none")) + + ;; Classification of each insn. ;; branch conditional branch ;; jump unconditional jump @@ -1602,6 +1606,7 @@ madd\t%1,%2 #" [(set_attr "type" "imadd") + (set_attr "accum_in" "3") (set_attr "mode" "SI") (set_attr "length" "4,8")]) @@ -1620,6 +1625,7 @@ madd\t%0,%1,%2 #" [(set_attr "type" "imadd") + (set_attr "accum_in" "3") (set_attr "mode" "SI") (set_attr "length" "4,4,8")]) @@ -1658,6 +1664,7 @@ return "%[macc\t%@,%1,%2%]"; } [(set_attr "type" "imadd") + (set_attr "accum_in" "3") (set_attr "mode" "SI")]) (define_insn "*msac" @@ -1676,6 +1683,7 @@ return "msac\t$0,%2,%3"; } [(set_attr "type" "imadd") + (set_attr "accum_in" "1") (set_attr "mode" "SI")]) ;; An msac-like instruction implemented using negation and a macc. @@ -1699,6 +1707,7 @@ (clobber (match_dup 4))])] "" [(set_attr "type" "imadd") + (set_attr "accum_in" "1") (set_attr "length" "8")]) ;; Patterns generated by the define_peephole2 below. @@ -1715,6 +1724,7 @@ "ISA_HAS_MACC && reload_completed" "macc\t%3,%1,%2" [(set_attr "type" "imadd") + (set_attr "accum_in" "3") (set_attr "mode" "SI")]) (define_insn "*msac2" @@ -1729,6 +1739,7 @@ "ISA_HAS_MSAC && reload_completed" "msac\t%3,%1,%2" [(set_attr "type" "imadd") + (set_attr "accum_in" "3") (set_attr "mode" "SI")]) ;; Convert macc $0,, & mflo into macc ,, @@ -1831,6 +1842,7 @@ msub\t%2,%3 #" [(set_attr "type" "imadd") + (set_attr "accum_in" "1") (set_attr "mode" "SI") (set_attr "length" "4,8")]) @@ -2040,6 +2052,7 @@ return "msac\t$0,%1,%2"; } [(set_attr "type" "imadd") + (set_attr "accum_in" "3") (set_attr "mode" "SI")]) ;; _highpart patterns @@ -2260,6 +2273,7 @@ "TARGET_MAD" "mad\t%1,%2" [(set_attr "type" "imadd") + (set_attr "accum_in" "0") (set_attr "mode" "SI")]) ;; See the comment above msubsidi4 for the relationship between @@ -2284,6 +2298,7 @@ return "%[macc\t%@,%1,%2%]"; } [(set_attr "type" "imadd") + (set_attr "accum_in" "3") (set_attr "mode" "SI")]) ;; Floating point multiply accumulate instructions. @@ -2296,6 +2311,7 @@ "ISA_HAS_FP_MADD4_MSUB4 && TARGET_FUSED_MADD" "madd.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") + (set_attr "accum_in" "3") (set_attr "mode" "")]) (define_insn "*madd3" @@ -2306,6 +2322,7 @@ "ISA_HAS_FP_MADD3_MSUB3 && TARGET_FUSED_MADD" "madd.\t%0,%1,%2" [(set_attr "type" "fmadd") + (set_attr "accum_in" "3") (set_attr "mode" "")]) (define_insn "*msub4" @@ -2316,6 +2333,7 @@ "ISA_HAS_FP_MADD4_MSUB4 && TARGET_FUSED_MADD" "msub.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") + (set_attr "accum_in" "3") (set_attr "mode" "")]) (define_insn "*msub3" @@ -2326,6 +2344,7 @@ "ISA_HAS_FP_MADD3_MSUB3 && TARGET_FUSED_MADD" "msub.\t%0,%1,%2" [(set_attr "type" "fmadd") + (set_attr "accum_in" "3") (set_attr "mode" "")]) (define_insn "*nmadd4" @@ -2340,6 +2359,7 @@ && !HONOR_NANS (mode)" "nmadd.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") + (set_attr "accum_in" "3") (set_attr "mode" "")]) (define_insn "*nmadd3" @@ -2354,6 +2374,7 @@ && !HONOR_NANS (mode)" "nmadd.\t%0,%1,%2" [(set_attr "type" "fmadd") + (set_attr "accum_in" "3") (set_attr "mode" "")]) (define_insn "*nmadd4_fastmath" @@ -2368,6 +2389,7 @@ && !HONOR_NANS (mode)" "nmadd.\t%0,%3,%1,%2" [(set_attr "type" "fmadd") + (set_attr "accum_in" "3") (set_attr "mode" "")]) (define_insn "*nmadd3_fastmath" @@ -2382,6 +2404,7 @@ && !HONOR_NANS (mode)" "nmadd.\t%0,%1,%2" [(set_attr "type" "fmadd") + (set_attr "accum_in" "3") (set_attr "mode" "")]) (define_insn "*nmsub4" @@ -2396,6 +2419,7 @@ && !HONOR_NANS (mode)" "nmsub.\t%0,%1,%2,%3" [(set_attr "type" "fmadd") + (set_attr "accum_in" "1") (set_attr "mode" "")]) (define_insn "*nmsub3" @@ -2410,6 +2434,7 @@ && !HONOR_NANS (mode)" "nmsub.\t%0,%1,%2" [(set_attr "type" "fmadd") + (set_attr "accum_in" "1") (set_attr "mode" "")]) (define_insn "*nmsub4_fastmath" @@ -2424,6 +2449,7 @@ && !HONOR_NANS (mode)" "nmsub.\t%0,%1,%2,%3" [(set_attr "type" "fmadd") + (set_attr "accum_in" "1") (set_attr "mode" "")]) (define_insn "*nmsub3_fastmath" @@ -2438,6 +2464,7 @@ && !HONOR_NANS (mode)" "nmsub.\t%0,%1,%2" [(set_attr "type" "fmadd") + (set_attr "accum_in" "1") (set_attr "mode" "")]) ;;