From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id 0DAA33858D1E; Wed, 25 Jan 2023 04:56:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0DAA33858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674622593; bh=G/hAtO9txLx/LvhEekNmckCtdcuoRKyVbffWSta8/nw=; h=From:To:Subject:Date:From; b=YMyyZfgY0vTppqN0HtxbZq4qHsTpUgk+OzFVz1IP9GweZtHsI7f1TNuF8OPLyaBTq 7cwbgNTSKZ6E4LwvzJlDdIFwsnMfh8wGVulxRjDDfW/CfABDBkB13L0eWnqnazrRhg lL6p8ICvJYC58DWS6KuaRXErH7qwZm6MVUJQSKC0= 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/work107)] Revert patches X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work107 X-Git-Oldrev: b4204634312f78d07a7b6fa7d5e1fc12429cd90e X-Git-Newrev: 146fffb36338595317131fc3d3371133baabb484 Message-Id: <20230125045633.0DAA33858D1E@sourceware.org> Date: Wed, 25 Jan 2023 04:56:33 +0000 (GMT) List-Id: https://gcc.gnu.org/g:146fffb36338595317131fc3d3371133baabb484 commit 146fffb36338595317131fc3d3371133baabb484 Author: Michael Meissner Date: Tue Jan 24 23:56:28 2023 -0500 Revert patches Diff: --- gcc/config/rs6000/rs6000.cc | 2 +- gcc/config/rs6000/rs6000.md | 181 +++++++++++++++++++++++++++++++------------- 2 files changed, 130 insertions(+), 53 deletions(-) diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index e108065a468..7e76c37fdab 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -11188,7 +11188,7 @@ init_float128_ieee (machine_mode mode) if (mode != TFmode && FLOAT128_IBM_P (TFmode)) set_conv_libfunc (sext_optab, mode, TFmode, "__trunctfkf2"); - set_conv_libfunc (sext_optab, IFmode, mode, "__extendkftf2"); + set_conv_libfunc (trunc_optab, IFmode, mode, "__extendkftf2"); if (mode != TFmode && FLOAT128_IBM_P (TFmode)) set_conv_libfunc (trunc_optab, TFmode, mode, "__extendkftf2"); diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index 7decb7f7974..4a7812fa592 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -543,6 +543,12 @@ ; Iterator for 128-bit VSX types for pack/unpack (define_mode_iterator FMOVE128_VSX [V1TI KF]) +; Iterators for converting to/from TFmode +(define_mode_iterator IFKF [IF KF]) + +; Constraints for moving IF/KFmode. +(define_mode_attr IFKF_reg [(IF "d") (KF "wa")]) + ; Whether a floating point move is ok, don't allow SD without hardware FP (define_mode_attr fmove_ok [(SF "") (DF "") @@ -633,7 +639,6 @@ (define_code_iterator any_extend [sign_extend zero_extend]) (define_code_iterator any_fix [fix unsigned_fix]) (define_code_iterator any_float [float unsigned_float]) -(define_code_iterator any_fp_cvt [float_extend float_truncate]) (define_code_attr u [(sign_extend "") (zero_extend "u") @@ -659,9 +664,6 @@ (float "") (unsigned_float "uns")]) -(define_code_attr fp_cvt [(float_extend "extend") - (float_truncate "trunc")]) - ; 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") @@ -9159,65 +9161,106 @@ "xxlor %x0,%x1,%x2" [(set_attr "type" "veclogical")]) -;; Float128 conversion functions. We only define the 'conversions' between two -;; formats that use the same representation. We call the library function to -;; convert between IEEE 128-bit and IBM 128-bit. We can't do these moves by -;; using a SUBREG before register allocation. We set up the moves to prefer -;; the output register being the same as the input register, which would enable -;; the move to be deleted completely. -(define_insn_and_split "kftf2" - [(set (match_operand:TF 0 "gpc_reg_operand" "=wa,wa") - (any_fp_cvt:TF (match_operand:KF 1 "gpc_reg_operand" "0,wa")))] - "TARGET_FLOAT128_TYPE && FLOAT128_IEEE_P (TFmode)" - "#" - "&& reload_completed" - [(set (match_dup 0) - (match_dup 2))] +;; Float128 conversion functions. These expand to library function calls. +;; We use expand to convert from IBM double double to IEEE 128-bit +;; and trunc for the opposite. +(define_expand "extendiftf2" + [(set (match_operand:TF 0 "gpc_reg_operand") + (float_extend:TF (match_operand:IF 1 "gpc_reg_operand")))] + "TARGET_FLOAT128_TYPE" { - operands[2] = gen_lowpart (TFmode, operands[1]); -} - [(set_attr "type" "veclogical")]) + rs6000_expand_float128_convert (operands[0], operands[1], false); + DONE; +}) -(define_insn_and_split "tfkf2" - [(set (match_operand:KF 0 "gpc_reg_operand" "=wa,wa") - (any_fp_cvt:KF (match_operand:TF 1 "gpc_reg_operand" "0,wa")))] - "TARGET_FLOAT128_TYPE && FLOAT128_IEEE_P (TFmode)" - "#" - "&& reload_completed" - [(set (match_dup 0) - (match_dup 2))] +(define_expand "extendifkf2" + [(set (match_operand:KF 0 "gpc_reg_operand") + (float_extend:KF (match_operand:IF 1 "gpc_reg_operand")))] + "TARGET_FLOAT128_TYPE" { - operands[2] = gen_lowpart (KFmode, operands[1]); -} - [(set_attr "type" "veclogical")]) + rs6000_expand_float128_convert (operands[0], operands[1], false); + DONE; +}) + +(define_expand "extendtfkf2" + [(set (match_operand:KF 0 "gpc_reg_operand") + (float_extend:KF (match_operand:TF 1 "gpc_reg_operand")))] + "TARGET_FLOAT128_TYPE" +{ + rs6000_expand_float128_convert (operands[0], operands[1], false); + DONE; +}) -(define_insn_and_split "iftf2" - [(set (match_operand:TF 0 "gpc_reg_operand" "=wa,wa,r,r") - (any_fp_cvt:TF (match_operand:IF 1 "gpc_reg_operand" "0,wa,0,r")))] - "TARGET_HARD_FLOAT && FLOAT128_IBM_P (TFmode)" +(define_expand "extendtfif2" + [(set (match_operand:IF 0 "gpc_reg_operand") + (float_extend:IF (match_operand:TF 1 "gpc_reg_operand")))] + "TARGET_FLOAT128_TYPE" +{ + rs6000_expand_float128_convert (operands[0], operands[1], false); + DONE; +}) + +(define_expand "trunciftf2" + [(set (match_operand:TF 0 "gpc_reg_operand") + (float_truncate:TF (match_operand:IF 1 "gpc_reg_operand")))] + "TARGET_FLOAT128_TYPE" +{ + rs6000_expand_float128_convert (operands[0], operands[1], false); + DONE; +}) + +(define_expand "truncifkf2" + [(set (match_operand:KF 0 "gpc_reg_operand") + (float_truncate:KF (match_operand:IF 1 "gpc_reg_operand")))] + "TARGET_FLOAT128_TYPE" +{ + rs6000_expand_float128_convert (operands[0], operands[1], false); + DONE; +}) + +(define_expand "trunckftf2" + [(set (match_operand:TF 0 "gpc_reg_operand") + (float_truncate:TF (match_operand:KF 1 "gpc_reg_operand")))] + "TARGET_FLOAT128_TYPE" +{ + rs6000_expand_float128_convert (operands[0], operands[1], false); + DONE; +}) + +(define_expand "trunctfif2" + [(set (match_operand:IF 0 "gpc_reg_operand") + (float_truncate:IF (match_operand:TF 1 "gpc_reg_operand")))] + "TARGET_FLOAT128_TYPE" +{ + rs6000_expand_float128_convert (operands[0], operands[1], false); + DONE; +}) + +(define_insn_and_split "*extendtf2_internal" + [(set (match_operand:TF 0 "gpc_reg_operand" "=") + (float_extend:TF + (match_operand:IFKF 1 "gpc_reg_operand" "")))] + "TARGET_FLOAT128_TYPE + && FLOAT128_IBM_P (TFmode) == FLOAT128_IBM_P (mode)" "#" "&& reload_completed" - [(set (match_dup 0) - (match_dup 2))] + [(set (match_dup 0) (match_dup 2))] { - operands[2] = gen_lowpart (TFmode, operands[1]); -} - [(set_attr "num_insns" "2") - (set_attr "length" "8")]) + operands[2] = gen_rtx_REG (TFmode, REGNO (operands[1])); +}) -(define_insn_and_split "tfif2" - [(set (match_operand:IF 0 "gpc_reg_operand" "=wa,wa,r,r") - (any_fp_cvt:IF (match_operand:TF 1 "gpc_reg_operand" "0,wa,0,r")))] - "TARGET_HARD_FLOAT && FLOAT128_IBM_P (TFmode)" +(define_insn_and_split "*extendtf2_internal" + [(set (match_operand:IFKF 0 "gpc_reg_operand" "=") + (float_extend:IFKF + (match_operand:TF 1 "gpc_reg_operand" "")))] + "TARGET_FLOAT128_TYPE + && FLOAT128_IBM_P (TFmode) == FLOAT128_IBM_P (mode)" "#" "&& reload_completed" - [(set (match_dup 0) - (match_dup 2))] + [(set (match_dup 0) (match_dup 2))] { - operands[2] = gen_lowpart (IFmode, operands[1]); -} - [(set_attr "num_insns" "2") - (set_attr "length" "8")]) + operands[2] = gen_rtx_REG (mode, REGNO (operands[1])); +}) ;; Reload helper functions used by rs6000_secondary_reload. The patterns all @@ -14940,6 +14983,40 @@ [(set_attr "type" "vecfloat") (set_attr "size" "128")]) +;; Conversion between KFmode and TFmode if TFmode is ieee 128-bit floating +;; point is a simple copy. +(define_insn_and_split "extendkftf2" + [(set (match_operand:TF 0 "vsx_register_operand" "=wa,?wa") + (float_extend:TF (match_operand:KF 1 "vsx_register_operand" "0,wa")))] + "TARGET_FLOAT128_TYPE && TARGET_IEEEQUAD" + "@ + # + xxlor %x0,%x1,%x1" + "&& reload_completed && REGNO (operands[0]) == REGNO (operands[1])" + [(const_int 0)] +{ + emit_note (NOTE_INSN_DELETED); + DONE; +} + [(set_attr "type" "*,veclogical") + (set_attr "length" "0,4")]) + +(define_insn_and_split "trunctfkf2" + [(set (match_operand:KF 0 "vsx_register_operand" "=wa,?wa") + (float_extend:KF (match_operand:TF 1 "vsx_register_operand" "0,wa")))] + "TARGET_FLOAT128_TYPE && TARGET_IEEEQUAD" + "@ + # + xxlor %x0,%x1,%x1" + "&& reload_completed && REGNO (operands[0]) == REGNO (operands[1])" + [(const_int 0)] +{ + emit_note (NOTE_INSN_DELETED); + DONE; +} + [(set_attr "type" "*,veclogical") + (set_attr "length" "0,4")]) + (define_insn "truncdf2_hw" [(set (match_operand:DF 0 "altivec_register_operand" "=v") (float_truncate:DF