aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--linuxthreads/ChangeLog2
-rw-r--r--linuxthreads/sysdeps/ia64/Versions5
-rw-r--r--linuxthreads/sysdeps/pthread/getcpuclockid.c16
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c37
-rw-r--r--sysdeps/generic/clock_getcpuclockid.c11
-rw-r--r--sysdeps/generic/dl-sysdep.c2
-rw-r--r--sysdeps/ia64/Makefile1
-rw-r--r--sysdeps/ia64/Versions3
-rw-r--r--sysdeps/ia64/hp-timing.c (renamed from sysdeps/unix/i386/clock_getcpuclockid.c)22
-rw-r--r--sysdeps/ia64/hp-timing.h155
-rw-r--r--sysdeps/unix/sysv/linux/ia64/bits/time.h8
12 files changed, 218 insertions, 58 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c68f5a416..23a2bae52e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
2001-04-23 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/ia64/Makefile [subdir=csu] (sysdep_routines): Add hp-timing.
+ * sysdeps/ia64/Versions: Add _dl_cpuclock_offset for ld in 2.2.3.
+ * sysdeps/ia64/hp-timing.c: New file.
+ * sysdeps/ia64/hp-timing.h: New file.
+ * sysdeps/unix/sysv/linux/ia64/bits/time.h: Add definitions for
+ CLOCK_PROCESS_CPUTIME_ID and CLOCK_THREAD_CPUTIME_ID.
+
+ * sysdeps/generic/clock_getcpuclockid.c: Make function generic, test
+ using #ifdef whether the clock is available.
+ * sysdeps/unix/i386/clock_getcpuclockid.c: Not needed anymore.
+
+ * sysdeps/generic/dl-sysdep.c: Initialize _dl_cpuclock_offset to move
+ it into data section.
+
* sysdeps/unix/i386/i586/clock_getres.c: Removed.
* sysdeps/unix/i386/i586/clock_gettime.c: Removed.
* sysdeps/unix/i386/i586/clock_nanosleep.c: Removed.
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index c4676e9f7f..7225ec4ab6 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,7 @@
2001-04-23 Ulrich Drepper <drepper@redhat.com>
+ * sysdeps/ia64/Versions: New file.
+
* sysdeps/unix/sysv/linux/ia64/pt-initfini.c (_init): We don't
have to call __gmon_start__ in the libpthread DSO.
* sysdeps/pthread/pt-initfini.c (_init): Likewise.
diff --git a/linuxthreads/sysdeps/ia64/Versions b/linuxthreads/sysdeps/ia64/Versions
new file mode 100644
index 0000000000..f9921aff55
--- /dev/null
+++ b/linuxthreads/sysdeps/ia64/Versions
@@ -0,0 +1,5 @@
+libpthread {
+ GLIBC_2.2.3 {
+ __pthread_clock_gettime; __pthread_clock_settime;
+ }
+}
diff --git a/linuxthreads/sysdeps/pthread/getcpuclockid.c b/linuxthreads/sysdeps/pthread/getcpuclockid.c
index ef1f84fd3e..76d39a5de4 100644
--- a/linuxthreads/sysdeps/pthread/getcpuclockid.c
+++ b/linuxthreads/sysdeps/pthread/getcpuclockid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,10 +19,22 @@
#include <errno.h>
#include <pthread.h>
#include <sys/time.h>
+#include <internals.h>
int
-pthread_getcpuclockid (pthread_t pthread_id, clockid_t *clock_id)
+pthread_getcpuclockid (pthread_t thread_id, clockid_t *clock_id)
{
+ /* We don't allow any process ID but our own. */
+ if (thread_handle (thread_id)->h_descr != thread_self ())
+ return EPERM;
+
+#ifdef CLOCK_THREAD_CPUTIME_ID
+ /* Store the number. */
+ *clock_id = CLOCK_THREAD_CPUTIME_ID;
+
+ return 0;
+#else
/* We don't have a timer for that. */
return ENOENT;
+#endif
}
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c b/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c
deleted file mode 100644
index b1a96705ac..0000000000
--- a/linuxthreads/sysdeps/unix/sysv/linux/i386/getcpuclockid.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with the GNU C Library; see the file COPYING.LIB. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
-
-#include <errno.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <sys/time.h>
-
-#include <internals.h>
-
-int
-pthread_getcpuclockid (pthread_t thread_id, clockid_t *clock_id)
-{
- /* We don't allow any process ID but our own. */
- if (thread_handle (thread_id)->h_descr != thread_self ())
- return EPERM;
-
- /* Store the number. */
- *clock_id = CLOCK_THREAD_CPUTIME_ID;
-
- return 0;
-}
diff --git a/sysdeps/generic/clock_getcpuclockid.c b/sysdeps/generic/clock_getcpuclockid.c
index 07f6c22bec..f39a8cf492 100644
--- a/sysdeps/generic/clock_getcpuclockid.c
+++ b/sysdeps/generic/clock_getcpuclockid.c
@@ -22,6 +22,17 @@
int
clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
{
+ /* We don't allow any process ID but our own. */
+ if (pid != 0 && pid != getpid ())
+ return EPERM;
+
+#ifdef CLOCK_PROCESS_CPUTIME_ID
+ /* Store the number. */
+ *clock_id = CLOCK_PROCESS_CPUTIME_ID;
+
+ return 0;
+#else
/* We don't have a timer for that. */
return ENOENT;
+#endif
}
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index 114ec8be4e..1880084c6e 100644
--- a/sysdeps/generic/dl-sysdep.c
+++ b/sysdeps/generic/dl-sysdep.c
@@ -62,7 +62,7 @@ void *__libc_stack_end;
static ElfW(auxv_t) *_dl_auxv;
unsigned long int _dl_hwcap_mask = HWCAP_IMPORTANT;
#if HP_TIMING_AVAIL
-hp_timing_t _dl_cpuclock_offset;
+hp_timing_t _dl_cpuclock_offset = 0;
#endif
#ifndef DL_FIND_ARG_COMPONENTS
diff --git a/sysdeps/ia64/Makefile b/sysdeps/ia64/Makefile
index d8b465718b..997a227f73 100644
--- a/sysdeps/ia64/Makefile
+++ b/sysdeps/ia64/Makefile
@@ -7,6 +7,7 @@ endif
ifeq ($(subdir), csu)
CPPFLAGS-start.S = -D__ASSEMBLY__
+sysdep_routines += hp-timing
endif
ifeq ($(subdir),elf)
diff --git a/sysdeps/ia64/Versions b/sysdeps/ia64/Versions
index 1e1387f9d4..b1df498940 100644
--- a/sysdeps/ia64/Versions
+++ b/sysdeps/ia64/Versions
@@ -4,4 +4,7 @@ ld {
_dl_symbol_address; _dl_unmap; _dl_lookup_address;
_dl_function_address;
}
+ GLIBC_2.2.3 {
+ _dl_cpuclock_offset;
+ }
}
diff --git a/sysdeps/unix/i386/clock_getcpuclockid.c b/sysdeps/ia64/hp-timing.c
index c1b4487486..36f18edf5b 100644
--- a/sysdeps/unix/i386/clock_getcpuclockid.c
+++ b/sysdeps/ia64/hp-timing.c
@@ -1,5 +1,7 @@
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+/* Support for high precision, low overhead timing functions. IA-64 version.
+ Copyright (C) 2001 Free Software Foundation, Inc.
This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
@@ -16,19 +18,7 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#include <errno.h>
-#include <time.h>
-#include <unistd.h>
+#include <hp-timing.h>
-int
-clock_getcpuclockid (pid_t pid, clockid_t *clock_id)
-{
- /* We don't allow any process ID but our own. */
- if (pid != 0 && pid != getpid ())
- return EPERM;
-
- /* Store the number. */
- *clock_id = CLOCK_PROCESS_CPUTIME_ID;
-
- return 0;
-}
+/* We have to define the variable for the overhead. */
+hp_timing_t __libc_hp_timing_overhead;
diff --git a/sysdeps/ia64/hp-timing.h b/sysdeps/ia64/hp-timing.h
new file mode 100644
index 0000000000..df5bc16665
--- /dev/null
+++ b/sysdeps/ia64/hp-timing.h
@@ -0,0 +1,155 @@
+/* High precision, low overhead timing functions. IA-64 version.
+ Copyright (C) 2001 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef _HP_TIMING_H
+#define _HP_TIMING_H 1
+
+#include <string.h>
+#include <sys/param.h>
+#include <stdio-common/_itoa.h>
+#include <ia64intrin.h>
+
+/* The macros defined here use the timestamp counter in IA-64. They
+ provide a very accurate way to measure the time with very little
+ overhead. The time values themself have no real meaning, only
+ differences are interesting.
+
+ The list of macros we need includes the following:
+
+ - HP_TIMING_AVAIL: test for availability.
+
+ - HP_TIMING_INLINE: this macro is non-zero if the functionality is not
+ implemented using function calls but instead uses some inlined code
+ which might simply consist of a few assembler instructions. We have to
+ know this since we might want to use the macros here in places where we
+ cannot make function calls.
+
+ - hp_timing_t: This is the type for variables used to store the time
+ values.
+
+ - HP_TIMING_ZERO: clear `hp_timing_t' object.
+
+ - HP_TIMING_NOW: place timestamp for current time in variable given as
+ parameter.
+
+ - HP_TIMING_DIFF_INIT: do whatever is necessary to be able to use the
+ HP_TIMING_DIFF macro.
+
+ - HP_TIMING_DIFF: compute difference between two times and store it
+ in a third. Source and destination might overlap.
+
+ - HP_TIMING_ACCUM: add time difference to another variable. This might
+ be a bit more complicated to implement for some platforms as the
+ operation should be thread-safe and 64bit arithmetic on 32bit platforms
+ is not.
+
+ - HP_TIMING_ACCUM_NT: this is the variant for situations where we know
+ there are no threads involved.
+
+ - HP_TIMING_PRINT: write decimal representation of the timing value into
+ the given string. This operation need not be inline even though
+ HP_TIMING_INLINE is specified.
+
+*/
+
+/* We always assume having the timestamp register. */
+#define HP_TIMING_AVAIL (1)
+
+/* We indeed have inlined functions. */
+#define HP_TIMING_INLINE (1)
+
+/* We use 64bit values for the times. */
+typedef unsigned long int hp_timing_t;
+
+/* Internal variable used to store the overhead of the measurement
+ opcodes. */
+extern hp_timing_t __libc_hp_timing_overhead;
+
+/* Set timestamp value to zero. */
+#define HP_TIMING_ZERO(Var) (Var) = (0)
+
+
+/* The Itanium/Merced has a bug where the ar.itc register value read
+ is not correct in some situations. The solution is to read again.
+ For now we always do this until we know how to recognize a fixed
+ processor implementation. */
+#define REPEAT_READ(val) __builtin_expect ((int) val == -1, 0)
+
+/* That's quite simple. Use the `rdtsc' instruction. Note that the value
+ might not be 100% accurate since there might be some more instructions
+ running in this moment. This could be changed by using a barrier like
+ 'cpuid' right before the `rdtsc' instruciton. But we are not interested
+ in accurate clock cycles here so we don't do this. */
+#define HP_TIMING_NOW(Var) \
+ ({ unsigned long int __itc; \
+ do \
+ asm volatile ("mov %0=ar.itc" : "=r" (__itc) : : "memory"); \
+ while (REPEAT_READ (__itc)); \
+ Var = __itc; })
+
+/* Use two 'ar.itc' instructions in a row to find out how long it takes. */
+#define HP_TIMING_DIFF_INIT() \
+ do { \
+ int __cnt = 5; \
+ __libc_hp_timing_overhead = ~0ul; \
+ do \
+ { \
+ hp_timing_t __t1, __t2; \
+ HP_TIMING_NOW (__t1); \
+ HP_TIMING_NOW (__t2); \
+ if (__t2 - __t1 < __libc_hp_timing_overhead) \
+ __libc_hp_timing_overhead = __t2 - __t1; \
+ } \
+ while (--__cnt > 0); \
+ } while (0)
+
+/* It's simple arithmetic for us. */
+#define HP_TIMING_DIFF(Diff, Start, End) (Diff) = ((End) - (Start))
+
+/* We have to jump through hoops to get this correctly implemented. */
+#define HP_TIMING_ACCUM(Sum, Diff) \
+ do { \
+ hp_timing_t __oldval; \
+ hp_timing_t __diff = (Diff) - __libc_hp_timing_overhead; \
+ hp_timing_t __newval; \
+ do \
+ { \
+ __oldval = (Sum); \
+ __newval = __oldval + __diff; \
+ } \
+ while (! __sync_bool_compare_and_swap (&Sum, __oldvar, __newval)); \
+ } while (0)
+
+/* No threads, no extra work. */
+#define HP_TIMING_ACCUM_NT(Sum, Diff) (Sum) += (Diff)
+
+/* Print the time value. */
+#define HP_TIMING_PRINT(Buf, Len, Val) \
+ do { \
+ char __buf[20]; \
+ char *__cp = _itoa_word (Val, __buf + sizeof (__buf), 10, 0); \
+ int __len = (Len); \
+ char *__dest = (Buf); \
+ while (__len-- > 0 && __cp < __buf + sizeof (__buf)) \
+ *__dest++ = *__cp++; \
+ memcpy (__dest, " clock cycles", MIN (__len, sizeof (" clock cycles"))); \
+ } while (0)
+
+#endif /* hp-timing.h */
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/time.h b/sysdeps/unix/sysv/linux/ia64/bits/time.h
index e7095b895b..87ab2f448b 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/time.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/time.h
@@ -43,10 +43,14 @@ extern long int __sysconf (int);
# ifdef __USE_POSIX199309
/* Identifier for system-wide realtime clock. */
-# define CLOCK_REALTIME 0
+# define CLOCK_REALTIME 0
+/* High-resolution timer from the CPU. */
+# define CLOCK_PROCESS_CPUTIME_ID 2
+/* Thread-specific CPU-time clock. */
+# define CLOCK_THREAD_CPUTIME_ID 3
/* Flag to indicate time is absolute. */
-# define TIMER_ABSTIME 1
+# define TIMER_ABSTIME 1
# endif
# endif /* bits/time.h */