From patchwork Thu Aug 4 19:30:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Brooks X-Patchwork-Id: 73309 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp1560379qga; Thu, 4 Aug 2016 12:32:52 -0700 (PDT) X-Received: by 10.55.185.131 with SMTP id j125mr8066158qkf.138.1470339172658; Thu, 04 Aug 2016 12:32:52 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id i10si9224276qta.6.2016.08.04.12.32.52; Thu, 04 Aug 2016 12:32:52 -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 E09EA6080C; Thu, 4 Aug 2016 19:32:51 +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_H3, RCVD_IN_MSPIKE_WL, 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 2019260802; Thu, 4 Aug 2016 19:30:51 +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 F2E0960800; Thu, 4 Aug 2016 19:30:46 +0000 (UTC) Received: from mail-oi0-f52.google.com (mail-oi0-f52.google.com [209.85.218.52]) by lists.linaro.org (Postfix) with ESMTPS id 4834A60800 for ; Thu, 4 Aug 2016 19:30:17 +0000 (UTC) Received: by mail-oi0-f52.google.com with SMTP id l203so932748oib.1 for ; Thu, 04 Aug 2016 12:30:17 -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=i2WXKsXV5hIpugrKnek1zKQyTi14o4H7ina0p4JYox8=; b=gW/8HAPQ3DqkeBchPrWjWY0Y5q13tAA/G6XF03/lQ2mi1/GOtuDzpGcBNh6KqUZ5Rx 74KVvnd4/cCSRxwUchnIAPXgu+KS64H86ovblswMIrRZTNDkKzHt4CSodr/zFPZ8n2Fb 91WpLKa6kYp2I7HfPYZpsbUsR0FaLyy/QfJEpTvZWZ1kwVsltawd1SApWu0wsIitPU3R lysAdP+mjH/Ny9zrLbDwukeTE/rI6BlsqGOdsJmqpvSLzITxAg74+qLSc3UczjDDmlnZ pA80fNSLCBaxOtwR5MU8DKjlBj47y7Qg6qS583glPSGOPDKpTpPF9jGO6mLKTbzHHAnn A8LQ== X-Gm-Message-State: AEkooutSwAIXP6M+EMtP5QUPXEw3PuuJX3rw4a6Ej6ZhZfqswLgWeyHmtckddVGaP/+ArJMUbnk= X-Received: by 10.202.170.5 with SMTP id t5mr44983075oie.133.1470339016246; Thu, 04 Aug 2016 12:30:16 -0700 (PDT) Received: from localhost.localdomain (adsl-68-248-140-212.dsl.applwi.ameritech.net. [68.248.140.212]) by smtp.gmail.com with ESMTPSA id o185sm6883540oif.26.2016.08.04.12.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Aug 2016 12:30:15 -0700 (PDT) From: Brian Brooks To: lng-odp@lists.linaro.org Date: Thu, 4 Aug 2016 14:30:05 -0500 Message-Id: <20160804193006.99010-5-brian.brooks@linaro.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160804193006.99010-1-brian.brooks@linaro.org> References: <20160804193006.99010-1-brian.brooks@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v2 5/6] 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" Lift the definition of odp_cpu_cycles() out of the arch specific directory into the common odp_cpu.c which then calls the internal arch specific definition. Signed-off-by: Brian Brooks --- platform/linux-generic/Makefile.am | 1 + platform/linux-generic/arch/default/odp_cpu_arch.c | 3 ++- platform/linux-generic/arch/mips64/odp_cpu_arch.c | 3 ++- platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 3 ++- platform/linux-generic/arch/x86/odp_cpu_arch.c | 3 ++- platform/linux-generic/include/odp_cpu_internal.h | 22 ++++++++++++++++++++++ platform/linux-generic/odp_cpu.c | 6 ++++++ 7 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 platform/linux-generic/include/odp_cpu_internal.h -- 2.9.2 diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8dc2764..7c364ec 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -97,6 +97,7 @@ noinst_HEADERS = \ ${srcdir}/include/odp_classification_inlines.h \ ${srcdir}/include/odp_classification_internal.h \ ${srcdir}/include/odp_config_internal.h \ + ${srcdir}/include/odp_cpu_internal.h \ ${srcdir}/include/odp_crypto_internal.h \ ${srcdir}/include/odp_debug_internal.h \ ${srcdir}/include/odp_forward_typedefs_internal.h \ diff --git a/platform/linux-generic/arch/default/odp_cpu_arch.c b/platform/linux-generic/arch/default/odp_cpu_arch.c index 109dd93..e7899fd 100644 --- a/platform/linux-generic/arch/default/odp_cpu_arch.c +++ b/platform/linux-generic/arch/default/odp_cpu_arch.c @@ -12,11 +12,12 @@ #include #include #include +#include #include #define GIGA 1000000000 -uint64_t odp_cpu_cycles(void) +uint64_t _odp_cpu_cycles(void) { struct timespec time; uint64_t sec, ns, hz, cycles; diff --git a/platform/linux-generic/arch/mips64/odp_cpu_arch.c b/platform/linux-generic/arch/mips64/odp_cpu_arch.c index 6dc8f86..1b282e4 100644 --- a/platform/linux-generic/arch/mips64/odp_cpu_arch.c +++ b/platform/linux-generic/arch/mips64/odp_cpu_arch.c @@ -7,8 +7,9 @@ #include #include #include +#include -uint64_t odp_cpu_cycles(void) +uint64_t _odp_cpu_cycles(void) { #define CVMX_TMP_STR(x) CVMX_TMP_STR2(x) #define CVMX_TMP_STR2(x) #x diff --git a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c index 109dd93..e7899fd 100644 --- a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c +++ b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c @@ -12,11 +12,12 @@ #include #include #include +#include #include #define GIGA 1000000000 -uint64_t odp_cpu_cycles(void) +uint64_t _odp_cpu_cycles(void) { struct timespec time; uint64_t sec, ns, hz, cycles; diff --git a/platform/linux-generic/arch/x86/odp_cpu_arch.c b/platform/linux-generic/arch/x86/odp_cpu_arch.c index c3be356..c596775 100644 --- a/platform/linux-generic/arch/x86/odp_cpu_arch.c +++ b/platform/linux-generic/arch/x86/odp_cpu_arch.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ #include +#include -uint64_t odp_cpu_cycles(void) +uint64_t _odp_cpu_cycles(void) { union { uint64_t tsc_64; diff --git a/platform/linux-generic/include/odp_cpu_internal.h b/platform/linux-generic/include/odp_cpu_internal.h new file mode 100644 index 0000000..351d430 --- /dev/null +++ b/platform/linux-generic/include/odp_cpu_internal.h @@ -0,0 +1,22 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_CPU_INTERNAL_H_ +#define ODP_CPU_INTERNAL_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +uint64_t _odp_cpu_cycles(void); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/odp_cpu.c b/platform/linux-generic/odp_cpu.c index 282defd..da4f2bc 100644 --- a/platform/linux-generic/odp_cpu.c +++ b/platform/linux-generic/odp_cpu.c @@ -6,6 +6,12 @@ #include #include +#include + +uint64_t odp_cpu_cycles(void) +{ + return _odp_cpu_cycles(); +} uint64_t odp_cpu_cycles_diff(uint64_t c2, uint64_t c1) {