From 428dd03f5a7291d19f0c45fc314da9356ee22d63 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Wed, 25 Jun 2014 12:27:16 -0700 Subject: Remove HP_TIMING_DIFF_INIT and dl_hp_timing_overhead Without HP_TIMING_ACCUM, dl_hp_timing_overhead is write-only. If we remove it, there's no point in HP_TIMING_DIFF_INIT either. --- sysdeps/sparc/sparc32/sparcv9/Makefile | 5 ----- sysdeps/sparc/sparc32/sparcv9/hp-timing.c | 23 ----------------------- sysdeps/sparc/sparc32/sparcv9/hp-timing.h | 15 --------------- sysdeps/sparc/sparc64/Makefile | 5 ----- sysdeps/sparc/sparc64/hp-timing.c | 23 ----------------------- sysdeps/sparc/sparc64/hp-timing.h | 15 --------------- 6 files changed, 86 deletions(-) delete mode 100644 sysdeps/sparc/sparc32/sparcv9/hp-timing.c delete mode 100644 sysdeps/sparc/sparc64/hp-timing.c (limited to 'sysdeps/sparc') diff --git a/sysdeps/sparc/sparc32/sparcv9/Makefile b/sysdeps/sparc/sparc32/sparcv9/Makefile index 36f889ec96..925fa4ff73 100644 --- a/sysdeps/sparc/sparc32/sparcv9/Makefile +++ b/sysdeps/sparc/sparc32/sparcv9/Makefile @@ -1,10 +1,5 @@ sysdep-CFLAGS += -mcpu=ultrasparc -Wa,-Av9a -ifeq ($(subdir),csu) -sysdep_routines += hp-timing -elide-routines.os += hp-timing -endif - ifeq ($(have-as-vis3),yes) ASFLAGS-.o += -Wa,-Av9d ASFLAGS-.os += -Wa,-Av9d diff --git a/sysdeps/sparc/sparc32/sparcv9/hp-timing.c b/sysdeps/sparc/sparc32/sparcv9/hp-timing.c deleted file mode 100644 index 2224099940..0000000000 --- a/sysdeps/sparc/sparc32/sparcv9/hp-timing.c +++ /dev/null @@ -1,23 +0,0 @@ -/* Support for high precision, low overhead timing functions. sparcv9 version. - Copyright (C) 2001-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by David S. Miller , 2001. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include - -/* We have to define the variable for the overhead. */ -hp_timing_t _dl_hp_timing_overhead; diff --git a/sysdeps/sparc/sparc32/sparcv9/hp-timing.h b/sysdeps/sparc/sparc32/sparcv9/hp-timing.h index c3be1ca944..3f63ce68d3 100644 --- a/sysdeps/sparc/sparc32/sparcv9/hp-timing.h +++ b/sysdeps/sparc/sparc32/sparcv9/hp-timing.h @@ -34,21 +34,6 @@ typedef unsigned long long int hp_timing_t; "srlx %L0, 32, %H0" \ : "=r" (Var)) -#define HP_TIMING_DIFF_INIT() \ - do { \ - int __cnt = 5; \ - GLRO(dl_hp_timing_overhead) = ~0ull; \ - do \ - { \ - hp_timing_t __t1, __t2; \ - HP_TIMING_NOW (__t1); \ - HP_TIMING_NOW (__t2); \ - if (__t2 - __t1 < GLRO(dl_hp_timing_overhead)) \ - GLRO(dl_hp_timing_overhead) = __t2 - __t1; \ - } \ - while (--__cnt > 0); \ - } while (0) - #define HP_TIMING_DIFF(Diff, Start, End) (Diff) = ((End) - (Start)) #define HP_TIMING_ACCUM_NT(Sum, Diff) (Sum) += (Diff) diff --git a/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile index dd3023dcec..dfc118cfef 100644 --- a/sysdeps/sparc/sparc64/Makefile +++ b/sysdeps/sparc/sparc64/Makefile @@ -1,8 +1,3 @@ -ifeq ($(subdir),csu) -sysdep_routines += hp-timing -elide-routines.os += hp-timing -endif - ifeq ($(subdir),string) sysdep_routines += align-cpy endif diff --git a/sysdeps/sparc/sparc64/hp-timing.c b/sysdeps/sparc/sparc64/hp-timing.c deleted file mode 100644 index 0a425eddb4..0000000000 --- a/sysdeps/sparc/sparc64/hp-timing.c +++ /dev/null @@ -1,23 +0,0 @@ -/* Support for high precision, low overhead timing functions. sparc64 version. - Copyright (C) 2001-2014 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by David S. Miller , 2001. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include - -/* We have to define the variable for the overhead. */ -hp_timing_t _dl_hp_timing_overhead; diff --git a/sysdeps/sparc/sparc64/hp-timing.h b/sysdeps/sparc/sparc64/hp-timing.h index 9e49b7841b..521f64ec43 100644 --- a/sysdeps/sparc/sparc64/hp-timing.h +++ b/sysdeps/sparc/sparc64/hp-timing.h @@ -31,21 +31,6 @@ typedef unsigned long int hp_timing_t; #define HP_TIMING_NOW(Var) __asm__ __volatile__ ("rd %%tick, %0" : "=r" (Var)) -#define HP_TIMING_DIFF_INIT() \ - do { \ - int __cnt = 5; \ - GLRO(dl_hp_timing_overhead) = ~0ull; \ - do \ - { \ - hp_timing_t __t1, __t2; \ - HP_TIMING_NOW (__t1); \ - HP_TIMING_NOW (__t2); \ - if (__t2 - __t1 < GLRO(dl_hp_timing_overhead)) \ - GLRO(dl_hp_timing_overhead) = __t2 - __t1; \ - } \ - while (--__cnt > 0); \ - } while (0) - #define HP_TIMING_DIFF(Diff, Start, End) (Diff) = ((End) - (Start)) #define HP_TIMING_ACCUM_NT(Sum, Diff) (Sum) += (Diff) -- cgit 1.4.1