From patchwork Wed Oct 3 23:08:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 978596 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-96242-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="XEow+QVb"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="g3D77PeZ"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42QWty19xMz9s5c for ; Thu, 4 Oct 2018 09:09:45 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-type; q=dns; s=default; b=sZcZ EUa68REWFeH8KxHX9+o700Uw5J+8gxOg+tISULHsqW9RXPhN/vDi3/rjwKvWNT5d /fxgauKsDknwC1bSJIEZjxA1or12E3t8kfZVPT9RAK0X9a+pxCfpyfED2L78p2+3 ylFhttrdnTKEnZ1zUQqtYIwhJzq4Ro+kxvQdfUQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-type; s=default; bh=koVsREftY8 8gzRlEtj75neK5mw8=; b=XEow+QVbzEqPDdFRImAMoK6x4rn3EOVR9jN+8f8b8w JO6PrreANtNishVs6wM0nyFLuFutB/I3EzvOkOlt2ofUsmn+VxtiJRChSPygyKL/ J7bjpeRKfsORC8SJvmQAFi8KOdYgZmSQyp9mSdWxPhgRxuqOOj9KZhZkWXilr+Bo 0= Received: (qmail 108587 invoked by alias); 3 Oct 2018 23:09:39 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 108577 invoked by uid 89); 3 Oct 2018 23:09:38 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SEM_URI, SEM_URIRED, SPF_PASS autolearn=ham version=3.3.2 spammy=Due, __asm__ X-HELO: mail-oi1-f195.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=107FD68IqzboPevaRpSsDFq8tlSDpfUGROZYKM8U1uw=; b=g3D77PeZsreX4KRNZ4lLnbYOGqZmSnA+ZBqHFbCl7unb6TL0ZwXaPZVKCRkc5juSRO 3Vlw28UZh39CNVv/1gaiA+TGNmId2UplcfU3qKVjsaZnQ5hmZOg110oLRTxRPTssyeX5 irr7nmO/OfmL6Xxt5R7AeqFNopH1K7SBZZYfKPHWFE3/MCYTSl/juNw/2nylRDJsnWjv dSS37pGEbcprJJCfUyq1zUTf9oaN4FldZnUHz7ObYoUKQyQFqsBPMQWmi84w5cjnI/Df CbrpW0UwEvJy5TQE0JhRMQdiqwcSqrc8EmOAdvPj5j+J6+MW00m2l7K0VRC50TJrnEU8 dlXA== MIME-Version: 1.0 References: <20181001220836.20131-1-hjl.tools@gmail.com> <2b463e8a-4f78-2850-0375-425803b96f83@linaro.org> In-Reply-To: From: "H.J. Lu" Date: Wed, 3 Oct 2018 16:08:57 -0700 Message-ID: Subject: V2 [PATCH] x86: Use _rdtsc intrinsic for HP_TIMING_NOW To: Adhemerval Zanella Cc: GNU C Library On Tue, Oct 2, 2018 at 11:06 AM H.J. Lu wrote: > > On Tue, Oct 2, 2018 at 10:23 AM Adhemerval Zanella > wrote: > > > > > > > > On 02/10/2018 13:56, H.J. Lu wrote: > > > On Tue, Oct 2, 2018 at 6:45 AM H.J. Lu wrote: > > >> > > >> On Tue, Oct 2, 2018 at 6:15 AM Adhemerval Zanella > > >> wrote: > > > > > >>> I am not very found of cross abi includes like this one, wouldn't be better > > >>> to create a 'sysdeps/x86/hp-timing.h' and for 32-bit use _rdtsc iff > > >>> __i686__ is defined otherwise include generic header? > > >> > > >> I can do that. > > > > > > Here is the V2 patch. OK for master? > > > > > > > > NB: Checking if __i686__ isn't sufficient since __i686__ may not be > > > defined when building for i686 class processors. > > > > Right, it seems gcc does not define it for -march newer than pentium4. > > > > > diff --git a/sysdeps/i386/i586/init-arch.h b/sysdeps/i386/i586/isa.h > > > similarity index 89% > > > rename from sysdeps/i386/i586/init-arch.h > > > rename to sysdeps/i386/i586/isa.h > > > index 72fb46c61e..a2b5d585d4 100644 > > > --- a/sysdeps/i386/i586/init-arch.h > > > +++ b/sysdeps/i386/i586/isa.h > > > @@ -1,4 +1,4 @@ > > > -/* Copyright (C) 2015-2018 Free Software Foundation, Inc. > > > +/* Copyright (C) 2018 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 > > > @@ -15,5 +15,9 @@ > > > License along with the GNU C Library; if not, see > > > . */ > > > > > > +#ifndef _isa_h > > > +#define _isa_h > > > + > > > > Not sure if this is explicit on our coding rules, but usually we > > use uppercase caps for preprocessor guards. I think it requires > > a one-line description as well (same for other isa.h files). > > I will change that. > > > > -#ifndef _HP_TIMING_H > > > -#define _HP_TIMING_H 1 > > > +#include > > > + > > > +#if MINIMUM_ISA == 686 || MINIMUM_ISA == 8664 > > > +# ifndef _HP_TIMING_H > > > +# define _HP_TIMING_H 1 > > > + > > > > The include guard inside the MINIMUM_ISA check seems off, why do > > you need it? > > will be skipped if _HP_TIMING_H is > defined. That is the draw back for the single x86 hp-timing.h. Here is the updated patch. OK for master? From 01974a82401e0facbefe46f5d5a1423314083d7d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 1 Oct 2018 15:05:34 -0700 Subject: [PATCH] x86: Use _rdtsc intrinsic for HP_TIMING_NOW Since _rdtsc intrinsic is supported in GCC 4.9, we can use it for HP_TIMING_NOW. This patch 1. Create x86 hp-timing.h to replace i686 and x86_64 hp-timing.h. 2. Move MINIMUM_ISA from init-arch.h to isa.h so that x86 hp-timing.h can check minimum x86 ISA to decide if _rdtsc can be used. NB: Checking if __i686__ isn't sufficient since __i686__ may not be defined when building for i686 class processors. * sysdeps/i386/init-arch.h: Removed. * sysdeps/i386/i586/init-arch.h: Likewise. * sysdeps/i386/i686/init-arch.h: Likewise. * sysdeps/i386/i686/hp-timing.h: Likewise. * sysdeps/x86_64/hp-timing.h: Likewise. * sysdeps/i386/isa.h: New file. * sysdeps/i386/i586/isa.h: Likewise. * sysdeps/i386/i686/isa.h: Likewise. * sysdeps/x86_64/isa.h: Likewise. * sysdeps/x86/hp-timing.h: New file. * sysdeps/x86/init-arch.h: Include . --- sysdeps/i386/i586/{init-arch.h => isa.h} | 9 ++++-- sysdeps/i386/i686/{init-arch.h => isa.h} | 9 ++++-- sysdeps/i386/{init-arch.h => isa.h} | 9 ++++-- sysdeps/{i386/i686 => x86}/hp-timing.h | 28 +++++++++++------ sysdeps/x86/init-arch.h | 1 + sysdeps/x86_64/hp-timing.h | 40 ------------------------ sysdeps/x86_64/isa.h | 24 ++++++++++++++ 7 files changed, 65 insertions(+), 55 deletions(-) rename sysdeps/i386/i586/{init-arch.h => isa.h} (85%) rename sysdeps/i386/i686/{init-arch.h => isa.h} (85%) rename sysdeps/i386/{init-arch.h => isa.h} (85%) rename sysdeps/{i386/i686 => x86}/hp-timing.h (69%) delete mode 100644 sysdeps/x86_64/hp-timing.h create mode 100644 sysdeps/x86_64/isa.h diff --git a/sysdeps/i386/i586/init-arch.h b/sysdeps/i386/i586/isa.h similarity index 85% rename from sysdeps/i386/i586/init-arch.h rename to sysdeps/i386/i586/isa.h index 72fb46c61e..79481ce680 100644 --- a/sysdeps/i386/i586/init-arch.h +++ b/sysdeps/i386/i586/isa.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2015-2018 Free Software Foundation, Inc. +/* x86 ISA info. i586 version. + Copyright (C) 2018 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 @@ -15,5 +16,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef _ISA_H +#define _ISA_H + #define MINIMUM_ISA 586 -#include + +#endif diff --git a/sysdeps/i386/i686/init-arch.h b/sysdeps/i386/i686/isa.h similarity index 85% rename from sysdeps/i386/i686/init-arch.h rename to sysdeps/i386/i686/isa.h index ab99392b58..584e26bd4f 100644 --- a/sysdeps/i386/i686/init-arch.h +++ b/sysdeps/i386/i686/isa.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2015-2018 Free Software Foundation, Inc. +/* x86 ISA info. i686 version. + Copyright (C) 2018 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 @@ -15,5 +16,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef _ISA_H +#define _ISA_H + #define MINIMUM_ISA 686 -#include + +#endif diff --git a/sysdeps/i386/init-arch.h b/sysdeps/i386/isa.h similarity index 85% rename from sysdeps/i386/init-arch.h rename to sysdeps/i386/isa.h index 043089ceb9..e0a1e9c84f 100644 --- a/sysdeps/i386/init-arch.h +++ b/sysdeps/i386/isa.h @@ -1,4 +1,5 @@ -/* Copyright (C) 2015-2018 Free Software Foundation, Inc. +/* x86 ISA info. i486 version. + Copyright (C) 2018 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 @@ -15,5 +16,9 @@ License along with the GNU C Library; if not, see . */ +#ifndef _ISA_H +#define _ISA_H + #define MINIMUM_ISA 486 -#include + +#endif diff --git a/sysdeps/i386/i686/hp-timing.h b/sysdeps/x86/hp-timing.h similarity index 69% rename from sysdeps/i386/i686/hp-timing.h rename to sysdeps/x86/hp-timing.h index 59af526fdb..1c20e9d828 100644 --- a/sysdeps/i386/i686/hp-timing.h +++ b/sysdeps/x86/hp-timing.h @@ -1,7 +1,6 @@ -/* High precision, low overhead timing functions. i686 version. - Copyright (C) 1998-2018 Free Software Foundation, Inc. +/* High precision, low overhead timing functions. x86 version. + Copyright (C) 2018 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1998. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -20,12 +19,17 @@ #ifndef _HP_TIMING_H #define _HP_TIMING_H 1 +#include + +#if MINIMUM_ISA == 686 || MINIMUM_ISA == 8664 +# include + /* We always assume having the timestamp register. */ -#define HP_TIMING_AVAIL (1) -#define HP_SMALL_TIMING_AVAIL (1) +# define HP_TIMING_AVAIL (1) +# define HP_SMALL_TIMING_AVAIL (1) /* We indeed have inlined functions. */ -#define HP_TIMING_INLINE (1) +# define HP_TIMING_INLINE (1) /* We use 64bit values for the times. */ typedef unsigned long long int hp_timing_t; @@ -35,8 +39,14 @@ typedef unsigned long long int hp_timing_t; 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) __asm__ __volatile__ ("rdtsc" : "=A" (Var)) +# define HP_TIMING_NOW(Var) ((Var) = _rdtsc ()) -#include +# include +#else +/* NB: Undefine _HP_TIMING_H so that will + be included. */ +# undef _HP_TIMING_H +# include +#endif -#endif /* hp-timing.h */ +#endif /* hp-timing.h */ diff --git a/sysdeps/x86/init-arch.h b/sysdeps/x86/init-arch.h index a81ca8a4eb..bc860fcd69 100644 --- a/sysdeps/x86/init-arch.h +++ b/sysdeps/x86/init-arch.h @@ -21,6 +21,7 @@ # include #endif #include +#include #ifndef __x86_64__ /* Due to the reordering and the other nifty extensions in i686, it is diff --git a/sysdeps/x86_64/hp-timing.h b/sysdeps/x86_64/hp-timing.h deleted file mode 100644 index ec543bef03..0000000000 --- a/sysdeps/x86_64/hp-timing.h +++ /dev/null @@ -1,40 +0,0 @@ -/* High precision, low overhead timing functions. x86-64 version. - Copyright (C) 2002-2018 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 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 - . */ - -#ifndef _HP_TIMING_H -#define _HP_TIMING_H 1 - -/* We always assume having the timestamp register. */ -#define HP_TIMING_AVAIL (1) -#define HP_SMALL_TIMING_AVAIL (1) - -/* We indeed have inlined functions. */ -#define HP_TIMING_INLINE (1) - -/* We use 64bit values for the times. */ -typedef unsigned long long int hp_timing_t; - -/* The "=A" constraint used in 32-bit mode does not work in 64-bit mode. */ -#define HP_TIMING_NOW(Var) \ - ({ unsigned int _hi, _lo; \ - asm volatile ("rdtsc" : "=a" (_lo), "=d" (_hi)); \ - (Var) = ((unsigned long long int) _hi << 32) | _lo; }) - -#include - -#endif /* hp-timing.h */ diff --git a/sysdeps/x86_64/isa.h b/sysdeps/x86_64/isa.h new file mode 100644 index 0000000000..452bce75eb --- /dev/null +++ b/sysdeps/x86_64/isa.h @@ -0,0 +1,24 @@ +/* x86 ISA info. x86-64 version. + Copyright (C) 2018 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 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 + . */ + +#ifndef _ISA_H +#define _ISA_H + +#define MINIMUM_ISA 8664 + +#endif -- 2.17.1