* RFA: Add a common tls_referenced_p function
@ 2014-07-24 15:52 Richard Sandiford
2014-07-25 20:41 ` Jeff Law
0 siblings, 1 reply; 2+ messages in thread
From: Richard Sandiford @ 2014-07-24 15:52 UTC (permalink / raw)
To: gcc-patches
Three targets had the same for_each_rtx function to check for a TLS symbol.
This patch adds a generic version instead.
Some other targets have a variation that checks for target-specific
UNSPEC sequences too so I've left those alone. They're all prefixed
by the target name so there's no name clash or ambiguity.
Tested on mips64-linux-gnu and via a cross-compiler for
powerpc64-linux-gnu and hppa64-hp-hpux11.23. OK to install?
Thanks,
Richard
gcc/
* rtl.h (tls_referenced_p): Declare.
* rtlanal.c (tls_referenced_p_1, tls_referenced_p): New functions.
* config/mips/mips.c (mips_tls_symbol_ref_1): Delete.
(mips_cannot_force_const_mem): Use tls_referenced_p.
* config/pa/pa-protos.h (pa_tls_referenced_p): Delete.
* config/pa/pa.h (CONSTANT_ADDRESS_P): Use tls_referenced_p
instead of pa_tls_referenced_p.
* config/pa/pa.c (hppa_legitimize_address, pa_cannot_force_const_mem)
(pa_emit_move_sequence, pa_emit_move_sequence): Likewise.
(pa_legitimate_constant_p): Likewise.
(pa_tls_symbol_ref_1, pa_tls_referenced_p): Delete.
* config/rs6000/rs6000.c (rs6000_tls_referenced_p): Delete.
(rs6000_cannot_force_const_mem, rs6000_emit_move)
(rs6000_address_for_altivec): Use tls_referenced_p instead of
rs6000_tls_referenced_p.
(rs6000_tls_symbol_ref_1): Delete.
Index: gcc/rtl.h
===================================================================
--- gcc/rtl.h 2014-07-24 16:17:57.804445472 +0100
+++ gcc/rtl.h 2014-07-24 16:42:55.788314641 +0100
@@ -2292,6 +2292,7 @@ extern int replace_label (rtx *, void *)
extern int rtx_referenced_p (rtx, rtx);
extern bool tablejump_p (const_rtx, rtx *, rtx *);
extern int computed_jump_p (const_rtx);
+extern bool tls_referenced_p (rtx);
typedef int (*rtx_function) (rtx *, void *);
extern int for_each_rtx (rtx *, rtx_function, void *);
Index: gcc/rtlanal.c
===================================================================
--- gcc/rtlanal.c 2014-07-24 16:11:17.367474535 +0100
+++ gcc/rtlanal.c 2014-07-24 16:42:55.789314647 +0100
@@ -5960,3 +5960,22 @@ get_index_code (const struct address_inf
return SCRATCH;
}
+
+/* Return 1 if *X is a thread-local symbol. */
+
+static int
+tls_referenced_p_1 (rtx *x, void *)
+{
+ return GET_CODE (*x) == SYMBOL_REF && SYMBOL_REF_TLS_MODEL (*x) != 0;
+}
+
+/* Return true if X contains a thread-local symbol. */
+
+bool
+tls_referenced_p (rtx x)
+{
+ if (!targetm.have_tls)
+ return false;
+
+ return for_each_rtx (&x, &tls_referenced_p_1, 0);
+}
Index: gcc/config/mips/mips.c
===================================================================
--- gcc/config/mips/mips.c 2014-07-24 16:12:51.943409858 +0100
+++ gcc/config/mips/mips.c 2014-07-24 16:42:55.779314588 +0100
@@ -2171,15 +2171,6 @@ mips_symbol_insns (enum mips_symbol_type
return mips_symbol_insns_1 (type, mode) * (TARGET_MIPS16 ? 2 : 1);
}
\f
-/* A for_each_rtx callback. Stop the search if *X references a
- thread-local symbol. */
-
-static int
-mips_tls_symbol_ref_1 (rtx *x, void *data ATTRIBUTE_UNUSED)
-{
- return mips_tls_symbol_p (*x);
-}
-
/* Implement TARGET_CANNOT_FORCE_CONST_MEM. */
static bool
@@ -2223,7 +2214,7 @@ mips_cannot_force_const_mem (enum machin
}
/* TLS symbols must be computed by mips_legitimize_move. */
- if (for_each_rtx (&x, &mips_tls_symbol_ref_1, NULL))
+ if (tls_referenced_p (x))
return true;
return false;
Index: gcc/config/pa/pa-protos.h
===================================================================
--- gcc/config/pa/pa-protos.h 2014-07-24 16:11:17.367474535 +0100
+++ gcc/config/pa/pa-protos.h 2014-07-24 16:42:55.780314594 +0100
@@ -54,7 +54,6 @@ extern void pa_output_global_address (FI
extern void pa_print_operand (FILE *, rtx, int);
extern void pa_encode_label (rtx);
extern int pa_symbolic_expression_p (rtx);
-extern bool pa_tls_referenced_p (rtx);
extern int pa_adjust_insn_length (rtx, int);
extern int pa_fmpyaddoperands (rtx *);
extern int pa_fmpysuboperands (rtx *);
Index: gcc/config/pa/pa.h
===================================================================
--- gcc/config/pa/pa.h 2014-07-24 16:11:17.367474535 +0100
+++ gcc/config/pa/pa.h 2014-07-24 16:42:55.782314606 +0100
@@ -797,7 +797,7 @@ #define CONSTANT_ADDRESS_P(X) \
((GET_CODE (X) == LABEL_REF \
|| (GET_CODE (X) == SYMBOL_REF && !SYMBOL_REF_TLS_MODEL (X)) \
|| GET_CODE (X) == CONST_INT \
- || (GET_CODE (X) == CONST && !pa_tls_referenced_p (X)) \
+ || (GET_CODE (X) == CONST && !tls_referenced_p (X)) \
|| GET_CODE (X) == HIGH) \
&& (reload_in_progress || reload_completed \
|| ! pa_symbolic_expression_p (X)))
Index: gcc/config/pa/pa.c
===================================================================
--- gcc/config/pa/pa.c 2014-07-24 16:11:17.367474535 +0100
+++ gcc/config/pa/pa.c 2014-07-24 16:42:55.782314606 +0100
@@ -1037,7 +1037,7 @@ hppa_legitimize_address (rtx x, rtx oldx
&& !REG_POINTER (XEXP (x, 1)))
return gen_rtx_PLUS (Pmode, XEXP (x, 1), XEXP (x, 0));
- if (pa_tls_referenced_p (x))
+ if (tls_referenced_p (x))
return legitimize_tls_address (x);
else if (flag_pic)
return legitimize_pic_address (x, mode, gen_reg_rtx (Pmode));
@@ -1542,31 +1542,12 @@ force_mode (enum machine_mode mode, rtx
return gen_rtx_REG (mode, REGNO (orig));
}
-/* Return 1 if *X is a thread-local symbol. */
-
-static int
-pa_tls_symbol_ref_1 (rtx *x, void *data ATTRIBUTE_UNUSED)
-{
- return PA_SYMBOL_REF_TLS_P (*x);
-}
-
-/* Return 1 if X contains a thread-local symbol. */
-
-bool
-pa_tls_referenced_p (rtx x)
-{
- if (!TARGET_HAVE_TLS)
- return false;
-
- return for_each_rtx (&x, &pa_tls_symbol_ref_1, 0);
-}
-
/* Implement TARGET_CANNOT_FORCE_CONST_MEM. */
static bool
pa_cannot_force_const_mem (enum machine_mode mode ATTRIBUTE_UNUSED, rtx x)
{
- return pa_tls_referenced_p (x);
+ return tls_referenced_p (x);
}
/* Emit insns to move operands[1] into operands[0].
@@ -1921,7 +1902,7 @@ pa_emit_move_sequence (rtx *operands, en
|| (GET_CODE (operand1) == HIGH
&& symbolic_operand (XEXP (operand1, 0), mode))
|| function_label_operand (operand1, VOIDmode)
- || pa_tls_referenced_p (operand1))
+ || tls_referenced_p (operand1))
{
int ishighonly = 0;
@@ -2081,7 +2062,7 @@ pa_emit_move_sequence (rtx *operands, en
}
return 1;
}
- else if (pa_tls_referenced_p (operand1))
+ else if (tls_referenced_p (operand1))
{
rtx tmp = operand1;
rtx addend = NULL;
@@ -10293,7 +10274,7 @@ pa_legitimate_constant_p (enum machine_m
/* TLS_MODEL_GLOBAL_DYNAMIC and TLS_MODEL_LOCAL_DYNAMIC are not
legitimate constants. The other variants can't be handled by
the move patterns after reload starts. */
- if (pa_tls_referenced_p (x))
+ if (tls_referenced_p (x))
return false;
if (TARGET_64BIT && GET_CODE (x) == CONST_DOUBLE)
Index: gcc/config/rs6000/rs6000.c
===================================================================
--- gcc/config/rs6000/rs6000.c 2014-07-24 16:12:55.744447485 +0100
+++ gcc/config/rs6000/rs6000.c 2014-07-24 16:42:55.787314635 +0100
@@ -1101,7 +1101,6 @@ static void is_altivec_return_reg (rtx,
int easy_vector_constant (rtx, enum machine_mode);
static rtx rs6000_debug_legitimize_address (rtx, rtx, enum machine_mode);
static rtx rs6000_legitimize_tls_address (rtx, enum tls_model);
-static int rs6000_tls_symbol_ref_1 (rtx *, void *);
static int rs6000_get_some_local_dynamic_name_1 (rtx *, void *);
static rtx rs6000_darwin64_record_arg (CUMULATIVE_ARGS *, const_tree,
bool, bool);
@@ -7228,17 +7227,6 @@ rs6000_legitimize_tls_address (rtx addr,
return dest;
}
-/* Return 1 if X contains a thread-local symbol. */
-
-static bool
-rs6000_tls_referenced_p (rtx x)
-{
- if (! TARGET_HAVE_TLS)
- return false;
-
- return for_each_rtx (&x, &rs6000_tls_symbol_ref_1, 0);
-}
-
/* Implement TARGET_CANNOT_FORCE_CONST_MEM. */
static bool
@@ -7256,16 +7244,7 @@ rs6000_cannot_force_const_mem (enum mach
return true;
/* Do not place an ELF TLS symbol in the constant pool. */
- return TARGET_ELF && rs6000_tls_referenced_p (x);
-}
-
-/* Return 1 if *X is a thread-local symbol. This is the same as
- rs6000_tls_symbol_ref except for the type of the unused argument. */
-
-static int
-rs6000_tls_symbol_ref_1 (rtx *x, void *data ATTRIBUTE_UNUSED)
-{
- return RS6000_SYMBOL_REF_TLS_P (*x);
+ return TARGET_ELF && tls_referenced_p (x);
}
/* Return true iff the given SYMBOL_REF refers to a constant pool entry
@@ -8214,7 +8193,7 @@ rs6000_emit_move (rtx dest, rtx source,
/* Recognize the case where operand[1] is a reference to thread-local
data and load its address to a register. */
- if (rs6000_tls_referenced_p (operands[1]))
+ if (tls_referenced_p (operands[1]))
{
enum tls_model model;
rtx tmp = operands[1];
@@ -32324,7 +32303,7 @@ rs6000_address_for_altivec (rtx x)
static bool
rs6000_legitimate_constant_p (enum machine_mode mode, rtx x)
{
- if (TARGET_ELF && rs6000_tls_referenced_p (x))
+ if (TARGET_ELF && tls_referenced_p (x))
return false;
return ((GET_CODE (x) != CONST_DOUBLE && GET_CODE (x) != CONST_VECTOR)
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: RFA: Add a common tls_referenced_p function
2014-07-24 15:52 RFA: Add a common tls_referenced_p function Richard Sandiford
@ 2014-07-25 20:41 ` Jeff Law
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Law @ 2014-07-25 20:41 UTC (permalink / raw)
To: gcc-patches, rdsandiford
On 07/24/14 09:44, Richard Sandiford wrote:
> Three targets had the same for_each_rtx function to check for a TLS symbol.
> This patch adds a generic version instead.
>
> Some other targets have a variation that checks for target-specific
> UNSPEC sequences too so I've left those alone. They're all prefixed
> by the target name so there's no name clash or ambiguity.
>
> Tested on mips64-linux-gnu and via a cross-compiler for
> powerpc64-linux-gnu and hppa64-hp-hpux11.23. OK to install?
>
> Thanks,
> Richard
>
>
> gcc/
> * rtl.h (tls_referenced_p): Declare.
> * rtlanal.c (tls_referenced_p_1, tls_referenced_p): New functions.
> * config/mips/mips.c (mips_tls_symbol_ref_1): Delete.
> (mips_cannot_force_const_mem): Use tls_referenced_p.
> * config/pa/pa-protos.h (pa_tls_referenced_p): Delete.
> * config/pa/pa.h (CONSTANT_ADDRESS_P): Use tls_referenced_p
> instead of pa_tls_referenced_p.
> * config/pa/pa.c (hppa_legitimize_address, pa_cannot_force_const_mem)
> (pa_emit_move_sequence, pa_emit_move_sequence): Likewise.
> (pa_legitimate_constant_p): Likewise.
> (pa_tls_symbol_ref_1, pa_tls_referenced_p): Delete.
> * config/rs6000/rs6000.c (rs6000_tls_referenced_p): Delete.
> (rs6000_cannot_force_const_mem, rs6000_emit_move)
> (rs6000_address_for_altivec): Use tls_referenced_p instead of
> rs6000_tls_referenced_p.
> (rs6000_tls_symbol_ref_1): Delete.
OK.
Jeff
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-25 20:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-24 15:52 RFA: Add a common tls_referenced_p function Richard Sandiford
2014-07-25 20:41 ` Jeff Law
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).