在 2024/3/1 下午5:39, mengqinggang 写道:
Thanks, I try to send a new version patch next week.
在 2024/2/29 下午2:08, Xi Ruoyao 写道:
On Thu, 2024-02-29 at 09:42 +0800, mengqinggang wrote:
Generate la.tls.desc macro instruction for TLS descriptors model.
la.tls.desc expand to
pcalau12i $a0, %desc_pc_hi20(a)
ld.d $a1, $a0, %desc_ld_pc_lo12(a)
addi.d $a0, $a0, %desc_add_pc_lo12(a)
jirl $ra, $a1, %desc_call(a)
The default is TLS descriptors, but can be configure with
-mtls-dialect={desc,trad}.
Please keep trad as the default for now. Glibc-2.40 will be released
after GCC 14.1 but we don't want to end up in a situation where the
default configuration of the latest GCC release creating something not
working with latest Glibc release.
And there's also musl libc we need to take into account.
Or you can write some autoconf test for if the assembler supports
tlsdesc and check TARGET_GLIBC_MAJOR & TARGET_GLIBC_MINOR for Glibc
version to decide if enable desc by default. If you want this but don't
have time to implement you can leave trad the default and I'll take care
of this.
I think the implementation of the options also needs to be tweaked.
I've modified a version and the patch is attached.
And here you need to add test cases.
Thanks.
/* snip */
+(define_insn "@got_load_tls_desc<mode>"
+ [(set (match_operand:P 0 "register_operand" "=r")
+ (unspec:P
+ [(match_operand:P 1 "symbolic_operand" "")]
+ UNSPEC_TLS_DESC))
+ (clobber (reg:SI FCC0_REGNUM))
+ (clobber (reg:SI FCC1_REGNUM))
+ (clobber (reg:SI FCC2_REGNUM))
+ (clobber (reg:SI FCC3_REGNUM))
+ (clobber (reg:SI FCC4_REGNUM))
+ (clobber (reg:SI FCC5_REGNUM))
+ (clobber (reg:SI FCC6_REGNUM))
+ (clobber (reg:SI FCC7_REGNUM))
+ (clobber (reg:SI A1_REGNUM))
+ (clobber (reg:SI RETURN_ADDR_REGNUM))]
Ok, the clobber list is correct.
+ "TARGET_TLS_DESC"
+ "la.tls.desc\t%0,%1"
With -mexplicit-relocs=always we should emit %desc_pc_lo12 etc. instead
of la.tls.desc. As we don't want to add too many code we can just hard
code the 4 instructions here instead of splitting this insn, just
something like
{ return TARGET_EXPLICIT_RELOCS_ALWAS ? "......" :
"la.tls.desc\t%0,%1"; }
+ [(set_attr "got" "load")
+ (set_attr "mode" "<MODE>")])
We need (set_attr "length" "16") in this list as this actually expands
into 16 bytes.
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 01ddc1a92f6..955e74d3bf9 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2547,7 +2547,6 @@ loongarch*-*-linux*)
# Force .init_array support. The configure script cannot always
# automatically detect that GAS supports it, yet we require it.
gcc_cv_initfini_array=yes
- with_tls=${with_tls:-desc}
;;
loongarch*-*-elf*)
@@ -5924,6 +5923,11 @@ case ${target} in
lasx) tm_defines="$tm_defines DEFAULT_ISA_EXT_SIMD=ISA_EXT_SIMD_LASX" ;;
esac
+ case ${with_tls} in
+ "" | trad) tm_defines="$tm_defines DEFAULT_TLS_TYPE=TLS_TRADITIONAL" ;;
+ desc) tm_defines="$tm_defines DEFAULT_TLS_TYPE=TLS_DESCRIPTORS" ;;
+ esac
+
tmake_file="loongarch/t-loongarch $tmake_file"
;;
diff --git a/gcc/config/loongarch/genopts/loongarch.opt.in b/gcc/config/loongarch/genopts/loongarch.opt.in
index 2cc943ef683..7de107c3e3d 100644
--- a/gcc/config/loongarch/genopts/loongarch.opt.in
+++ b/gcc/config/loongarch/genopts/loongarch.opt.in
@@ -264,7 +264,7 @@ TargetVariable
HOST_WIDE_INT la_isa_evolution = 0
Enum
-Name(tls_type) Type(enum loongarch_tls_type)
+Name(tls_type) Type(int)
The possible TLS dialects:
EnumValue
@@ -274,5 +274,5 @@ EnumValue
Enum(tls_type) String(desc) Value(TLS_DESCRIPTORS)
mtls-dialect=
-Target RejectNegative Joined Enum(tls_type) Var(loongarch_tls_dialect) Init(TLS_DESCRIPTORS) Save
+Target RejectNegative Joined Enum(tls_type) Var(la_opt_tls_dialect) Init(M_OPT_UNSET) Save
Specify TLS dialect.
diff --git a/gcc/config/loongarch/loongarch-def.h b/gcc/config/loongarch/loongarch-def.h
index 2dbf006d013..48d60e2b456 100644
--- a/gcc/config/loongarch/loongarch-def.h
+++ b/gcc/config/loongarch/loongarch-def.h
@@ -175,6 +175,7 @@ struct loongarch_target
int cpu_arch; /* CPU_ */
int cpu_tune; /* same */
int cmodel; /* CMODEL_ */
+ int tls_dialect; /* TLS_ */
};
/* CPU model */
@@ -188,6 +189,12 @@ enum {
N_TUNE_TYPES = 5
};
+/* TLS types. */
+enum {
+ TLS_TRADITIONAL = 0,
+ TLS_DESCRIPTORS = 1
+};
+
/* CPU model properties */
extern loongarch_def_array<const char *, N_ARCH_TYPES>
loongarch_cpu_strings;
diff --git a/gcc/config/loongarch/loongarch-driver.cc b/gcc/config/loongarch/loongarch-driver.cc
index 62658f531ad..8c4ed34698b 100644
--- a/gcc/config/loongarch/loongarch-driver.cc
+++ b/gcc/config/loongarch/loongarch-driver.cc
@@ -45,7 +45,7 @@ la_driver_init (int argc ATTRIBUTE_UNUSED, const char **argv ATTRIBUTE_UNUSED)
/* Initialize all fields of la_target. */
loongarch_init_target (&la_target, M_OPT_UNSET, M_OPT_UNSET, M_OPT_UNSET,
M_OPT_UNSET, M_OPT_UNSET, M_OPT_UNSET, M_OPT_UNSET,
- 0, 0);
+ M_OPT_UNSET, 0, 0);
return "";
}
diff --git a/gcc/config/loongarch/loongarch-opts.cc b/gcc/config/loongarch/loongarch-opts.cc
index 7eeac43ed2f..0ec55b78466 100644
--- a/gcc/config/loongarch/loongarch-opts.cc
+++ b/gcc/config/loongarch/loongarch-opts.cc
@@ -139,6 +139,7 @@ void
loongarch_init_target (struct loongarch_target *target,
int cpu_arch, int cpu_tune, int fpu, int simd,
int abi_base, int abi_ext, int cmodel,
+ int tls_dialect,
HOST_WIDE_INT isa_evolution,
HOST_WIDE_INT isa_evolution_set)
{
@@ -153,6 +154,7 @@ loongarch_init_target (struct loongarch_target *target,
target->abi.base = abi_base;
target->abi.ext = abi_ext;
target->cmodel = cmodel;
+ target->tls_dialect = tls_dialect;
}
@@ -174,7 +176,8 @@ loongarch_config_target (struct loongarch_target *target,
obstack_init (&msg_obstack);
struct {
- int arch, tune, fpu, simd, abi_base, abi_ext, cmodel, abi_flt;
+ int arch, tune, fpu, simd, abi_base, abi_ext, cmodel,
+ tls_dialect, abi_flt;
} constrained = {
M_OPT_ABSENT (target->cpu_arch) ? 0 : 1,
M_OPT_ABSENT (target->cpu_tune) ? 0 : 1,
@@ -183,6 +186,7 @@ loongarch_config_target (struct loongarch_target *target,
M_OPT_ABSENT (target->abi.base) ? 0 : 1,
M_OPT_ABSENT (target->abi.ext) ? 0 : 1,
M_OPT_ABSENT (target->cmodel) ? 0 : 1,
+ M_OPT_ABSENT (target->tls_dialect) ? 0 : 1,
M_OPT_ABSENT (target->abi.base) ? 0 : 1,
};
@@ -551,6 +555,9 @@ fallback:
gcc_unreachable ();
}
+ t.tls_dialect = constrained.tls_dialect ? target->tls_dialect
+ : DEFAULT_TLS_TYPE;
+
/* Cleanup and return. */
obstack_free (&msg_obstack, NULL);
*target = t;
diff --git a/gcc/config/loongarch/loongarch-opts.h b/gcc/config/loongarch/loongarch-opts.h
index a08ab6fac10..88e23fcee4b 100644
--- a/gcc/config/loongarch/loongarch-opts.h
+++ b/gcc/config/loongarch/loongarch-opts.h
@@ -35,6 +35,7 @@ void
loongarch_init_target (struct loongarch_target *target,
int cpu_arch, int cpu_tune, int fpu, int simd,
int abi_base, int abi_ext, int cmodel,
+ int tls_dialect,
HOST_WIDE_INT isa_evolutions,
HOST_WIDE_INT isa_evolutions_set);
@@ -83,6 +84,7 @@ struct loongarch_flags {
#define TARGET_ABI_LP64 (la_target.abi.base == ABI_BASE_LP64D \
|| la_target.abi.base == ABI_BASE_LP64F \
|| la_target.abi.base == ABI_BASE_LP64S)
+#define TARGET_TLS_DESC (la_target.tls_dialect == TLS_DESCRIPTORS)
#define ISA_HAS_LSX \
(la_target.isa.simd == ISA_EXT_SIMD_LSX \
@@ -134,10 +136,4 @@ struct loongarch_flags {
#define HAVE_AS_TLS_LE_RELAXATION 0
#endif
-/* TLS types. */
-enum loongarch_tls_type {
- TLS_TRADITIONAL,
- TLS_DESCRIPTORS
-};
-
#endif /* LOONGARCH_OPTS_H */
diff --git a/gcc/config/loongarch/loongarch.cc b/gcc/config/loongarch/loongarch.cc
index b4e43f1d037..a7b757cdb53 100644
--- a/gcc/config/loongarch/loongarch.cc
+++ b/gcc/config/loongarch/loongarch.cc
@@ -7674,7 +7674,8 @@ loongarch_option_override_internal (struct gcc_options *opts,
loongarch_init_target (&la_target,
la_opt_cpu_arch, la_opt_cpu_tune, la_opt_fpu,
la_opt_simd, la_opt_abi_base, la_opt_abi_ext,
- la_opt_cmodel, opts->x_la_isa_evolution,
+ la_opt_cmodel, la_opt_tls_dialect,
+ opts->x_la_isa_evolution,
opts_set->x_la_isa_evolution);
/* Handle target-specific options: compute defaults/conflicts etc. */
diff --git a/gcc/config/loongarch/loongarch.h b/gcc/config/loongarch/loongarch.h
index 5a7220ae504..bf2351f0968 100644
--- a/gcc/config/loongarch/loongarch.h
+++ b/gcc/config/loongarch/loongarch.h
@@ -25,14 +25,6 @@ along with GCC; see the file COPYING3. If not see
#define TARGET_SUPPORTS_WIDE_INT 1
-/* Support for configure-time default option. The rules are:
- --with-tls is ignored if -mtls-dialect is specified. */
-#define OPTION_DEFAULT_SPECS \
- {"tls", "%{!mtls-dialect=*:-mtls-dialect=%(VALUE)}"}, \
-
-/* Check TLS Descriptors mechanism is selected. */
-#define TARGET_TLS_DESC (loongarch_tls_dialect == TLS_DESCRIPTORS)
-
/* Macros to silence warnings about numbers being signed in traditional
C and unsigned in ISO C when compiled on 32-bit hosts. */
diff --git a/gcc/config/loongarch/loongarch.opt b/gcc/config/loongarch/loongarch.opt
index 04846ae86c0..1c54ab6ae43 100644
--- a/gcc/config/loongarch/loongarch.opt
+++ b/gcc/config/loongarch/loongarch.opt
@@ -272,7 +272,7 @@ TargetVariable
HOST_WIDE_INT la_isa_evolution = 0
Enum
-Name(tls_type) Type(enum loongarch_tls_type)
+Name(tls_type) Type(int)
The possible TLS dialects:
EnumValue
@@ -282,7 +282,7 @@ EnumValue
Enum(tls_type) String(desc) Value(TLS_DESCRIPTORS)
mtls-dialect=
-Target RejectNegative Joined Enum(tls_type) Var(loongarch_tls_dialect) Init(TLS_DESCRIPTORS) Save
+Target RejectNegative Joined Enum(tls_type) Var(la_opt_tls_dialect) Init(M_OPT_UNSET) Save
Specify TLS dialect.
mfrecipe
