[dpdk-dev,v2,3/6] eal/arm: add 64-bit armv8 version of rte_cycles.h
Commit Message
Signed-off-by: David Hunt <david.hunt@intel.com>
---
.../common/include/arch/arm/rte_cycles.h | 4 ++
.../common/include/arch/arm/rte_cycles_64.h | 77 ++++++++++++++++++++++
2 files changed, 81 insertions(+)
create mode 100644 lib/librte_eal/common/include/arch/arm/rte_cycles_64.h
Comments
On Fri, 30 Oct 2015 11:51:23 +0000
David Hunt <david.hunt@intel.com> wrote:
> +static inline uint64_t
> +rte_rdtsc(void)
> +{
> + uint64_t tsc;
> +
> + asm volatile("mrs %0, CNTVCT_EL0" : "=r" (tsc));
> +
> +#ifdef RTE_TIMER_MULTIPLIER
> + return tsc * RTE_TIMER_MULTIPLIER;
> +#else
I think, this should be CONFIG_RTE_TIMER_MULTIPLIER.
Jan
> + return tsc;
> +#endif
> +
> +}
> +
On 30/10/2015 12:44, Jan Viktorin wrote:
> On Fri, 30 Oct 2015 11:51:23 +0000
> David Hunt <david.hunt@intel.com> wrote:
>
>> +static inline uint64_t
>> +rte_rdtsc(void)
>> +{
>> + uint64_t tsc;
>> +
>> + asm volatile("mrs %0, CNTVCT_EL0" : "=r" (tsc));
>> +
>> +#ifdef RTE_TIMER_MULTIPLIER
>> + return tsc * RTE_TIMER_MULTIPLIER;
>> +#else
>
> I think, this should be CONFIG_RTE_TIMER_MULTIPLIER.
>
> Jan
Jan,
Thanks for the super-fast review :)
I've taken a look at this and RTE_TIMER_MULTIPLIER is present in
the generated include/rte_config.h, so it compiles and run fine. I've
also confirmed this by removing the #ifdef, forcing the use of
RTE_TIMER_MULTIPLIER as a test.
Dave.
@@ -33,6 +33,10 @@
#ifndef _RTE_CYCLES_ARM_H_
#define _RTE_CYCLES_ARM_H_
+#ifdef RTE_ARCH_64
+#include <rte_cycles_64.h>
+#else
#include <rte_cycles_32.h>
+#endif
#endif /* _RTE_CYCLES_ARM_H_ */
new file mode 100644
@@ -0,0 +1,77 @@
+/*
+ * BSD LICENSE
+ *
+ * Copyright (C) IBM Corporation 2014.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of IBM Corporation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef _RTE_CYCLES_ARM64_H_
+#define _RTE_CYCLES_ARM64_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "generic/rte_cycles.h"
+
+/**
+ * Read the time base register.
+ *
+ * @return
+ * The time base for this lcore.
+ */
+static inline uint64_t
+rte_rdtsc(void)
+{
+ uint64_t tsc;
+
+ asm volatile("mrs %0, CNTVCT_EL0" : "=r" (tsc));
+
+#ifdef RTE_TIMER_MULTIPLIER
+ return tsc * RTE_TIMER_MULTIPLIER;
+#else
+ return tsc;
+#endif
+
+}
+
+static inline uint64_t
+rte_rdtsc_precise(void)
+{
+ asm volatile("isb sy" :::);
+ return rte_rdtsc();
+}
+
+static inline uint64_t
+rte_get_tsc_cycles(void) { return rte_rdtsc(); }
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTE_CYCLES_ARM64_H_ */