From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id 064A43858407; Thu, 11 Nov 2021 02:47:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 064A43858407 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/work072)] Revert patches. X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work072 X-Git-Oldrev: bb176ccfbcdaa59b4093b7f6c2d9673241126c41 X-Git-Newrev: d3e0a07b70602ccdd4cf0b2899ccf9ab913ede1a Message-Id: <20211111024729.064A43858407@sourceware.org> Date: Thu, 11 Nov 2021 02:47:29 +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: Thu, 11 Nov 2021 02:47:29 -0000 https://gcc.gnu.org/g:d3e0a07b70602ccdd4cf0b2899ccf9ab913ede1a commit d3e0a07b70602ccdd4cf0b2899ccf9ab913ede1a Author: Michael Meissner Date: Wed Nov 10 21:46:51 2021 -0500 Revert patches. 2021-11-10 Michael Meissner Revert patches. * config/rs6000/rs6000.c (rs6000_option_override_internal): Add support for -mpower10-fusion-zero-cycle. * config/rs6000/rs6000.md (tablejump_normal): Likewise. (tablejump_absolute): Likewise. (tablejump_insn_zero_cycle): New insn. * config/rs6000/rs6000.opt (-mpower10-fusion-zero-cycle): New debug switch. --- gcc/config/rs6000/rs6000.c | 4 ++++ gcc/config/rs6000/rs6000.md | 24 ++++++++++++++++++++++-- gcc/config/rs6000/rs6000.opt | 4 ++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 8fde48cf2b3..92736d4cca4 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -4503,6 +4503,10 @@ rs6000_option_override_internal (bool global_init_p) && (rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION_2STORE) == 0) rs6000_isa_flags |= OPTION_MASK_P10_FUSION_2STORE; + if (TARGET_POWER10 + && (rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION_ZERO_CYCLE) == 0) + rs6000_isa_flags |= OPTION_MASK_P10_FUSION_ZERO_CYCLE; + /* Turn off vector pair/mma options on non-power10 systems. */ else if (!TARGET_POWER10 && TARGET_MMA) { diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index 4122acb98cf..fe835e1a79f 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -13116,7 +13116,11 @@ (define_expand "@tablejump_normal" rtx addr = gen_reg_rtx (Pmode); emit_insn (gen_add3 (addr, off, lab)); - emit_jump_insn (gen_tablejump_insn_normal (Pmode, addr, operands[1])); + rtx insn = (TARGET_P10_FUSION && TARGET_P10_FUSION_ZERO_CYCLE + ? gen_tablejump_insn_zero_cycle (Pmode, addr, operands[1]) + : gen_tablejump_insn_normal (Pmode, addr, operands[1])); + + emit_jump_insn (insn); DONE; }) @@ -13128,7 +13132,11 @@ (define_expand "@tablejump_absolute" rtx addr = gen_reg_rtx (Pmode); emit_move_insn (addr, operands[0]); - emit_jump_insn (gen_tablejump_insn_normal (Pmode, addr, operands[1])); + rtx insn = (TARGET_P10_FUSION && TARGET_P10_FUSION_ZERO_CYCLE + ? gen_tablejump_insn_zero_cycle (Pmode, addr, operands[1]) + : gen_tablejump_insn_normal (Pmode, addr, operands[1])); + + emit_jump_insn (insn); DONE; }) @@ -13177,6 +13185,18 @@ (define_insn "@tablejump_insn_normal" "b%T0" [(set_attr "type" "jmpreg")]) +;; Version of indirect jump that fuses the mtctr to bctr to achieve 0 cycle +;; moves on Power10. +(define_insn "@tablejump_insn_zero_cycle" + [(set (pc) + (match_operand:P 0 "register_operand" "r,r")) + (use (label_ref (match_operand 1))) + (clobber (match_scratch:P 2 "=c,*l"))] + "rs6000_speculate_indirect_jumps" + "mt%T2 %0\;b%T2" + [(set_attr "type" "jmpreg") + (set_attr "length" "8")]) + (define_insn "@tablejump_insn_nospec" [(set (pc) (match_operand:P 0 "register_operand" "c,*l")) diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt index c1d661d7e6b..c0d5e1d45a6 100644 --- a/gcc/config/rs6000/rs6000.opt +++ b/gcc/config/rs6000/rs6000.opt @@ -518,6 +518,10 @@ mpower10-fusion-2store Target Undocumented Mask(P10_FUSION_2STORE) Var(rs6000_isa_flags) Fuse certain store operations together for better performance on power10. +mpower10-fusion-zero-cycle +Target Undocumented Mask(P10_FUSION_ZERO_CYCLE) Var(rs6000_isa_flags) +Fuse move to special register and jump for better performance on power10. + mcrypto Target Mask(CRYPTO) Var(rs6000_isa_flags) Use ISA 2.07 Category:Vector.AES and Category:Vector.SHA2 instructions. -- 2.31.1 Diff: --- gcc/config/rs6000/rs6000.c | 4 ---- gcc/config/rs6000/rs6000.md | 24 ++---------------------- gcc/config/rs6000/rs6000.opt | 4 ---- 3 files changed, 2 insertions(+), 30 deletions(-) diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 92736d4cca4..8fde48cf2b3 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -4503,10 +4503,6 @@ rs6000_option_override_internal (bool global_init_p) && (rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION_2STORE) == 0) rs6000_isa_flags |= OPTION_MASK_P10_FUSION_2STORE; - if (TARGET_POWER10 - && (rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION_ZERO_CYCLE) == 0) - rs6000_isa_flags |= OPTION_MASK_P10_FUSION_ZERO_CYCLE; - /* Turn off vector pair/mma options on non-power10 systems. */ else if (!TARGET_POWER10 && TARGET_MMA) { diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index fe835e1a79f..4122acb98cf 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -13116,11 +13116,7 @@ rtx addr = gen_reg_rtx (Pmode); emit_insn (gen_add3 (addr, off, lab)); - rtx insn = (TARGET_P10_FUSION && TARGET_P10_FUSION_ZERO_CYCLE - ? gen_tablejump_insn_zero_cycle (Pmode, addr, operands[1]) - : gen_tablejump_insn_normal (Pmode, addr, operands[1])); - - emit_jump_insn (insn); + emit_jump_insn (gen_tablejump_insn_normal (Pmode, addr, operands[1])); DONE; }) @@ -13132,11 +13128,7 @@ rtx addr = gen_reg_rtx (Pmode); emit_move_insn (addr, operands[0]); - rtx insn = (TARGET_P10_FUSION && TARGET_P10_FUSION_ZERO_CYCLE - ? gen_tablejump_insn_zero_cycle (Pmode, addr, operands[1]) - : gen_tablejump_insn_normal (Pmode, addr, operands[1])); - - emit_jump_insn (insn); + emit_jump_insn (gen_tablejump_insn_normal (Pmode, addr, operands[1])); DONE; }) @@ -13185,18 +13177,6 @@ "b%T0" [(set_attr "type" "jmpreg")]) -;; Version of indirect jump that fuses the mtctr to bctr to achieve 0 cycle -;; moves on Power10. -(define_insn "@tablejump_insn_zero_cycle" - [(set (pc) - (match_operand:P 0 "register_operand" "r,r")) - (use (label_ref (match_operand 1))) - (clobber (match_scratch:P 2 "=c,*l"))] - "rs6000_speculate_indirect_jumps" - "mt%T2 %0\;b%T2" - [(set_attr "type" "jmpreg") - (set_attr "length" "8")]) - (define_insn "@tablejump_insn_nospec" [(set (pc) (match_operand:P 0 "register_operand" "c,*l")) diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt index c0d5e1d45a6..c1d661d7e6b 100644 --- a/gcc/config/rs6000/rs6000.opt +++ b/gcc/config/rs6000/rs6000.opt @@ -518,10 +518,6 @@ mpower10-fusion-2store Target Undocumented Mask(P10_FUSION_2STORE) Var(rs6000_isa_flags) Fuse certain store operations together for better performance on power10. -mpower10-fusion-zero-cycle -Target Undocumented Mask(P10_FUSION_ZERO_CYCLE) Var(rs6000_isa_flags) -Fuse move to special register and jump for better performance on power10. - mcrypto Target Mask(CRYPTO) Var(rs6000_isa_flags) Use ISA 2.07 Category:Vector.AES and Category:Vector.SHA2 instructions.