This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".

The branch, master has been updated via 94665734b42bb11f98bf18205c4df7ad13c6f2a4 (commit) via c3af3011406a0b5a67c8dbf95b53ef94775d3014 (commit) via c1a00bb2a20b166a329dbd1158400fb27081c66c (commit) via 34dcdce23b1851f910aef53c4f17f3491f95183c (commit) via 7b98d4d5018461db83c3feef696b4470674844de (commit) via ff6fdd70a2b07bee11b708f5fd13350c5740de0e (commit) via b6ac02a13723c372501d21c56c9d73f506cafc3b (commit) from 40e4bafd9122e9531b0b6480b14f3d73d1d14e58 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit 94665734b42bb11f98bf18205c4df7ad13c6f2a4 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Feb 9 17:12:22 2018 +0300

configure: fix enabling -mcx16 flag for i?86 platforms

Use correct pattern in case-host construction.

Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/configure.ac b/configure.ac index 24a78823..21718f07 100644 --- a/configure.ac +++ b/configure.ac @@ -124,7 +124,7 @@ ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" # Check if compiler supports cmpxchng16 on x86-based architectures ########################################################################## case "${host}" in - i?86? | x86*) + i?86* | x86*) if test "${CC}" != "gcc" -o ${CC_VERSION_MAJOR} -ge 5; then ODP_CHECK_CFLAG([-mcx16]) fi

commit c3af3011406a0b5a67c8dbf95b53ef94775d3014 Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Feb 9 03:02:46 2018 +0300

configure: use AS_HELP_STRING for abi-compat option

Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/configure.ac b/configure.ac index 799d0b7b..24a78823 100644 --- a/configure.ac +++ b/configure.ac @@ -211,7 +211,8 @@ AC_SUBST(PKGCONFIG_VERSION) ODP_ABI_COMPAT=1 abi_compat=yes AC_ARG_ENABLE([abi-compat], - [ --disable-abi-compat disables ABI compatible mode, enables inline code in header files], + [AS_HELP_STRING([--disable-abi-compat], + [disables ABI compatible mode, enables inline code in header files])], [if test "x$enableval" = "xno"; then ODP_ABI_COMPAT=0 abi_compat=no

commit c1a00bb2a20b166a329dbd1158400fb27081c66c Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Feb 9 03:01:55 2018 +0300

travis: enable tests for default host configuration

Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/.travis.yml b/.travis.yml index 5fbb42c4..d9423adc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,8 @@ env: - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" - CONF="--disable-static-applications" + - CONF="--disable-host-optimization" + - CONF="--disable-host-optimization --disable-abi-compat" - DPDK_SHARED="y" CONF="--disable-static-applications" - DPDK_VERS="17.11" CONF="" - DPDK_VERS="17.11" DPDK_SHARED="y" CONF="--disable-static-applications"

commit 34dcdce23b1851f910aef53c4f17f3491f95183c Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Feb 9 03:01:05 2018 +0300

configure: add flag to build for host=default

Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/configure.ac b/configure.ac index dd82b66e..799d0b7b 100644 --- a/configure.ac +++ b/configure.ac @@ -163,14 +163,6 @@ AS_CASE([$host], ) AC_SUBST([ARCH_DIR])

-########################################################################## -# Warn on the defaults if arch is undefined -########################################################################## -if test "${ARCH_DIR}" = "default"; -then - AC_MSG_WARN([ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}]) -fi - ########################################################################## # Architecture for ABI support ########################################################################## @@ -185,6 +177,23 @@ AS_CASE([$host], ) AC_SUBST([ARCH_ABI])

+AC_ARG_ENABLE([host-optimization], + [AS_HELP_STRING([--disable-host-optimization], + [disables using host-specific ARCH and ABI files])], + [], [enable_host_optimization=yes]) +if test "x$enable_host_optimization" = "xno" ; then + ARCH_DIR=default + ARCH_ABI=default-linux +fi + +########################################################################## +# Warn on the defaults if arch is undefined +########################################################################## +if test "${ARCH_DIR}" = "default"; +then + AC_MSG_WARN([ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}]) +fi + if test "${ARCH_ABI}" = "default-linux"; then AC_MSG_WARN([ARCH_ABI is undefined, please add your ARCH_ABI based on host=${host}])

commit 7b98d4d5018461db83c3feef696b4470674844de Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Feb 9 02:55:49 2018 +0300

linux-gen: set DPDK's -msse4.2 flag during configure

Use ${host} during configure time to detect if we should enable -msse4.2 flag when building with DPDK.

Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index bb5bc813..7f212fe5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -13,12 +13,6 @@ AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) AM_CPPFLAGS += $(NETMAP_CPPFLAGS)

-if PKTIO_DPDK -if ARCH_IS_X86 -AM_CFLAGS += -msse4.2 -endif -endif - if !ODP_ABI_COMPAT odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index b2193a16..cb2ed60d 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -34,6 +34,12 @@ then ODP_DPDK([$DPDK_PATH], [], [AC_MSG_FAILURE([can't find DPDK])])

+ case "${host}" in + i?86* | x86*) + DPDK_CPPFLAGS="${DPDK_CPPFLAGS} -msse4.2" + ;; + esac + AC_DEFINE([ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy],

commit ff6fdd70a2b07bee11b708f5fd13350c5740de0e Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Feb 9 02:55:09 2018 +0300

build: add default-linux ABI dir, supporting generic arch

Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/configure.ac b/configure.ac index 97f0af40..dd82b66e 100644 --- a/configure.ac +++ b/configure.ac @@ -181,14 +181,13 @@ AS_CASE([$host], [powerpc*], [ARCH_ABI=power64-linux], [aarch64*], [ARCH_ABI=arm64-linux], [arm*], [ARCH_ABI=arm32-linux], - [ARCH_ABI=undefined] + [ARCH_ABI=default-linux] ) AC_SUBST([ARCH_ABI])

-if test "${ARCH_ABI}" = "undefined"; +if test "${ARCH_ABI}" = "default-linux"; then - echo "ARCH_ABI is undefined, please add your ARCH_ABI based on host=${host}" - exit 1 + AC_MSG_WARN([ARCH_ABI is undefined, please add your ARCH_ABI based on host=${host}]) fi

########################################################################## diff --git a/include/Makefile.am b/include/Makefile.am index aa330b8d..512002f8 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -226,6 +226,44 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h \ odp/arch/arm64-linux/odp/api/abi/version.h endif +if ARCH_IS_DEFAULT +odpapiabiarchinclude_HEADERS = \ + odp/arch/default-linux/odp/api/abi/align.h \ + odp/arch/default-linux/odp/api/abi/atomic.h \ + odp/arch/default-linux/odp/api/abi/barrier.h \ + odp/arch/default-linux/odp/api/abi/buffer.h \ + odp/arch/default-linux/odp/api/abi/byteorder.h \ + odp/arch/default-linux/odp/api/abi/classification.h \ + odp/arch/default-linux/odp/api/abi/cpu.h \ + odp/arch/default-linux/odp/api/abi/cpumask.h \ + odp/arch/default-linux/odp/api/abi/crypto.h \ + odp/arch/default-linux/odp/api/abi/debug.h \ + odp/arch/default-linux/odp/api/abi/event.h \ + odp/arch/default-linux/odp/api/abi/init.h \ + odp/arch/default-linux/odp/api/abi/ipsec.h \ + odp/arch/default-linux/odp/api/abi/packet.h \ + odp/arch/default-linux/odp/api/abi/packet_flags.h \ + odp/arch/default-linux/odp/api/abi/packet_io.h \ + odp/arch/default-linux/odp/api/abi/pool.h \ + odp/arch/default-linux/odp/api/abi/queue.h \ + odp/arch/default-linux/odp/api/abi/rwlock.h \ + odp/arch/default-linux/odp/api/abi/rwlock_recursive.h \ + odp/arch/default-linux/odp/api/abi/schedule.h \ + odp/arch/default-linux/odp/api/abi/schedule_types.h \ + odp/arch/default-linux/odp/api/abi/shared_memory.h \ + odp/arch/default-linux/odp/api/abi/spinlock.h \ + odp/arch/default-linux/odp/api/abi/spinlock_recursive.h \ + odp/arch/default-linux/odp/api/abi/std_clib.h \ + odp/arch/default-linux/odp/api/abi/std_types.h \ + odp/arch/default-linux/odp/api/abi/sync.h \ + odp/arch/default-linux/odp/api/abi/thread.h \ + odp/arch/default-linux/odp/api/abi/thrmask.h \ + odp/arch/default-linux/odp/api/abi/ticketlock.h \ + odp/arch/default-linux/odp/api/abi/time.h \ + odp/arch/default-linux/odp/api/abi/timer.h \ + odp/arch/default-linux/odp/api/abi/traffic_mngr.h \ + odp/arch/default-linux/odp/api/abi/version.h +endif if ARCH_IS_MIPS64 odpapiabiarchinclude_HEADERS = \ odp/arch/mips64-linux/odp/api/abi/align.h \ diff --git a/include/odp/arch/default-linux/odp/api/abi/align.h b/include/odp/arch/default-linux/odp/api/abi/align.h new file mode 100644 index 00000000..a4692f5d --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/align.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/align.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/atomic.h b/include/odp/arch/default-linux/odp/api/abi/atomic.h new file mode 100644 index 00000000..df1c2cd9 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/atomic.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/atomic.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/barrier.h b/include/odp/arch/default-linux/odp/api/abi/barrier.h new file mode 100644 index 00000000..5ccdf017 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/barrier.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/barrier.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/buffer.h b/include/odp/arch/default-linux/odp/api/abi/buffer.h new file mode 100644 index 00000000..e030559a --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/buffer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/buffer.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/byteorder.h b/include/odp/arch/default-linux/odp/api/abi/byteorder.h new file mode 100644 index 00000000..27219f94 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/byteorder.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/byteorder.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/classification.h b/include/odp/arch/default-linux/odp/api/abi/classification.h new file mode 100644 index 00000000..4c3ba327 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/classification.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/classification.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/cpu.h b/include/odp/arch/default-linux/odp/api/abi/cpu.h new file mode 100644 index 00000000..0765339b --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/cpu.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define ODP_CACHE_LINE_SIZE 64 + +static inline void odp_cpu_pause(void) +{ +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/odp/arch/default-linux/odp/api/abi/cpumask.h b/include/odp/arch/default-linux/odp/api/abi/cpumask.h new file mode 100644 index 00000000..b4e7a5df --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/cpumask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/cpumask.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/crypto.h b/include/odp/arch/default-linux/odp/api/abi/crypto.h new file mode 100644 index 00000000..4f4b4368 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/crypto.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/crypto.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/debug.h b/include/odp/arch/default-linux/odp/api/abi/debug.h new file mode 100644 index 00000000..1bc03109 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/debug.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/debug.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/event.h b/include/odp/arch/default-linux/odp/api/abi/event.h new file mode 100644 index 00000000..f87d6195 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/event.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/event.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/init.h b/include/odp/arch/default-linux/odp/api/abi/init.h new file mode 100644 index 00000000..bd64cf14 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/init.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/init.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/ipsec.h b/include/odp/arch/default-linux/odp/api/abi/ipsec.h new file mode 100644 index 00000000..5073680b --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/ipsec.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ipsec.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/packet.h b/include/odp/arch/default-linux/odp/api/abi/packet.h new file mode 100644 index 00000000..a1e9b1a8 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/packet.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_flags.h b/include/odp/arch/default-linux/odp/api/abi/packet_flags.h new file mode 100644 index 00000000..fd3e10d0 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/packet_flags.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet_flags.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_io.h b/include/odp/arch/default-linux/odp/api/abi/packet_io.h new file mode 100644 index 00000000..e4220c63 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/packet_io.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/packet_io.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/pool.h b/include/odp/arch/default-linux/odp/api/abi/pool.h new file mode 100644 index 00000000..72055635 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/pool.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/pool.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/queue.h b/include/odp/arch/default-linux/odp/api/abi/queue.h new file mode 100644 index 00000000..04f0c6eb --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/queue.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/queue.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/rwlock.h b/include/odp/arch/default-linux/odp/api/abi/rwlock.h new file mode 100644 index 00000000..a6aa377d --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/rwlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h new file mode 100644 index 00000000..a78a2181 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/rwlock_recursive.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/schedule.h b/include/odp/arch/default-linux/odp/api/abi/schedule.h new file mode 100644 index 00000000..027265c1 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/schedule.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/schedule_types.h b/include/odp/arch/default-linux/odp/api/abi/schedule_types.h new file mode 100644 index 00000000..f9aa2005 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/schedule_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/schedule_types.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/shared_memory.h b/include/odp/arch/default-linux/odp/api/abi/shared_memory.h new file mode 100644 index 00000000..51e35e90 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/shared_memory.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/shared_memory.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/spinlock.h b/include/odp/arch/default-linux/odp/api/abi/spinlock.h new file mode 100644 index 00000000..46da3024 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/spinlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h new file mode 100644 index 00000000..e75e753e --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/spinlock_recursive.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/std_clib.h b/include/odp/arch/default-linux/odp/api/abi/std_clib.h new file mode 100644 index 00000000..048c9fc2 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/std_clib.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/std_clib.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/std_types.h b/include/odp/arch/default-linux/odp/api/abi/std_types.h new file mode 100644 index 00000000..fa360e01 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/std_types.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/std_types.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/sync.h b/include/odp/arch/default-linux/odp/api/abi/sync.h new file mode 100644 index 00000000..cdab3a94 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/sync.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/sync.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/thread.h b/include/odp/arch/default-linux/odp/api/abi/thread.h new file mode 100644 index 00000000..e34b7c7b --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/thread.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thread.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/thrmask.h b/include/odp/arch/default-linux/odp/api/abi/thrmask.h new file mode 100644 index 00000000..14ff7770 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/thrmask.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/thrmask.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/ticketlock.h b/include/odp/arch/default-linux/odp/api/abi/ticketlock.h new file mode 100644 index 00000000..268b8094 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/ticketlock.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/ticketlock.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/time.h b/include/odp/arch/default-linux/odp/api/abi/time.h new file mode 100644 index 00000000..85c7dd03 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/time.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/time.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/timer.h b/include/odp/arch/default-linux/odp/api/abi/timer.h new file mode 100644 index 00000000..b1664959 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/timer.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/timer.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h new file mode 100644 index 00000000..fcd83801 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/traffic_mngr.h> diff --git a/include/odp/arch/default-linux/odp/api/abi/version.h b/include/odp/arch/default-linux/odp/api/abi/version.h new file mode 100644 index 00000000..36559ec8 --- /dev/null +++ b/include/odp/arch/default-linux/odp/api/abi/version.h @@ -0,0 +1,7 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <odp/api/abi-default/version.h>

commit b6ac02a13723c372501d21c56c9d73f506cafc3b Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Fri Feb 9 02:52:49 2018 +0300

build: support building for generic arch

Support building ODP for generic architecture, using default ARCH code.

Signed-off-by: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Reviewed-by: Bill Fischofer bill.fischofer@linaro.org Signed-off-by: Maxim Uvarov maxim.uvarov@linaro.org

diff --git a/configure.ac b/configure.ac index a44a2ec6..97f0af40 100644 --- a/configure.ac +++ b/configure.ac @@ -159,17 +159,16 @@ AS_CASE([$host], [powerpc*], [ARCH_DIR=powerpc], [aarch64*], [ARCH_DIR=aarch64], [arm*], [ARCH_DIR=arm], - [ARCH_DIR=undefined] + [ARCH_DIR=default] ) AC_SUBST([ARCH_DIR])

########################################################################## # Warn on the defaults if arch is undefined ########################################################################## -if test "${ARCH_DIR}" = "undefined"; +if test "${ARCH_DIR}" = "default"; then - echo "ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}" - exit 1 + AC_MSG_WARN([ARCH_DIR is undefined, please add your ARCH_DIR based on host=${host}]) fi

########################################################################## @@ -280,6 +279,7 @@ AM_CONDITIONAL([HAVE_MSCGEN], [test "x${MSCGEN}" = "xmscgen"]) AM_CONDITIONAL([helper_linux], [test x$helper_linux = xyes ]) AM_CONDITIONAL([ARCH_IS_ARM], [test "x${ARCH_DIR}" = "xarm"]) AM_CONDITIONAL([ARCH_IS_AARCH64], [test "x${ARCH_DIR}" = "xaarch64"]) +AM_CONDITIONAL([ARCH_IS_DEFAULT], [test "x${ARCH_DIR}" = "xdefault"]) AM_CONDITIONAL([ARCH_IS_MIPS64], [test "x${ARCH_DIR}" = "xmips64"]) AM_CONDITIONAL([ARCH_IS_POWERPC], [test "x${ARCH_DIR}" = "xpowerpc"]) AM_CONDITIONAL([ARCH_IS_X86], [test "x${ARCH_DIR}" = "xx86"]) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 9e82f262..bb5bc813 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -241,6 +241,16 @@ noinst_HEADERS += arch/aarch64/odp_atomic.h \ arch/default/odp_cpu_idling.h \ arch/aarch64/odp_llsc.h endif +if ARCH_IS_DEFAULT +__LIB__libodp_linux_la_SOURCES += arch/default/odp_cpu_cycles.c \ + arch/default/odp_global_time.c \ + arch/default/odp_sysinfo_parse.c +if !ODP_ABI_COMPAT +odpapiabiarchinclude_HEADERS += arch/default/odp/api/abi/cpu.h +endif +noinst_HEADERS += arch/default/odp_cpu.h \ + arch/default/odp_cpu_idling.h +endif if ARCH_IS_MIPS64 __LIB__libodp_linux_la_SOURCES += arch/mips64/odp_cpu_cycles.c \ arch/default/odp_global_time.c \ diff --git a/platform/linux-generic/arch/default/odp/api/abi/cpu.h b/platform/linux-generic/arch/default/odp/api/abi/cpu.h new file mode 100644 index 00000000..0765339b --- /dev/null +++ b/platform/linux-generic/arch/default/odp/api/abi/cpu.h @@ -0,0 +1,24 @@ +/* Copyright (c) 2018, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_API_ABI_CPU_H_ +#define ODP_API_ABI_CPU_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#define ODP_CACHE_LINE_SIZE 64 + +static inline void odp_cpu_pause(void) +{ +} + +#ifdef __cplusplus +} +#endif + +#endif

-----------------------------------------------------------------------

Summary of changes: .travis.yml | 2 ++ configure.ac | 41 +++++++++++++--------- include/Makefile.am | 38 ++++++++++++++++++++ .../odp/api/abi/align.h | 2 +- .../odp/api/abi/atomic.h | 2 +- .../odp/api/abi/barrier.h | 2 +- .../odp/api/abi/buffer.h | 2 +- .../odp/api/abi/byteorder.h | 2 +- .../odp/api/abi/classification.h | 2 +- .../odp/arch/default-linux}/odp/api/abi/cpu.h | 7 +--- .../odp/api/abi/cpumask.h | 2 +- .../odp/api/abi/crypto.h | 2 +- .../odp/api/abi/debug.h | 2 +- .../odp/api/abi/event.h | 2 +- .../odp/api/abi/init.h | 2 +- .../odp/api/abi/ipsec.h | 2 +- .../odp/api/abi/packet.h | 2 +- .../odp/api/abi/packet_flags.h | 2 +- .../odp/api/abi/packet_io.h | 2 +- .../odp/api/abi/pool.h | 2 +- .../odp/api/abi/queue.h | 2 +- .../odp/api/abi/rwlock.h | 2 +- .../odp/api/abi/rwlock_recursive.h | 2 +- .../odp/api/abi/schedule.h | 2 +- .../odp/api/abi/schedule_types.h | 2 +- .../odp/api/abi/shared_memory.h | 2 +- .../odp/api/abi/spinlock.h | 2 +- .../odp/api/abi/spinlock_recursive.h | 2 +- .../odp/api/abi/std_clib.h | 2 +- .../odp/api/abi/std_types.h | 2 +- .../odp/api/abi/sync.h | 2 +- .../odp/api/abi/thread.h | 2 +- .../odp/api/abi/thrmask.h | 2 +- .../odp/api/abi/ticketlock.h | 2 +- .../odp/api/abi/time.h | 2 +- .../odp/api/abi/timer.h | 2 +- .../odp/api/abi/traffic_mngr.h | 2 +- .../odp/api/abi/version.h | 2 +- platform/linux-generic/Makefile.am | 16 +++++---- .../arch/{x86 => default}/odp/api/abi/cpu.h | 7 +--- platform/linux-generic/m4/odp_dpdk.m4 | 6 ++++ 41 files changed, 117 insertions(+), 68 deletions(-) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/align.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/atomic.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/barrier.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/buffer.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/byteorder.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/classification.h (76%) copy {platform/linux-generic/arch/x86 => include/odp/arch/default-linux}/odp/api/abi/cpu.h (67%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/cpumask.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/crypto.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/debug.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/event.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/init.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/ipsec.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/packet.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/packet_flags.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/packet_io.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/pool.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/queue.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/rwlock.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/rwlock_recursive.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/schedule.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/schedule_types.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/shared_memory.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/spinlock.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/spinlock_recursive.h (77%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/std_clib.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/std_types.h (75%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/sync.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/thread.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/thrmask.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/ticketlock.h (76%) copy include/odp/arch/{arm64-linux => default-linux}/odp/api/abi/time.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/timer.h (75%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/traffic_mngr.h (76%) copy include/odp/arch/{arm32-linux => default-linux}/odp/api/abi/version.h (75%) copy platform/linux-generic/arch/{x86 => default}/odp/api/abi/cpu.h (67%)

hooks/post-receive