From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1383) id 3472B3858C83; Fri, 22 Apr 2022 19:29:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3472B3858C83 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Segher Boessenkool To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-8226] rs6000: Fix pack for soft-float (PR105334) X-Act-Checkin: gcc X-Git-Author: Segher Boessenkool X-Git-Refname: refs/heads/master X-Git-Oldrev: 55c17bc75c4c65d75597b545680f9fbff163ccd1 X-Git-Newrev: 4938888ae1a1680e2aebf394d8fe80faad745bc7 Message-Id: <20220422192917.3472B3858C83@sourceware.org> Date: Fri, 22 Apr 2022 19:29:17 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Apr 2022 19:29:17 -0000 https://gcc.gnu.org/g:4938888ae1a1680e2aebf394d8fe80faad745bc7 commit r12-8226-g4938888ae1a1680e2aebf394d8fe80faad745bc7 Author: Segher Boessenkool Date: Fri Apr 22 15:45:00 2022 +0000 rs6000: Fix pack for soft-float (PR105334) For PR103623 I fixed unpack, but pack is broken as well, as reported in PR105334. Fixing that is a bit more code, but it is pretty simple code nonetheless. 2022-04-22 Segher Boessenkool PR target/105334 * config/rs6000/rs6000.md (pack for FMOVE128): New expander. (pack for FMOVE128): Rename and split the insn_and_split to... (pack_hard for FMOVE128): ... this... (pack_soft for FMOVE128): ... and this. Diff: --- gcc/config/rs6000/rs6000.md | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index a39b95f7dff..64049a6e521 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -14602,13 +14602,26 @@ } [(set_attr "type" "fp,fpstore,store")]) -(define_insn_and_split "pack" +(define_expand "pack" + [(use (match_operand:FMOVE128 0 "register_operand")) + (use (match_operand: 1 "register_operand")) + (use (match_operand: 2 "register_operand"))] + "FLOAT128_2REG_P (mode)" +{ + if (TARGET_HARD_FLOAT) + emit_insn (gen_pack_hard (operands[0], operands[1], operands[2])); + else + emit_insn (gen_pack_soft (operands[0], operands[1], operands[2])); + DONE; +}) + +(define_insn_and_split "pack_hard" [(set (match_operand:FMOVE128 0 "register_operand" "=&d") (unspec:FMOVE128 [(match_operand: 1 "register_operand" "d") (match_operand: 2 "register_operand" "d")] UNSPEC_PACK_128BIT))] - "FLOAT128_2REG_P (mode)" + "FLOAT128_2REG_P (mode) && TARGET_HARD_FLOAT" "#" "&& reload_completed" [(set (match_dup 3) (match_dup 1)) @@ -14626,6 +14639,34 @@ [(set_attr "type" "fp") (set_attr "length" "8")]) +(define_insn_and_split "pack_soft" + [(set (match_operand:FMOVE128 0 "register_operand" "=&r") + (unspec:FMOVE128 + [(match_operand: 1 "register_operand" "r") + (match_operand: 2 "register_operand" "r")] + UNSPEC_PACK_128BIT))] + "FLOAT128_2REG_P (mode) && TARGET_SOFT_FLOAT" + "#" + "&& reload_completed" + [(set (match_dup 3) (match_dup 1)) + (set (match_dup 4) (match_dup 2))] +{ + unsigned dest_hi = REGNO (operands[0]); + unsigned dest_lo = dest_hi + (TARGET_POWERPC64 ? 1 : 2); + + gcc_assert (!IN_RANGE (REGNO (operands[1]), dest_hi, dest_lo)); + gcc_assert (!IN_RANGE (REGNO (operands[2]), dest_hi, dest_lo)); + + operands[3] = gen_rtx_REG (mode, dest_hi); + operands[4] = gen_rtx_REG (mode, dest_lo); +} + [(set_attr "type" "integer") + (set (attr "length") + (if_then_else + (match_test "TARGET_POWERPC64") + (const_string "8") + (const_string "16")))]) + (define_insn "unpack" [(set (match_operand:DI 0 "register_operand" "=wa,wa") (unspec:DI [(match_operand:FMOVE128_VSX 1 "register_operand" "0,wa")