git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR target/59691 (cilk-plus run failures on non-sse processors) 

Fix for PR target/59691.
+2014-02-10  Balaji V. Iyer  <balaji.v.iyer@intel.com>
+
+       PR target/59691
+       * runtime/config/x86/os-unix-sysdep.c (__builtin_cpu_supports): New
+       function.
+       (restore_x86_fp_state): Added a check if the cpu supports the
+       instruction before emitting it.
+       (sysdep_save_fp_ctrl_state): Likewise.
+

From-SVN: r207664
This commit is contained in:
Balaji V. Iyer 2014-02-10 16:56:54 +00:00 committed by Balaji V. Iyer
parent 2607ef8a7a
commit a596d94005
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libcilkrts/ChangeLog
View File

@ -1,3 +1,12 @@
2014-02-10 Balaji V. Iyer <balaji.v.iyer@intel.com>
PR target/59691
* runtime/config/x86/os-unix-sysdep.c (__builtin_cpu_supports): New
function.
(restore_x86_fp_state): Added a check if the cpu supports the
instruction before emitting it.
(sysdep_save_fp_ctrl_state): Likewise.
2014-01-20 Balaji V. Iyer <balaji.v.iyer@intel.com> 2014-01-20 Balaji V. Iyer <balaji.v.iyer@intel.com>
PR other/58996 PR other/58996

39
libcilkrts/runtime/config/x86/os-unix-sysdep.c
View File

@ -2,11 +2,9 @@
* *
************************************************************************* *************************************************************************
* *
* @copyright * Copyright (C) 2009-2014, Intel Corporation
* Copyright (C) 2009-2013, Intel Corporation
* All rights reserved. * All rights reserved.
* *
* @copyright
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
@ -21,7 +19,6 @@
* contributors may be used to endorse or promote products derived * contributors may be used to endorse or promote products derived
* from this software without specific prior written permission. * from this software without specific prior written permission.
* *
* @copyright
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@ -91,6 +88,20 @@ COMMON_SYSDEP int __cilkrts_xchg(volatile int *ptr, int x)
return x; return x;
} }
/*
* The Intel compiler distribution assumes newer CPUs and doesn't yet support
* the __builtin_cpu_supports intrinsic added by GCC 4.8, so just return 1 in
* that environment.
*
* This declaration should generate an error when the Intel compiler adds
* supprt for the intrinsic.
*/
#ifdef __INTEL_COMPILER
static inline int __builtin_cpu_supports(const char *feature)
{
return 1;
}
#endif
/* /*
* Restore the floating point state that is stored in a stack frame at each * Restore the floating point state that is stored in a stack frame at each
@ -100,11 +111,16 @@ COMMON_SYSDEP int __cilkrts_xchg(volatile int *ptr, int x)
*/ */
void restore_x86_fp_state (__cilkrts_stack_frame *sf) { void restore_x86_fp_state (__cilkrts_stack_frame *sf) {
#ifdef RESTORE_X86_FP_STATE #ifdef RESTORE_X86_FP_STATE
__asm__ ( "ldmxcsr %0\n\t" if (__builtin_cpu_supports("sse"))
"fnclex\n\t" {
"fldcw %1" __asm__ ("ldmxcsr %0"
: :
: "m" (sf->mxcsr), "m" (sf->fpcsr)); : "m" (sf->mxcsr));
}
__asm__ ("fnclex\n\t"
"fldcw %0"
:
: "m" (sf->fpcsr));
#endif #endif
} }
@ -115,7 +131,10 @@ void sysdep_save_fp_ctrl_state(__cilkrts_stack_frame *sf)
#ifdef RESTORE_X86_FP_STATE #ifdef RESTORE_X86_FP_STATE
if (CILK_FRAME_VERSION_VALUE(sf->flags) >= 1) if (CILK_FRAME_VERSION_VALUE(sf->flags) >= 1)
{ {
__asm__ ("stmxcsr %0" : "=m" (sf->mxcsr)); if (__builtin_cpu_supports("sse"))
{
__asm__ ("stmxcsr %0" : "=m" (sf->mxcsr));
}
__asm__ ("fnstsw %0" : "=m" (sf->fpcsr)); __asm__ ("fnstsw %0" : "=m" (sf->fpcsr));
} }
#endif #endif