Skip to content

Commit

Permalink
* sysdeps/sparc/sparc32/fpu/libm-test-ulps: Update.
Browse files Browse the repository at this point in the history
	* sysdeps/sparc/fpu/fraiseexcpt.c (__feraiseexcept):
	Use inline asm to make sure the compiler doesn't optimize insns out.
  • Loading branch information
Roland McGrath committed Mar 1, 2006
1 parent 996f5e6 commit c4a4875
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 9 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
2006-03-01 Jakub Jelinek <jakub@redhat.com>

* sysdeps/sparc/sparc32/fpu/libm-test-ulps: Update.
* sysdeps/sparc/fpu/fraiseexcpt.c (__feraiseexcept):
Use inline asm to make sure the compiler doesn't optimize insns out.

* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
(DECLARGS_6): Fix a typo.

Expand Down
8 changes: 8 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2006-03-01 Jakub Jelinek <jakub@redhat.com>

* sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_robust_mutex_dead,
lll_robust_mutex_trylock, lll_robust_mutex_lock,
lll_robust_mutex_cond_lock, lll_robust_mutex_timedlock,
lll_robust_mutex_unlock): Define.
(__lll_robust_lock_wait, __lll_robust_timedlock_wait): New prototypes.

2006-02-28 H.J. Lu <hongjiu.lu@intel.com>

* sysdeps/unix/sysv/linux/ia64/clone2.S: Include <clone2.S>
Expand Down
58 changes: 56 additions & 2 deletions nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@
INTERNAL_SYSCALL_ERROR_P (__ret, __err); \
})

#define lll_robust_mutex_dead(futexv) \
do \
{ \
int *__futexp = &(futexv); \
atomic_or (__futexp, FUTEX_OWNER_DIED); \
lll_futex_wake (__futexp, 1); \
} \
while (0)

/* Returns non-zero if error happened, zero if success. */
#ifdef __sparc32_atomic_do_lock
/* Avoid FUTEX_WAKE_OP if supporting pre-v9 CPUs. */
Expand Down Expand Up @@ -112,9 +121,18 @@ __lll_mutex_cond_trylock (int *futex)
}
#define lll_mutex_cond_trylock(futex) __lll_mutex_cond_trylock (&(futex))

static inline int
__attribute__ ((always_inline))
__lll_robust_mutex_trylock (int *futex, int id)
{
return atomic_compare_and_exchange_val_acq (futex, id, 0) != 0;
}
#define lll_robust_mutex_trylock(futex, id) \
__lll_robust_mutex_trylock (&(futex), id)


extern void __lll_lock_wait (int *futex) attribute_hidden;

extern int __lll_robust_lock_wait (int *futex) attribute_hidden;

static inline void
__attribute__ ((always_inline))
Expand All @@ -127,6 +145,17 @@ __lll_mutex_lock (int *futex)
}
#define lll_mutex_lock(futex) __lll_mutex_lock (&(futex))

static inline int
__attribute__ ((always_inline))
__lll_robust_mutex_lock (int *futex, int id)
{
int result = 0;
if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0)
result = __lll_robust_lock_wait (futex);
return result;
}
#define lll_robust_mutex_lock(futex, id) \
__lll_robust_mutex_lock (&(futex), id)

static inline void
__attribute__ ((always_inline))
Expand All @@ -139,10 +168,14 @@ __lll_mutex_cond_lock (int *futex)
}
#define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex))

#define lll_robust_mutex_cond_lock(futex, id) \
__lll_robust_mutex_lock (&(futex), (id) | FUTEX_WAITERS)


extern int __lll_timedlock_wait (int *futex, const struct timespec *)
attribute_hidden;

extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *)
attribute_hidden;

static inline int
__attribute__ ((always_inline))
Expand All @@ -158,6 +191,19 @@ __lll_mutex_timedlock (int *futex, const struct timespec *abstime)
#define lll_mutex_timedlock(futex, abstime) \
__lll_mutex_timedlock (&(futex), abstime)

static inline int
__attribute__ ((always_inline))
__lll_robust_mutex_timedlock (int *futex, const struct timespec *abstime,
int id)
{
int result = 0;
if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0)
result = __lll_robust_timedlock_wait (futex, abstime);
return result;
}
#define lll_robust_mutex_timedlock(futex, abstime, id) \
__lll_robust_mutex_timedlock (&(futex), abstime, id)

#define lll_mutex_unlock(lock) \
((void) ({ \
int *__futex = &(lock); \
Expand All @@ -166,6 +212,14 @@ __lll_mutex_timedlock (int *futex, const struct timespec *abstime)
lll_futex_wake (__futex, 1); \
}))

#define lll_robust_mutex_unlock(lock) \
((void) ({ \
int *__futex = &(lock); \
int __val = atomic_exchange_rel (__futex, 0); \
if (__builtin_expect (__val & FUTEX_WAITERS, 0)) \
lll_futex_wake (__futex, 1); \
}))

#define lll_mutex_unlock_force(lock) \
((void) ({ \
int *__futex = &(lock); \
Expand Down
34 changes: 27 additions & 7 deletions sysdeps/sparc/fpu/fraiseexcpt.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
int
__feraiseexcept (int excepts)
{
static volatile double sink;
static const struct {
double zero, one, max, min, sixteen, pi;
} c = {
0.0, 1.0, DBL_MAX, DBL_MIN, 16.0, M_PI
};
double d;

/* Raise exceptions represented by EXPECTS. But we must raise only
one signal at a time. It is important the if the overflow/underflow
Expand All @@ -39,24 +39,44 @@ __feraiseexcept (int excepts)

/* First: invalid exception. */
if ((FE_INVALID & excepts) != 0)
/* One example of a invalid operation is 0/0. */
sink = c.zero / c.zero;
{
/* One example of a invalid operation is 0/0. */
__asm ("" : "=e" (d) : "0" (c.zero));
d /= c.zero;
__asm __volatile ("" : : "e" (d));
}

/* Next: division by zero. */
if ((FE_DIVBYZERO & excepts) != 0)
sink = c.one / c.zero;
{
__asm ("" : "=e" (d) : "0" (c.one));
d /= c.zero;
__asm __volatile ("" : : "e" (d));
}

/* Next: overflow. */
if ((FE_OVERFLOW & excepts) != 0)
sink = c.max * c.max;
{
__asm ("" : "=e" (d) : "0" (c.max));
d *= d;
__asm __volatile ("" : : "e" (d));
}

/* Next: underflow. */
if ((FE_UNDERFLOW & excepts) != 0)
sink = c.min / c.sixteen;
{
__asm ("" : "=e" (d) : "0" (c.min));
d /= c.sixteen;
__asm __volatile ("" : : "e" (d));
}

/* Last: inexact. */
if ((FE_INEXACT & excepts) != 0)
sink = c.one / c.pi;
{
__asm ("" : "=e" (d) : "0" (c.one));
d /= c.pi;
__asm __volatile ("" : : "e" (d));
}

/* Success. */
return 0;
Expand Down
9 changes: 9 additions & 0 deletions sysdeps/sparc/sparc32/fpu/libm-test-ulps
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,11 @@ ifloat: 2
ildouble: 1
ldouble: 1

# exp2
Test "exp2 (10) == 1024":
ildouble: 2
ldouble: 2

# expm1
Test "expm1 (0.75) == 1.11700001661267466854536981983709561":
double: 1
Expand Down Expand Up @@ -1192,6 +1197,10 @@ ifloat: 2
ildouble: 1
ldouble: 1

Function: "exp2":
ildouble: 2
ldouble: 2

Function: "expm1":
double: 1
float: 1
Expand Down

0 comments on commit c4a4875

Please sign in to comment.