-AC_INIT([vpp], [17.10], [vpp-dev@fd.io])
+AC_INIT([vpp], [18.04], [vpp-dev@fd.io])
LT_INIT
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([subdir-objects])
AM_SILENT_RULES([yes])
-AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile vpp-api/vapi/Makefile])
+AC_CONFIG_FILES([Makefile plugins/Makefile vpp-api/python/Makefile vpp-api/java/Makefile vpp-api/vapi/Makefile vpp-api/vom/Makefile])
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
AC_PROG_CXX
+AC_PROG_CPP
AM_PROG_AS
AM_PROG_LIBTOOL
AC_PROG_YACC
m4_append_uniq([list_of_with], [$2], [, ])
])
-AC_DEFUN([DETECT_DPDK_IS_1702_OR_1705],
+# Check if compiler supports specific flag
+AC_DEFUN([CC_CHECK_FLAG],
[
- AC_MSG_CHECKING([for RTE_VERSION 17.02/17.05 in rte_version.h])
- AC_TRY_RUN(
- [
- #include <rte_version.h>
- int main()
- {
- return ((RTE_VER_YEAR != 17) ||
- (RTE_VER_MONTH != 2 && RTE_VER_MONTH != 5));
- }
- ],
- [dpdk_is_1702_or_1705=yes]
- [AC_MSG_RESULT([yes])],
- [dpdk_is_1702_or_1705=no]
- [AC_MSG_RESULT([no])]
- )
- AM_CONDITIONAL(DPDK_IS_1702_OR_1705, test "$dpdk_is_1702_or_1705" = "yes")
+ AC_MSG_CHECKING([if $CC supports $1])
+ AC_LANG_PUSH([C])
+ ac_saved_cflags="$CFLAGS"
+ CFLAGS="-Werror $1"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
+ [cc_flag_check=yes],
+ [cc_flag_check=no]
+)
+ AC_MSG_RESULT([$cc_flag_check])
+ CFLAGS="$ac_saved_cflags"
+ AC_LANG_POP([C])
])
###############################################################################
DISABLE_ARG(svm, [Disable svm and dependant libs and binaries])
DISABLE_ARG(papi, [Disable Python API bindings])
DISABLE_ARG(japi, [Disable Java API bindings])
+DISABLE_ARG(vom, [Disable VPP object model bindings])
# --with-X
*) with_pre_data="pre-data-not-set" ;;
esac], [with_pre_data=128])
+###############################################################################
+# Target CPU flags
+###############################################################################
+
+# Check if compiler supports march=core-avx2
+CC_CHECK_FLAG("-march=core-avx2")
+AS_IF([test "$cc_flag_check" = yes],
+ [march_core_avx2=yes],
+ [march_core_avx2=no])
+AM_CONDITIONAL([CC_SUPPORTS_AVX2], [test "$march_core_avx2" = "yes"])
+
+# Check if compiler supports march=skylake-avx512
+CC_CHECK_FLAG("-march=skylake-avx512")
+AS_IF([test "$cc_flag_check" = yes],
+ [march_skylake_avx512=yes],
+ [march_skylake_avx512=no])
+AM_CONDITIONAL([CC_SUPPORTS_AVX512], [test "$march_skylake_avx512" = "yes"])
+
+AS_CASE([$build_cpu],
+ [x86_64], [CPU_FLAGS="-march=corei7 -mtune=corei7-avx"],
+ [aarch64], [CPU_FLAGS="-march=armv8-a+crc"],
+ [CPU_FLAGS=""],
+)
+AC_SUBST([CPU_FLAGS])
+
+AC_SUBST([CPU_AVX2_FLAGS],"-march=core-avx2 -mtune=core-avx2")
+AC_SUBST([CPU_AVX512_FLAGS],"-march=skylake-avx512 -mtune=skylake-avx512")
+
+AM_CONDITIONAL([CPU_X86_64], [test "$build_cpu" = "x86_64"])
+AM_CONDITIONAL([CPU_AARCH64], [test "$build_cpu" = "aarch64"])
+
###############################################################################
# Substitutions and defines
###############################################################################
PLUGIN_ENABLED(ila)
PLUGIN_ENABLED(ioam)
PLUGIN_ENABLED(ixge)
+PLUGIN_ENABLED(kubeproxy)
PLUGIN_ENABLED(lb)
+PLUGIN_ENABLED(marvell)
PLUGIN_ENABLED(memif)
PLUGIN_ENABLED(pppoe)
PLUGIN_ENABLED(sixrd)
+PLUGIN_ENABLED(srv6as)
PLUGIN_ENABLED(nat)
+PLUGIN_ENABLED(stn)
+PLUGIN_ENABLED(l2e)
###############################################################################
# Dependency checks
DPDK_IS_PMD_ENABLED(LIBRTE_PMD_AESNI_MB, dpdk_aesni_mb_pmd)
DPDK_IS_PMD_ENABLED(LIBRTE_PMD_AESNI_GCM, dpdk_aesni_gcm_pmd)
-DETECT_DPDK_IS_1702_OR_1705()
-
AM_COND_IF([WITH_DPDK_AESNI_MB_PMD],
[
AC_CHECK_LIB([IPSec_MB], [submit_job_sse],
AM_COND_IF([WITH_DPDK_AESNI_GCM_PMD],
[
- AM_COND_IF([DPDK_IS_1702_OR_1705],
- [
- AC_CHECK_LIB([isal_crypto], [aesni_gcm128_init],
- [with_isa_l_crypto_lib=yes],
- [AC_MSG_ERROR([isal_crypto library not found])])
- ],
- [
- AC_CHECK_LIB([IPSec_MB], [submit_job_sse],
- [with_aesni_mb_lib=yes],
- [AC_MSG_ERROR([IPSec_MB library not found])])
- ])
+ AC_CHECK_LIB([IPSec_MB], [submit_job_sse],
+ [with_aesni_mb_lib=yes],
+ [AC_MSG_ERROR([IPSec_MB library not found])])
])
m4_append([list_of_with], [aesni_mb_lib], [, ])
PKG_CHECK_MODULES(g2, gtk+-2.0)
])
-# If cross-compiling, we need external vppapigen and we cannot continue without it
-# For native builds, we just set dependency on vpppaigen binary in top_builddir
-AM_COND_IF([CROSSCOMPILE],
+AM_COND_IF([ENABLE_MARVELL_PLUGIN],
[
- AC_PATH_PROG([VPPAPIGEN], [vppapigen], [no])
- if test "$VPPAPIGEN" = "no"; then
- AC_MSG_ERROR([Externaly built vppapigen is needed when cross-compiling...])
- fi
-],[
- VPPAPIGEN=\$\(top_builddir\)/vppapigen
+ AC_CHECK_LIB( [musdk], [pp2_init],
+ [],
+ [
+ AC_MSG_WARN([Marvell MUSDK library with PP2 support not found. Plugin disabled.])
+ enable_marvell_plugin=no
+ AM_CONDITIONAL(ENABLE_MARVELL_PLUGIN, false)
+ ])
])
-AC_SUBST([VPPAPIGEN])
+AC_PATH_PROG([VPPAPIGEN], [vppapigen], [no])
+if test "$VPPAPIGEN" = "no"; then
+ VPPAPIGEN=\$\(top_srcdir\)/tools/vppapigen/vppapigen
+fi
###############################################################################
# JAVA
Code Review / vpp.git / blobdiff