From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id 604C63858C62; Thu, 8 Jun 2023 14:20:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 604C63858C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1686234042; bh=Y8ysdChY5cnZtZ5FJLLi9eEHzWgW0HzzPem5gvRoY/M=; h=From:To:Subject:Date:From; b=DPBgUP93URhaAK+PogLzeXC1/Cazjtl3LYr95gs1JJHi7355hyKqdAwFarJcD/Y1W 1kwonhZ+ocFFSPesdGQo2Z4LQ2l71h9wb01figUIIWavPY1xoMTCZIEm+aXS47lr9S FwLdMW/7iXc6ipEVUYK/53o36u6mon46Et4J0jSc= 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/work122)] Revert patches X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work122 X-Git-Oldrev: f3e67c49a8c22d0eeb10697dab9840071fe7b413 X-Git-Newrev: 616916bc6702ea2f1e447010f4e6c15474d23f09 Message-Id: <20230608142042.604C63858C62@sourceware.org> Date: Thu, 8 Jun 2023 14:20:42 +0000 (GMT) List-Id: https://gcc.gnu.org/g:616916bc6702ea2f1e447010f4e6c15474d23f09 commit 616916bc6702ea2f1e447010f4e6c15474d23f09 Author: Michael Meissner Date: Thu Jun 8 10:20:38 2023 -0400 Revert patches Diff: --- gcc/config/rs6000/fusion.md | 44 +++++++++++----------- gcc/config/rs6000/genfusion.pl | 36 ++++-------------- gcc/config/rs6000/rs6000.md | 2 +- gcc/testsuite/g++.target/powerpc/pr105325.C | 26 ------------- .../gcc.target/powerpc/fusion-p10-ldcmpi.c | 31 +++++++-------- 5 files changed, 44 insertions(+), 95 deletions(-) diff --git a/gcc/config/rs6000/fusion.md b/gcc/config/rs6000/fusion.md index 4444e3315dd..d45fb138a70 100644 --- a/gcc/config/rs6000/fusion.md +++ b/gcc/config/rs6000/fusion.md @@ -22,7 +22,7 @@ ;; load mode is DI result mode is clobber compare mode is CC extend is none (define_insn_and_split "*ld_cmpdi_cr0_DI_clobber_CC_none" [(set (match_operand:CC 2 "cc_reg_operand" "=x") - (compare:CC (match_operand:DI 1 "ds_form_mem_operand" "YZ") + (compare:CC (match_operand:DI 1 "ds_form_mem_operand" "m") (match_operand:DI 3 "const_m1_to_1_operand" "n"))) (clobber (match_scratch:DI 0 "=r"))] "(TARGET_P10_FUSION)" @@ -43,7 +43,7 @@ ;; load mode is DI result mode is clobber compare mode is CCUNS extend is none (define_insn_and_split "*ld_cmpldi_cr0_DI_clobber_CCUNS_none" [(set (match_operand:CCUNS 2 "cc_reg_operand" "=x") - (compare:CCUNS (match_operand:DI 1 "ds_form_mem_operand" "YZ") + (compare:CCUNS (match_operand:DI 1 "ds_form_mem_operand" "m") (match_operand:DI 3 "const_0_to_1_operand" "n"))) (clobber (match_scratch:DI 0 "=r"))] "(TARGET_P10_FUSION)" @@ -64,7 +64,7 @@ ;; load mode is DI result mode is DI compare mode is CC extend is none (define_insn_and_split "*ld_cmpdi_cr0_DI_DI_CC_none" [(set (match_operand:CC 2 "cc_reg_operand" "=x") - (compare:CC (match_operand:DI 1 "ds_form_mem_operand" "YZ") + (compare:CC (match_operand:DI 1 "ds_form_mem_operand" "m") (match_operand:DI 3 "const_m1_to_1_operand" "n"))) (set (match_operand:DI 0 "gpc_reg_operand" "=r") (match_dup 1))] "(TARGET_P10_FUSION)" @@ -85,7 +85,7 @@ ;; load mode is DI result mode is DI compare mode is CCUNS extend is none (define_insn_and_split "*ld_cmpldi_cr0_DI_DI_CCUNS_none" [(set (match_operand:CCUNS 2 "cc_reg_operand" "=x") - (compare:CCUNS (match_operand:DI 1 "ds_form_mem_operand" "YZ") + (compare:CCUNS (match_operand:DI 1 "ds_form_mem_operand" "m") (match_operand:DI 3 "const_0_to_1_operand" "n"))) (set (match_operand:DI 0 "gpc_reg_operand" "=r") (match_dup 1))] "(TARGET_P10_FUSION)" @@ -104,17 +104,17 @@ ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is SI result mode is clobber compare mode is CC extend is none -(define_insn_and_split "*lwz_cmpsi_cr0_SI_clobber_CC_none" +(define_insn_and_split "*lwa_cmpdi_cr0_SI_clobber_CC_none" [(set (match_operand:CC 2 "cc_reg_operand" "=x") - (compare:CC (match_operand:SI 1 "non_update_memory_operand" "m") + (compare:CC (match_operand:SI 1 "ds_form_mem_operand" "m") (match_operand:SI 3 "const_m1_to_1_operand" "n"))) (clobber (match_scratch:SI 0 "=r"))] "(TARGET_P10_FUSION)" - "lwz%X1 %0,%1\;cmpwi %2,%0,%3" + "lwa%X1 %0,%1\;cmpdi %2,%0,%3" "&& reload_completed && (cc_reg_not_cr0_operand (operands[2], CCmode) || !address_is_non_pfx_d_or_x (XEXP (operands[1], 0), - SImode, NON_PREFIXED_D))" + SImode, NON_PREFIXED_DS))" [(set (match_dup 0) (match_dup 1)) (set (match_dup 2) (compare:CC (match_dup 0) (match_dup 3)))] @@ -125,7 +125,7 @@ ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is SI result mode is clobber compare mode is CCUNS extend is none -(define_insn_and_split "*lwz_cmplsi_cr0_SI_clobber_CCUNS_none" +(define_insn_and_split "*lwz_cmpldi_cr0_SI_clobber_CCUNS_none" [(set (match_operand:CCUNS 2 "cc_reg_operand" "=x") (compare:CCUNS (match_operand:SI 1 "non_update_memory_operand" "m") (match_operand:SI 3 "const_0_to_1_operand" "n"))) @@ -146,9 +146,9 @@ ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is SI result mode is SI compare mode is CC extend is none -(define_insn_and_split "*lwa_cmpsi_cr0_SI_SI_CC_none" +(define_insn_and_split "*lwa_cmpdi_cr0_SI_SI_CC_none" [(set (match_operand:CC 2 "cc_reg_operand" "=x") - (compare:CC (match_operand:SI 1 "lwa_operand" "YZ") + (compare:CC (match_operand:SI 1 "ds_form_mem_operand" "m") (match_operand:SI 3 "const_m1_to_1_operand" "n"))) (set (match_operand:SI 0 "gpc_reg_operand" "=r") (match_dup 1))] "(TARGET_P10_FUSION)" @@ -163,12 +163,11 @@ "" [(set_attr "type" "fused_load_cmpi") (set_attr "cost" "8") - (set_attr "sign_extend" "yes") (set_attr "length" "8")]) ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is SI result mode is SI compare mode is CCUNS extend is none -(define_insn_and_split "*lwz_cmplsi_cr0_SI_SI_CCUNS_none" +(define_insn_and_split "*lwz_cmpldi_cr0_SI_SI_CCUNS_none" [(set (match_operand:CCUNS 2 "cc_reg_operand" "=x") (compare:CCUNS (match_operand:SI 1 "non_update_memory_operand" "m") (match_operand:SI 3 "const_0_to_1_operand" "n"))) @@ -189,9 +188,9 @@ ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is SI result mode is EXTSI compare mode is CC extend is sign -(define_insn_and_split "*lwa_cmp_cr0_SI_EXTSI_CC_sign" +(define_insn_and_split "*lwa_cmpdi_cr0_SI_EXTSI_CC_sign" [(set (match_operand:CC 2 "cc_reg_operand" "=x") - (compare:CC (match_operand:SI 1 "lwa_operand" "YZ") + (compare:CC (match_operand:SI 1 "ds_form_mem_operand" "m") (match_operand:SI 3 "const_m1_to_1_operand" "n"))) (set (match_operand:EXTSI 0 "gpc_reg_operand" "=r") (sign_extend:EXTSI (match_dup 1)))] "(TARGET_P10_FUSION)" @@ -206,12 +205,11 @@ "" [(set_attr "type" "fused_load_cmpi") (set_attr "cost" "8") - (set_attr "sign_extend" "yes") (set_attr "length" "8")]) ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is SI result mode is EXTSI compare mode is CCUNS extend is zero -(define_insn_and_split "*lwz_cmpl_cr0_SI_EXTSI_CCUNS_zero" +(define_insn_and_split "*lwz_cmpldi_cr0_SI_EXTSI_CCUNS_zero" [(set (match_operand:CCUNS 2 "cc_reg_operand" "=x") (compare:CCUNS (match_operand:SI 1 "non_update_memory_operand" "m") (match_operand:SI 3 "const_0_to_1_operand" "n"))) @@ -232,7 +230,7 @@ ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is HI result mode is clobber compare mode is CC extend is sign -(define_insn_and_split "*lha_cmp_cr0_HI_clobber_CC_sign" +(define_insn_and_split "*lha_cmpdi_cr0_HI_clobber_CC_sign" [(set (match_operand:CC 2 "cc_reg_operand" "=x") (compare:CC (match_operand:HI 1 "non_update_memory_operand" "m") (match_operand:HI 3 "const_m1_to_1_operand" "n"))) @@ -253,7 +251,7 @@ ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is HI result mode is clobber compare mode is CCUNS extend is zero -(define_insn_and_split "*lhz_cmpl_cr0_HI_clobber_CCUNS_zero" +(define_insn_and_split "*lhz_cmpldi_cr0_HI_clobber_CCUNS_zero" [(set (match_operand:CCUNS 2 "cc_reg_operand" "=x") (compare:CCUNS (match_operand:HI 1 "non_update_memory_operand" "m") (match_operand:HI 3 "const_0_to_1_operand" "n"))) @@ -274,7 +272,7 @@ ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is HI result mode is EXTHI compare mode is CC extend is sign -(define_insn_and_split "*lha_cmp_cr0_HI_EXTHI_CC_sign" +(define_insn_and_split "*lha_cmpdi_cr0_HI_EXTHI_CC_sign" [(set (match_operand:CC 2 "cc_reg_operand" "=x") (compare:CC (match_operand:HI 1 "non_update_memory_operand" "m") (match_operand:HI 3 "const_m1_to_1_operand" "n"))) @@ -295,7 +293,7 @@ ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is HI result mode is EXTHI compare mode is CCUNS extend is zero -(define_insn_and_split "*lhz_cmpl_cr0_HI_EXTHI_CCUNS_zero" +(define_insn_and_split "*lhz_cmpldi_cr0_HI_EXTHI_CCUNS_zero" [(set (match_operand:CCUNS 2 "cc_reg_operand" "=x") (compare:CCUNS (match_operand:HI 1 "non_update_memory_operand" "m") (match_operand:HI 3 "const_0_to_1_operand" "n"))) @@ -316,7 +314,7 @@ ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is QI result mode is clobber compare mode is CCUNS extend is zero -(define_insn_and_split "*lbz_cmpl_cr0_QI_clobber_CCUNS_zero" +(define_insn_and_split "*lbz_cmpldi_cr0_QI_clobber_CCUNS_zero" [(set (match_operand:CCUNS 2 "cc_reg_operand" "=x") (compare:CCUNS (match_operand:QI 1 "non_update_memory_operand" "m") (match_operand:QI 3 "const_0_to_1_operand" "n"))) @@ -337,7 +335,7 @@ ;; load-cmpi fusion pattern generated by gen_ld_cmpi_p10 ;; load mode is QI result mode is GPR compare mode is CCUNS extend is zero -(define_insn_and_split "*lbz_cmpl_cr0_QI_GPR_CCUNS_zero" +(define_insn_and_split "*lbz_cmpldi_cr0_QI_GPR_CCUNS_zero" [(set (match_operand:CCUNS 2 "cc_reg_operand" "=x") (compare:CCUNS (match_operand:QI 1 "non_update_memory_operand" "m") (match_operand:QI 3 "const_0_to_1_operand" "n"))) diff --git a/gcc/config/rs6000/genfusion.pl b/gcc/config/rs6000/genfusion.pl index 42517b3bce7..82e8f863b02 100755 --- a/gcc/config/rs6000/genfusion.pl +++ b/gcc/config/rs6000/genfusion.pl @@ -57,26 +57,14 @@ sub gen_ld_cmpi_p10_one { my ($lmode, $result, $ccmode) = @_; - my $cmp_size = "d"; - my $echr = ($ccmode eq "CC") ? "a" : "z"; - if ($lmode eq "DI") { $echr = ""; } my $np = "NON_PREFIXED_D"; my $mempred = "non_update_memory_operand"; my $extend; if ($ccmode eq "CC") { - # if we would generate lwa and just want the CC value, generate lwz instead - # and use cmpwi. This allows us to avoid the ds-form restrictions on lwa. - if ($lmode eq "SI" && $result eq "clobber") { - $echr = "z"; - $cmp_size = "w"; - - } else { - # ld and lwa are both DS-FORM, use LWA_OPERAND for LWA - ($lmode =~ /^[SD]I$/) and $np = "NON_PREFIXED_DS"; - ($lmode eq "DI") and $mempred = "ds_form_mem_operand"; - ($lmode eq "SI") and $mempred = "lwa_operand"; - } + # ld and lwa are both DS-FORM. + ($lmode =~ /^[SD]I$/) and $np = "NON_PREFIXED_DS"; + ($lmode =~ /^[SD]I$/) and $mempred = "ds_form_mem_operand"; } else { if ($lmode eq "DI") { # ld is DS-form, but lwz is not. @@ -86,6 +74,8 @@ sub gen_ld_cmpi_p10_one } my $cmpl = ($ccmode eq "CC") ? "" : "l"; + my $echr = ($ccmode eq "CC") ? "a" : "z"; + if ($lmode eq "DI") { $echr = ""; } my $constpred = ($ccmode eq "CC") ? "const_m1_to_1_operand" : "const_0_to_1_operand"; @@ -100,17 +90,13 @@ sub gen_ld_cmpi_p10_one $extend = "none"; } - my $load_mode = (($clobbermode eq "GPR" || $result =~ /^EXT/) - ? "" - : lc ($clobbermode)); my $ldst = mode_to_ldst_char($lmode); - my $constraint = ($np eq "NON_PREFIXED_DS") ? "YZ" : "m"; print <