From patchwork Thu Aug 2 16:00:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 143361 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2345834ljj; Thu, 2 Aug 2018 09:07:35 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfSFcgyYVEPSjfZ1Wnildq/49wNwZg06xYzc/PAf+mtLespVWyp85zTzQXyC1O+0uV/xXmG X-Received: by 2002:a0c:91b5:: with SMTP id n50-v6mr131498qvn.90.1533226055119; Thu, 02 Aug 2018 09:07:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533226055; cv=none; d=google.com; s=arc-20160816; b=G4OCk7bIxuM5PoHp/7+CpJ+Wo7K6CxE3h1TlYm0uO140RwGpc0EMbk21iqo8x0FoaG HR8rqyHUsrgHJ4jzn2GPkDO7+jKUPx4drB1I1OpEvr3f4JpJzZcfWaMJ4vZzps/qM3Es dY7IsiTRtY52bTBEssembPuEnWkI6P/gAw9hmxDllyWPjk7TWSMPggbOa0TikVZm+YNS +O+0f19JQ7fllN3eFUFaVzJJ+J1dtSAVkOx4ohcC8iCI1+q99VB6LiAXgsDbaRu9lVVA h0vCRzJe1ZgitNLcxuEqviIviEoEaewK2Bp/N7goHnIA+3AF+UVxl+pQlb8hcVzggDKS TTig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=ADARPve2iUY9kX4m78eSinnjJeK6cDXHfIDqcZKgUtI=; b=s8Vo0L/aGnO4qW/R/Zqq7DpURvw9eqytqhp5nsmTRdZyS0Vv4wTPCgpXxLovY3RliR 2EHfxyAU/VEkVdivLXa3Zrs7sxrUxirBDZ4/EKwmpUAvWepZOyJK3+d/NjwqgPARTi4X a0ZT2TUFkJi1FOTKfz4pUh6OfG/DVDsm45Q6+5+kmKt6YgaD77kX3FtQwBVCwWSuUWPL UDTK9MRRG7jM0M9DjyhuKgSI2MgPwG8LZymT2GeCXaRRZl4tqWFXxCJNcAdOmlZpDfhh 9ee0bNMvKzLRLqQuOxJCMax3jyzK9/SHkAoQe4azbZFgVIJ45UhQJyjFhs19KzTcypnj A6hQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id s38-v6si1327129qtc.226.2018.08.02.09.07.34; Thu, 02 Aug 2018 09:07:35 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id C9F4268621; Thu, 2 Aug 2018 16:07:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_LOW autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 4EFE568618; Thu, 2 Aug 2018 16:02:25 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id B0DD768615; Thu, 2 Aug 2018 16:02:18 +0000 (UTC) Received: from forward103o.mail.yandex.net (forward103o.mail.yandex.net [37.140.190.177]) by lists.linaro.org (Postfix) with ESMTPS id B587C68617 for ; Thu, 2 Aug 2018 16:00:29 +0000 (UTC) Received: from mxback13j.mail.yandex.net (mxback13j.mail.yandex.net [IPv6:2a02:6b8:0:1619::88]) by forward103o.mail.yandex.net (Yandex) with ESMTP id 38284588864E for ; Thu, 2 Aug 2018 19:00:28 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback13j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id FYIghDKsPX-0Sg05VFN; Thu, 02 Aug 2018 19:00:28 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Gj7hFMLav7-0R942vQO; Thu, 02 Aug 2018 19:00:27 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Thu, 2 Aug 2018 16:00:09 +0000 Message-Id: <1533225614-20192-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533225614-20192-1-git-send-email-odpbot@yandex.ru> References: <1533225614-20192-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 647 Subject: [lng-odp] [PATCH v5 6/11] ci: use dpdk installed with apt-get X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Maxim Uvarov Signed-off-by: Maxim Uvarov --- /** Email created from pull request 647 (muvarov:master_docker2) ** https://github.com/Linaro/odp/pull/647 ** Patch: https://github.com/Linaro/odp/pull/647.patch ** Base sha: 6886a2ca3d3dd1157302ddee424c36f632903bd0 ** Merge commit sha: 1ca948a3fc61fc94775495bb529ab02560071b04 **/ scripts/ci/build_dpdk.sh | 89 ---------------------------------------------- scripts/ci/build_x86_64.sh | 8 +---- scripts/ci/coverage.sh | 6 +--- 3 files changed, 2 insertions(+), 101 deletions(-) delete mode 100755 scripts/ci/build_dpdk.sh diff --git a/scripts/ci/build_dpdk.sh b/scripts/ci/build_dpdk.sh deleted file mode 100755 index 9ceac4529..000000000 --- a/scripts/ci/build_dpdk.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash -x - -set -e - -DPDK_VERS="17.11.2" -CROSS= - - -case "$CROSS_ARCH" in - "arm64") - DPDK_TARGET="arm64-armv8a-linuxapp-" - ;; - "armhf") - DPDK_TARGET="arm-armv7a-linuxapp-" - ;; - "i386") - DPDK_TARGET="i686-native-linuxapp-" - ;; - "") - DPDK_TARGET="x86_64-native-linuxapp-" - DPDK_MACHINE=snb - ;; -esac - - -if [ -n "$DPDK_TARGET" ] ; then - if [ "${CC#clang}" != "${CC}" ] ; then - DPDKCC=clang ; - else - DPDKCC=gcc ; - fi - if [ -n "$DPDK_SHARED" ] ; then - TARGET="${DPDK_TARGET}$DPDKCC"-shared - LIBDPDKEXT=so - export LD_LIBRARY_PATH="`pwd`/${TARGET}:$LD_LIBRARY_PATH" - echo $LD_LIBRARY_PATH - else - TARGET="${DPDK_TARGET}$DPDKCC" - LIBDPDKEXT=a - fi - DPDK_TARGET="${DPDK_TARGET}gcc" - CACHED_DPDK_VERS=`fgrep Version dpdk/pkg/dpdk.spec | cut -d " " -f 2` - if [ ! -d dpdk -o "${CACHED_DPDK_VERS}" != "${DPDK_VERS}" ]; then - rm -rf dpdk - mkdir dpdk - pushd dpdk - git init - git -c advice.detachedHead=false fetch -q --depth=1 http://dpdk.org/git/dpdk-stable v${DPDK_VERS} - git checkout -f FETCH_HEAD - popd - fi - if [ ! -f "dpdk/${TARGET}/usr/local/lib/libdpdk.$LIBDPDKEXT" ]; then - pushd dpdk - git log --oneline --decorate - # AArch64 && ARMv7 fixup - sed -i -e 's/40900/40800/g' lib/librte_eal/common/include/arch/arm/rte_vect.h - sed -i -e 's/!(/!(defined(__arm__) \&\& defined(__clang__) || /g' lib/librte_eal/common/include/arch/arm/rte_byteorder.h - sed -i -e 's/__GNUC__/defined(__arm__) \&\& defined(__clang__) || __GNUC__/' lib/librte_eal/common/include/generic/rte_byteorder.h - sed -i -e 's,\$(CC),\0 $(EXTRA_CFLAGS),g' lib/librte_acl/Makefile - make config T=${DPDK_TARGET} O=${TARGET} - pushd ${TARGET} - sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config - # OCTEON TX driver includes ARM v8.1 instructions - sed -ri 's,(CONFIG_RTE_LIBRTE_OCTEONTX_PMD=).*,\1n,' .config - sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=).*,\1n,' .config - sed -ri 's,(CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=).*,\1n,' .config - if test -n "${DPDK_MACHINE}" ; then - sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"'${DPDK_MACHINE}'",' .config - fi - if test -n "${DPDK_SHARED}" ; then - sed -ri 's,(CONFIG_RTE_BUILD_SHARED_LIB=).*,\1y,' .config - fi - if test -n "$CROSS_ARCH" ; then - sed -ri -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' .config - sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config - fi - sed -ri -e 's,(CONFIG_RTE_TOOLCHAIN=).*,\1"'${DPDKCC}'",' .config - sed -ri -e '/CONFIG_RTE_TOOLCHAIN_.*/d' .config - echo CONFIG_RTE_TOOLCHAIN_${DPDKCC^^}=y >> .config - popd - make build O=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" CC="${CC}" HOSTCC="gcc" -j $(nproc) - make install O=${TARGET} DESTDIR=${TARGET} - pwd - rm -r ./doc ./${TARGET}/app ./${TARGET}/build - popd - fi -fi - -echo "`pwd`/dpdk/${TARGET}/usr/local" > /tmp/dpdk_install_dir diff --git a/scripts/ci/build_x86_64.sh b/scripts/ci/build_x86_64.sh index d49271d9e..1356dcdc9 100755 --- a/scripts/ci/build_x86_64.sh +++ b/scripts/ci/build_x86_64.sh @@ -10,12 +10,6 @@ CWD=$(dirname "$0") TDIR=`mktemp -d -p ~` cd ${TDIR} -export CROSS_ARCH="" - -export TARGET="x86_64$DPDKCC" - -$CWD/build_dpdk.sh -DPDKPATH=`cat /tmp/dpdk_install_dir` echo 1000 | tee /proc/sys/vm/nr_hugepages mkdir -p /mnt/huge @@ -25,7 +19,7 @@ git clone ${CWD}/../../ odp cd ./odp ./bootstrap ./configure ${CONF} \ - --with-dpdk-path=${DPDKPATH} + --enable-dpdk make -j 8 # Ignore possible failures there because these tests depends on measurements diff --git a/scripts/ci/coverage.sh b/scripts/ci/coverage.sh index 0d812e82b..279ab5dcf 100755 --- a/scripts/ci/coverage.sh +++ b/scripts/ci/coverage.sh @@ -10,17 +10,13 @@ CWD=$(dirname "$0") TDIR=`mktemp -d -p ~` cd ${TDIR} -export CROSS_ARCH="" -export TARGET="x86_64$DPDKCC" - -$CWD/build_dpdk.sh git clone ${CWD}/../../ odp cd ./odp ./bootstrap ./configure \ CFLAGS="-O0 -coverage" CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" \ - --enable-debug=full --enable-helper-linux + --enable-debug=full --enable-helper-linux --enable-dpdk export CCACHE_DISABLE=1 make -j $(nproc)