From patchwork Tue Jul 26 02:56:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Brooks X-Patchwork-Id: 72764 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1456840qga; Mon, 25 Jul 2016 20:03:54 -0700 (PDT) X-Received: by 10.55.159.148 with SMTP id i142mr27095287qke.53.1469502234287; Mon, 25 Jul 2016 20:03:54 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id f18si19692208qkh.171.2016.07.25.20.03.54; Mon, 25 Jul 2016 20:03:54 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 00F2263012; Tue, 26 Jul 2016 03:03:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 21E3D686F0; Tue, 26 Jul 2016 02:58:19 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E087F68090; Tue, 26 Jul 2016 02:58:09 +0000 (UTC) Received: from mail-io0-f173.google.com (mail-io0-f173.google.com [209.85.223.173]) by lists.linaro.org (Postfix) with ESMTPS id 17501686D9 for ; Tue, 26 Jul 2016 02:56:45 +0000 (UTC) Received: by mail-io0-f173.google.com with SMTP id q83so190825588iod.1 for ; Mon, 25 Jul 2016 19:56:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iBfyBmYwYcqq+wdGPuYhHBsFlRVZzlmXRcrKx90uP1U=; b=KdCuohwP/F6f5QUWWhnJim1+mVm7Qyr5t7mrctPySDXlE9sNQnA6LqUd1zYkG/3o52 PN0j7N0q90D68OQyL1HudK4ECgnT9BE+WKoWWT/vzroRB7Ghbj8a0MkGLLUI5pDDRKR4 M2DrWUxyQWnTIagm83kapOcQ1upzOjs2OpGaPUebzv5qOokvyTxa4zdNFEM2Lln6FmLu p96b70SXgrcdUEh3xpm8Z4K4b2UL93N5F3luulm9o+Y0OjzwpMa/QQM2xCmnTJSiW8z+ O3b43FKX7ozZ/euttCg+I6ltMJlHzf177jrljCoapsFb5QReYAK+OH2FtKkPUFZMhR5P unyA== X-Gm-Message-State: AEkoous9O0d7eeQv7zFQP9OpJXXZGAgv2sAGk6K72rDtRLD6Se69BViTLfQXIETRKtBVcffLWqw= X-Received: by 10.202.72.70 with SMTP id v67mr9931260oia.143.1469501804512; Mon, 25 Jul 2016 19:56:44 -0700 (PDT) Received: from localhost.localdomain (68-248-140-212.lightspeed.austtx.sbcglobal.net. [68.248.140.212]) by smtp.gmail.com with ESMTPSA id z189sm12624679oig.29.2016.07.25.19.56.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jul 2016 19:56:43 -0700 (PDT) From: Brian Brooks To: lng-odp@lists.linaro.org Date: Mon, 25 Jul 2016 21:56:24 -0500 Message-Id: <20160726025625.7343-12-brian.brooks@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160726025625.7343-1-brian.brooks@linaro.org> References: <20160726025625.7343-1-brian.brooks@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v3 11/12] linux-generic: internal odp_cpu_cycles() X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Brian Brooks --- platform/Makefile.inc | 4 --- platform/linux-generic/Makefile.am | 1 - platform/linux-generic/arch/arm/cpu_arch.h | 12 +++++++++ platform/linux-generic/arch/arm/odp_cpu_arch.c | 25 ------------------ platform/linux-generic/arch/mips64/cpu_arch.h | 14 ++++++++++ platform/linux-generic/arch/mips64/odp_cpu_arch.c | 21 --------------- platform/linux-generic/arch/powerpc/cpu_arch.h | 17 ++++++++++++ platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 30 ---------------------- platform/linux-generic/arch/x86/cpu_arch.h | 12 +++++++++ platform/linux-generic/arch/x86/odp_cpu_arch.c | 16 ------------ platform/linux-generic/include/odp/api/cpu.h | 6 ++++- 11 files changed, 60 insertions(+), 98 deletions(-) delete mode 100644 platform/linux-generic/arch/arm/odp_cpu_arch.c delete mode 100644 platform/linux-generic/arch/mips64/odp_cpu_arch.c delete mode 100644 platform/linux-generic/arch/powerpc/odp_cpu_arch.c delete mode 100644 platform/linux-generic/arch/x86/odp_cpu_arch.c -- 2.9.0 diff --git a/platform/Makefile.inc b/platform/Makefile.inc index b45c955..fae6094 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -63,14 +63,10 @@ odpapispecinclude_HEADERS = \ EXTRA_DIST = \ arch/arm/cpu_arch.h \ - arch/arm/odp_cpu_arch.c \ arch/arm/odp_sysinfo_parse.c \ arch/mips64/cpu_arch.h \ - arch/mips64/odp_cpu_arch.c \ arch/mips64/odp_sysinfo_parse.c \ arch/powerpc/cpu_arch.h \ - arch/powerpc/odp_cpu_arch.c \ arch/powerpc/odp_sysinfo_parse.c \ arch/x86/cpu_arch.h \ - arch/x86/odp_cpu_arch.c \ arch/x86/odp_sysinfo_parse.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8dc2764..fef2109 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -183,7 +183,6 @@ __LIB__libodp_linux_la_SOURCES = \ odp_traffic_mngr.c \ odp_version.c \ odp_weak.c \ - arch/@ARCH_DIR@/odp_cpu_arch.c \ arch/@ARCH_DIR@/odp_sysinfo_parse.c if HAVE_PCAP diff --git a/platform/linux-generic/arch/arm/cpu_arch.h b/platform/linux-generic/arch/arm/cpu_arch.h index bdd3335..19ee349 100644 --- a/platform/linux-generic/arch/arm/cpu_arch.h +++ b/platform/linux-generic/arch/arm/cpu_arch.h @@ -7,12 +7,24 @@ #ifndef ODP_PLAT_CPU_ARCH_H_ #define ODP_PLAT_CPU_ARCH_H_ +#include + #ifdef __cplusplus extern "C" { #endif #define _ODP_CACHE_LINE_SIZE 64 +static inline uint64_t _odp_cpu_cycles(void) +{ +#if defined(__aarch64__) + uint64_t vct; + __asm__ volatile("isb" : : : "memory"); + __asm__ volatile("mrs %0, cntvct_el0" : "=r" (vct)); + return vct; +#endif +} + static inline void _odp_cpu_pause(void) { #if defined(__aarch64__) diff --git a/platform/linux-generic/arch/arm/odp_cpu_arch.c b/platform/linux-generic/arch/arm/odp_cpu_arch.c deleted file mode 100644 index 0ae3e0e..0000000 --- a/platform/linux-generic/arch/arm/odp_cpu_arch.c +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include - -#include -#include - -#include -#include -#include -#include - -uint64_t odp_cpu_cycles(void) -{ -#if defined(__aarch64__) - uint64_t vct; - __asm__ volatile("isb" : : : "memory"); - __asm__ volatile("mrs %0, cntvct_el0" : "=r" (vct)); - return vct; -#endif -} diff --git a/platform/linux-generic/arch/mips64/cpu_arch.h b/platform/linux-generic/arch/mips64/cpu_arch.h index d984255..e615e26 100644 --- a/platform/linux-generic/arch/mips64/cpu_arch.h +++ b/platform/linux-generic/arch/mips64/cpu_arch.h @@ -7,6 +7,8 @@ #ifndef ODP_PLAT_CPU_ARCH_H_ #define ODP_PLAT_CPU_ARCH_H_ +#include + #ifdef __cplusplus extern "C" { #endif @@ -17,6 +19,18 @@ extern "C" { #error Please add support for your arch in cpu_arch.h #endif +static inline uint64_t _odp_cpu_cycles(void) +{ + #define CVMX_TMP_STR(x) CVMX_TMP_STR2(x) + #define CVMX_TMP_STR2(x) #x + uint64_t cycle; + + __asm__ __volatile__ ("rdhwr %[rt],$" CVMX_TMP_STR(31) : + [rt] "=d" (cycle) : : "memory"); + + return cycle; +} + static inline void _odp_cpu_pause(void) { __asm__ __volatile__ ("nop"); diff --git a/platform/linux-generic/arch/mips64/odp_cpu_arch.c b/platform/linux-generic/arch/mips64/odp_cpu_arch.c deleted file mode 100644 index 6dc8f86..0000000 --- a/platform/linux-generic/arch/mips64/odp_cpu_arch.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include -#include -#include - -uint64_t odp_cpu_cycles(void) -{ - #define CVMX_TMP_STR(x) CVMX_TMP_STR2(x) - #define CVMX_TMP_STR2(x) #x - uint64_t cycle; - - __asm__ __volatile__ ("rdhwr %[rt],$" CVMX_TMP_STR(31) : - [rt] "=d" (cycle) : : "memory"); - - return cycle; -} diff --git a/platform/linux-generic/arch/powerpc/cpu_arch.h b/platform/linux-generic/arch/powerpc/cpu_arch.h index 0d52616..3387444 100644 --- a/platform/linux-generic/arch/powerpc/cpu_arch.h +++ b/platform/linux-generic/arch/powerpc/cpu_arch.h @@ -7,12 +7,29 @@ #ifndef ODP_PLAT_CPU_ARCH_H_ #define ODP_PLAT_CPU_ARCH_H_ +#include + #ifdef __cplusplus extern "C" { #endif #define _ODP_CACHE_LINE_SIZE 64 +static inline uint64_t _odp_cpu_cycles(void) +{ +#if defined(__powerpc__) || defined(__ppc__) + uint64_t tbl, tbu0, tbu1; + + do { + __asm__ volatile("mftbu %0" : "=r"(tbu0)); + __asm__ volatile("mftb %0" : "=r"(tbl)); + __asm__ volatile("mftbu %0" : "=r"(tbu1)); + } while (tbu0 != tbu1); + + return (tbu0 << 32) | tbl; +#endif +} + static inline void _odp_cpu_pause(void) { } diff --git a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c deleted file mode 100644 index 346c170..0000000 --- a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include - -#include -#include - -#include -#include -#include -#include - -uint64_t odp_cpu_cycles(void) -{ -#if defined(__powerpc__) || defined(__ppc__) - uint64_t tbl, tbu0, tbu1; - - do { - __asm__ volatile("mftbu %0" : "=r"(tbu0)); - __asm__ volatile("mftb %0" : "=r"(tbl)); - __asm__ volatile("mftbu %0" : "=r"(tbu1)); - } while (tbu0 != tbu1); - - return (tbu0 << 32) | tbl; -#endif -} diff --git a/platform/linux-generic/arch/x86/cpu_arch.h b/platform/linux-generic/arch/x86/cpu_arch.h index 4f4dbff..6aaf80e 100644 --- a/platform/linux-generic/arch/x86/cpu_arch.h +++ b/platform/linux-generic/arch/x86/cpu_arch.h @@ -7,12 +7,24 @@ #ifndef ODP_PLAT_CPU_ARCH_H_ #define ODP_PLAT_CPU_ARCH_H_ +#include + #ifdef __cplusplus extern "C" { #endif #define _ODP_CACHE_LINE_SIZE 64 +static inline uint64_t _odp_cpu_cycles(void) +{ +#if defined(__x86_64__) || defined(__amd64__) + uint64_t hi, lo; + __asm__ volatile("mfence" : : : "memory"); + __asm__ volatile("rdtsc" : "=a" (lo), "=d" (hi)); + return (hi << 32) | lo; +#endif +} + static inline void _odp_cpu_pause(void) { #ifdef __SSE2__ diff --git a/platform/linux-generic/arch/x86/odp_cpu_arch.c b/platform/linux-generic/arch/x86/odp_cpu_arch.c deleted file mode 100644 index a9e819d..0000000 --- a/platform/linux-generic/arch/x86/odp_cpu_arch.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright (c) 2015, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -#include - -uint64_t odp_cpu_cycles(void) -{ -#if defined(__x86_64__) || defined(__amd64__) - uint64_t hi, lo; - __asm__ volatile("mfence" : : : "memory"); - __asm__ volatile("rdtsc" : "=a" (lo), "=d" (hi)); - return (hi << 32) | lo; -#endif -} diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h index 8dd978e..2e59ea8 100644 --- a/platform/linux-generic/include/odp/api/cpu.h +++ b/platform/linux-generic/include/odp/api/cpu.h @@ -18,7 +18,11 @@ extern "C" { #endif #include "cpu_arch.h" -#include + +static inline uint64_t odp_cpu_cycles(void) +{ + return _odp_cpu_cycles(); +} static inline uint64_t odp_cpu_cycles_max(void) {