From patchwork Wed Apr 1 16:50:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 47085 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D1FAC21416 for ; Sat, 11 Apr 2015 10:03:22 +0000 (UTC) Received: by wizk4 with SMTP id k4sf3970684wiz.2 for ; Sat, 11 Apr 2015 03:03:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=Ch7wTVzYMVNtciIrb+uO11R2h1QtDp1/ArGpZmM9ogw=; b=c887/PTSd+IO7vSJtJwgBdC2yYm7QekSnP9KIEBMzQyx5Jt6b1L5EuDbwdOqfXvpZ6 Mfetpk2ab1Xsj9pq5Bcj9wqYqXW+YUnV5BoT4lvDEn0Rd/R4Elx2QUS3T+V1kCDJNz3i aKAQCXe/JPSa9lyCnHmo9FqeDTf9pzkMPNmQzPjqH/V+si8fazbvFl92hWx3+img92GZ XZzlBAMLJFeQtQtZFN7MW9w4Y/DlIcWzE7dq32JxiwVdDWs2K2g9VnnOY163V7UGWVGM jycHEQ5HEoJE88taJghLB3K10u2QdJhrua1vasE5gBC7NgY58Qk8/M2RKjn5q3Ztt2eN nI9Q== X-Gm-Message-State: ALoCoQkCpexT+zE1YUXN/Ce9NbX01ceR5egzCmA/kr81qH9qumLQX+IcUbP8Qd688Evg96Q/U/QT X-Received: by 10.180.74.197 with SMTP id w5mr409685wiv.5.1428746602180; Sat, 11 Apr 2015 03:03:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.194 with SMTP id v2ls592352lag.59.gmail; Sat, 11 Apr 2015 03:03:22 -0700 (PDT) X-Received: by 10.152.19.132 with SMTP id f4mr4926766lae.115.1428746602017; Sat, 11 Apr 2015 03:03:22 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id jj4si3483137lbb.174.2015.04.11.03.03.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Apr 2015 03:03:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbcga7 with SMTP id ga7so29275619lbc.1 for ; Sat, 11 Apr 2015 03:03:21 -0700 (PDT) X-Received: by 10.112.162.232 with SMTP id yd8mr4910828lbb.41.1428746601584; Sat, 11 Apr 2015 03:03:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp233840lbt; Sat, 11 Apr 2015 03:03:20 -0700 (PDT) X-Received: by 10.55.53.137 with SMTP id c131mr10785585qka.102.1428746600224; Sat, 11 Apr 2015 03:03:20 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 93si4407271qkv.8.2015.04.11.03.03.17; Sat, 11 Apr 2015 03:03:20 -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; Received: by lists.linaro.org (Postfix, from userid 109) id 9955961C72; Sat, 11 Apr 2015 10:03:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id CAD356515A; Sat, 11 Apr 2015 09:52:22 +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 03F8564FDB; Wed, 1 Apr 2015 16:50:48 +0000 (UTC) Received: from mail-qg0-f42.google.com (mail-qg0-f42.google.com [209.85.192.42]) by lists.linaro.org (Postfix) with ESMTPS id 93BAC64FD8 for ; Wed, 1 Apr 2015 16:50:48 +0000 (UTC) Received: by qgep97 with SMTP id p97so47764210qge.1 for ; Wed, 01 Apr 2015 09:50:48 -0700 (PDT) X-Received: by 10.140.35.83 with SMTP id m77mr19585846qgm.19.1427907048419; Wed, 01 Apr 2015 09:50:48 -0700 (PDT) Received: from mike-desktop.?.holmesfamily.ws (c-98-221-136-245.hsd1.nj.comcast.net. [98.221.136.245]) by mx.google.com with ESMTPSA id f37sm1619236qkf.14.2015.04.01.09.50.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2015 09:50:47 -0700 (PDT) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Wed, 1 Apr 2015 12:50:38 -0400 Message-Id: <1427907038-12230-3-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427907038-12230-1-git-send-email-mike.holmes@linaro.org> References: <1427907038-12230-1-git-send-email-mike.holmes@linaro.org> X-Topics: Architecture patch Subject: [lng-odp] [PATCH 3/3] linux-generic: use arch optimisations for time X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mike.holmes@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Switch to using configure time optimizations from compile time Signed-off-by: Mike Holmes --- platform/linux-generic/Makefile.am | 3 +- platform/linux-generic/odp_time.c | 64 -------------------------------------- 2 files changed, 2 insertions(+), 65 deletions(-) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e5558ac..06d5998 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -167,4 +167,5 @@ __LIB__libodp_la_SOURCES = \ odp_time.c \ odp_timer.c \ odp_version.c \ - odp_weak.c + odp_weak.c \ + arch/@ARCH@/odp_time.c diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index 31d6656..a08833d 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -12,70 +12,6 @@ #define GIGA 1000000000 -#if defined __x86_64__ || defined __i386__ - -uint64_t odp_time_cycles(void) -{ - union { - uint64_t tsc_64; - struct { - uint32_t lo_32; - uint32_t hi_32; - }; - } tsc; - - __asm__ __volatile__ ("rdtsc" : - "=a" (tsc.lo_32), - "=d" (tsc.hi_32) : : "memory"); - - return tsc.tsc_64; -} - - -#elif defined __OCTEON__ - -uint64_t odp_time_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; -} - -#else - -#include -#include -#include - -uint64_t odp_time_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_sys_cpu_hz(); - sec = (uint64_t) time.tv_sec; - ns = (uint64_t) time.tv_nsec; - - cycles = sec * hz; - cycles += (ns * hz) / GIGA; - - return cycles; -} - -#endif - uint64_t odp_time_diff_cycles(uint64_t t1, uint64_t t2) { if (odp_likely(t2 > t1))