X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=d92e1e51b68a8789d2bb9f24681cd002a493255d;hb=c5fa5391ed04ec1d18129792dc38524f81a7b6e1;hp=fb5bd1dd10faf56f526658823f0e1416a7493af0;hpb=a47203128ba6a9d840280377a8dd3a72888c3708;p=vpp.git diff --git a/Makefile b/Makefile index fb5bd1dd10f..d92e1e51b68 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ endif ifeq ($(filter ubuntu debian,$(OS_ID)),$(OS_ID)) PKG=deb -else ifeq ($(filter rhel centos fedora opensuse-leap,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter rhel centos fedora opensuse-leap rocky,$(OS_ID)),$(OS_ID)) PKG=rpm endif @@ -65,63 +65,64 @@ endif DEB_DEPENDS = curl build-essential autoconf automake ccache DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-python DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config -DEB_DEPENDS += lcov chrpath autoconf libnuma-dev +DEB_DEPENDS += gcovr lcov chrpath autoconf libnuma-dev DEB_DEPENDS += python3-all python3-setuptools check DEB_DEPENDS += libffi-dev python3-ply -DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml +DEB_DEPENDS += cmake ninja-build python3-jsonschema python3-yaml DEB_DEPENDS += python3-venv # ensurepip -DEB_DEPENDS += python3-dev # needed for python3 -m pip install psutil +DEB_DEPENDS += python3-dev python3-pip DEB_DEPENDS += libnl-3-dev libnl-route-3-dev libmnl-dev # DEB_DEPENDS += enchant # for docs DEB_DEPENDS += python3-virtualenv DEB_DEPENDS += libssl-dev -DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) +DEB_DEPENDS += libelf-dev libpcap-dev # for libxdp (af_xdp) DEB_DEPENDS += iperf3 # for 'make test TEST=vcl' +DEB_DEPENDS += nasm +DEB_DEPENDS += iperf ethtool # for 'make test TEST=vm_vpp_interfaces' +DEB_DEPENDS += libpcap-dev LIBFFI=libffi6 # works on all but 20.04 and debian-testing -ifeq ($(OS_VERSION_ID),20.04) +ifeq ($(OS_VERSION_ID),22.04) DEB_DEPENDS += python3-virtualenv DEB_DEPENDS += libssl-dev - DEB_DEPENDS += libelf-dev # for libbpf (af_xdp) - # TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh - # when clang-format-10 is removed - DEB_DEPENDS += clang-11 clang-format-11 clang-format-10 + DEB_DEPENDS += clang clang-format-11 + LIBFFI=libffi7 + DEB_DEPENDS += enchant-2 # for docs +else ifeq ($(OS_VERSION_ID),20.04) + DEB_DEPENDS += python3-virtualenv + DEB_DEPENDS += libssl-dev + DEB_DEPENDS += clang clang-format-11 LIBFFI=libffi7 DEB_DEPENDS += enchant-2 # for docs else ifeq ($(OS_VERSION_ID),20.10) - # TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh - # when clang-format-10 is removed - DEB_DEPENDS += clang-11 clang-format-11 clang-format-10 + DEB_DEPENDS += clang clang-format-11 LIBFFI=libffi8ubuntu1 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10) DEB_DEPENDS += virtualenv else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-11) DEB_DEPENDS += virtualenv - DEB_DEPENDS += clang-11 clang-format-11 + DEB_DEPENDS += clang clang-format-11 LIBFFI=libffi7 else - # TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh - # when clang-format-10 is removed - DEB_DEPENDS += clang-11 clang-format-11 clang-format-10 + DEB_DEPENDS += clang-11 clang-format-11 LIBFFI=libffi7 DEB_DEPENDS += enchant-2 # for docs endif DEB_DEPENDS += $(LIBFFI) -RPM_DEPENDS = redhat-lsb glibc-static +RPM_DEPENDS = glibc-static RPM_DEPENDS += apr-devel RPM_DEPENDS += numactl-devel RPM_DEPENDS += check check-devel RPM_DEPENDS += selinux-policy selinux-policy-devel RPM_DEPENDS += ninja-build -RPM_DEPENDS += libuuid-devel -RPM_DEPENDS += mbedtls-devel RPM_DEPENDS += ccache RPM_DEPENDS += xmlto -RPM_DEPENDS += elfutils-libelf-devel +RPM_DEPENDS += elfutils-libelf-devel libpcap-devel RPM_DEPENDS += libnl3-devel libmnl-devel +RPM_DEPENDS += nasm ifeq ($(OS_ID),fedora) RPM_DEPENDS += dnf-utils @@ -132,12 +133,23 @@ ifeq ($(OS_ID),fedora) RPM_DEPENDS += python3-virtualenv python3-jsonschema RPM_DEPENDS += cmake RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries' +else ifeq ($(OS_ID),rocky) + RPM_DEPENDS += yum-utils + RPM_DEPENDS += subunit subunit-devel + RPM_DEPENDS += openssl-devel + RPM_DEPENDS += python3-devel # needed for python3 -m pip install psutil + RPM_DEPENDS += python3-ply # for vppapigen + RPM_DEPENDS += python3-virtualenv python3-jsonschema + RPM_DEPENDS += infiniband-diags llvm clang cmake + RPM_DEPENDS_GROUPS = 'Development Tools' else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) RPM_DEPENDS += yum-utils RPM_DEPENDS += compat-openssl10 openssl-devel RPM_DEPENDS += python2-devel python36-devel python3-ply RPM_DEPENDS += python3-virtualenv python3-jsonschema RPM_DEPENDS += libarchive cmake + RPM_DEPENDS += infiniband-diags libibumad + RPM_DEPENDS += libpcap-devel llvm-toolset RPM_DEPENDS_GROUPS = 'Development Tools' else RPM_DEPENDS += yum-utils @@ -163,24 +175,18 @@ RPM_SUSE_BUILDTOOLS_DEPS = autoconf automake ccache check-devel chrpath RPM_SUSE_BUILDTOOLS_DEPS += clang cmake indent libtool make ninja python3-ply RPM_SUSE_DEVEL_DEPS = glibc-devel-static libnuma-devel libelf-devel -RPM_SUSE_DEVEL_DEPS += libopenssl-devel openssl-devel mbedtls-devel libuuid-devel +RPM_SUSE_DEVEL_DEPS += libopenssl-devel lsb-release +RPM_SUSE_DEVEL_DEPS += libpcap-devel llvm-devel +RPM_SUSE_DEVEL_DEPS += curl libstdc++-devel bison gcc-c++ zlib-devel -RPM_SUSE_PYTHON_DEPS = python-devel python3-devel python-pip python3-pip -RPM_SUSE_PYTHON_DEPS += python-rpm-macros python3-rpm-macros +RPM_SUSE_PYTHON_DEPS = python3-devel python3-pip python3-rpm-macros -RPM_SUSE_PLATFORM_DEPS = distribution-release shadow rpm-build +RPM_SUSE_PLATFORM_DEPS = shadow rpm-build ifeq ($(OS_ID),opensuse-leap) -ifeq ($(OS_VERSION_ID),15.3) - RPM_SUSE_DEVEL_DEPS += curl libstdc++-devel bison gcc-c++ zlib-devel xmlto - RPM_SUSE_DEVEL_DEPS += lsb-release - RPM_SUSE_DEVEL_DEPS += asciidoc git - RPM_SUSE_PYTHON_DEPS += python3 python2-ply -endif -ifeq ($(OS_VERSION_ID),15.0) - RPM_SUSE_DEVEL_DEPS += gcc git curl - RPM_SUSE_PYTHON_DEPS += python3-ply python2-virtualenv -endif + RPM_SUSE_DEVEL_DEPS += xmlto openssl-devel asciidoc git nasm + RPM_SUSE_PYTHON_DEPS += python3 python3-ply python3-virtualenv + RPM_SUSE_PLATFORM_DEPS += distribution-release endif RPM_SUSE_DEPENDS += $(RPM_SUSE_BUILDTOOLS_DEPS) $(RPM_SUSE_DEVEL_DEPS) $(RPM_SUSE_PYTHON_DEPS) $(RPM_SUSE_PLATFORM_DEPS) @@ -191,7 +197,7 @@ endif ifeq ($(findstring y,$(UNATTENDED)),y) CONFIRM=-y -FORCE=--force-yes +FORCE=--allow-downgrades --allow-remove-essential --allow-change-held-packages endif TARGETS = vpp @@ -237,10 +243,10 @@ help: @echo " compdb - (re)generate compile_commands.json" @echo " checkstyle - check coding style" @echo " checkstyle-commit - check commit message format" - @echo " checkstyle-test - check test framework coding style" - @echo " checkstyle-test-diff - check test framework coding style (only changed files)" + @echo " checkstyle-python - check python coding style using 'black' formatter" @echo " checkstyle-api - check api for incompatible changes" @echo " fixstyle - fix coding style" + @echo " fixstyle-python - fix python coding style using 'black' formatter" @echo " doxygen - DEPRECATED - use 'make docs'" @echo " bootstrap-doxygen - DEPRECATED" @echo " wipe-doxygen - DEPRECATED" @@ -252,6 +258,7 @@ help: @echo " docs - Build the Sphinx documentation" @echo " docs-venv - Build the virtual environment for the Sphinx docs" @echo " docs-clean - Remove the generated files from the Sphinx docs" + @echo " docs-rebuild - Rebuild all of the Sphinx documentation" @echo "" @echo "Make Arguments:" @echo " V=[0|1] - set build verbosity level" @@ -262,7 +269,6 @@ help: @echo " startup.conf file is present" @echo " GDB= - gdb binary to use for debugging" @echo " PLATFORM= - target platform. default is vpp" - @echo " TEST= - apply filter to test set, see test-help" @echo " DPDK_CONFIG= - add specified dpdk config commands to" @echo " autogenerated startup.conf" @echo " (e.g. \"no-pci\" )" @@ -321,11 +327,17 @@ ifeq ($(OS_ID),rhel) @sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms @sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @sudo -E yum install $(CONFIRM) $(RPM_DEPENDS) - @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib + @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib +else ifeq ($(OS_ID),rocky) + @sudo -E dnf install $(CONFIRM) dnf-plugins-core epel-release + @sudo -E dnf config-manager --set-enabled \ + $(shell dnf repolist all 2>/dev/null|grep -i crb|cut -d' ' -f1|grep -v source) + @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) + @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8) @sudo -E dnf install $(CONFIRM) dnf-plugins-core epel-release @sudo -E dnf config-manager --set-enabled \ - $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1) + $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1|grep -v source) @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @sudo -E dnf install --skip-broken $(CONFIRM) $(RPM_DEPENDS) else ifeq ($(OS_ID),centos) @@ -336,9 +348,9 @@ else ifeq ($(OS_ID),centos) else ifeq ($(OS_ID),fedora) @sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS) @sudo -E dnf install $(CONFIRM) $(RPM_DEPENDS) - @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib + @sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs zlib endif -else ifeq ($(filter opensuse-leap,$(OS_ID)),$(OS_ID)) +else ifeq ($(filter opensuse-leap-15.3 opensuse-leap-15.4 ,$(OS_ID)-$(OS_VERSION_ID)),$(OS_ID)-$(OS_VERSION_ID)) @sudo -E zypper refresh @sudo -E zypper install -y $(RPM_SUSE_DEPENDS) else @@ -413,20 +425,21 @@ wipe-release: test-wipe $(BR)/.deps.ok rebuild-release: wipe-release build-release export TEST_DIR ?= $(WS_ROOT)/test -export RND_SEED ?= $(shell python3 -c 'import time; print(time.time())') define test - $(if $(filter-out $(2),retest),make -C $(BR) PLATFORM=vpp TAG=$(1) vpp-install,) + $(if $(filter-out $(2),retest),make -C $(BR) PLATFORM=vpp TAG=$(1) CC=$(CC) vpp-install,) $(eval libs:=lib lib64) make -C test \ VPP_BUILD_DIR=$(BR)/build-$(1)-native/vpp \ VPP_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \ VPP_INSTALL_PATH=$(BR)/install-$(1)-native/ \ EXTENDED_TESTS=$(EXTENDED_TESTS) \ + TEST_GCOV=$(TEST_GCOV) \ PYTHON=$(PYTHON) \ OS_ID=$(OS_ID) \ RND_SEED=$(RND_SEED) \ CACHE_OUTPUT=$(CACHE_OUTPUT) \ + TAG=$(1) \ $(2) endef @@ -438,20 +451,45 @@ test: test-debug: $(call test,vpp_debug,test) -.PHONY: test-gcov -test-gcov: +.PHONY: test-cov +test-cov: + $(eval CC=gcc) + $(eval TEST_GCOV=1) + $(call test,vpp_gcov,cov) + +.PHONY: test-cov-build +test-cov-build: + $(eval CC=gcc) + $(eval TEST_GCOV=1) $(call test,vpp_gcov,test) +.PHONY: test-cov-prep +test-cov-prep: + $(eval CC=gcc) + $(call test,vpp_gcov,cov-prep) + +.PHONY: test-cov-post +test-cov-post: + $(eval CC=gcc) + $(call test,vpp_gcov,cov-post) + .PHONY: test-all test-all: - $(eval EXTENDED_TESTS=yes) + $(eval EXTENDED_TESTS=1) $(call test,vpp,test) .PHONY: test-all-debug test-all-debug: - $(eval EXTENDED_TESTS=yes) + $(eval EXTENDED_TESTS=1) $(call test,vpp_debug,test) +.PHONY: test-all-cov +test-all-cov: + $(eval CC=gcc) + $(eval TEST_GCOV=1) + $(eval EXTENDED_TESTS=1) + $(call test,vpp_gcov,test) + .PHONY: papi-wipe papi-wipe: test-wipe-papi $(call banner,"This command is deprecated. Please use 'test-wipe-papi'") @@ -476,8 +514,10 @@ test-shell: test-shell-debug: $(call test,vpp_debug,shell) -.PHONY: test-shell-gcov -test-shell-gcov: +.PHONY: test-shell-cov +test-shell-cov: + $(eval CC=gcc) + $(eval TEST_GCOV=1) $(call test,vpp_gcov,shell) .PHONY: test-dep @@ -494,26 +534,26 @@ test-wipe-doc: @echo "make test-wipe-doc is DEPRECATED" sleep 300 -.PHONY: test-cov -test-cov: - $(eval EXTENDED_TESTS=yes) - $(call test,vpp_gcov,cov) - .PHONY: test-wipe-cov test-wipe-cov: + $(call make,$(PLATFORM)_gcov,$(addsuffix -wipe,$(TARGETS))) @make -C test wipe-cov .PHONY: test-wipe-all test-wipe-all: @make -C test wipe-all +# Note: All python venv consolidated in test/Makefile, test/requirements*.txt .PHONY: test-checkstyle test-checkstyle: - @make -C test checkstyle + $(warning test-checkstyle is deprecated. Running checkstyle-python.") + @make -C test checkstyle-python-all +# Note: All python venv consolidated in test/Makefile, test/requirements*.txt .PHONY: test-checkstyle-diff test-checkstyle-diff: - @make -C test checkstyle-diff + $(warning test-checkstyle-diff is deprecated. Running checkstyle-python.") + @make -C test checkstyle-python-all .PHONY: test-refresh-deps test-refresh-deps: @@ -529,12 +569,12 @@ retest-debug: .PHONY: retest-all retest-all: - $(eval EXTENDED_TESTS=yes) + $(eval EXTENDED_TESTS=1) $(call test,vpp,retest) .PHONY: retest-all-debug retest-all-debug: - $(eval EXTENDED_TESTS=yes) + $(eval EXTENDED_TESTS=1) $(call test,vpp_debug,retest) .PHONY: test-start-vpp-in-gdb @@ -640,7 +680,7 @@ json-api-files-debug: .PHONY: go-api-files go-api-files: json-api-files - $(WS_ROOT)/src/tools/vppapigen/generate_go.py + $(WS_ROOT)/src/tools/vppapigen/generate_go.py $(ARGS) .PHONY: ctags ctags: ctags.files @@ -670,15 +710,27 @@ checkstyle-commit: @extras/scripts/check_commit_msg.sh .PHONY: checkstyle-test -checkstyle-test: test-checkstyle +checkstyle-test: + $(warning test-checkstyle is deprecated. Running checkstyle-python.") + @make -C test checkstyle-python-all + +# Note: All python venv consolidated in test/Makefile, test/requirements*.txt +.PHONY: checkstyle-python +checkstyle-python: + @make -C test checkstyle-python-all .PHONY: checkstyle-all -checkstyle-all: checkstyle-commit checkstyle checkstyle-test +checkstyle-all: checkstyle-commit checkstyle checkstyle-python docs-spell .PHONY: fixstyle fixstyle: @extras/scripts/checkstyle.sh --fix +# Note: All python venv consolidated in test/Makefile, test/requirements*.txt +.PHONY: fixstyle-python +fixstyle-python: + @make -C test fixstyle-python-all + .PHONY: checkstyle-api checkstyle-api: @extras/scripts/crcchecker.py --check-patchset @@ -729,7 +781,7 @@ docs: .PHONY: pkg-verify pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps - $(call banner,"Building for PLATFORM=vpp using gcc") + $(call banner,"Building for PLATFORM=vpp") @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages $(call banner,"Building sample-plugin") @make -C build-root PLATFORM=vpp TAG=vpp sample-plugin-install @@ -738,7 +790,8 @@ pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps $(call banner,"Building $(PKG) packages") @make pkg-$(PKG) -MAKE_VERIFY_GATE_OS ?= ubuntu-20.04 +# Note: 'make verify' target is not used by ci-management scripts +MAKE_VERIFY_GATE_OS ?= ubuntu-22.04 .PHONY: verify verify: pkg-verify ifeq ($(OS_ID)-$(OS_VERSION_ID),$(MAKE_VERIFY_GATE_OS)) @@ -749,3 +802,7 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),$(MAKE_VERIFY_GATE_OS)) else $(call banner,"Skipping tests. Tests under 'make verify' supported on $(MAKE_VERIFY_GATE_OS)") endif + +.PHONY: check-dpdk-mlx +check-dpdk-mlx: + @[ $$(make -sC build/external dpdk-show-DPDK_MLX_DEFAULT) = y ]