Skip to content

R
riscv-gcc-1
Commit 89762a83 by Daniel Santos Committed by Daniel Santos
Options

PR target/82196 addendum: Fix Darwin build breakage and test FAILS on Solaris 

gcc/testsuite:
	* gcc.target/i386/pr82196-1.c: (b): Remove volatile asm.
	* gcc.target/i386/pr82196-2.c: (b): Likewise.

libgcc:
	* configure.ac: Add Check for HAVE_AS_AVX.
	* config.in: Regenerate.
	* configure: Likewise.
	* config/i386/i386-asm.h: Include auto-target.h from libgcc.
	(SSE_SAVE, SSE_RESTORE): Emit .byte sequence for !HAVE_AS_AVX.
	Correct out-of-date comments.

From-SVN: r253116
parent 099666b3
Showing with 114 additions and 14 deletions
gcc/testsuite/ChangeLog
2017-09-23 Daniel Santos <daniel.santos@pobox.com>
* gcc.target/i386/pr82196-1.c: (b): Remove volatile asm.
* gcc.target/i386/pr82196-2.c: (b): Likewise.
2017-09-22 Jakub Jelinek <jakub@redhat.com>
PR middle-end/35691
......
gcc/testsuite/gcc.target/i386/pr82196-1.c
/* { dg-do compile { target lp64 } } */
/* { dg-options "-msse -mcall-ms2sysv-xlogues -O2" } */
/* { dg-final { scan-assembler "call.*__sse_savms64_18" } } */
/* { dg-final { scan-assembler "jmp.*__sse_resms64x_18" } } */
/* { dg-final { scan-assembler "call.*__sse_savms64f?_12" } } */
/* { dg-final { scan-assembler "jmp.*__sse_resms64f?x_12" } } */
void __attribute__((sysv_abi)) a() {
}
......@@ -9,6 +9,5 @@ void __attribute__((sysv_abi)) a() {
static void __attribute__((sysv_abi)) (*volatile a_noinfo)() = a;
void __attribute__((ms_abi)) b() {
__asm__ __volatile__ ("" :::"rbx", "rbp", "r12", "r13", "r14", "r15");
a_noinfo ();
}
gcc/testsuite/gcc.target/i386/pr82196-2.c
/* { dg-do compile { target lp64 } } */
/* { dg-options "-mavx -mcall-ms2sysv-xlogues -O2" } */
/* { dg-final { scan-assembler "call.*__avx_savms64_18" } } */
/* { dg-final { scan-assembler "jmp.*__avx_resms64x_18" } } */
/* { dg-final { scan-assembler "call.*__avx_savms64f?_12" } } */
/* { dg-final { scan-assembler "jmp.*__avx_resms64f?x_12" } } */
void __attribute__((sysv_abi)) a() {
}
......@@ -9,6 +9,5 @@ void __attribute__((sysv_abi)) a() {
static void __attribute__((sysv_abi)) (*volatile a_noinfo)() = a;
void __attribute__((ms_abi)) b() {
__asm__ __volatile__ ("" :::"rbx", "rbp", "r12", "r13", "r14", "r15");
a_noinfo ();
}
libgcc/ChangeLog
2017-09-23 Daniel Santos <daniel.santos@pobox.com>
* configure.ac: Add Check for HAVE_AS_AVX.
* config.in: Regenerate.
* configure: Likewise.
* config/i386/i386-asm.h: Include auto-target.h from libgcc.
(SSE_SAVE, SSE_RESTORE): Emit .byte sequence for !HAVE_AS_AVX.
Correct out-of-date comments.
2017-09-20 Sebastian Peryt <sebastian.peryt@intel.com>
* config/i386/cpuinfo.h (processor_types): Add INTEL_KNM.
......
libgcc/config.in
/* config.in. Generated from configure.ac by autoheader. */
/* Define to 1 if the assembler supports AVX. */
#undef HAVE_AS_AVX
/* Define to 1 if the target assembler supports thread-local storage. */
#undef HAVE_CC_TLS
......
libgcc/config/i386/i386-asm.h
......@@ -26,6 +26,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#ifndef I386_ASM_H
#define I386_ASM_H
#include "auto-target.h"
#include "auto-host.h"
#define PASTE2(a, b) PASTE2a(a, b)
......@@ -69,13 +70,15 @@ ASMNAME(fn):
#ifdef MS2SYSV_STUB_AVX
# define MS2SYSV_STUB_PREFIX __avx_
# define MOVAPS vmovaps
# ifdef HAVE_AS_AVX
# define MOVAPS vmovaps
# endif
#elif defined(MS2SYSV_STUB_SSE)
# define MS2SYSV_STUB_PREFIX __sse_
# define MOVAPS movaps
#endif
#if defined (MS2SYSV_STUB_PREFIX) && defined (MOVAPS)
#ifdef MS2SYSV_STUB_PREFIX
# define MS2SYSV_STUB_BEGIN(base_name) \
HIDDEN_FUNC(PASTE2(MS2SYSV_STUB_PREFIX, base_name))
......@@ -83,8 +86,10 @@ ASMNAME(fn):
# define MS2SYSV_STUB_END(base_name) \
FUNC_END(PASTE2(MS2SYSV_STUB_PREFIX, base_name))
/* Save SSE registers 6-15. off is the offset of rax to get to xmm6. */
# define SSE_SAVE \
/* If expanding for sse or avx and we have assembler support. */
# ifdef MOVAPS
/* Save SSE registers 6-15 using rax as the base address. */
# define SSE_SAVE \
MOVAPS %xmm15,-0x30(%rax); \
MOVAPS %xmm14,-0x20(%rax); \
MOVAPS %xmm13,-0x10(%rax); \
......@@ -96,8 +101,8 @@ ASMNAME(fn):
MOVAPS %xmm7, 0x50(%rax); \
MOVAPS %xmm6, 0x60(%rax)
/* Restore SSE registers 6-15. off is the offset of rsi to get to xmm6. */
# define SSE_RESTORE \
/* Restore SSE registers 6-15 using rsi as the base address. */
# define SSE_RESTORE \
MOVAPS -0x30(%rsi), %xmm15; \
MOVAPS -0x20(%rsi), %xmm14; \
MOVAPS -0x10(%rsi), %xmm13; \
......@@ -108,6 +113,31 @@ ASMNAME(fn):
MOVAPS 0x40(%rsi), %xmm8 ; \
MOVAPS 0x50(%rsi), %xmm7 ; \
MOVAPS 0x60(%rsi), %xmm6
#endif /* defined (MS2SYSV_STUB_ISA) && defined (MOVAPS) */
# else /* MOVAPS */
/* If the assembler doesn't support AVX then directly emit machine code
for the instructions above. */
# define SSE_SAVE \
.byte 0xc5, 0x78, 0x29, 0x78, 0xd0; /* vmovaps %xmm15,-0x30(%rax) */ \
.byte 0xc5, 0x78, 0x29, 0x70, 0xe0; /* vmovaps %xmm14,-0x20(%rax) */ \
.byte 0xc5, 0x78, 0x29, 0x68, 0xf0; /* vmovaps %xmm13,-0x10(%rax) */ \
.byte 0xc5, 0x78, 0x29, 0x20; /* vmovaps %xmm12, (%rax) */ \
.byte 0xc5, 0x78, 0x29, 0x58, 0x10; /* vmovaps %xmm11, 0x10(%rax) */ \
.byte 0xc5, 0x78, 0x29, 0x50, 0x20; /* vmovaps %xmm10, 0x20(%rax) */ \
.byte 0xc5, 0x78, 0x29, 0x48, 0x30; /* vmovaps %xmm9, 0x30(%rax) */ \
.byte 0xc5, 0x78, 0x29, 0x40, 0x40; /* vmovaps %xmm8, 0x40(%rax) */ \
.byte 0xc5, 0xf8, 0x29, 0x78, 0x50; /* vmovaps %xmm7, 0x50(%rax) */ \
.byte 0xc5, 0xf8, 0x29, 0x70, 0x60; /* vmovaps %xmm6, 0x60(%rax) */
# define SSE_RESTORE \
.byte 0xc5, 0x78, 0x28, 0x7e, 0xd0; /* vmovaps -0x30(%rsi),%xmm15 */ \
.byte 0xc5, 0x78, 0x28, 0x76, 0xe0; /* vmovaps -0x20(%rsi),%xmm14 */ \
.byte 0xc5, 0x78, 0x28, 0x6e, 0xf0; /* vmovaps -0x10(%rsi),%xmm13 */ \
.byte 0xc5, 0x78, 0x28, 0x26; /* vmovaps (%rsi),%xmm12 */ \
.byte 0xc5, 0x78, 0x28, 0x5e, 0x10; /* vmovaps 0x10(%rsi),%xmm11 */ \
.byte 0xc5, 0x78, 0x28, 0x56, 0x20; /* vmovaps 0x20(%rsi),%xmm10 */ \
.byte 0xc5, 0x78, 0x28, 0x4e, 0x30; /* vmovaps 0x30(%rsi),%xmm9 */ \
.byte 0xc5, 0x78, 0x28, 0x46, 0x40; /* vmovaps 0x40(%rsi),%xmm8 */ \
.byte 0xc5, 0xf8, 0x28, 0x7e, 0x50; /* vmovaps 0x50(%rsi),%xmm7 */ \
.byte 0xc5, 0xf8, 0x28, 0x76, 0x60; /* vmovaps 0x60(%rsi),%xmm6 */
# endif /* MOVAPS */
#endif /* MS2SYSV_STUB_PREFIX */
#endif /* I386_ASM_H */
libgcc/configure
......@@ -5212,6 +5212,45 @@ if test "$enable_tls $gcc_cv_use_emutls" = "yes yes"; then
fi
case "${target}" in
i[34567]86-*-* | x86_64-*-*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the assembler supports AVX" >&5
$as_echo_n "checking if the assembler supports AVX... " >&6; }
if test "${libgcc_cv_as_avx+set}" = set; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
main ()
{
asm("vzeroupper");
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
libgcc_cv_as_avx=yes
else
libgcc_cv_as_avx=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgcc_cv_as_avx" >&5
$as_echo "$libgcc_cv_as_avx" >&6; }
if test x$libgcc_cv_as_avx = xyes; then
$as_echo "#define HAVE_AS_AVX 1" >>confdefs.h
fi
;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for init priority support" >&5
$as_echo_n "checking for init priority support... " >&6; }
if test "${libgcc_cv_init_priority+set}" = set; then :
......
libgcc/configure.ac
......@@ -506,6 +506,22 @@ if test "$enable_tls $gcc_cv_use_emutls" = "yes yes"; then
fi
AC_SUBST(set_use_emutls)
dnl Check if as supports AVX instructions.
AC_DEFUN([LIBGCC_CHECK_AS_AVX], [
case "${target}" in
i[[34567]]86-*-* | x86_64-*-*)
AC_CACHE_CHECK([if the assembler supports AVX], libgcc_cv_as_avx, [
AC_TRY_COMPILE([], [asm("vzeroupper");],
[libgcc_cv_as_avx=yes], [libgcc_cv_as_avx=no])
])
if test x$libgcc_cv_as_avx = xyes; then
AC_DEFINE(HAVE_AS_AVX, 1, [Define to 1 if the assembler supports AVX.])
fi
;;
esac])
LIBGCC_CHECK_AS_AVX
dnl Check if as supports RTM instructions.
AC_CACHE_CHECK(for init priority support, libgcc_cv_init_priority, [
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,
[[void ip (void) __attribute__ ((constructor (1)));]])],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment