Skip to content

Commit

Permalink
aix: TLS precompute register parameters (PR 94177)
Browse files Browse the repository at this point in the history
AIX uses a compiler-managed TOC for global data, including TLS symbols.
The GCC TOC implementation manages the TOC entries through the constant pool.

TLS symbols sometimes require a function call to obtain the TLS base
pointer.  The arguments to the TLS call can conflict with arguments to
a normal function call if the TLS symbol is an argument in the normal call.
GCC specifically checks for this situation and precomputes the TLS
arguments, but the mechanism to check for this requirement utilizes
legitimate_constant_p().  The necessary result of legitimate_constant_p()
for correct TOC behavior and for correct TLS argument behavior is in
conflict.

This patch adds a new target hook precompute_tls_p() to decide if an
argument should be precomputed regardless of the result from
legitmate_constant_p().

gcc/ChangeLog:

	PR target/94177
	* calls.c (precompute_register_parameters): Additionally test
	targetm.precompute_tls_p to pre-compute argument.
	* config/rs6000/aix.h (TARGET_PRECOMPUTE_TLS_P): Define.
	* config/rs6000/rs6000.c (rs6000_aix_precompute_tls_p): New.
	* target.def (precompute_tls_p): New.
	* doc/tm.texi.in (TARGET_PRECOMPUTE_TLS_P): Add hook documentation.
	* doc/tm.texi: Regenerated.
  • Loading branch information
edelsohn committed Apr 27, 2021
1 parent 1c0c371 commit a21b399
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 2 deletions.
3 changes: 2 additions & 1 deletion gcc/calls.c
Original file line number Diff line number Diff line change
Expand Up @@ -1002,7 +1002,8 @@ precompute_register_parameters (int num_actuals, struct arg_data *args,
/* If the value is a non-legitimate constant, force it into a
pseudo now. TLS symbols sometimes need a call to resolve. */
if (CONSTANT_P (args[i].value)
&& !targetm.legitimate_constant_p (args[i].mode, args[i].value))
&& (!targetm.legitimate_constant_p (args[i].mode, args[i].value)
|| targetm.precompute_tls_p (args[i].mode, args[i].value)))
args[i].value = force_reg (args[i].mode, args[i].value);

/* If we're going to have to load the value by parts, pull the
Expand Down
1 change: 1 addition & 0 deletions gcc/config/rs6000/aix.h
Original file line number Diff line number Diff line change
Expand Up @@ -279,3 +279,4 @@
/* Use standard DWARF numbering for DWARF debugging information. */
#define RS6000_USE_DWARF_NUMBERING

#define TARGET_PRECOMPUTE_TLS_P rs6000_aix_precompute_tls_p
15 changes: 14 additions & 1 deletion gcc/config/rs6000/rs6000.c
Original file line number Diff line number Diff line change
Expand Up @@ -9608,7 +9608,8 @@ rs6000_cannot_force_const_mem (machine_mode mode ATTRIBUTE_UNUSED, rtx x)
&& SYMBOL_REF_TLS_MODEL (XEXP (XEXP (x, 0), 0)) != 0)
return true;

/* Do not place an ELF TLS symbol in the constant pool. */
/* Allow AIX TOC TLS symbols in the constant pool,
but not ELF TLS symbols. */
return TARGET_ELF && tls_referenced_p (x);
}

Expand Down Expand Up @@ -25370,6 +25371,18 @@ rs6000_legitimate_constant_p (machine_mode mode, rtx x)
return true;
}

/* Implement TARGET_PRECOMPUTE_TLS_P.

On the AIX, TLS symbols are in the TOC, which is maintained in the
constant pool. AIX TOC TLS symbols need to be pre-computed, but
must be considered legitimate constants. */

static bool
rs6000_aix_precompute_tls_p (machine_mode mode ATTRIBUTE_UNUSED, rtx x)
{
return tls_referenced_p (x);
}


/* Return TRUE iff the sequence ending in LAST sets the static chain. */

Expand Down
9 changes: 9 additions & 0 deletions gcc/doc/tm.texi
Original file line number Diff line number Diff line change
Expand Up @@ -5880,6 +5880,15 @@ This hook returns true if @var{x} is a legitimate constant for a
The default definition returns true.
@end deftypefn

@deftypefn {Target Hook} bool TARGET_PRECOMPUTE_TLS_P (machine_mode @var{mode}, rtx @var{x})
This hook returns true if @var{x} is a TLS operand on the target
machine that should be pre-computed when used as the argument in a call.
You can assume that @var{x} satisfies @code{CONSTANT_P}, so you need not
check this.

The default definition returns false.
@end deftypefn

@deftypefn {Target Hook} rtx TARGET_DELEGITIMIZE_ADDRESS (rtx @var{x})
This hook is used to undo the possibly obfuscating effects of the
@code{LEGITIMIZE_ADDRESS} and @code{LEGITIMIZE_RELOAD_ADDRESS} target
Expand Down
2 changes: 2 additions & 0 deletions gcc/doc/tm.texi.in
Original file line number Diff line number Diff line change
Expand Up @@ -4147,6 +4147,8 @@ address; but often a machine-dependent strategy can generate better code.

@hook TARGET_LEGITIMATE_CONSTANT_P

@hook TARGET_PRECOMPUTE_TLS_P

@hook TARGET_DELEGITIMIZE_ADDRESS

@hook TARGET_CONST_NOT_OK_FOR_DEBUG_P
Expand Down
12 changes: 12 additions & 0 deletions gcc/target.def
Original file line number Diff line number Diff line change
Expand Up @@ -2715,6 +2715,18 @@ The default definition returns true.",
bool, (machine_mode mode, rtx x),
hook_bool_mode_rtx_true)

/* True if X is a TLS operand whose value should be pre-computed. */
DEFHOOK
(precompute_tls_p,
"This hook returns true if @var{x} is a TLS operand on the target\n\
machine that should be pre-computed when used as the argument in a call.\n\
You can assume that @var{x} satisfies @code{CONSTANT_P}, so you need not \n\
check this.\n\
\n\
The default definition returns false.",
bool, (machine_mode mode, rtx x),
hook_bool_mode_rtx_false)

/* True if the constant X cannot be placed in the constant pool. */
DEFHOOK
(cannot_force_const_mem,
Expand Down

0 comments on commit a21b399

Please sign in to comment.