integration: Test vHost User numa awareness

[vswitchperf.git] / src / dpdk / Makefile

diff --git a/src/dpdk/Makefile b/src/dpdk/Makefile
index 030e4ba..2996702 100755 (executable)
--- a/src/dpdk/Makefile
+++ b/src/dpdk/Makefile
@@ -1,7 +1,7 @@
 # makefile to manage dpdk package
 #
 
-# Copyright 2015 OPNFV
+# Copyright 2015-2016 OPNFV
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 #
 # Contributors:
 #   Aihua Li, Huawei Technologies.
+#   Martin Klozik, Intel Corporation.
 
 include ../mk/master.mk
 include ../package-list.mk
@@ -29,16 +30,30 @@ ifndef VHOST_USER
 endif
 WORK_DIR = dpdk
 TAG_DONE_FLAG = $(WORK_DIR)/.$(DPDK_TAG).tag.done
-DPDK_VANILLA = ../../src_vanilla/dpdk
-DPDK_CUSE = ../../src_cuse/dpdk
 
-# the name has been changed from version to version
-ifeq ($(DPDK_TAG),v1.6.0r0)
+# VHOST configuration options are stored in different files based on DPDK version
+# v1.2.3r0-v1.6.0r2 - configuration inside config/defconfig_x86_64-default-linuxapp-gcc
+# v1.7.0-rc1-v2.2.0 - configuration inside config/common_linuxapp
+# v16 and newer - configuration split between config/common_linuxapp and config/common_base
+DPDK_TAG_MAJOR = $(shell echo $(DPDK_TAG) | cut -d. -f1)
+DPDK_TAG_MINOR = $(shell echo $(DPDK_TAG) | cut -d. -f2)
+ifeq ($(DPDK_TAG_MAJOR),v1)
+ifeq ($(DPDK_TAG_MINOR), $(filter $(DPDK_TAG_MINOR), 7 8))
+    DPDK_TARGET = x86_64-native-linuxapp-gcc
+    CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp
+else
     DPDK_TARGET = x86_64-default-linuxapp-gcc
-    CONFIG_FILE = $(WORK_DIR)/config/defconfig_x86_64-default-linuxapp-gcc
+    CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/defconfig_x86_64-default-linuxapp-gcc
+endif
+else
+ifeq ($(DPDK_TAG_MAJOR),v2)
+    DPDK_TARGET = x86_64-native-linuxapp-gcc
+    CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp
 else
     DPDK_TARGET = x86_64-native-linuxapp-gcc
-    CONFIG_FILE = $(WORK_DIR)/config/common_linuxapp
+    CONFIG_FILE_BASE = $(WORK_DIR)/config/common_base
+    CONFIG_FILE_LINUXAPP = $(WORK_DIR)/config/common_linuxapp
+endif
 endif
 
 all: force_make
@@ -47,14 +62,28 @@ all: force_make
 INSTALL_TARGET = force_make
 
 # modify CONFIG_FILE to enable VHOST_USER build and restore original CONFIG_FILE after the build
+# DPDK v16 comments:
+## CONFIG_RTE_BUILD_COMBINE_LIBS has been obsoleted
+## CONFIG_RTE_LIBRTE_VHOST and CONFIG_RTE_LIBRTE_KNI are listed in both config_base and config_linuxapp,
+## values from config_linuxapp will be used, but options are modified at both places to avoid confusion.
 force_make: $(TAG_DONE_FLAG)
        $(AT)cd $(WORK_DIR) && git pull $(DPDK_URL) $(DPDK_TAG)
-       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.\+/CONFIG_RTE_LIBRTE_VHOST_USER=$(VHOST_USER)/g' $(CONFIG_FILE)
-       $(AT)sed -i -e 's/CONFIG_RTE_BUILD_COMBINE_LIBS=./CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE)
-       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=./CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE)
-       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_KNI=./CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE)
-       $(AT)cd $(WORK_DIR); make install T=$(DPDK_TARGET) -j
-       $(AT)cd `dirname $(CONFIG_FILE)` && git checkout `basename $(CONFIG_FILE)` && cd -
+ifdef CONFIG_FILE_BASE
+       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.\+/CONFIG_RTE_LIBRTE_VHOST_USER=$(VHOST_USER)/g' $(CONFIG_FILE_BASE)
+       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=./CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE_BASE)
+       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_KNI=./CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE_BASE)
+       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_NUMA=./CONFIG_RTE_LIBRTE_VHOST_NUMA=y/g' $(CONFIG_FILE_BASE)
+else
+       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST_USER=.\+/CONFIG_RTE_LIBRTE_VHOST_USER=$(VHOST_USER)/g' $(CONFIG_FILE_LINUXAPP)
+       $(AT)sed -i -e 's/CONFIG_RTE_BUILD_COMBINE_LIBS=./CONFIG_RTE_BUILD_COMBINE_LIBS=y/g' $(CONFIG_FILE_LINUXAPP)
+endif
+       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_VHOST=./CONFIG_RTE_LIBRTE_VHOST=y/g' $(CONFIG_FILE_LINUXAPP)
+       $(AT)sed -i -e 's/CONFIG_RTE_LIBRTE_KNI=./CONFIG_RTE_LIBRTE_KNI=n/g' $(CONFIG_FILE_LINUXAPP)
+       $(AT)cd $(WORK_DIR); make install T=$(DPDK_TARGET) -j DESTDIR=$(WORK_DIR)
+       $(AT)cd `dirname $(CONFIG_FILE_LINUXAPP)` && git checkout `basename $(CONFIG_FILE_LINUXAPP)` && cd -
+ifdef CONFIG_FILE_BASE
+       $(AT)cd `dirname $(CONFIG_FILE_BASE)` && git checkout `basename $(CONFIG_FILE_BASE)` && cd -
+endif
        $(AT)echo "VHOST_USER = $(VHOST_USER)"
 ifeq ($(VHOST_USER),n)
        $(AT)cd $(WORK_DIR)/lib/librte_vhost/eventfd_link; make
@@ -70,8 +99,6 @@ clean:
        $(AT)cd $(WORK_DIR) && git clean -xfd *.o
 clobber:
        $(AT)rm -rf $(WORK_DIR)
-       $(AT)rm -rf $(DPDK_VANILLA)
-       $(AT)rm -rf $(DPDK_CUSE)
 
 # distclean is for developer who would like to keep the
 # clone git repo, saving time to fetch again from url
@@ -86,10 +113,6 @@ sanity:
 
 $(WORK_DIR):
        $(AT)git clone $(DPDK_URL)
-       $(AT)mkdir -p $(DPDK_VANILLA)
-       $(AT)cp -rf ./* $(DPDK_VANILLA)
-       $(AT)mkdir -p $(DPDK_CUSE)
-       $(AT)cp -rf ./* $(DPDK_CUSE)
 
 $(TAG_DONE_FLAG): $(WORK_DIR)
        $(AT)cd $(WORK_DIR); git checkout $(DPDK_TAG)