From patchwork Tue Aug 2 21:29:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Brooks X-Patchwork-Id: 73185 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp377644qga; Tue, 2 Aug 2016 14:30:38 -0700 (PDT) X-Received: by 10.200.46.122 with SMTP id s55mr103333253qta.80.1470173438439; Tue, 02 Aug 2016 14:30:38 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id v138si153483qka.94.2016.08.02.14.30.37; Tue, 02 Aug 2016 14:30:38 -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 0AF9368684; Tue, 2 Aug 2016 21:30:37 +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 C4F3968642; Tue, 2 Aug 2016 21:30:17 +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 6C5626867A; Tue, 2 Aug 2016 21:29:50 +0000 (UTC) Received: from mail-oi0-f44.google.com (mail-oi0-f44.google.com [209.85.218.44]) by lists.linaro.org (Postfix) with ESMTPS id 070A668528 for ; Tue, 2 Aug 2016 21:29:49 +0000 (UTC) Received: by mail-oi0-f44.google.com with SMTP id l65so255148984oib.1 for ; Tue, 02 Aug 2016 14:29:49 -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=VI1mr6Iyvabhec1Kca6JIweh226HI8GADbPrj958OUg=; b=POOMXnDtdluVIRCISafw/Rc9EfnVxThlQkdP836xMYDngO5lVX/s1QDWp0NyMj7TFq TfhMABbojDkoliST78FI1AI0bX9LlljjIGhTgkwQS9touYGoIAd06JrWr0ZYX7bKhhCV EmIJzt26M8D7RtSOgF8t4CI8ZyXjTUoJmgQGK3UrxVGhgiiWVCMPmtyjW/O0sXDejvCG v/s1bDQCirI34WyEXn+fbV9S+DQDgzFnP7Edb9nVCUj9bSdKQgrQEDeIL66IAnvBtFEu +z9MNi+pTas6W1P39hCpjl/l0wvm0m96R6efH1E/eBw8WRHAGVLyi2mrZuMkptxSpbKZ OLMg== X-Gm-Message-State: AEkoouvkOXZb0qVxmKBANOTSJlGpY6ezL+fdh3vjnkRLAclbgbAg7HnZP7RWmQWoCCZ5+kO9qUs= X-Received: by 10.157.10.76 with SMTP id 70mr37751213otg.13.1470173388168; Tue, 02 Aug 2016 14:29:48 -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 98sm2175967oth.15.2016.08.02.14.29.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Aug 2016 14:29:47 -0700 (PDT) From: Brian Brooks To: lng-odp@lists.linaro.org Date: Tue, 2 Aug 2016 16:29:40 -0500 Message-Id: <20160802212944.122603-2-brian.brooks@linaro.org> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160802212944.122603-1-brian.brooks@linaro.org> References: <20160802212944.122603-1-brian.brooks@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 2/6] linux-generic: use source files instead of symbolic links 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" Use source files in arch/default for undetected archs. This alleviates the need to use symlinks in the source code directory structure. Signed-off-by: Brian Brooks --- configure.ac | 13 +----- platform/Makefile.inc | 3 -- platform/linux-generic/arch/arm/odp/api/cpu_arch.h | 1 - platform/linux-generic/arch/arm/odp_cpu_arch.c | 1 - .../linux-generic/arch/arm/odp_sysinfo_parse.c | 1 - platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 49 +++++++++++++++++++++- 6 files changed, 49 insertions(+), 19 deletions(-) delete mode 120000 platform/linux-generic/arch/arm/odp/api/cpu_arch.h delete mode 120000 platform/linux-generic/arch/arm/odp_cpu_arch.c delete mode 120000 platform/linux-generic/arch/arm/odp_sysinfo_parse.c mode change 120000 => 100644 platform/linux-generic/arch/powerpc/odp_cpu_arch.c -- 2.9.2 diff --git a/configure.ac b/configure.ac index c0f0f21..a7e058a 100644 --- a/configure.ac +++ b/configure.ac @@ -77,22 +77,11 @@ AS_CASE([$host], [i686*], [ARCH_DIR=x86], [mips64*], [ARCH_DIR=mips64], [powerpc*], [ARCH_DIR=powerpc], - [aarch64*], [ARCH_DIR=arm], - [arm*], [ARCH_DIR=arm], - [ARCH_DIR=undefined] + [ARCH_DIR=default] ) AC_SUBST([ARCH_DIR]) ########################################################################## -# Warn on the defaults if arch is undefined -########################################################################## -if test "${ARCH_DIR}" == "undefined"; -then - echo "ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}" - exit 1 -fi - -########################################################################## # Set correct pkgconfig version ########################################################################## PKGCONFIG_VERSION=$(echo $VERSION | awk -F '.git' '{print $1}') diff --git a/platform/Makefile.inc b/platform/Makefile.inc index a44f88f..2a4255c 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -62,9 +62,6 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/version.h EXTRA_DIST = \ - arch/arm/odp/api/cpu_arch.h \ - arch/arm/odp_cpu_arch.c \ - arch/arm/odp_sysinfo_parse.c \ arch/default/odp/api/cpu_arch.h \ arch/default/odp_cpu_arch.c \ arch/default/odp_sysinfo_parse.c \ diff --git a/platform/linux-generic/arch/arm/odp/api/cpu_arch.h b/platform/linux-generic/arch/arm/odp/api/cpu_arch.h deleted file mode 120000 index e86e132..0000000 --- a/platform/linux-generic/arch/arm/odp/api/cpu_arch.h +++ /dev/null @@ -1 +0,0 @@ -../../../default/odp/api/cpu_arch.h \ No newline at end of file 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 120000 index deebc47..0000000 --- a/platform/linux-generic/arch/arm/odp_cpu_arch.c +++ /dev/null @@ -1 +0,0 @@ -../default/odp_cpu_arch.c \ No newline at end of file diff --git a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c b/platform/linux-generic/arch/arm/odp_sysinfo_parse.c deleted file mode 120000 index 39962b8..0000000 --- a/platform/linux-generic/arch/arm/odp_sysinfo_parse.c +++ /dev/null @@ -1 +0,0 @@ -../default/odp_sysinfo_parse.c \ No newline at end of file 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 120000 index deebc47..0000000 --- a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c +++ /dev/null @@ -1 +0,0 @@ -../default/odp_cpu_arch.c \ No newline at end of file diff --git a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c new file mode 100644 index 0000000..2ac223e --- /dev/null +++ b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c @@ -0,0 +1,48 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include + +#include +#include + +#include +#include +#include +#include + +#define GIGA 1000000000 + +uint64_t odp_cpu_cycles(void) +{ + struct timespec time; + uint64_t sec, ns, hz, cycles; + int ret; + + ret = clock_gettime(CLOCK_MONOTONIC_RAW, &time); + + if (ret != 0) + ODP_ABORT("clock_gettime failed\n"); + + hz = odp_cpu_hz_max(); + sec = (uint64_t)time.tv_sec; + ns = (uint64_t)time.tv_nsec; + + cycles = sec * hz; + cycles += (ns * hz) / GIGA; + + return cycles; +} + +uint64_t odp_cpu_cycles_max(void) +{ + return UINT64_MAX; +} + +uint64_t odp_cpu_cycles_resolution(void) +{ + return 1; +}