Add ninja as a default build system for some runners.

.github/workflows/ci-lint.yaml

@@ -26,25 +26,17 @@ jobs:
           key: apply-linters-${{ runner.os }}
           max-size: 1000M
 
-      # TODO: This check is disabled because git on the Github serves behaves differently. Unclear why.
-      # - name: Check submodule ref points.
-      #   run: |
-      #     ./tools/check-git-submodules.sh
-
       - name: Build (Ubuntu 20.04)
         run: |
           tools/ci-build.sh
 
       - name: Run cpplint on C/C++ files.
-        run: make cpplint
-        working-directory: ./build
+        run: cmake --build build --target cpplint
 
       - name: Run clang-format on C/C++ files.
-        run: make clang-format
-        working-directory: ./build
+        run: cmake --build build --target clang-format
 
       - name: Run black and isort on Python files.
         run: |
-          make black
-          make isort
-        working-directory: ./build
+          cmake --build build --target black
+          cmake --build build --target isort

.github/workflows/ci-p4tools.yml

@@ -22,6 +22,7 @@ jobs:
       IMAGE_TYPE: test
       CMAKE_UNITY_BUILD: ON
       ENABLE_TEST_TOOLS: ON
+      BUILD_GENERATOR: Ninja
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/ci-ptf.yml

@@ -35,8 +35,8 @@ jobs:
       CTEST_PARALLEL_LEVEL: 4
       IMAGE_TYPE: test
       CMAKE_UNITY_BUILD: ON
-      MAKEFLAGS: -j8
       INSTALL_PTF_EBPF_DEPENDENCIES: ON
+      BUILD_GENERATOR: Ninja
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/ci-static-build-test.yml

@@ -22,6 +22,7 @@ jobs:
       CMAKE_UNITY_BUILD: ON
       BUILD_STATIC_RELEASE_SANS_GLIBC: ON
       ENABLE_TEST_TOOLS: ON
+      BUILD_GENERATOR: Ninja
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/ci-test-debian.yml

@@ -20,6 +20,7 @@ jobs:
     env:
       CTEST_PARALLEL_LEVEL: 4
       IMAGE_TYPE: test
+      BUILD_GENERATOR: Ninja
     steps:
       - uses: actions/checkout@v4
         with:
@@ -53,6 +54,7 @@ jobs:
       CTEST_PARALLEL_LEVEL: 4
       IMAGE_TYPE: test
       CMAKE_UNITY_BUILD: ${{ matrix.unity }}
+      BUILD_GENERATOR: Ninja
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/ci-test-fedora.yml

@@ -43,8 +43,8 @@ jobs:
 
       - name: Build p4c (Fedora Linux)
         run: |
-          ./bootstrap.sh -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_UNITY_BUILD=ON
-          make -j$((`nproc`+1)) -C build
+          ./bootstrap.sh -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_UNITY_BUILD=ON --build-generator "Ninja"
+          cmake --build build -- -j $(nproc)
 
       - name: Run p4c tests (Fedora Linux)
         # Need to use sudo for the eBPF kernel tests.

.github/workflows/ci-test-mac.yml

@@ -52,8 +52,8 @@ jobs:
         run: |
           source ~/.bash_profile
           ./bootstrap.sh -DENABLE_GC=ON -DCMAKE_BUILD_TYPE=RELEASE \
-              -DCMAKE_UNITY_BUILD=ON -DENABLE_TEST_TOOLS=ON
-          make -Cbuild -j$((`nproc`+1))
+              -DCMAKE_UNITY_BUILD=ON -DENABLE_TEST_TOOLS=ON --build-generator "Ninja"
+          cmake --build build -- -j $(nproc)
 
       - name: Run tests (MacOS)
         run: |
@@ -105,8 +105,8 @@ jobs:
         run: |
           source ~/.bash_profile
           ./bootstrap.sh -DENABLE_GC=ON -DCMAKE_BUILD_TYPE=RELEASE \
-              -DCMAKE_UNITY_BUILD=ON -DENABLE_TEST_TOOLS=ON
-          make -Cbuild -j$((`nproc`+1))
+              -DCMAKE_UNITY_BUILD=ON -DENABLE_TEST_TOOLS=ON --build-generator "Ninja"
+          cmake --build build -- -j $(nproc)
 
       - name: Run tests (MacOS)
         run: |

backends/bmv2/CMakeLists.txt

@@ -199,7 +199,11 @@ if (HAVE_SIMPLE_SWITCH)
     # Does not work well with sanitizers, extern_func_module fails due to linking failures related to missing symbols.
     p4c_add_tests("bmv2" ${BMV2_DRIVER} "${BMV2_V1MODEL_TEST_SUITES}" "${XFAIL_TESTS}")
     add_library(extern_func_module MODULE EXCLUDE_FROM_ALL "${P4C_SOURCE_DIR}/testdata/extern_modules/extern-funcs-bmv2.cpp" )
-    p4c_add_test_with_args("bmv2" ${BMV2_DRIVER} FALSE "bmv2_emit_externs" "testdata/p4_16_samples/extern-funcs-bmv2.p4" "-a=--emit-externs --target-specific-switch-arg=\"--load-modules ${CMAKE_CURRENT_BINARY_DIR}/libextern_func_module.so\" --init=\"make extern_func_module\"" "")
+    p4c_add_test_with_args("bmv2" ${BMV2_DRIVER} FALSE "bmv2_emit_externs"
+      "testdata/p4_16_samples/extern-funcs-bmv2.p4"
+      "-a=--emit-externs --target-specific-switch-arg=\"--load-modules ${CMAKE_CURRENT_BINARY_DIR}/libextern_func_module.so\" --init=\"cmake --build . --target extern_func_module extern_func_module\""
+      ""
+    )
     p4c_add_tests("bmv2-parser-inline-opt-disabled" ${BMV2_DRIVER} "${BMV2_PARSER_INLINE_TESTS}" "")
     p4c_add_tests("bmv2-parser-inline-opt-enabled" ${BMV2_DRIVER} "${BMV2_PARSER_INLINE_TESTS}" "" "-a=--parser-inline-opt")
   endif()

bootstrap.sh

@@ -27,6 +27,7 @@ cd $mydir
 
 BuildType=Debug
 BuildDir=""
+BuildGenerator="Unix Makefiles"
 EXTRA=""
 FORCE=false
 
@@ -40,6 +41,10 @@ while [ $# -gt 0 ]; do
         BuildType="$2"
         shift
         ;;
+    --build-generator)
+        BuildGenerator="$2"
+        shift
+        ;;
     --distcc)
         export CC="distcc gcc"
         export CXX="distcc g++"
@@ -96,8 +101,8 @@ fi
 mkdir -p p4c/extensions
 mkdir -p "$BuildDir"
 cd "$BuildDir"
-cmake .. -DCMAKE_BUILD_TYPE=$BuildType $EXTRA
-echo "### Configured for building in '$BuildDir' folder"
+cmake .. -DCMAKE_BUILD_TYPE=$BuildType -G "$BuildGenerator" $EXTRA
+echo "### Configured for building with '$BuildGenerator' in '$BuildDir' folder"
 
 make_relative_link ()
 {

tools/ci-build.sh

@@ -38,6 +38,8 @@ P4C_DIR=$(readlink -f ${THIS_DIR}/..)
 : "${ENABLE_SANITIZERS:=OFF}"
 # Only execute the steps necessary to successfully run CMake.
 : "${CMAKE_ONLY:=OFF}"
+# The build generator to use. Defaults to Make.
+: "${BUILD_GENERATOR:="Unix Makefiles"}"
 # Build with -ftrivial-auto-var-init=pattern to catch more bugs caused by
 # uninitialized variables.
 : "${BUILD_AUTO_VAR_INIT_PATTERN:=OFF}"
@@ -62,6 +64,7 @@ P4C_DEPS="bison \
           build-essential \
           ccache \
           flex \
+          ninja-build \
           g++ \
           git \
           lld \
@@ -85,8 +88,14 @@ sudo apt-get update
 sudo apt-get install -y --no-install-recommends ${P4C_DEPS}
 sudo pip3 install --upgrade pip
 sudo pip3 install -r ${P4C_DIR}/requirements.txt
-# ! ------  END CORE -----------------------------------------------
 
+if [ "${BUILD_GENERATOR,,}" == "ninja" ] && [ ! $(command -v ninja) ]
+then
+    echo "Selected ninja as build generator, but ninja could not be found."
+    exit 1
+fi
+
+# ! ------  END CORE -----------------------------------------------
 
 # ! ------  BEGIN BMV2 -----------------------------------------------
 function build_bmv2() {
@@ -166,9 +175,9 @@ function install_ptf_ebpf_test_deps() (
     ./build_libbpf.sh
     mkdir build
     cd build
-    cmake -DCMAKE_BUILD_TYPE=Release ..
-    make "-j$(nproc)"
-    sudo make install
+    cmake -DCMAKE_BUILD_TYPE=Release -G "${BUILD_GENERATOR}" ..
+    cmake --build . -- -j $(nproc)
+    sudo cmake --install .
 
     # install bpftool
     git clone --recurse-submodules --branch v7.3.0 https://github.com/libbpf/bpftool.git /tmp/bpftool
@@ -248,17 +257,16 @@ fi
 if [ -e build ]; then /bin/rm -rf build; fi
 mkdir -p ${P4C_DIR}/build
 cd ${P4C_DIR}/build
-cmake ${CMAKE_FLAGS} ..
+cmake ${CMAKE_FLAGS} -G "${BUILD_GENERATOR}" ..
 
 # If CMAKE_ONLY is active, only run CMake. Do not build.
 if [ "$CMAKE_ONLY" == "OFF" ]; then
-  make -j$((`nproc`+1))
-  sudo make -j$((`nproc`+1)) install
+  cmake --build . -- -j $(nproc)
+  sudo cmake --install .
   # Print ccache statistics after building
   ccache -p -s
 fi
 
-
 if [[ "${IMAGE_TYPE}" == "build" ]] ; then
   cd ~
   sudo apt-get purge -y ${P4C_DEPS} git

tools/install_fedora_deps.sh

@@ -45,7 +45,8 @@ sudo dnf install -y -q \
     tcpdump \
     thrift-devel \
     valgrind \
-    zlib-devel
+    zlib-devel \
+    ninja-build
 
 sudo pip3 install ply ptf scapy==2.5.0 wheel
 

tools/install_mac_deps.sh

@@ -40,7 +40,7 @@ brew update
 BOOST_LIB="boost@1.84"
 REQUIRED_PACKAGES=(
     autoconf automake bdw-gc ccache cmake libtool
-    openssl pkg-config coreutils bison grep
+    openssl pkg-config coreutils bison grep ninja
     ${BOOST_LIB}
 )
 for package in "${REQUIRED_PACKAGES[@]}"; do