From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id B0EBF3858401; Tue, 22 Mar 2022 23:22:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B0EBF3858401 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Michael Meissner To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/meissner/heads/work082)] Revert patches. X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work082 X-Git-Oldrev: d5f025d7022531724762135158f77ae153ec4436 X-Git-Newrev: 49b09f373571c4ffce706402d16331a057d024cc Message-Id: <20220322232257.B0EBF3858401@sourceware.org> Date: Tue, 22 Mar 2022 23:22:57 +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: Tue, 22 Mar 2022 23:22:57 -0000 https://gcc.gnu.org/g:49b09f373571c4ffce706402d16331a057d024cc commit 49b09f373571c4ffce706402d16331a057d024cc Author: Michael Meissner Date: Tue Mar 22 19:20:51 2022 -0400 Revert patches. 2022-03-18 Michael Meissner gcc/ * config/rs6000/rs6000.md (addti3): Don't immediate expand the insn, delay expansion until the split passes. (subti3): Likewise. 2022-03-22 Michael Meissner gcc/ PR target/103109 * config/rs6000/rs6000.md (su_int32): New code attribute. (mul3): Convert from define_expand to define_insn_and_split. (maddld4): Add generator function. (mulditi3_adddi3): New insn. (mulditi3_add_const): New insn. (mulditi3_adddi3_upper): New insn. gcc/testsuite/ PR target/103109 * gcc.target/powerpc/pr103109.c: New test. Diff: --- gcc/config/rs6000/rs6000.md | 166 +++------------------------- gcc/testsuite/gcc.target/powerpc/pr103109.c | 62 ----------- 2 files changed, 17 insertions(+), 211 deletions(-) diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index da7367ee642..fdfbc6566a5 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -676,9 +676,6 @@ (float "") (unsigned_float "uns")]) -(define_code_attr su_int32 [(sign_extend "s32bit_cint_operand") - (zero_extend "c32bit_cint_operand")]) - ; Various instructions that come in SI and DI forms. ; A generic w/d attribute, for things like cmpw/cmpd. (define_mode_attr wd [(QI "b") @@ -3202,16 +3199,13 @@ "mulhw %0,%1,%2" [(set_attr "type" "mul")]) -(define_insn_and_split "mul3" - [(set (match_operand: 0 "gpc_reg_operand" "=&r") +(define_expand "mul3" + [(set (match_operand: 0 "gpc_reg_operand") (mult: (any_extend: - (match_operand:GPR 1 "gpc_reg_operand" "r")) + (match_operand:GPR 1 "gpc_reg_operand")) (any_extend: - (match_operand:GPR 2 "gpc_reg_operand" "r"))))] + (match_operand:GPR 2 "gpc_reg_operand"))))] "!(mode == SImode && TARGET_POWERPC64)" - "#" - "&& 1" - [(pc)] { rtx l = gen_reg_rtx (mode); rtx h = gen_reg_rtx (mode); @@ -3220,10 +3214,9 @@ emit_move_insn (gen_lowpart (mode, operands[0]), l); emit_move_insn (gen_highpart (mode, operands[0]), h); DONE; -} - [(set_attr "length" "8")]) +}) -(define_insn "maddld4" +(define_insn "*maddld4" [(set (match_operand:GPR 0 "gpc_reg_operand" "=r") (plus:GPR (mult:GPR (match_operand:GPR 1 "gpc_reg_operand" "r") (match_operand:GPR 2 "gpc_reg_operand" "r")) @@ -3232,115 +3225,6 @@ "maddld %0,%1,%2,%3" [(set_attr "type" "mul")]) -(define_insn_and_split "*mulditi3_adddi3" - [(set (match_operand:TI 0 "gpc_reg_operand" "=&r") - (plus:TI - (mult:TI - (any_extend:TI (match_operand:DI 1 "gpc_reg_operand" "r")) - (any_extend:TI (match_operand:DI 2 "gpc_reg_operand" "r"))) - (any_extend:TI (match_operand:DI 3 "gpc_reg_operand" "r"))))] - "TARGET_MADDLD && TARGET_POWERPC64" - "#" - "&& 1" - [(pc)] -{ - rtx dest = operands[0]; - rtx dest_hi = gen_highpart (DImode, dest); - rtx dest_lo = gen_lowpart (DImode, dest); - rtx op1 = operands[1]; - rtx op2 = operands[2]; - rtx op3 = operands[3]; - rtx tmp_hi, tmp_lo; - - if (can_create_pseudo_p ()) - { - tmp_hi = gen_reg_rtx (DImode); - tmp_lo = gen_reg_rtx (DImode); - } - else - { - tmp_hi = dest_hi; - tmp_lo = dest_lo; - } - - emit_insn (gen_mulditi3_adddi3_upper (tmp_hi, op1, op2, op3)); - emit_insn (gen_maddlddi4 (tmp_lo, op1, op2, op3)); - - if (can_create_pseudo_p ()) - { - emit_move_insn (dest_hi, tmp_hi); - emit_move_insn (dest_lo, tmp_lo); - } - DONE; -} - [(set_attr "length" "8")]) - -;; Optimize 128-bit multiply with zero/sign extend and adding a constant. We -;; force the constant into a register to generate li, maddhd, and maddld, -;; instead of mulld, mulhd, addic, and addze. We can't combine this pattern -;; with the pattern that handles registers, since constants don't have a sign -;; or zero extend around them. -(define_insn_and_split "*mulditi3_add_const" - [(set (match_operand:TI 0 "gpc_reg_operand" "=&r") - (plus:TI - (mult:TI - (any_extend:TI (match_operand:DI 1 "gpc_reg_operand" "r")) - (any_extend:TI (match_operand:DI 2 "gpc_reg_operand" "r"))) - (match_operand 3 "" "r")))] - "TARGET_MADDLD && TARGET_POWERPC64 -" - "#" - "&& 1" - [(pc)] -{ - rtx dest = operands[0]; - rtx dest_hi = gen_highpart (DImode, dest); - rtx dest_lo = gen_lowpart (DImode, dest); - rtx op1 = operands[1]; - rtx op2 = operands[2]; - rtx op3 = force_reg (DImode, operands[3]); - rtx tmp_hi, tmp_lo; - - if (can_create_pseudo_p ()) - { - tmp_hi = gen_reg_rtx (DImode); - tmp_lo = gen_reg_rtx (DImode); - } - else - { - tmp_hi = dest_hi; - tmp_lo = dest_lo; - } - - emit_insn (gen_mulditi3_adddi3_upper (tmp_hi, op1, op2, op3)); - emit_insn (gen_maddlddi4 (tmp_lo, op1, op2, op3)); - - if (can_create_pseudo_p ()) - { - emit_move_insn (dest_hi, tmp_hi); - emit_move_insn (dest_lo, tmp_lo); - } - DONE; -} - [(set_attr "length" "8") - (set_attr "type" "mul") - (set_attr "size" "64")]) - -(define_insn "mulditi3_adddi3_upper" - [(set (match_operand:DI 0 "gpc_reg_operand" "=r") - (truncate:DI - (lshiftrt:TI - (plus:TI - (mult:TI - (any_extend:TI (match_operand:DI 1 "gpc_reg_operand" "r")) - (any_extend:TI (match_operand:DI 2 "gpc_reg_operand" "r"))) - (any_extend:TI (match_operand:DI 3 "gpc_reg_operand" "r"))) - (const_int 64))))] - "TARGET_MADDLD && TARGET_POWERPC64" - "maddhd %0,%1,%2,%3" - [(set_attr "type" "mul") - (set_attr "size" "64")]) - (define_insn "udiv3" [(set (match_operand:GPR 0 "gpc_reg_operand" "=r") (udiv:GPR (match_operand:GPR 1 "gpc_reg_operand" "r") @@ -7145,19 +7029,12 @@ ;; allocator from allocating registers that overlap with the inputs ;; (for example, having an input in 7,8 and an output in 6,7). We ;; also allow for the output being the same as one of the inputs. -;; -;; Addti3/subti3 are define_insn_and_splits instead of define_expand, to allow -;; for combine to make things like multiply and add with extend operations. - -(define_insn_and_split "addti3" - [(set (match_operand:TI 0 "gpc_reg_operand" "=&r,r,r") - (plus:TI (match_operand:TI 1 "gpc_reg_operand" "r,0,r") - (match_operand:TI 2 "reg_or_short_operand" "rn,r,0"))) - (clobber (reg:DI CA_REGNO))] + +(define_expand "addti3" + [(set (match_operand:TI 0 "gpc_reg_operand") + (plus:TI (match_operand:TI 1 "gpc_reg_operand") + (match_operand:TI 2 "reg_or_short_operand")))] "TARGET_64BIT" - "#" - "&& 1" - [(pc)] { rtx lo0 = gen_lowpart (DImode, operands[0]); rtx lo1 = gen_lowpart (DImode, operands[1]); @@ -7174,19 +7051,13 @@ emit_insn (gen_adddi3_carry (lo0, lo1, lo2)); emit_insn (gen_adddi3_carry_in (hi0, hi1, hi2)); DONE; -} - [(set_attr "length" "8") - (set_attr "type" "add") - (set_attr "size" "128")]) +}) -(define_insn_and_split "subti3" - [(set (match_operand:TI 0 "gpc_reg_operand" "=&r,r,r") - (minus:TI (match_operand:TI 1 "reg_or_short_operand" "rn,0,r") - (match_operand:TI 2 "gpc_reg_operand" "r,r,0")))] +(define_expand "subti3" + [(set (match_operand:TI 0 "gpc_reg_operand") + (minus:TI (match_operand:TI 1 "reg_or_short_operand") + (match_operand:TI 2 "gpc_reg_operand")))] "TARGET_64BIT" - "#" - "&& 1" - [(pc)] { rtx lo0 = gen_lowpart (DImode, operands[0]); rtx lo1 = gen_lowpart (DImode, operands[1]); @@ -7203,10 +7074,7 @@ emit_insn (gen_subfdi3_carry (lo0, lo2, lo1)); emit_insn (gen_subfdi3_carry_in (hi0, hi2, hi1)); DONE; -} - [(set_attr "length" "8") - (set_attr "type" "add") - (set_attr "size" "128")]) +}) ;; 128-bit logical operations expanders diff --git a/gcc/testsuite/gcc.target/powerpc/pr103109.c b/gcc/testsuite/gcc.target/powerpc/pr103109.c deleted file mode 100644 index ae2cfb9eda7..00000000000 --- a/gcc/testsuite/gcc.target/powerpc/pr103109.c +++ /dev/null @@ -1,62 +0,0 @@ -/* { dg-require-effective-target int128 } */ -/* { dg-require-effective-target power10_ok } */ -/* { dg-options "-mdejagnu-cpu=power10 -O2" } */ - -/* This test makes sure that GCC generates the maddhd, maddhdu, and maddld - power9 instructions when doing some forms of 64-bit integers converted to - 128-bit integers and used with multiply/add operations. */ - -__int128_t -s_mult_add (long long a, - long long b, - long long c) -{ - /* maddhd, maddld. */ - return ((__int128_t)a * (__int128_t)b) + (__int128_t)c; -} - -/* Test 32-bit constants that are loaded into GPRs instead of doing the - mulld/mulhd and then addic/addime or addc/addze. */ -__int128_t -s_mult_add_m10 (long long a, - long long b) -{ - /* maddhd, maddld. */ - return ((__int128_t)a * (__int128_t)b) - 10; -} - -__int128_t -s_mult_add_70000 (long long a, - long long b) -{ - /* maddhd, maddld. */ - return ((__int128_t)a * (__int128_t)b) + 70000; -} - -__uint128_t -u_mult_add (unsigned long long a, - unsigned long long b, - unsigned long long c) -{ - /* maddhd, maddld. */ - return ((__uint128_t)a * (__uint128_t)b) + (__uint128_t)c; -} - -__uint128_t -u_mult_add_0x80000000 (unsigned long long a, - unsigned long long b) -{ - /* maddhd, maddld. */ - return ((__uint128_t)a * (__uint128_t)b) + 0x80000000UL; -} - -/* { dg-final { scan-assembler-not {\maddc\M} } } */ -/* { dg-final { scan-assembler-not {\madde\M} } } */ -/* { dg-final { scan-assembler-not {\maddid\M} } } */ -/* { dg-final { scan-assembler-not {\maddme\M} } } */ -/* { dg-final { scan-assembler-not {\maddze\M} } } */ -/* { dg-final { scan-assembler-not {\mmulhd\M} } } */ -/* { dg-final { scan-assembler-not {\mmulld\M} } } */ -/* { dg-final { scan-assembler-times {\mmaddhd\M} 3 } } */ -/* { dg-final { scan-assembler-times {\mmaddhdu\M} 2 } } */ -/* { dg-final { scan-assembler-times {\mmaddld\M} 5 } } */