[gcc(refs/users/meissner/heads/work073)] Revert patches.

[gcc(refs/users/meissner/heads/work073)] Revert patches.

[Michael Meissner]

https://gcc.gnu.org/g:3c61b39896b26d1e0c9693cf41800f51b21b2d9a

commit 3c61b39896b26d1e0c9693cf41800f51b21b2d9a
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Thu Nov 11 11:51:51 2021 -0500

    Revert patches.
    
    2021-11-11  Michael Meissner  <meissner@the-meissners.org>
    
            Revert patches.
            * config/rs6000/rs6000.c (rs6000_option_override_internal): Add
            support for -mpower10-fusion-zero-cycle.
            * config/rs6000/rs6000.md (tablejump<mode>_normal): Likewise.
            (tablejump<mode>_absolute): Likewise.
            (tablejump<mode>_insn_zero_cycle): New insn.
            * config/rs6000/rs6000.opt (-mpower10-fusion-zero-cycle): New
            debug switch.

Diff:
---
 gcc/config/rs6000/rs6000.c   |  4 ----
 gcc/config/rs6000/rs6000.md  | 28 +++-------------------------
 gcc/config/rs6000/rs6000.opt |  4 ----
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 6780304a5eb..e4843eb0f1c 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4497,10 +4497,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 7622defa5ea..6bec2bddbde 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -13050,11 +13050,7 @@
   rtx addr = gen_reg_rtx (Pmode);
 
   emit_insn (gen_add<mode>3 (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;
 })
 
@@ -13066,11 +13062,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;
 })
 
@@ -13115,24 +13107,10 @@
   [(set (pc)
 	(match_operand:P 0 "register_operand" "c,*l"))
    (use (label_ref (match_operand 1)))]
-  "rs6000_speculate_indirect_jumps
-   && !(TARGET_P10_FUSION && TARGET_P10_FUSION_ZERO_CYCLE)"
+  "rs6000_speculate_indirect_jumps"
   "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<mode>_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 && TARGET_P10_FUSION
-   && TARGET_P10_FUSION_ZERO_CYCLE"
-  "mt%T2 %0\;b%T2"
-  [(set_attr "type" "jmpreg")
-   (set_attr "length" "8")])
-
 (define_insn "@tablejump<mode>_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 ba674947557..9d7878f144a 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.