aboutsummaryrefslogtreecommitdiff
path: root/platform/linux-generic/include/odp/api
diff options
context:
space:
mode:
Diffstat (limited to 'platform/linux-generic/include/odp/api')
-rw-r--r--platform/linux-generic/include/odp/api/plat/atomic_inlines.h34
-rw-r--r--platform/linux-generic/include/odp/api/plat/cpu_inlines.h25
2 files changed, 31 insertions, 28 deletions
diff --git a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h
index 4ab8bb411..a9da70890 100644
--- a/platform/linux-generic/include/odp/api/plat/atomic_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/atomic_inlines.h
@@ -34,6 +34,13 @@
#define odp_atomic_dec_u32 __odp_atomic_dec_u32
#define odp_atomic_cas_u32 __odp_atomic_cas_u32
#define odp_atomic_xchg_u32 __odp_atomic_xchg_u32
+ #define odp_atomic_load_acq_u32 __odp_atomic_load_acq_u32
+ #define odp_atomic_store_rel_u32 __odp_atomic_store_rel_u32
+ #define odp_atomic_add_rel_u32 __odp_atomic_add_rel_u32
+ #define odp_atomic_sub_rel_u32 __odp_atomic_sub_rel_u32
+ #define odp_atomic_cas_acq_u32 __odp_atomic_cas_acq_u32
+ #define odp_atomic_cas_rel_u32 __odp_atomic_cas_rel_u32
+ #define odp_atomic_cas_acq_rel_u32 __odp_atomic_cas_acq_rel_u32
#define odp_atomic_max_u32 __odp_atomic_max_u32
#define odp_atomic_min_u32 __odp_atomic_min_u32
#define odp_atomic_init_u64 __odp_atomic_init_u64
@@ -56,35 +63,8 @@
#define odp_atomic_cas_acq_u64 __odp_atomic_cas_acq_u64
#define odp_atomic_cas_rel_u64 __odp_atomic_cas_rel_u64
#define odp_atomic_cas_acq_rel_u64 __odp_atomic_cas_acq_rel_u64
- #define odp_atomic_init_u64 __odp_atomic_init_u64
- #define odp_atomic_load_u64 __odp_atomic_load_u64
- #define odp_atomic_store_u64 __odp_atomic_store_u64
- #define odp_atomic_fetch_add_u64 __odp_atomic_fetch_add_u64
- #define odp_atomic_add_u64 __odp_atomic_add_u64
- #define odp_atomic_fetch_sub_u64 __odp_atomic_fetch_sub_u64
- #define odp_atomic_sub_u64 __odp_atomic_sub_u64
- #define odp_atomic_fetch_inc_u64 __odp_atomic_fetch_inc_u64
- #define odp_atomic_inc_u64 __odp_atomic_inc_u64
- #define odp_atomic_fetch_dec_u64 __odp_atomic_fetch_dec_u64
- #define odp_atomic_dec_u64 __odp_atomic_dec_u64
- #define odp_atomic_cas_u64 __odp_atomic_cas_u64
- #define odp_atomic_xchg_u64 __odp_atomic_xchg_u64
- #define odp_atomic_load_acq_u64 __odp_atomic_load_acq_u64
- #define odp_atomic_store_rel_u64 __odp_atomic_store_rel_u64
- #define odp_atomic_add_rel_u64 __odp_atomic_add_rel_u64
- #define odp_atomic_sub_rel_u64 __odp_atomic_sub_rel_u64
- #define odp_atomic_cas_acq_u64 __odp_atomic_cas_acq_u64
- #define odp_atomic_cas_rel_u64 __odp_atomic_cas_rel_u64
- #define odp_atomic_cas_acq_rel_u64 __odp_atomic_cas_acq_rel_u64
#define odp_atomic_max_u64 __odp_atomic_max_u64
#define odp_atomic_min_u64 __odp_atomic_min_u64
- #define odp_atomic_load_acq_u32 __odp_atomic_load_acq_u32
- #define odp_atomic_store_rel_u32 __odp_atomic_store_rel_u32
- #define odp_atomic_add_rel_u32 __odp_atomic_add_rel_u32
- #define odp_atomic_sub_rel_u32 __odp_atomic_sub_rel_u32
- #define odp_atomic_cas_acq_u32 __odp_atomic_cas_acq_u32
- #define odp_atomic_cas_rel_u32 __odp_atomic_cas_rel_u32
- #define odp_atomic_cas_acq_rel_u32 __odp_atomic_cas_acq_rel_u32
#define odp_atomic_init_u128 __odp_atomic_init_u128
#define odp_atomic_load_u128 __odp_atomic_load_u128
#define odp_atomic_store_u128 __odp_atomic_store_u128
diff --git a/platform/linux-generic/include/odp/api/plat/cpu_inlines.h b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h
index 054801e80..60c4bb920 100644
--- a/platform/linux-generic/include/odp/api/plat/cpu_inlines.h
+++ b/platform/linux-generic/include/odp/api/plat/cpu_inlines.h
@@ -1,4 +1,5 @@
/* Copyright (c) 2018, Linaro Limited
+ * Copyright (c) 2021, Nokia
* All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
@@ -9,6 +10,10 @@
#include <odp/api/hints.h>
+#include <odp/api/abi/cpu_inlines.h>
+
+#include <stdint.h>
+
/** @cond _ODP_HIDE_FROM_DOXYGEN_ */
#ifndef _ODP_NO_INLINE
@@ -23,7 +28,25 @@
#define _ODP_INLINE
#endif
-#include <odp/api/abi/cpu_inlines.h>
+_ODP_INLINE void odp_cpu_pause(void)
+{
+ _odp_cpu_pause();
+}
+
+_ODP_INLINE uint64_t odp_cpu_cycles_max(void)
+{
+ return _odp_cpu_cycles_max();
+}
+
+_ODP_INLINE uint64_t odp_cpu_cycles_resolution(void)
+{
+ return _odp_cpu_cycles_resolution();
+}
+
+_ODP_INLINE uint64_t odp_cpu_cycles(void)
+{
+ return _odp_cpu_cycles();
+}
_ODP_INLINE uint64_t odp_cpu_cycles_diff(uint64_t c2, uint64_t c1)
{