From: Duncan Bellamy <dunk@denkimushi.com> To: dev@dpdk.org Cc: Duncan Bellamy <dunk@denkimushi.com> Subject: [PATCH v4] lib/eal/ppc fix compilation for musl Date: Sat, 7 May 2022 20:43:58 +0100 Message-ID: <20220507194358.2330320-1-dunk@denkimushi.com> (raw) In-Reply-To: <20220502142615.3705639-1-dunk@denkimushi.com> musl lacks __ppc_get_timebase() but has __builtin_ppc_get_timebase() the __ppc_get_timebase_freq() is taken from: https://git.alpinelinux.org/aports/commit/?id=06b03f70fb94972286c0c9f6278df89e53903833 Signed-off-by: Duncan Bellamy <dunk@denkimushi.com> --- lib/eal/common/eal_private.h | 7 ++++++ lib/eal/linux/eal_timer.c | 39 ++++++++++++++++++++++++++++++++ lib/eal/ppc/include/rte_cycles.h | 7 ++++++ lib/eal/ppc/rte_cycles.c | 10 ++++++++ 4 files changed, 63 insertions(+) diff --git a/lib/eal/common/eal_private.h b/lib/eal/common/eal_private.h index 44d14241f0..9ac1949e1c 100644 --- a/lib/eal/common/eal_private.h +++ b/lib/eal/common/eal_private.h @@ -743,4 +743,11 @@ int eal_asprintf(char **buffer, const char *format, ...); eal_asprintf(buffer, format, ##__VA_ARGS__) #endif +/** + * Function for systems with no __ppc_get_timebase_freq function. + */ +#ifndef RTE_ARCH_PPC_64 +uint64_t no_ppc_get_timebase_freq(void); +#endif + #endif /* _EAL_PRIVATE_H_ */ diff --git a/lib/eal/linux/eal_timer.c b/lib/eal/linux/eal_timer.c index 620baf038d..89cadb9cfb 100644 --- a/lib/eal/linux/eal_timer.c +++ b/lib/eal/linux/eal_timer.c @@ -5,6 +5,8 @@ #include <stdio.h> #include <stdint.h> +#include <string.h> +#include <features.h> #include <rte_common.h> #include <rte_cycles.h> @@ -222,3 +224,40 @@ rte_eal_timer_init(void) set_tsc_freq(); return 0; } + +#ifndef RTE_ARCH_PPC_64 +uint64_t +no_ppc_get_timebase_freq(void) +{ + static uint64_t base; + #if defined(__LINUX__) + if (!base) { + FILE *f = fopen("/proc/cpuinfo", "rb"); + if (f) { + ssize_t nr; + /* virtually always big enough to hold the line */ + char buf[512]; + while (fgets(buf, sizeof(buf), f)) { + char *ret = strstr(buf, "timebase"); + if (!ret) { + continue; + } + ret += sizeof("timebase") - 1; + ret = strchr(ret, ':'); + if (!ret) { + continue; + } + base = strtoul(ret + 1, 0, 10); + break; + } + fclose(f); + } + } + #elif defined(_WIN32) || defined(_WIN64) + /* windows code here */ + #elif defined(RTE_EXEC_ENV_FREEBSD) + /* freebsd code here */ + #endif + return base; +} +#endif diff --git a/lib/eal/ppc/include/rte_cycles.h b/lib/eal/ppc/include/rte_cycles.h index 5585f9273c..666fc9b0bf 100644 --- a/lib/eal/ppc/include/rte_cycles.h +++ b/lib/eal/ppc/include/rte_cycles.h @@ -10,7 +10,10 @@ extern "C" { #endif +#include <features.h> +#ifdef __GLIBC__ #include <sys/platform/ppc.h> +#endif #include "generic/rte_cycles.h" @@ -26,7 +29,11 @@ extern "C" { static inline uint64_t rte_rdtsc(void) { +#ifdef __GLIBC__ return __ppc_get_timebase(); +#else + return __builtin_ppc_get_timebase(); +#endif } static inline uint64_t diff --git a/lib/eal/ppc/rte_cycles.c b/lib/eal/ppc/rte_cycles.c index 3180adb0ff..b69fc701a6 100644 --- a/lib/eal/ppc/rte_cycles.c +++ b/lib/eal/ppc/rte_cycles.c @@ -2,12 +2,22 @@ * Copyright (C) IBM Corporation 2019. */ +#include <features.h> +#ifdef __GLIBC__ #include <sys/platform/ppc.h> +#else +#include <string.h> +#include <stdio.h> +#endif #include "eal_private.h" uint64_t get_tsc_freq_arch(void) { +#ifdef __GLIBC__ return __ppc_get_timebase_freq(); +#else + return no_ppc_get_timebase_freq(); +#endif } -- 2.32.0
next prev parent reply other threads:[~2022-05-07 19:44 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20220502115228.3AAAB1242D4@dpdk.org> 2022-05-02 14:26 ` [PATCH v2] " Duncan Bellamy 2022-05-02 17:41 ` David Marchand 2022-05-02 20:18 ` Dunk 2022-05-02 17:42 ` David Christensen 2022-05-02 20:20 ` Dunk 2022-05-07 9:47 ` [PATCH v3] " Duncan Bellamy 2022-05-07 19:43 ` Duncan Bellamy [this message] 2022-05-07 21:03 ` [PATCH v5] " Duncan Bellamy 2022-05-07 21:15 ` [PATCH v6] " Duncan Bellamy 2022-05-09 12:06 ` David Marchand 2022-05-09 22:39 ` Dunk 2022-05-14 7:14 ` [PATCH v7] eal/ppc: " Duncan Bellamy 2022-05-19 16:18 ` David Marchand 2022-05-31 17:24 ` David Christensen 2022-06-01 15:06 ` David Marchand
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220507194358.2330320-1-dunk@denkimushi.com \ --to=dunk@denkimushi.com \ --cc=dev@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ http://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git