From patchwork Wed Apr 1 20:12:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Holmes X-Patchwork-Id: 46660 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 22D8F2159A for ; Wed, 1 Apr 2015 20:12:27 +0000 (UTC) Received: by lbdc10 with SMTP id c10sf12875526lbd.0 for ; Wed, 01 Apr 2015 13:12:25 -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=i9cQXgKDu0uUfbZHga3YZqOXQi63V16R6eSTPJInBZ/8bcJ4NJ3bERjtIAz5eH/d8b iP0fWXU+jlhKBT/KgqQg1QHuLPJmup7ZoBaOqp+YfuFuf+/InxvReH5dPuJ/s4fyZWt8 EsJJItkSRhN1HyCyFWOoFA8/9RVE9qoaGGuweX+eEgojIS8dTdZ/cbxmF3hOGXvZRJtl vRo9IHOVIlGTccyhcgxA2h/2SLoPfPQ7mx0xJ2RZdMUUjwdOY9fTeoUuWU9sx9wcXVOb UgV0RqnwJERmrGv8kiz4O0OqSmcPbRaDqmCeoFI9CR1zHT0OsSZzFYs6dOENhHDab7ZF pUHQ== X-Gm-Message-State: ALoCoQkOGd9T/ExFMaN1ZEK4TiCJZdher+PaP1qVS8IOvP3tOGazQEKVczx4TSAZOFOB8B9ctxqB X-Received: by 10.180.89.36 with SMTP id bl4mr2299738wib.2.1427919145871; Wed, 01 Apr 2015 13:12:25 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.227 with SMTP id b3ls106130lak.58.gmail; Wed, 01 Apr 2015 13:12:25 -0700 (PDT) X-Received: by 10.152.44.200 with SMTP id g8mr15149281lam.46.1427919145707; Wed, 01 Apr 2015 13:12:25 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id g4si2443378lbs.114.2015.04.01.13.12.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Apr 2015 13:12:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by labe2 with SMTP id e2so45407460lab.3 for ; Wed, 01 Apr 2015 13:12:25 -0700 (PDT) X-Received: by 10.152.28.5 with SMTP id x5mr36718234lag.112.1427919145539; Wed, 01 Apr 2015 13:12:25 -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.57.201 with SMTP id k9csp892233lbq; Wed, 1 Apr 2015 13:12:24 -0700 (PDT) X-Received: by 10.140.28.203 with SMTP id 69mr57185361qgz.5.1427919142656; Wed, 01 Apr 2015 13:12:22 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id r41si2915587qkr.92.2015.04.01.13.12.21; Wed, 01 Apr 2015 13:12:22 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id C261E65010; Wed, 1 Apr 2015 20:12:21 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: from mail-qg0-f42.google.com (mail-qg0-f42.google.com [209.85.192.42]) by lists.linaro.org (Postfix) with ESMTPS id 643CE65004 for ; Wed, 1 Apr 2015 20:12:19 +0000 (UTC) Received: by qgfa8 with SMTP id a8so53006639qgf.0 for ; Wed, 01 Apr 2015 13:12:19 -0700 (PDT) X-Received: by 10.140.235.208 with SMTP id g199mr59217591qhc.89.1427919139148; Wed, 01 Apr 2015 13:12:19 -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 z67sm1999853qgz.10.2015.04.01.13.12.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Apr 2015 13:12:18 -0700 (PDT) From: Mike Holmes To: lng-odp@lists.linaro.org Date: Wed, 1 Apr 2015 16:12:08 -0400 Message-Id: <1427919128-30737-3-git-send-email-mike.holmes@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427919128-30737-1-git-send-email-mike.holmes@linaro.org> References: <1427919128-30737-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.215.44 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))