public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Michael Meissner <meissner@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/meissner/heads/work135-vsize)] Revert patches Date: Fri, 29 Sep 2023 04:05:36 +0000 (GMT) [thread overview] Message-ID: <20230929040536.4CC5A3858C52@sourceware.org> (raw) https://gcc.gnu.org/g:141841beea4757bf999dee4afd2504336cdd85b9 commit 141841beea4757bf999dee4afd2504336cdd85b9 Author: Michael Meissner <meissner@linux.ibm.com> Date: Fri Sep 29 00:05:33 2023 -0400 Revert patches Diff: --- gcc/config/rs6000/mma.md | 17 +++++------------ gcc/config/rs6000/rs6000.cc | 35 ++--------------------------------- gcc/config/rs6000/rs6000.opt | 8 -------- 3 files changed, 7 insertions(+), 53 deletions(-) diff --git a/gcc/config/rs6000/mma.md b/gcc/config/rs6000/mma.md index b6cc7b28956..575751d477e 100644 --- a/gcc/config/rs6000/mma.md +++ b/gcc/config/rs6000/mma.md @@ -298,19 +298,12 @@ "TARGET_MMA && (gpc_reg_operand (operands[0], OOmode) || gpc_reg_operand (operands[1], OOmode))" -{ - if (MEM_P (operands[0])) - return TARGET_STORE_VECTOR_PAIR ? "stxvp%X0 %x1,%0" : "#"; - - if (MEM_P (operands[1])) - return TARGET_LOAD_VECTOR_PAIR ? "lxvp%X1 %x0,%1" : "#"; - - return "#"; -} + "@ + lxvp%X1 %x0,%1 + stxvp%X0 %x1,%0 + #" "&& reload_completed - && ((MEM_P (operands[0]) && !TARGET_STORE_VECTOR_PAIR) - || (MEM_P (operands[1]) && !TARGET_LOAD_VECTOR_PAIR) - || (!MEM_P (operands[0]) && !MEM_P (operands[1])))" + && (!MEM_P (operands[0]) && !MEM_P (operands[1]))" [(const_int 0)] { rs6000_split_multireg_move (operands[0], operands[1]); diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index 07e2218511e..cc9253bb040 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -2576,14 +2576,6 @@ rs6000_debug_reg_global (void) if (TARGET_DIRECT_MOVE_128) fprintf (stderr, DEBUG_FMT_D, "VSX easy 64-bit mfvsrld element", (int)VECTOR_ELEMENT_MFVSRLD_64BIT); - - if (TARGET_MMA) - { - fprintf (stderr, DEBUG_FMT_S, "load vector pair", - TARGET_LOAD_VECTOR_PAIR ? "yes" : "no"); - fprintf (stderr, DEBUG_FMT_S, "store vector pair", - TARGET_STORE_VECTOR_PAIR ? "yes" : "no"); - } } \f @@ -2719,9 +2711,7 @@ rs6000_setup_reg_addr_masks (void) /* Vector pairs can do both indexed and offset loads if the instructions are enabled, otherwise they can only do offset loads since it will be broken into two vector moves. Vector quads can - only do offset loads. If the user restricted generation of either - of the LXVP or STXVP instructions, do not allow indexed mode so - that we can split the load/store. */ + only do offset loads. */ else if ((addr_mask != 0) && TARGET_MMA && (m2 == OOmode || m2 == XOmode)) { @@ -2729,9 +2719,7 @@ rs6000_setup_reg_addr_masks (void) if (rc == RELOAD_REG_FPR || rc == RELOAD_REG_VMX) { addr_mask |= RELOAD_REG_QUAD_OFFSET; - if (m2 == OOmode - && TARGET_LOAD_VECTOR_PAIR - && TARGET_STORE_VECTOR_PAIR) + if (m2 == OOmode) addr_mask |= RELOAD_REG_INDEXED; } } @@ -4417,19 +4405,6 @@ rs6000_option_override_internal (bool global_init_p) rs6000_isa_flags &= ~OPTION_MASK_MMA; } - /* Warn if -menable-load-vector-pair or -menable-store-vector-pair are used - and MMA is not set. */ - if (!TARGET_MMA) - { - if (TARGET_LOAD_VECTOR_PAIR && OPTION_SET_P(TARGET_LOAD_VECTOR_PAIR)) - warning (0, "%qs should not be used unless you use %qs", - "-menable-load-vector-pair", "-mmma"); - - if (TARGET_STORE_VECTOR_PAIR && OPTION_SET_P(TARGET_STORE_VECTOR_PAIR)) - warning (0, "%qs should not be used unless you use %qs", - "-mstore-vector-pair", "-mmma"); - } - /* Enable power10 fusion if we are tuning for power10, even if we aren't generating power10 instructions. */ if (!(rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION)) @@ -24351,12 +24326,6 @@ static struct rs6000_opt_var const rs6000_opt_vars[] = { "speculate-indirect-jumps", offsetof (struct gcc_options, x_rs6000_speculate_indirect_jumps), offsetof (struct cl_target_option, x_rs6000_speculate_indirect_jumps), }, - { "enable-load-vector-pair", - offsetof (struct gcc_options, x_TARGET_LOAD_VECTOR_PAIR), - offsetof (struct cl_target_option, x_TARGET_LOAD_VECTOR_PAIR), }, - { "enable-store-vector-pair", - offsetof (struct gcc_options, x_TARGET_STORE_VECTOR_PAIR), - offsetof (struct cl_target_option, x_TARGET_STORE_VECTOR_PAIR), }, }; /* Inner function to handle attribute((target("..."))) and #pragma GCC target diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt index e2b50e43cc4..bde6d3ff664 100644 --- a/gcc/config/rs6000/rs6000.opt +++ b/gcc/config/rs6000/rs6000.opt @@ -597,14 +597,6 @@ mmma Target Mask(MMA) Var(rs6000_isa_flags) Generate (do not generate) MMA instructions. -menable-load-vector-pair -Target Undocumented Var(TARGET_LOAD_VECTOR_PAIR) Init(1) Save -Generate (do not generate) load vector pair instructions. - -menable-store-vector-pair -Target Undocumented Var(TARGET_STORE_VECTOR_PAIR) Init(1) Save -Generate (do not generate) store vector pair instructions. - mrelative-jumptables Target Undocumented Var(rs6000_relative_jumptables) Init(1) Save
next reply other threads:[~2023-09-29 4:05 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-09-29 4:05 Michael Meissner [this message] -- strict thread matches above, loose matches on Subject: below -- 2023-09-29 3:59 Michael Meissner
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230929040536.4CC5A3858C52@sourceware.org \ --to=meissner@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).