Sync patch from openeuler/gcc - 20220808 (cherry picked from commit 3d663928609a23db4fc8b4ba1039a53a943ac1ed)
166 lines
5.5 KiB
Diff
166 lines
5.5 KiB
Diff
From b4770dd95fa342671d53c9de2077d77ee07b68dd Mon Sep 17 00:00:00 2001
|
|
From: zhaowenyu <804544223@qq.com>
|
|
Date: Sat, 25 Jun 2022 00:41:50 +0800
|
|
Subject: [PATCH 09/12] [Backport] Extend special_memory_constraint.
|
|
|
|
Reference: https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=4de7b010038933dd6ca96bf186ca49f243d0def6
|
|
|
|
For operand with special_memory_constraint, there could be a wrapper for memory_operand.
|
|
Extract mem for operand for conditional judgement like MEM_P, also for record_address_regs.
|
|
---
|
|
gcc/ira-costs.c | 12 +++++++-----
|
|
gcc/ira.c | 2 +-
|
|
gcc/lra-constraints.c | 28 +++++++++++++++++++++++-----
|
|
gcc/recog.c | 7 +++++--
|
|
gcc/rtl.h | 1 +
|
|
5 files changed, 37 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/gcc/ira-costs.c b/gcc/ira-costs.c
|
|
index 6891156b5..aeda6588b 100644
|
|
--- a/gcc/ira-costs.c
|
|
+++ b/gcc/ira-costs.c
|
|
@@ -781,7 +781,8 @@ record_reg_classes (int n_alts, int n_ops, rtx *ops,
|
|
|
|
case CT_SPECIAL_MEMORY:
|
|
insn_allows_mem[i] = allows_mem[i] = 1;
|
|
- if (MEM_P (op) && constraint_satisfied_p (op, cn))
|
|
+ if (MEM_P (extract_mem_from_operand (op))
|
|
+ && constraint_satisfied_p (op, cn))
|
|
win = 1;
|
|
break;
|
|
|
|
@@ -1397,15 +1398,16 @@ record_operand_costs (rtx_insn *insn, enum reg_class *pref)
|
|
commutative. */
|
|
for (i = 0; i < recog_data.n_operands; i++)
|
|
{
|
|
+ rtx op_mem = extract_mem_from_operand (recog_data.operand[i]);
|
|
memcpy (op_costs[i], init_cost, struct_costs_size);
|
|
|
|
if (GET_CODE (recog_data.operand[i]) == SUBREG)
|
|
recog_data.operand[i] = SUBREG_REG (recog_data.operand[i]);
|
|
|
|
- if (MEM_P (recog_data.operand[i]))
|
|
- record_address_regs (GET_MODE (recog_data.operand[i]),
|
|
- MEM_ADDR_SPACE (recog_data.operand[i]),
|
|
- XEXP (recog_data.operand[i], 0),
|
|
+ if (MEM_P (op_mem))
|
|
+ record_address_regs (GET_MODE (op_mem),
|
|
+ MEM_ADDR_SPACE (op_mem),
|
|
+ XEXP (op_mem, 0),
|
|
0, MEM, SCRATCH, frequency * 2);
|
|
else if (constraints[i][0] == 'p'
|
|
|| (insn_extra_address_constraint
|
|
diff --git a/gcc/ira.c b/gcc/ira.c
|
|
index 681ec2f46..c13650229 100644
|
|
--- a/gcc/ira.c
|
|
+++ b/gcc/ira.c
|
|
@@ -1868,7 +1868,7 @@ ira_setup_alts (rtx_insn *insn)
|
|
|
|
case CT_MEMORY:
|
|
case CT_SPECIAL_MEMORY:
|
|
- if (MEM_P (op))
|
|
+ if (MEM_P (extract_mem_from_operand (op)))
|
|
goto op_success;
|
|
win_p = true;
|
|
break;
|
|
diff --git a/gcc/lra-constraints.c b/gcc/lra-constraints.c
|
|
index 7cc479b30..df75c7b94 100644
|
|
--- a/gcc/lra-constraints.c
|
|
+++ b/gcc/lra-constraints.c
|
|
@@ -409,14 +409,34 @@ valid_address_p (rtx op, struct address_info *ad,
|
|
return valid_address_p (ad->mode, *ad->outer, ad->as);
|
|
}
|
|
|
|
+/* For special_memory_operand, it could be false for MEM_P (op),
|
|
+ i.e. bcst_mem_operand in i386 backend.
|
|
+ Extract and return real memory operand or op. */
|
|
+rtx
|
|
+extract_mem_from_operand (rtx op)
|
|
+{
|
|
+ for (rtx x = op;; x = XEXP (x, 0))
|
|
+ {
|
|
+ if (MEM_P (x))
|
|
+ return x;
|
|
+ if (GET_RTX_LENGTH (GET_CODE (x)) != 1
|
|
+ || GET_RTX_FORMAT (GET_CODE (x))[0] != 'e')
|
|
+ break;
|
|
+ }
|
|
+ return op;
|
|
+}
|
|
+
|
|
/* Return true if the eliminated form of memory reference OP satisfies
|
|
extra (special) memory constraint CONSTRAINT. */
|
|
static bool
|
|
satisfies_memory_constraint_p (rtx op, enum constraint_num constraint)
|
|
{
|
|
struct address_info ad;
|
|
+ rtx mem = extract_mem_from_operand (op);
|
|
+ if (!MEM_P (mem))
|
|
+ return false;
|
|
|
|
- decompose_mem_address (&ad, op);
|
|
+ decompose_mem_address (&ad, mem);
|
|
address_eliminator eliminator (&ad);
|
|
return constraint_satisfied_p (op, constraint);
|
|
}
|
|
@@ -2344,8 +2364,7 @@ process_alt_operands (int only_alternative)
|
|
break;
|
|
|
|
case CT_MEMORY:
|
|
- if (MEM_P (op)
|
|
- && satisfies_memory_constraint_p (op, cn))
|
|
+ if (satisfies_memory_constraint_p (op, cn))
|
|
win = true;
|
|
else if (spilled_pseudo_p (op))
|
|
win = true;
|
|
@@ -2386,8 +2405,7 @@ process_alt_operands (int only_alternative)
|
|
break;
|
|
|
|
case CT_SPECIAL_MEMORY:
|
|
- if (MEM_P (op)
|
|
- && satisfies_memory_constraint_p (op, cn))
|
|
+ if (satisfies_memory_constraint_p (op, cn))
|
|
win = true;
|
|
else if (spilled_pseudo_p (op))
|
|
win = true;
|
|
diff --git a/gcc/recog.c b/gcc/recog.c
|
|
index 2720aaaac..8674054b9 100644
|
|
--- a/gcc/recog.c
|
|
+++ b/gcc/recog.c
|
|
@@ -1798,7 +1798,8 @@ asm_operand_ok (rtx op, const char *constraint, const char **constraints)
|
|
case CT_MEMORY:
|
|
case CT_SPECIAL_MEMORY:
|
|
/* Every memory operand can be reloaded to fit. */
|
|
- result = result || memory_operand (op, VOIDmode);
|
|
+ result = result || memory_operand (extract_mem_from_operand (op),
|
|
+ VOIDmode);
|
|
break;
|
|
|
|
case CT_ADDRESS:
|
|
@@ -2584,7 +2585,9 @@ constrain_operands (int strict, alternative_mask alternatives)
|
|
|
|
/* A unary operator may be accepted by the predicate, but it
|
|
is irrelevant for matching constraints. */
|
|
- if (UNARY_P (op))
|
|
+ /* For special_memory_operand, there could be a memory operand inside,
|
|
+ and it would cause a mismatch for constraint_satisfied_p. */
|
|
+ if (UNARY_P (op) && op == extract_mem_from_operand (op))
|
|
op = XEXP (op, 0);
|
|
|
|
if (GET_CODE (op) == SUBREG)
|
|
diff --git a/gcc/rtl.h b/gcc/rtl.h
|
|
index b29afca8d..35fb6ba73 100644
|
|
--- a/gcc/rtl.h
|
|
+++ b/gcc/rtl.h
|
|
@@ -4323,6 +4323,7 @@ extern rtx gen_hard_reg_clobber (machine_mode, unsigned int);
|
|
extern rtx get_reg_known_value (unsigned int);
|
|
extern bool get_reg_known_equiv_p (unsigned int);
|
|
extern rtx get_reg_base_value (unsigned int);
|
|
+extern rtx extract_mem_from_operand (rtx);
|
|
|
|
#ifdef STACK_REGS
|
|
extern int stack_regs_mentioned (const_rtx insn);
|
|
--
|
|
2.27.0.windows.1
|
|
|