diff options
| -rw-r--r-- | CMakeLists.txt | 110 | ||||
| -rwxr-xr-x | clean.sh | 7 | ||||
| -rw-r--r-- | docs/jvpp.rst | 7 | ||||
| -rw-r--r-- | java/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | modules/FindSphinx.cmake | 13 | ||||
| -rw-r--r-- | modules/ccache.cmake | 28 | ||||
| -rw-r--r-- | modules/cpu.cmake | 60 | ||||
| -rw-r--r-- | modules/misc.cmake | 112 | ||||
| -rwxr-xr-x | scripts/verify-installed | 4 |
9 files changed, 280 insertions, 87 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 082a2e7..e718896 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,51 +14,33 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) project(jvpp) - -include(CheckCCompilerFlag) # Add custom modules set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules") -# -# Convert to camel case string from lower case underscored string. -# -# :param input: the input lowercase underscored string -# :type input: string -# :param output: the output camelcase string -# :type output: string -# -function(camel_case_string input output) - string(REPLACE "_" ";" list ${input}) - foreach(SUBSTR ${list}) - string(SUBSTRING ${SUBSTR} 0 1 FIRST_LETTER) - string(TOUPPER ${FIRST_LETTER} FIRST_LETTER) - string(REGEX REPLACE "^.(.*)" "${FIRST_LETTER}\\1" SUBSTR "${SUBSTR}") - string(APPEND result ${SUBSTR}) - endforeach(SUBSTR) - set(${output} "${result}" PARENT_SCOPE) -endfunction() - -if (CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") - set(CMAKE_C_FLAGS "-march=corei7 -mtune=corei7-avx ${CMAKE_C_FLAGS}") -elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") - set(CMAKE_C_FLAGS "-march=armv8-a+crc ${CMAKE_C_FLAGS}") -endif () - -check_c_compiler_flag("-Wno-address-of-packed-member" compiler_flag_no_address_of_packed_member) -if (compiler_flag_no_address_of_packed_member) - add_definitions(-Wno-address-of-packed-member) -endif () +include(CheckCCompilerFlag) +include(modules/misc.cmake) +include(modules/cpu.cmake) +include(modules/ccache.cmake) find_package(Threads REQUIRED) # OPTIONS +message(INFO "\nSystem:") +info("Architecture" ${CMAKE_SYSTEM_PROCESSOR}) +info("C Compiler" ${CMAKE_C_COMPILER}) +info("C Flags" ${CMAKE_C_FLAGS}) +info("C++ Compiler" ${CMAKE_CXX_COMPILER}) +info("C++ Flags" "${CMAKE_CXX_FLAGS}") + +# OPTIONS option(PackZip "Create ZIP package (default: fasle)" false) option(PackTgz "Create Tgz package (default: fasle)" false) -message("\nOptions:") -message(" PackZip: ${PackZip}") -message(" PackTgz: ${PackTgz}") +message(INFO "\nOptions:") +info("JVPP_USE_CCACHE" ${JVPP_USE_CCACHE}) +info("PackZip" ${PackZip}) +info("PackTgz" ${PackTgz}) -message("\nEnvironment Variables:") +message(INFO "\nEnvironment Variables:") # JVPP RELATED VARIABLES unset(JVPP_VERSION) @@ -72,27 +54,11 @@ execute_process( string(REPLACE "-" ";" JAPI_LIB_VERSION ${JVPP_VERSION}) list(GET JAPI_LIB_VERSION 0 JAPI_LIB_VERSION) -message(" JVPP Main Version: ${JVPP_VERSION}") -message(" JVPP Version: ${JAPI_LIB_VERSION}") - -# OS RELATED VARIABLES -list(APPEND DebianBasedOS "Ubuntu" "LinuxMint") -list(APPEND RHBasedOS "CentOS") -unset(RELEASE_ID) -unset(RELEASE_CODENAME) -find_program(LSB_RELEASE_EXEC lsb_release) -execute_process(COMMAND ${LSB_RELEASE_EXEC} -is - OUTPUT_VARIABLE RELEASE_ID - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - -execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs - OUTPUT_VARIABLE RELEASE_CODENAME - OUTPUT_STRIP_TRAILING_WHITESPACE - ) +info("JVPP Main Version" ${JVPP_VERSION}) +info("JVPP Version" ${JAPI_LIB_VERSION}) -message(" OS Release Id: ${RELEASE_ID} ") -message(" OS Release Codename: ${RELEASE_CODENAME} ") +info("OS Release Id" ${RELEASE_ID}) +info("OS Release Codename" ${RELEASE_CODENAME}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/build-root/lib) @@ -122,22 +88,22 @@ else() set(ENV{JAVA_HOME} "${JAVA_HOME_SET}") endif() -message("\nJAVA:") -message(" Java home: $ENV{JAVA_HOME}") +message(INFO "\nJAVA:") find_package(Java 1.8 REQUIRED COMPONENTS Development) get_filename_component(jvm_path ${Java_JAVAC_EXECUTABLE} DIRECTORY) set(Java_INCLUDE_DIRS ${jvm_path}/../include ${jvm_path}/../include/linux) -message(" Java: ${Java_JAVA_EXECUTABLE}") -message(" Java version: ${Java_VERSION_STRING}") -message(" Java headers: ${Java_INCLUDE_DIRS}") -message(" Javac: ${Java_JAVAC_EXECUTABLE}") - -execute_process(COMMAND ./scripts/verify-installed vpp* OUTPUT_VARIABLE VPP_INSTALLED) -string(STRIP "${VPP_INSTALLED}" VPP_INSTALLED) - -if (${VPP_INSTALLED} MATCHES "vpp-dev") - message("\nVPP instalation found.") - message("Packages: \n${VPP_INSTALLED}") +info("Java home" $ENV{JAVA_HOME}) +info("Java" ${Java_JAVA_EXECUTABLE}) +info("Java version" ${Java_VERSION_STRING}) +info("Java headers" ${Java_INCLUDE_DIRS}) +info("Javac" ${Java_JAVAC_EXECUTABLE}) + +execute_process(COMMAND ./scripts/verify-installed vpp-* OUTPUT_VARIABLE VPP_INSTALLED) +#string(STRIP "${VPP_INSTALLED}" VPP_INSTALLED) + +if ("${VPP_INSTALLED}" MATCHES "vpp-dev") + message(INFO "\nVPP instalation found:") + info("Packages" "${VPP_INSTALLED}") else() if (${RELEASE_ID} IN_LIST DebianBasedOS) set(REQUIREMENTS "vpp, vpp-dev, libvppinfra, vpp-plugin-core") @@ -161,11 +127,13 @@ if(PYTHONINTERP_FOUND) separate_arguments(TEST_LIST UNIX_COMMAND ${STR_TESTS}) - message(\nJVPP tests:) + message(INFO "\nJVPP tests:") + set(TEST_ID 0) foreach(JVPPTEST ${TEST_LIST}) + MATH(EXPR TEST_ID "${TEST_ID}+1") string(REPLACE "test_jvpp.TestJVpp." "" JVPPTESTNAME ${JVPPTEST}) camel_case_string(${JVPPTESTNAME} JVPPTESTNAME) - message(" ${JVPPTESTNAME}") + info("${TEST_ID}." "${JVPPTESTNAME}") set(CTEST_OUTPUT_ON_FAILURE=1) set(ENV{V} "2") add_test(NAME ${JVPPTESTNAME} @@ -175,4 +143,4 @@ if(PYTHONINTERP_FOUND) else() message(WARNING "Python interpreter not found. Tests are disabled.") endif() -message(\nConfiguration results:) +message(INFO \nConfiguration results:) @@ -21,7 +21,12 @@ rm -rf docs/_build/* rm -rf docs/_doctrees/* rm -rf java/*.jar # clean cmake cache -find . -iwholename '*cmake*' -not -name CMakeLists.txt -not -name FindSphinx.cmake -delete +find . -iwholename '*cmake*' \ + -not -name CMakeLists.txt \ + -not -name FindSphinx.cmake \ + -not -name ccache.cmake \ + -not -name cpu.cmake \ + -not -name misc.cmake -delete # clean cpack cache find . -iwholename '*cpack*' -delete echo "... cleanup finished." diff --git a/docs/jvpp.rst b/docs/jvpp.rst index 513dbb1..5d6950c 100644 --- a/docs/jvpp.rst +++ b/docs/jvpp.rst @@ -52,6 +52,13 @@ from JVPP's root directory: cmake . +For CentOS7 enable devtoolset7 + +.. code-block:: console + + /opt/rh/devtoolset-7/enable + cmake3 . -DCMAKE_PROGRAM_PATH:PATH="/opt/rh/devtoolset-7/root/bin" + This will configure all variables and setup the build. If needed there are several optional parameters that can be set. You can list all configuration parameters using: diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt index a58b396..cc59910 100644 --- a/java/CMakeLists.txt +++ b/java/CMakeLists.txt @@ -307,12 +307,12 @@ if (${RELEASE_ID} IN_LIST DebianBasedOS) set(CPACK_DEBIAN_PACKAGE_DEPENDS "vpp (>= ${vpp_version}), vpp-plugin-core (>= ${vpp_version})") # Print Debian package summary - message("\nDebian package:") - message(" Name: ${CPACK_DEBIAN_PACKAGE_NAME}") - message(" Version: ${CPACK_DEBIAN_PACKAGE_VERSION}") - message(" Description: ${CPACK_DEBIAN_PACKAGE_DESCRIPTION}") - message(" File name: ${CPACK_DEBIAN_PACKAGE_FILE_NAME}") - message(" Depends on: ${CPACK_DEBIAN_PACKAGE_DEPENDS}\n") + message(INFO "\nDebian package:") + info("Name:" "${CPACK_DEBIAN_PACKAGE_NAME}") + info("Version:" "${CPACK_DEBIAN_PACKAGE_VERSION}") + info("Description:" "${CPACK_DEBIAN_PACKAGE_DESCRIPTION}") + info("File name:" "${CPACK_DEBIAN_PACKAGE_FILE_NAME}") + info("Depends on:" "${CPACK_DEBIAN_PACKAGE_DEPENDS}\n") elseif (${RELEASE_ID} IN_LIST RHBasedOS) set(CPACK_GENERATOR RPM) @@ -341,13 +341,13 @@ elseif (${RELEASE_ID} IN_LIST RHBasedOS) set(CPACK_RPM_PACKAGE_DEPENDS "vpp (>= ${vpp_version}), vpp-plugins (>= ${vpp_version})") # Print CentOS package summary - message("\nRPM package:") - message(" Name: ${CPACK_RPM_PACKAGE_NAME}") - message(" Version: ${CPACK_RPM_PACKAGE_VERSION}") - message(" Release: ${CPACK_RPM_PACKAGE_RELEASE}") - message(" Description: ${CPACK_RPM_PACKAGE_DESCRIPTION}") - message(" File name: ${CPACK_PACKAGE_FILE_NAME}") - message(" Depends on: ${CPACK_RPM_PACKAGE_DEPENDS}\n") + message(INFO "\nRPM package:") + info("Name:" "${CPACK_RPM_PACKAGE_NAME}") + info("Version:" "${CPACK_RPM_PACKAGE_VERSION}") + info("Release:" "${CPACK_RPM_PACKAGE_RELEASE}") + info("Description:" "${CPACK_RPM_PACKAGE_DESCRIPTION}") + info("File name:" "${CPACK_PACKAGE_FILE_NAME}") + info("Depends on:" "${CPACK_RPM_PACKAGE_DEPENDS}\n") endif () if (PackZip) list(APPEND CPACK_GENERATOR ZIP) diff --git a/modules/FindSphinx.cmake b/modules/FindSphinx.cmake index cb68e51..4952960 100644 --- a/modules/FindSphinx.cmake +++ b/modules/FindSphinx.cmake @@ -1,3 +1,16 @@ +# Copyright (c) 2019 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + find_program(SPHINX_EXECUTABLE NAMES sphinx-build HINTS $ENV{SPHINX_DIR} diff --git a/modules/ccache.cmake b/modules/ccache.cmake new file mode 100644 index 0000000..9c42227 --- /dev/null +++ b/modules/ccache.cmake @@ -0,0 +1,28 @@ +# Copyright (c) 2019 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +############################################################################## +# ccache +############################################################################## +option(JVPP_USE_CCACHE "Use ccache compiler cache." ON) +if(JVPP_USE_CCACHE) + find_program(CCACHE_FOUND ccache) + message(STATUS "Looking for ccache") + if(CCACHE_FOUND) + message(STATUS "Looking for ccache - found") + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) + set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) + else(CCACHE_FOUND) + message(STATUS "Looking for ccache - not found") + endif(CCACHE_FOUND) +endif(JVPP_USE_CCACHE) diff --git a/modules/cpu.cmake b/modules/cpu.cmake new file mode 100644 index 0000000..c3a4ce4 --- /dev/null +++ b/modules/cpu.cmake @@ -0,0 +1,60 @@ +# Copyright (c) 2019 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +############################################################################## +# CPU optimizations and multiarch support +############################################################################## +if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") + set(CMAKE_C_FLAGS "-march=corei7 -mtune=corei7-avx ${CMAKE_C_FLAGS}") + check_c_compiler_flag("-march=core-avx2" compiler_flag_march_core_avx2) + if(compiler_flag_march_core_avx2) + list(APPEND MARCH_VARIANTS "avx2\;-march=core-avx2 -mtune=core-avx2") + endif() + check_c_compiler_flag("-march=skylake-avx512" compiler_flag_march_skylake_avx512) + if(compiler_flag_march_skylake_avx512) + list(APPEND MARCH_VARIANTS "avx512\;-march=skylake-avx512 -mtune=skylake-avx512") + endif() +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") + set(CMAKE_C_FLAGS "-march=armv8-a+crc ${CMAKE_C_FLAGS}") + check_c_compiler_flag("-march=armv8-a+crc+crypto -mtune=qdf24xx" compiler_flag_march_core_qdf24xx) + if(compiler_flag_march_core_qdf24xx) + list(APPEND MARCH_VARIANTS "qdf24xx\;-march=armv8-a+crc+crypto -DCLIB_N_PREFETCHES=8") + endif() + check_c_compiler_flag("-march=armv8.1-a+crc+crypto -mtune=thunderx2t99" compiler_flag_march_thunderx2t99) + if(compiler_flag_march_thunderx2t99) + if (CMAKE_C_COMPILER_VERSION VERSION_GREATER 7.3) + list(APPEND MARCH_VARIANTS "thunderx2t99\;-march=armv8.1-a+crc+crypto -mtune=thunderx2t99 -DCLIB_N_PREFETCHES=8") + else() + list(APPEND MARCH_VARIANTS "thunderx2t99\;-march=armv8.1-a+crc+crypto -DCLIB_N_PREFETCHES=8") + endif() + endif() + check_c_compiler_flag("-march=armv8-a+crc+crypto -mtune=cortex-a72" compiler_flag_march_cortexa72) + if(compiler_flag_march_cortexa72) + list(APPEND MARCH_VARIANTS "cortexa72\;-march=armv8-a+crc+crypto -mtune=cortex-a72 -DCLIB_N_PREFETCHES=6") + endif() +endif() + +macro(vpp_library_set_multiarch_sources lib) + foreach(V ${MARCH_VARIANTS}) + list(GET V 0 VARIANT) + list(GET V 1 VARIANT_FLAGS) + set(l ${lib}_${VARIANT}) + add_library(${l} OBJECT ${ARGN}) + set_target_properties(${l} PROPERTIES POSITION_INDEPENDENT_CODE ON) + target_compile_options(${l} PUBLIC "-DCLIB_MARCH_VARIANT=${VARIANT}" -Wall -fno-common) + separate_arguments(VARIANT_FLAGS) + target_compile_options(${l} PUBLIC ${VARIANT_FLAGS}) + target_sources(${lib} PRIVATE $<TARGET_OBJECTS:${l}>) + endforeach() +endmacro() + diff --git a/modules/misc.cmake b/modules/misc.cmake new file mode 100644 index 0000000..56c9d7c --- /dev/null +++ b/modules/misc.cmake @@ -0,0 +1,112 @@ +# Copyright (c) 2019 Cisco and/or its affiliates. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +############################################################################## +# Highlight WARNING and ERROR messages +############################################################################## +function(message) + list(GET ARGV 0 type) + if("$ENV{TERM}" STREQUAL "xterm-256color" OR "$ENV{TERM}" STREQUAL "xterm-color" OR "$ENV{TERM}" STREQUAL "xterm") + string(ASCII 27 esc) + set(red "${esc}[1;31m") + set(yellow "${esc}[1;33m") + set(cyan "${esc}[36m") + set(white "${esc}[37;1m") + set(reset "${esc}[m") + endif() + if(type STREQUAL FATAL_ERROR OR type STREQUAL SEND_ERROR) + list(REMOVE_AT ARGV 0) + _message(${type} "${red}${ARGV}${reset}") + elseif(type STREQUAL WARNING) + list(REMOVE_AT ARGV 0) + _message(STATUS "${yellow}${ARGV}${reset}") + elseif(type STREQUAL STATUS) + list(REMOVE_AT ARGV 0) + _message(STATUS "${cyan}${ARGV}${reset}") + elseif(type STREQUAL INFO) + list(REMOVE_AT ARGV 0) + _message("${white}${ARGV}${reset}") + elseif(type STREQUAL INFO1) + list(REMOVE_AT ARGV 0) + _message(" ${white}${ARGV}${reset}") + else() + _message(${ARGV}) + endif() +endfunction() + +############################################################################## +# aligned config output +############################################################################## +function(info desc val) + if("$ENV{TERM}" STREQUAL "xterm-256color" OR "$ENV{TERM}" STREQUAL "xterm-color" OR "$ENV{TERM}" STREQUAL "xterm") + string(ASCII 27 esc) + set(reset "${esc}[m") + set(white "${esc}[37;1m") + endif() + string(LENGTH ${desc} len) + while (len LESS 20) + set (desc "${desc} ") + string(LENGTH ${desc} len) + endwhile() + if("${val}" MATCHES ";") + string(REPLACE ";" "\n " val "${val}") + endif() + _message(" ${white}${desc}${reset}: ${val}") +endfunction() + +############################################################################## +# Convert to camel case string from lower case underscored string. +# +# :param input: the input lowercase underscored string +# :type input: string +# :param output: the output camelcase string +# :type output: string +############################################################################## +function(camel_case_string input output) + string(REPLACE "_" ";" list ${input}) + foreach(SUBSTR ${list}) + string(SUBSTRING ${SUBSTR} 0 1 FIRST_LETTER) + string(TOUPPER ${FIRST_LETTER} FIRST_LETTER) + string(REGEX REPLACE "^.(.*)" "${FIRST_LETTER}\\1" SUBSTR "${SUBSTR}") + string(APPEND result ${SUBSTR}) + endforeach(SUBSTR) + set(${output} "${result}" PARENT_SCOPE) +endfunction() + +############################################################################## +# string append +############################################################################## + +macro(string_append var str) + if (NOT ${var}) + set(${var} "${str}") + else() + set(${var} "${${var}} ${str}") + endif() +endmacro() + +# OS RELATED VARIABLES +list(APPEND DebianBasedOS "Ubuntu" "LinuxMint") +list(APPEND RHBasedOS "CentOS") +unset(RELEASE_ID) +unset(RELEASE_CODENAME) +find_program(LSB_RELEASE_EXEC lsb_release) +execute_process(COMMAND ${LSB_RELEASE_EXEC} -is + OUTPUT_VARIABLE RELEASE_ID + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + +execute_process(COMMAND ${LSB_RELEASE_EXEC} -cs + OUTPUT_VARIABLE RELEASE_CODENAME + OUTPUT_STRIP_TRAILING_WHITESPACE + ) diff --git a/scripts/verify-installed b/scripts/verify-installed index 908eb93..7fd7811 100755 --- a/scripts/verify-installed +++ b/scripts/verify-installed @@ -17,9 +17,9 @@ package=$1 source /etc/os-release if [[ "$ID" = "centos" ]]; then - yum list installed | grep ${package} + yum list installed | grep ${package} | sed -n ':a;N;${s/\n/;/g;p};ba' exit else - dpkg -l ${package} |grep ii | grep ${package} + dpkg -l ${package} |grep ii | grep ${package} | sed -n ':a;N;${s/\n/;/g;p};ba' fi |