* [PATCH 1/1] LoongArch: Fix ptr mangling/demangling features.
@ 2022-08-18 2:19 caiyinyu
2022-08-21 13:29 ` Xi Ruoyao
0 siblings, 1 reply; 6+ messages in thread
From: caiyinyu @ 2022-08-18 2:19 UTC (permalink / raw)
To: adhemerval.zanella, libc-alpha, i.swmail
Cc: joseph_myers, carlos, xuchenghua, caiyinyu
Tested on LoongArch machine: gcc 13.0.0, Linux kernel 5.19.0 rc2,
binutils branch master 2eb132bdfb9.
This patch is ok with gcc 12.0.1, Linux kernel 5.19.0 rc5, binutils
2.39.
---
sysdeps/loongarch/__longjmp.S | 2 +-
sysdeps/loongarch/setjmp.S | 2 +-
sysdeps/unix/sysv/linux/loongarch/sysdep.h | 33 +++++++++++-----------
3 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/sysdeps/loongarch/__longjmp.S b/sysdeps/loongarch/__longjmp.S
index c2c5b56a80..4207376f5e 100644
--- a/sysdeps/loongarch/__longjmp.S
+++ b/sysdeps/loongarch/__longjmp.S
@@ -22,7 +22,7 @@
ENTRY (__longjmp)
#ifdef PTR_MANGLE
REG_L t0, a0, 0*SZREG
- PTR_DEMANGLE (ra, t0, t1, t2)
+ PTR_DEMANGLE (ra, t0, t1)
REG_L t0, a0, 1*SZREG
PTR_DEMANGLE2 (sp, t0, t1)
#else
diff --git a/sysdeps/loongarch/setjmp.S b/sysdeps/loongarch/setjmp.S
index ec4ddc72da..298bb02a82 100644
--- a/sysdeps/loongarch/setjmp.S
+++ b/sysdeps/loongarch/setjmp.S
@@ -30,7 +30,7 @@ END (setjmp)
ENTRY (__sigsetjmp)
#ifdef PTR_MANGLE
- PTR_MANGLE (t0, ra, t1, t2)
+ PTR_MANGLE (t0, ra, t1)
REG_S t0, a0, 0*SZREG
PTR_MANGLE2 (t0, sp, t1)
REG_S t0, a0, 1*SZREG
diff --git a/sysdeps/unix/sysv/linux/loongarch/sysdep.h b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
index 157cbd6c6b..f4a1d23a97 100644
--- a/sysdeps/unix/sysv/linux/loongarch/sysdep.h
+++ b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
@@ -316,29 +316,28 @@ extern long int __syscall_error (long int neg_errno);
/* Pointer mangling is supported for LoongArch. */
-/* Load or store to/from a got-relative EXPR into/from G, using T.
+/* Load a got-relative EXPR into G, using T.
Note G and T are register names. */
-#define LDST_GLOBAL(OP, G, T, EXPR) \
- pcalau12i T, %got_pc_hi20(EXPR); \
- OP T, T, %got_pc_lo12(EXPR); \
- OP G, T, 0;
+#define LD_GLOBAL(G, EXPR) \
+ la.global G, EXPR; \
+ REG_L G, G, 0;
-/* Load or store to/from a pc-relative EXPR into/from G, using T.
+/* Load a pc-relative EXPR into G, using T.
Note G and T are register names. */
-#define LDST_PCREL(OP, G, T, EXPR) \
- pcalau12i T, %pc_hi20(EXPR); \
- OP G, T, %pc_lo12(EXPR);
+#define LD_PCREL(G, EXPR) \
+ la.pcrel G, EXPR; \
+ REG_L G, G, 0;
#if (IS_IN (rtld) \
|| (!defined SHARED && (IS_IN (libc) \
|| IS_IN (libpthread))))
#ifdef __ASSEMBLER__
-#define PTR_MANGLE(dst, src, guard, tmp) \
- LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \
+#define PTR_MANGLE(dst, src, guard) \
+ LD_PCREL (guard, __pointer_chk_guard_local); \
PTR_MANGLE2 (dst, src, guard);
-#define PTR_DEMANGLE(dst, src, guard, tmp) \
- LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \
+#define PTR_DEMANGLE(dst, src, guard) \
+ LD_PCREL (guard, __pointer_chk_guard_local); \
PTR_DEMANGLE2 (dst, src, guard);
/* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
#define PTR_MANGLE2(dst, src, guard) \
@@ -355,11 +354,11 @@ extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
#else
#ifdef __ASSEMBLER__
-#define PTR_MANGLE(dst, src, guard, tmp) \
- LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \
+#define PTR_MANGLE(dst, src, guard) \
+ LD_GLOBAL (guard, __pointer_chk_guard); \
PTR_MANGLE2 (dst, src, guard);
-#define PTR_DEMANGLE(dst, src, guard, tmp) \
- LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \
+#define PTR_DEMANGLE(dst, src, guard) \
+ LD_GLOBAL (guard, __pointer_chk_guard); \
PTR_DEMANGLE2 (dst, src, guard);
/* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
#define PTR_MANGLE2(dst, src, guard) \
--
2.31.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] LoongArch: Fix ptr mangling/demangling features.
2022-08-18 2:19 [PATCH 1/1] LoongArch: Fix ptr mangling/demangling features caiyinyu
@ 2022-08-21 13:29 ` Xi Ruoyao
2022-08-23 12:31 ` caiyinyu
0 siblings, 1 reply; 6+ messages in thread
From: Xi Ruoyao @ 2022-08-21 13:29 UTC (permalink / raw)
To: caiyinyu, adhemerval.zanella, libc-alpha, i.swmail
Cc: xuchenghua, joseph_myers
On Thu, 2022-08-18 at 10:19 +0800, caiyinyu wrote:
> -/* Load or store to/from a pc-relative EXPR into/from G, using T.
> +/* Load a pc-relative EXPR into G, using T.
> Note G and T are register names. */
> -#define LDST_PCREL(OP, G, T, EXPR) \
> - pcalau12i T, %pc_hi20(EXPR); \
> - OP G, T, %pc_lo12(EXPR);
> +#define LD_PCREL(G, EXPR) \
> + la.pcrel G, EXPR; \
> + REG_L G, G, 0;
I'd write
#if HAVE_LOONGARCH_EXPLICIT_RELOCS
# define LDST_PCREL(OP, G, T, EXPR) \
pcalau12i T, %pc_hi20(EXPR); \
OP G, T, %pc_lo12(EXPR);
#else
# define LD_PCREL(G, EXPR) \
la.pcrel G, EXPR; \
REG_L G, G, 0;
#endif
And in configure.ac:
AC_CACHE_CHECK(whether explicit relocs can be used,
libc_cv_loongarch_explicit_relocs, [dnl
cat > conftest.s << EOF
x: pcalau12i $t0, %pc_hi20(x)
EOF
libc_cv_loongarch_explicit_relocs=no
if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&AS_MESSAGE_LOG_FD); then
libc_cv_loongarch_explicit_relocs=yes
fi
rm -f conftest*])
if test $libc_cv_loongarch_explicit_relocs = yes; then
AC_DEFINE(HAVE_LOONGARCH_EXPLICIT_RELOCS)
fi
This is a micro optimization but two instructions is smaller than 3
instructions anyway :).
--
Xi Ruoyao <xry111@xry111.site>
School of Aerospace Science and Technology, Xidian University
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] LoongArch: Fix ptr mangling/demangling features.
2022-08-21 13:29 ` Xi Ruoyao
@ 2022-08-23 12:31 ` caiyinyu
0 siblings, 0 replies; 6+ messages in thread
From: caiyinyu @ 2022-08-23 12:31 UTC (permalink / raw)
To: Xi Ruoyao, adhemerval.zanella, libc-alpha, i.swmail
Cc: xuchenghua, joseph_myers
I have sent new patches and I made some changes to prevent
build errors.
https://sourceware.org/pipermail/libc-alpha/2022-August/141588.html
在 2022/8/21 下午9:29, Xi Ruoyao 写道:
> On Thu, 2022-08-18 at 10:19 +0800, caiyinyu wrote:
>> -/* Load or store to/from a pc-relative EXPR into/from G, using T.
>> +/* Load a pc-relative EXPR into G, using T.
>> Note G and T are register names. */
>> -#define LDST_PCREL(OP, G, T, EXPR) \
>> - pcalau12i T, %pc_hi20(EXPR); \
>> - OP G, T, %pc_lo12(EXPR);
>> +#define LD_PCREL(G, EXPR) \
>> + la.pcrel G, EXPR; \
>> + REG_L G, G, 0;
> I'd write
>
> #if HAVE_LOONGARCH_EXPLICIT_RELOCS
> # define LDST_PCREL(OP, G, T, EXPR) \
> pcalau12i T, %pc_hi20(EXPR); \
> OP G, T, %pc_lo12(EXPR);
> #else
> # define LD_PCREL(G, EXPR) \
> la.pcrel G, EXPR; \
> REG_L G, G, 0;
> #endif
>
> And in configure.ac:
>
> AC_CACHE_CHECK(whether explicit relocs can be used,
> libc_cv_loongarch_explicit_relocs, [dnl
> cat > conftest.s << EOF
> x: pcalau12i $t0, %pc_hi20(x)
> EOF
> libc_cv_loongarch_explicit_relocs=no
> if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&AS_MESSAGE_LOG_FD); then
> libc_cv_loongarch_explicit_relocs=yes
> fi
> rm -f conftest*])
> if test $libc_cv_loongarch_explicit_relocs = yes; then
> AC_DEFINE(HAVE_LOONGARCH_EXPLICIT_RELOCS)
> fi
>
> This is a micro optimization but two instructions is smaller than 3
> instructions anyway :).
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/1] LoongArch: Fix ptr mangling/demangling features.
@ 2022-08-26 8:03 caiyinyu
2022-08-29 7:08 ` Xi Ruoyao
0 siblings, 1 reply; 6+ messages in thread
From: caiyinyu @ 2022-08-26 8:03 UTC (permalink / raw)
To: adhemerval.zanella, libc-alpha, joseph_myers, carlos, i.swmail, xry111
Cc: xuchenghua, caiyinyu
Co-authored-by: Xi Ruoyao <xry111@xry111.site>
---
config.h.in | 3 ++
sysdeps/loongarch/__longjmp.S | 2 +-
sysdeps/loongarch/configure | 26 ++++++++++++++
sysdeps/loongarch/configure.ac | 14 ++++++++
sysdeps/loongarch/setjmp.S | 2 +-
sysdeps/unix/sysv/linux/loongarch/sysdep.h | 40 +++++++++++++---------
6 files changed, 68 insertions(+), 19 deletions(-)
diff --git a/config.h.in b/config.h.in
index 43d32518ab..b182de0e91 100644
--- a/config.h.in
+++ b/config.h.in
@@ -138,6 +138,9 @@
/* LOONGARCH floating-point ABI for ld.so. */
#undef LOONGARCH_ABI_FRLEN
+/* To Indicate whether we can use explicit relocs or not. */
+#undef HAVE_LOONGARCH_EXPLICIT_RELOCS
+
/* Linux specific: minimum supported kernel version. */
#undef __LINUX_KERNEL_VERSION
diff --git a/sysdeps/loongarch/__longjmp.S b/sysdeps/loongarch/__longjmp.S
index c2c5b56a80..4207376f5e 100644
--- a/sysdeps/loongarch/__longjmp.S
+++ b/sysdeps/loongarch/__longjmp.S
@@ -22,7 +22,7 @@
ENTRY (__longjmp)
#ifdef PTR_MANGLE
REG_L t0, a0, 0*SZREG
- PTR_DEMANGLE (ra, t0, t1, t2)
+ PTR_DEMANGLE (ra, t0, t1)
REG_L t0, a0, 1*SZREG
PTR_DEMANGLE2 (sp, t0, t1)
#else
diff --git a/sysdeps/loongarch/configure b/sysdeps/loongarch/configure
index 43b54d4965..54385786d2 100644
--- a/sysdeps/loongarch/configure
+++ b/sysdeps/loongarch/configure
@@ -3,3 +3,29 @@
$as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether explicit relocs can be used" >&5
+$as_echo_n "checking whether explicit relocs can be used... " >&6; }
+if ${libc_cv_loongarch_explicit_relocs+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat > conftest.s << EOF
+x: pcalau12i \$t0, %pc_hi20(x)
+EOF
+libc_cv_loongarch_explicit_relocs=no
+if { ac_try='${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ libc_cv_loongarch_explicit_relocs=yes
+fi
+rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_loongarch_explicit_relocs" >&5
+$as_echo "$libc_cv_loongarch_explicit_relocs" >&6; }
+if test $libc_cv_loongarch_explicit_relocs = yes; then
+ $as_echo "#define HAVE_LOONGARCH_EXPLICIT_RELOCS 1" >>confdefs.h
+
+fi
diff --git a/sysdeps/loongarch/configure.ac b/sysdeps/loongarch/configure.ac
index f744367bf3..c5d3cb5ead 100644
--- a/sysdeps/loongarch/configure.ac
+++ b/sysdeps/loongarch/configure.ac
@@ -4,3 +4,17 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
dnl It is always possible to access static and hidden symbols in an
dnl position independent way.
AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC)
+
+AC_CACHE_CHECK(whether explicit relocs can be used,
+ libc_cv_loongarch_explicit_relocs, [dnl
+cat > conftest.s << EOF
+x: pcalau12i \$t0, %pc_hi20(x)
+EOF
+libc_cv_loongarch_explicit_relocs=no
+if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&AS_MESSAGE_LOG_FD); then
+ libc_cv_loongarch_explicit_relocs=yes
+fi
+rm -f conftest*])
+if test $libc_cv_loongarch_explicit_relocs = yes; then
+ AC_DEFINE(HAVE_LOONGARCH_EXPLICIT_RELOCS)
+fi
diff --git a/sysdeps/loongarch/setjmp.S b/sysdeps/loongarch/setjmp.S
index ec4ddc72da..298bb02a82 100644
--- a/sysdeps/loongarch/setjmp.S
+++ b/sysdeps/loongarch/setjmp.S
@@ -30,7 +30,7 @@ END (setjmp)
ENTRY (__sigsetjmp)
#ifdef PTR_MANGLE
- PTR_MANGLE (t0, ra, t1, t2)
+ PTR_MANGLE (t0, ra, t1)
REG_S t0, a0, 0*SZREG
PTR_MANGLE2 (t0, sp, t1)
REG_S t0, a0, 1*SZREG
diff --git a/sysdeps/unix/sysv/linux/loongarch/sysdep.h b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
index 157cbd6c6b..0a8773c38d 100644
--- a/sysdeps/unix/sysv/linux/loongarch/sysdep.h
+++ b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
@@ -316,29 +316,35 @@ extern long int __syscall_error (long int neg_errno);
/* Pointer mangling is supported for LoongArch. */
-/* Load or store to/from a got-relative EXPR into/from G, using T.
+/* Load a got-relative EXPR into G, using T.
Note G and T are register names. */
-#define LDST_GLOBAL(OP, G, T, EXPR) \
- pcalau12i T, %got_pc_hi20(EXPR); \
- OP T, T, %got_pc_lo12(EXPR); \
- OP G, T, 0;
+#define LD_GLOBAL(G, EXPR) \
+ la.global G, EXPR; \
+ REG_L G, G, 0;
-/* Load or store to/from a pc-relative EXPR into/from G, using T.
+/* Load a pc-relative EXPR into G, using T.
Note G and T are register names. */
-#define LDST_PCREL(OP, G, T, EXPR) \
- pcalau12i T, %pc_hi20(EXPR); \
- OP G, T, %pc_lo12(EXPR);
+
+#ifdef HAVE_LOONGARCH_EXPLICIT_RELOCS
+#define LD_PCREL(G, EXPR) \
+ pcalau12i G, %pc_hi20(EXPR); \
+ REG_L G, G, %pc_lo12(EXPR);
+#else
+#define LD_PCREL(G, EXPR) \
+ la.pcrel G, EXPR; \
+ REG_L G, G, 0;
+#endif
#if (IS_IN (rtld) \
|| (!defined SHARED && (IS_IN (libc) \
|| IS_IN (libpthread))))
#ifdef __ASSEMBLER__
-#define PTR_MANGLE(dst, src, guard, tmp) \
- LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \
+#define PTR_MANGLE(dst, src, guard) \
+ LD_PCREL (guard, __pointer_chk_guard_local); \
PTR_MANGLE2 (dst, src, guard);
-#define PTR_DEMANGLE(dst, src, guard, tmp) \
- LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \
+#define PTR_DEMANGLE(dst, src, guard) \
+ LD_PCREL (guard, __pointer_chk_guard_local); \
PTR_DEMANGLE2 (dst, src, guard);
/* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
#define PTR_MANGLE2(dst, src, guard) \
@@ -355,11 +361,11 @@ extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
#else
#ifdef __ASSEMBLER__
-#define PTR_MANGLE(dst, src, guard, tmp) \
- LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \
+#define PTR_MANGLE(dst, src, guard) \
+ LD_GLOBAL (guard, __pointer_chk_guard); \
PTR_MANGLE2 (dst, src, guard);
-#define PTR_DEMANGLE(dst, src, guard, tmp) \
- LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \
+#define PTR_DEMANGLE(dst, src, guard) \
+ LD_GLOBAL (guard, __pointer_chk_guard); \
PTR_DEMANGLE2 (dst, src, guard);
/* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
#define PTR_MANGLE2(dst, src, guard) \
--
2.31.1
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] LoongArch: Fix ptr mangling/demangling features.
2022-08-26 8:03 caiyinyu
@ 2022-08-29 7:08 ` Xi Ruoyao
2022-08-29 12:41 ` Adhemerval Zanella Netto
0 siblings, 1 reply; 6+ messages in thread
From: Xi Ruoyao @ 2022-08-29 7:08 UTC (permalink / raw)
To: caiyinyu, adhemerval.zanella, libc-alpha, joseph_myers, carlos, i.swmail
Cc: xuchenghua
I'm OK with either this or the simplified version w/o ac check.
Not sure about Glibc policy about committing a change (does a port
maintainer needs approval to commit a change within this port?)
On Fri, 2022-08-26 at 16:03 +0800, caiyinyu wrote:
> Co-authored-by: Xi Ruoyao <xry111@xry111.site>
> ---
> config.h.in | 3 ++
> sysdeps/loongarch/__longjmp.S | 2 +-
> sysdeps/loongarch/configure | 26 ++++++++++++++
> sysdeps/loongarch/configure.ac | 14 ++++++++
> sysdeps/loongarch/setjmp.S | 2 +-
> sysdeps/unix/sysv/linux/loongarch/sysdep.h | 40 +++++++++++++--------
> -
> 6 files changed, 68 insertions(+), 19 deletions(-)
>
> diff --git a/config.h.in b/config.h.in
> index 43d32518ab..b182de0e91 100644
> --- a/config.h.in
> +++ b/config.h.in
> @@ -138,6 +138,9 @@
> /* LOONGARCH floating-point ABI for ld.so. */
> #undef LOONGARCH_ABI_FRLEN
>
> +/* To Indicate whether we can use explicit relocs or not. */
> +#undef HAVE_LOONGARCH_EXPLICIT_RELOCS
> +
> /* Linux specific: minimum supported kernel version. */
> #undef __LINUX_KERNEL_VERSION
>
> diff --git a/sysdeps/loongarch/__longjmp.S
> b/sysdeps/loongarch/__longjmp.S
> index c2c5b56a80..4207376f5e 100644
> --- a/sysdeps/loongarch/__longjmp.S
> +++ b/sysdeps/loongarch/__longjmp.S
> @@ -22,7 +22,7 @@
> ENTRY (__longjmp)
> #ifdef PTR_MANGLE
> REG_L t0, a0, 0*SZREG
> - PTR_DEMANGLE (ra, t0, t1, t2)
> + PTR_DEMANGLE (ra, t0, t1)
> REG_L t0, a0, 1*SZREG
> PTR_DEMANGLE2 (sp, t0, t1)
> #else
> diff --git a/sysdeps/loongarch/configure b/sysdeps/loongarch/configure
> index 43b54d4965..54385786d2 100644
> --- a/sysdeps/loongarch/configure
> +++ b/sysdeps/loongarch/configure
> @@ -3,3 +3,29 @@
>
> $as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h
>
> +
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether explicit
> relocs can be used" >&5
> +$as_echo_n "checking whether explicit relocs can be used... " >&6; }
> +if ${libc_cv_loongarch_explicit_relocs+:} false; then :
> + $as_echo_n "(cached) " >&6
> +else
> + cat > conftest.s << EOF
> +x: pcalau12i \$t0, %pc_hi20(x)
> +EOF
> +libc_cv_loongarch_explicit_relocs=no
> +if { ac_try='${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&5'
> + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; }
> >&5
> + (eval $ac_try) 2>&5
> + ac_status=$?
> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
> + test $ac_status = 0; }; }; then
> + libc_cv_loongarch_explicit_relocs=yes
> +fi
> +rm -f conftest*
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
> $libc_cv_loongarch_explicit_relocs" >&5
> +$as_echo "$libc_cv_loongarch_explicit_relocs" >&6; }
> +if test $libc_cv_loongarch_explicit_relocs = yes; then
> + $as_echo "#define HAVE_LOONGARCH_EXPLICIT_RELOCS 1" >>confdefs.h
> +
> +fi
> diff --git a/sysdeps/loongarch/configure.ac
> b/sysdeps/loongarch/configure.ac
> index f744367bf3..c5d3cb5ead 100644
> --- a/sysdeps/loongarch/configure.ac
> +++ b/sysdeps/loongarch/configure.ac
> @@ -4,3 +4,17 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level
> source directory.
> dnl It is always possible to access static and hidden symbols in an
> dnl position independent way.
> AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC)
> +
> +AC_CACHE_CHECK(whether explicit relocs can be used,
> + libc_cv_loongarch_explicit_relocs, [dnl
> +cat > conftest.s << EOF
> +x: pcalau12i \$t0, %pc_hi20(x)
> +EOF
> +libc_cv_loongarch_explicit_relocs=no
> +if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s -o conftest.o
> 1>&AS_MESSAGE_LOG_FD); then
> + libc_cv_loongarch_explicit_relocs=yes
> +fi
> +rm -f conftest*])
> +if test $libc_cv_loongarch_explicit_relocs = yes; then
> + AC_DEFINE(HAVE_LOONGARCH_EXPLICIT_RELOCS)
> +fi
> diff --git a/sysdeps/loongarch/setjmp.S b/sysdeps/loongarch/setjmp.S
> index ec4ddc72da..298bb02a82 100644
> --- a/sysdeps/loongarch/setjmp.S
> +++ b/sysdeps/loongarch/setjmp.S
> @@ -30,7 +30,7 @@ END (setjmp)
>
> ENTRY (__sigsetjmp)
> #ifdef PTR_MANGLE
> - PTR_MANGLE (t0, ra, t1, t2)
> + PTR_MANGLE (t0, ra, t1)
> REG_S t0, a0, 0*SZREG
> PTR_MANGLE2 (t0, sp, t1)
> REG_S t0, a0, 1*SZREG
> diff --git a/sysdeps/unix/sysv/linux/loongarch/sysdep.h
> b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
> index 157cbd6c6b..0a8773c38d 100644
> --- a/sysdeps/unix/sysv/linux/loongarch/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
> @@ -316,29 +316,35 @@ extern long int __syscall_error (long int
> neg_errno);
>
> /* Pointer mangling is supported for LoongArch. */
>
> -/* Load or store to/from a got-relative EXPR into/from G, using T.
> +/* Load a got-relative EXPR into G, using T.
> Note G and T are register names. */
> -#define LDST_GLOBAL(OP, G, T, EXPR) \
> - pcalau12i T, %got_pc_hi20(EXPR); \
> - OP T, T, %got_pc_lo12(EXPR); \
> - OP G, T, 0;
> +#define LD_GLOBAL(G, EXPR) \
> + la.global G, EXPR; \
> + REG_L G, G, 0;
>
> -/* Load or store to/from a pc-relative EXPR into/from G, using T.
> +/* Load a pc-relative EXPR into G, using T.
> Note G and T are register names. */
> -#define LDST_PCREL(OP, G, T, EXPR) \
> - pcalau12i T, %pc_hi20(EXPR); \
> - OP G, T, %pc_lo12(EXPR);
> +
> +#ifdef HAVE_LOONGARCH_EXPLICIT_RELOCS
> +#define LD_PCREL(G, EXPR) \
> + pcalau12i G, %pc_hi20(EXPR); \
> + REG_L G, G, %pc_lo12(EXPR);
> +#else
> +#define LD_PCREL(G, EXPR) \
> + la.pcrel G, EXPR; \
> + REG_L G, G, 0;
> +#endif
>
> #if (IS_IN (rtld) \
> || (!defined SHARED && (IS_IN (libc) \
> || IS_IN (libpthread))))
>
> #ifdef __ASSEMBLER__
> -#define PTR_MANGLE(dst, src, guard, tmp) \
> - LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \
> +#define PTR_MANGLE(dst, src, guard) \
> + LD_PCREL (guard, __pointer_chk_guard_local); \
> PTR_MANGLE2 (dst, src, guard);
> -#define PTR_DEMANGLE(dst, src, guard, tmp) \
> - LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \
> +#define PTR_DEMANGLE(dst, src, guard) \
> + LD_PCREL (guard, __pointer_chk_guard_local); \
> PTR_DEMANGLE2 (dst, src, guard);
> /* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
> #define PTR_MANGLE2(dst, src, guard) \
> @@ -355,11 +361,11 @@ extern uintptr_t __pointer_chk_guard_local
> attribute_relro attribute_hidden;
> #else
>
> #ifdef __ASSEMBLER__
> -#define PTR_MANGLE(dst, src, guard, tmp) \
> - LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \
> +#define PTR_MANGLE(dst, src, guard) \
> + LD_GLOBAL (guard, __pointer_chk_guard); \
> PTR_MANGLE2 (dst, src, guard);
> -#define PTR_DEMANGLE(dst, src, guard, tmp) \
> - LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \
> +#define PTR_DEMANGLE(dst, src, guard) \
> + LD_GLOBAL (guard, __pointer_chk_guard); \
> PTR_DEMANGLE2 (dst, src, guard);
> /* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
> #define PTR_MANGLE2(dst, src, guard) \
--
Xi Ruoyao <xry111@xry111.site>
School of Aerospace Science and Technology, Xidian University
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/1] LoongArch: Fix ptr mangling/demangling features.
2022-08-29 7:08 ` Xi Ruoyao
@ 2022-08-29 12:41 ` Adhemerval Zanella Netto
0 siblings, 0 replies; 6+ messages in thread
From: Adhemerval Zanella Netto @ 2022-08-29 12:41 UTC (permalink / raw)
To: Xi Ruoyao, caiyinyu, libc-alpha, joseph_myers, carlos, i.swmail
Cc: xuchenghua
On 29/08/22 04:08, Xi Ruoyao wrote:
> I'm OK with either this or the simplified version w/o ac check.
>
> Not sure about Glibc policy about committing a change (does a port
> maintainer needs approval to commit a change within this port?)
Afaik as long the arch-maintainer is ok with the change and there is
no blocker it should be ok to push. I stil prefer to just use la.pcrel,
since it way simpler and I am really sceptical that using pcalau12i will
yield any real performance difference, but it is not a blocker from my
part.
>
> On Fri, 2022-08-26 at 16:03 +0800, caiyinyu wrote:
>> Co-authored-by: Xi Ruoyao <xry111@xry111.site>
>> ---
>> config.h.in | 3 ++
>> sysdeps/loongarch/__longjmp.S | 2 +-
>> sysdeps/loongarch/configure | 26 ++++++++++++++
>> sysdeps/loongarch/configure.ac | 14 ++++++++
>> sysdeps/loongarch/setjmp.S | 2 +-
>> sysdeps/unix/sysv/linux/loongarch/sysdep.h | 40 +++++++++++++--------
>> -
>> 6 files changed, 68 insertions(+), 19 deletions(-)
>>
>> diff --git a/config.h.in b/config.h.in
>> index 43d32518ab..b182de0e91 100644
>> --- a/config.h.in
>> +++ b/config.h.in
>> @@ -138,6 +138,9 @@
>> /* LOONGARCH floating-point ABI for ld.so. */
>> #undef LOONGARCH_ABI_FRLEN
>>
>> +/* To Indicate whether we can use explicit relocs or not. */
>> +#undef HAVE_LOONGARCH_EXPLICIT_RELOCS
>> +
>> /* Linux specific: minimum supported kernel version. */
>> #undef __LINUX_KERNEL_VERSION
>>
>> diff --git a/sysdeps/loongarch/__longjmp.S
>> b/sysdeps/loongarch/__longjmp.S
>> index c2c5b56a80..4207376f5e 100644
>> --- a/sysdeps/loongarch/__longjmp.S
>> +++ b/sysdeps/loongarch/__longjmp.S
>> @@ -22,7 +22,7 @@
>> ENTRY (__longjmp)
>> #ifdef PTR_MANGLE
>> REG_L t0, a0, 0*SZREG
>> - PTR_DEMANGLE (ra, t0, t1, t2)
>> + PTR_DEMANGLE (ra, t0, t1)
>> REG_L t0, a0, 1*SZREG
>> PTR_DEMANGLE2 (sp, t0, t1)
>> #else
>> diff --git a/sysdeps/loongarch/configure b/sysdeps/loongarch/configure
>> index 43b54d4965..54385786d2 100644
>> --- a/sysdeps/loongarch/configure
>> +++ b/sysdeps/loongarch/configure
>> @@ -3,3 +3,29 @@
>>
>> $as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h
>>
>> +
>> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether explicit
>> relocs can be used" >&5
>> +$as_echo_n "checking whether explicit relocs can be used... " >&6; }
>> +if ${libc_cv_loongarch_explicit_relocs+:} false; then :
>> + $as_echo_n "(cached) " >&6
>> +else
>> + cat > conftest.s << EOF
>> +x: pcalau12i \$t0, %pc_hi20(x)
>> +EOF
>> +libc_cv_loongarch_explicit_relocs=no
>> +if { ac_try='${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&5'
>> + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; }
>>> &5
>> + (eval $ac_try) 2>&5
>> + ac_status=$?
>> + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
>> + test $ac_status = 0; }; }; then
>> + libc_cv_loongarch_explicit_relocs=yes
>> +fi
>> +rm -f conftest*
>> +fi
>> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
>> $libc_cv_loongarch_explicit_relocs" >&5
>> +$as_echo "$libc_cv_loongarch_explicit_relocs" >&6; }
>> +if test $libc_cv_loongarch_explicit_relocs = yes; then
>> + $as_echo "#define HAVE_LOONGARCH_EXPLICIT_RELOCS 1" >>confdefs.h
>> +
>> +fi
>> diff --git a/sysdeps/loongarch/configure.ac
>> b/sysdeps/loongarch/configure.ac
>> index f744367bf3..c5d3cb5ead 100644
>> --- a/sysdeps/loongarch/configure.ac
>> +++ b/sysdeps/loongarch/configure.ac
>> @@ -4,3 +4,17 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level
>> source directory.
>> dnl It is always possible to access static and hidden symbols in an
>> dnl position independent way.
>> AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC)
>> +
>> +AC_CACHE_CHECK(whether explicit relocs can be used,
>> + libc_cv_loongarch_explicit_relocs, [dnl
>> +cat > conftest.s << EOF
>> +x: pcalau12i \$t0, %pc_hi20(x)
>> +EOF
>> +libc_cv_loongarch_explicit_relocs=no
>> +if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s -o conftest.o
>> 1>&AS_MESSAGE_LOG_FD); then
>> + libc_cv_loongarch_explicit_relocs=yes
>> +fi
>> +rm -f conftest*])
>> +if test $libc_cv_loongarch_explicit_relocs = yes; then
>> + AC_DEFINE(HAVE_LOONGARCH_EXPLICIT_RELOCS)
>> +fi
>> diff --git a/sysdeps/loongarch/setjmp.S b/sysdeps/loongarch/setjmp.S
>> index ec4ddc72da..298bb02a82 100644
>> --- a/sysdeps/loongarch/setjmp.S
>> +++ b/sysdeps/loongarch/setjmp.S
>> @@ -30,7 +30,7 @@ END (setjmp)
>>
>> ENTRY (__sigsetjmp)
>> #ifdef PTR_MANGLE
>> - PTR_MANGLE (t0, ra, t1, t2)
>> + PTR_MANGLE (t0, ra, t1)
>> REG_S t0, a0, 0*SZREG
>> PTR_MANGLE2 (t0, sp, t1)
>> REG_S t0, a0, 1*SZREG
>> diff --git a/sysdeps/unix/sysv/linux/loongarch/sysdep.h
>> b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
>> index 157cbd6c6b..0a8773c38d 100644
>> --- a/sysdeps/unix/sysv/linux/loongarch/sysdep.h
>> +++ b/sysdeps/unix/sysv/linux/loongarch/sysdep.h
>> @@ -316,29 +316,35 @@ extern long int __syscall_error (long int
>> neg_errno);
>>
>> /* Pointer mangling is supported for LoongArch. */
>>
>> -/* Load or store to/from a got-relative EXPR into/from G, using T.
>> +/* Load a got-relative EXPR into G, using T.
>> Note G and T are register names. */
>> -#define LDST_GLOBAL(OP, G, T, EXPR) \
>> - pcalau12i T, %got_pc_hi20(EXPR); \
>> - OP T, T, %got_pc_lo12(EXPR); \
>> - OP G, T, 0;
>> +#define LD_GLOBAL(G, EXPR) \
>> + la.global G, EXPR; \
>> + REG_L G, G, 0;
>>
>> -/* Load or store to/from a pc-relative EXPR into/from G, using T.
>> +/* Load a pc-relative EXPR into G, using T.
>> Note G and T are register names. */
>> -#define LDST_PCREL(OP, G, T, EXPR) \
>> - pcalau12i T, %pc_hi20(EXPR); \
>> - OP G, T, %pc_lo12(EXPR);
>> +
>> +#ifdef HAVE_LOONGARCH_EXPLICIT_RELOCS
>> +#define LD_PCREL(G, EXPR) \
>> + pcalau12i G, %pc_hi20(EXPR); \
>> + REG_L G, G, %pc_lo12(EXPR);
>> +#else
>> +#define LD_PCREL(G, EXPR) \
>> + la.pcrel G, EXPR; \
>> + REG_L G, G, 0;
>> +#endif
>>
>> #if (IS_IN (rtld) \
>> || (!defined SHARED && (IS_IN (libc) \
>> || IS_IN (libpthread))))
>>
>> #ifdef __ASSEMBLER__
>> -#define PTR_MANGLE(dst, src, guard, tmp) \
>> - LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \
>> +#define PTR_MANGLE(dst, src, guard) \
>> + LD_PCREL (guard, __pointer_chk_guard_local); \
>> PTR_MANGLE2 (dst, src, guard);
>> -#define PTR_DEMANGLE(dst, src, guard, tmp) \
>> - LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \
>> +#define PTR_DEMANGLE(dst, src, guard) \
>> + LD_PCREL (guard, __pointer_chk_guard_local); \
>> PTR_DEMANGLE2 (dst, src, guard);
>> /* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
>> #define PTR_MANGLE2(dst, src, guard) \
>> @@ -355,11 +361,11 @@ extern uintptr_t __pointer_chk_guard_local
>> attribute_relro attribute_hidden;
>> #else
>>
>> #ifdef __ASSEMBLER__
>> -#define PTR_MANGLE(dst, src, guard, tmp) \
>> - LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \
>> +#define PTR_MANGLE(dst, src, guard) \
>> + LD_GLOBAL (guard, __pointer_chk_guard); \
>> PTR_MANGLE2 (dst, src, guard);
>> -#define PTR_DEMANGLE(dst, src, guard, tmp) \
>> - LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \
>> +#define PTR_DEMANGLE(dst, src, guard) \
>> + LD_GLOBAL (guard, __pointer_chk_guard); \
>> PTR_DEMANGLE2 (dst, src, guard);
>> /* Use PTR_MANGLE2 for efficiency if guard is already loaded. */
>> #define PTR_MANGLE2(dst, src, guard) \
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-08-29 12:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-18 2:19 [PATCH 1/1] LoongArch: Fix ptr mangling/demangling features caiyinyu
2022-08-21 13:29 ` Xi Ruoyao
2022-08-23 12:31 ` caiyinyu
2022-08-26 8:03 caiyinyu
2022-08-29 7:08 ` Xi Ruoyao
2022-08-29 12:41 ` Adhemerval Zanella Netto
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).