p4lang · grg · Jun 19, 2025 · Apr 26, 2025 · Apr 29, 2025 · May 27, 2025
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -0,0 +1,98 @@
+name: CMake Build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        config:
+          # Disable basic build -- duplicated by the install step
+          #- name: "Basic Build"
+          #  options: ""
+          - name: "Without Thrift"
+            options: "-DWITH_THRIFT=OFF"
+          # FIXME: temporarily disable Without Nanomsg test
+          # This test is failing to build correctly due to programs in tests
+          # needing the bmapps lib which is not build when nanomsg is disabled.
+          # The same problem occurs with using autoconf, except the binaries in
+          # tests only get compiled when running "make check".
+          # - name: "Without Nanomsg"
+          #   options: "-DWITH_NANOMSG=OFF"
+          - name: "With Debugger"
+            options: "-DENABLE_DEBUGGER=ON"
+
+    name: ${{ matrix.config.name }}
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y automake cmake libgmp-dev \
+          libpcap-dev libboost-dev libboost-test-dev libboost-program-options-dev \
+          libboost-system-dev libboost-filesystem-dev libboost-thread-dev \
+          libevent-dev libtool flex bison pkg-config g++ libssl-dev
+        bash ./ci/install-thrift.sh
+        bash ./ci/install-nanomsg.sh
+        sudo ldconfig
+
+    - name: Configure CMake
+      run: |
+        mkdir build
+        cd build
+        cmake ${{ matrix.config.options }} ..
+
+    - name: Build
+      run: |
+        cd build
+        cmake --build .
+
+    - name: Test
+      run: |
+        cd build
+        ctest --output-on-failure
+
+  install:
+    runs-on: ubuntu-latest
+    name: "Build and install"
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y automake cmake libgmp-dev \
+          libpcap-dev libboost-dev libboost-test-dev libboost-program-options-dev \
+          libboost-system-dev libboost-filesystem-dev libboost-thread-dev \
+          libevent-dev libtool flex bison pkg-config g++ libssl-dev
+        bash ./ci/install-thrift.sh
+        bash ./ci/install-nanomsg.sh
+        sudo ldconfig
+
+    - name: Configure CMake
+      run: |
+        mkdir build
+        cd build
+        cmake ..
+
+    - name: Build
+      run: |
+        cd build
+        cmake --build .
+
+    - name: Install
+      run: |
+        cd build
+        sudo cmake --build . --target install
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,11 +43,14 @@ jobs:
         CC: ${{ matrix.cc }}
         CXX: ${{ matrix.cxx }}
       run: |
-        docker build -t bm --build-arg IMAGE_TYPE=test --build-arg CC=$CC --build-arg CXX=$CXX --build-arg GCOV=$GCOV .
+        docker build -t bm --build-arg IMAGE_TYPE=test --build-arg CC=$CC --build-arg CXX=$CXX --build-arg GCOV=$GCOV --build-arg BUILDER=autoconf .
     - name: Run tests
       run: |
         ci_env=`bash <(curl -s https://codecov.io/env)`
-        docker run --rm $ci_env --env GCOV -w /behavioral-model bm /bin/bash -c "make check -j$(nproc) && ./ci/codecov.sh"
+        docker run --rm $ci_env --env GCOV -w /behavioral-model bm /bin/bash -c \
+          "make check -j$(nproc) && ./ci/codecov.sh"
+        # FIXME: replace the command above with the following when switching to cmake
+        #  "cd build && make -j$(nproc) && ctest -j$(nproc) --output-on-failure && cd .. && ./ci/codecov.sh"
     - name: Check style
       run: |
         ./tools/check_style.sh
@@ -63,7 +66,7 @@ jobs:
     - name: Build Dockerfile.noPI image
       run: docker build -t bm-no-pi --build-arg IMAGE_TYPE=test -f Dockerfile.noPI .
     - name: Run tests
-      run: docker run --rm -w /behavioral-model bm-no-pi /bin/bash -c "make check -j$(nproc)"
+      run: docker run --rm -w /behavioral-model bm-no-pi /bin/bash -c "cd build && make -j$(nproc) && ctest -j$(nproc) --output-on-failure"
 
   test-ubuntu22:
     needs: check-changes
@@ -77,8 +80,9 @@ jobs:
       run: sudo ./install_deps_ubuntu_22.04.sh
     - name: Build BMv2
       run: |
-        ./autogen.sh
-        ./configure --with-pdfixed --with-pi --with-stress-tests --enable-debugger --enable-Werror
+        mkdir -p build
+        cd build
+        cmake -DWITH_PDFIXED=ON -DWITH_PI=ON -DWITH_STRESS_TESTS=ON -DENABLE_DEBUGGER=ON -DENABLE_WERROR=ON ..
         make -j$(nproc)
     - name: Run tests
-      run: make check -j$(nproc)
+      run: cd build && make -j$(nproc) && ctest -j$(nproc) --output-on-failure
diff --git a/.gitignore b/.gitignore
@@ -59,7 +59,7 @@ config.h
 aclocal.m4
 autom4te.cache/
 compile
-config.h.in
+/config.h.in
 config.status
 depcomp
 install-sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,221 @@
+cmake_minimum_required(VERSION 3.10)
+
+# Add cmake modules path
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+# Include necessary files for macros
+include(CheckIncludeFile)
+include(CheckIncludeFiles)
+include(CheckIncludeFileCXX)
+include(GenerateThrift)
+
+# Extract version from VERSION file
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" BM_VERSION)
+string(STRIP "${BM_VERSION}" BM_VERSION)
+
+# Define the project
+project(behavioral-model
+  VERSION ${BM_VERSION}
+  DESCRIPTION "Behavioral Model (BMv2) - P4 software switch"
+  HOMEPAGE_URL "https://github.com/p4lang/behavioral-model"
+  LANGUAGES CXX C
+)
+
+# Enable testing
+include(CTest)
+
+# Set C++ standard
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+# Options
+option(WITH_NANOMSG "Support generating Nanomsg events" ON)
+option(WITH_THRIFT "Build Thrift RPC service" ON)
+option(WITH_PI "Build PI implementation for bmv2" OFF)
+option(WITH_PDFIXED "Build pdfixed for bmv2" OFF)
+option(WITH_TARGETS "Build targets (simple_switch, psa_switch, ...)" ON)
+option(WITH_STRESS_TESTS "Include stress tests" OFF)
+option(ENABLE_DEBUGGER "Enable bmv2 remote debugger" OFF)
+option(ENABLE_COVERAGE "Enable code coverage tracking" OFF)
+option(ENABLE_LOGGING_MACROS "Enable compile time debug and trace logging macros" ON)
+option(ENABLE_ELOGGER "Enable nanomsg event logger" ON)
+option(ENABLE_MODULES "Allow loading third-party modules at runtime" OFF)
+option(ENABLE_UNDETERMINISTIC_TESTS "Run undeterministic tests (e.g. queueing) when running tests" ON)
+option(ENABLE_WERROR "Make all compiler warnings fatal" OFF)
+option(ENABLE_WP4_16_STACKS "Implement stacks strictly as per the P4_16 specification" ON)
+
+# Set compiler flags
+add_compile_options(-Wall -Wextra)
+if(ENABLE_WERROR)
+  add_compile_options(-Werror)
+endif()
+
+if(ENABLE_COVERAGE)
+  add_compile_options(-coverage)
+  link_libraries(gcov)
+endif()
+
+# clang builds were failing due to missing atomic library
+# FIXME: understand why this is -- wasn't required in autoconf build
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  link_libraries(${TEST_NAME}
+    atomic
+  )
+endif()
+
+# Make all code position-independent
+# FIXME: which files should be PIC?
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# Define include directories
+# FIXME: consider moving these to specific targets?
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_BINARY_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/jsoncpp/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/spdlog
+)
+
+# Find required packages
+find_package(Threads REQUIRED)
+find_package(Boost REQUIRED COMPONENTS thread program_options filesystem system)
+
+# Check for the presence of an include file and report an error if not found
+#
+# Usage: require_include(HDR <C/CXX>)
+function(REQUIRE_INCLUDE HDR)
+  string(TOUPPER ${HDR} HDR_UC)
+  string(REGEX REPLACE "[/.]" "_" HDR_UC ${HDR_UC})
+  if(${LANGUAGE_C})
+    check_include_file(${HDR} BM_HAVE_${HDR_UC})
+  else()
+    check_include_file_cxx(${HDR} BM_HAVE_${HDR_UC})
+  endif()
+  if (NOT BM_HAVE_${HDR_UC})
+    message(SEND_ERROR "Could not find include: ${HDR}")
+  endif()
+endfunction()
+
+# Check for necessary header files
+# Replicates checks performed by autoconf
+# FIXME: consider dropping BM_ prefix if autoconf support is dropped
+set(C_HEADERS
+  sys/stat.h sys/types.h unistd.h
+)
+set(CXX_HEADERS
+  algorithm array cassert cmath queue
+  cstdio string sys/stat.h sys/types.h ctime tuple unistd.h unordered_map
+  utility vector
+)
+foreach (hdr ${C_HEADERS})
+  require_include(${hdr} C)
+endforeach()
+foreach (hdr ${CXX_HEADERS})
+  require_include(${hdr} CXX)
+endforeach()
+
+# Check for libraries
+find_library(GMP_LIBRARY gmp REQUIRED)
+find_library(PCAP_LIBRARY pcap REQUIRED)
+
+if(WITH_NANOMSG)
+  find_library(NANOMSG_LIBRARY nanomsg REQUIRED)
+  add_definitions(-DNANOMSG_ON)
+
+  if(ENABLE_ELOGGER)
+    add_definitions(-DELOG_ON)
+  endif()
+
+  if(ENABLE_DEBUGGER)
+    add_definitions(-DDEBUG_ON)
+  endif()
+endif()
+
+if(ENABLE_LOGGING_MACROS)
+  add_definitions(-DLOG_DEBUG_ON -DLOG_TRACE_ON)
+endif()
+
+if(ENABLE_WP4_16_STACKS)
+  add_definitions(-DWP4_16_STACKS)
+endif()
+
+if(WITH_THRIFT)
+  # Find Thrift
+  find_package(Thrift REQUIRED)
+  add_definitions(-DTHRIFT_ON)
+endif()
+
+if(WITH_PI)
+  # Find Protobuf and gRPC
+  find_package(Protobuf REQUIRED)
+  find_package(gRPC REQUIRED)
+
+  # Verify that PI headers are present
+  check_include_files("PI/pi.h;PI/target/pi_imp.h;PI/p4info.h"
+    HAVE_PI_HEADERS LANGUAGE CXX)
+  if (NOT HAVE_PI_HEADERS)
+    set(PI_URL "https://github.com/p4lang/PI/")
+    message(SEND_ERROR "Cannot find PI headers, did you install ${PI_URL}")
+  endif()
+endif()
+
+if(ENABLE_MODULES)
+  # Check for dlopen
+  check_include_file(dlfcn.h HAVE_DLFCN_H)
+  if(HAVE_DLFCN_H)
+    include(CheckSymbolExists)
+    add_definitions(-DHAVE_DLOPEN -DENABLE_MODULES)
+    check_symbol_exists(dlopen "dlfcn.h" HAVE_DLOPEN)
+  else()
+    message(FATAL_ERROR "Cannot enable modules without dlfcn.h")
+  endif()
+endif()
+
+# Identify python installation directory
+find_package(Python3 REQUIRED COMPONENTS Interpreter)
+set(PY_SITE_PKG_DIR "lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages")
+
+# Add subdirectories
+if(WITH_THRIFT)
+  add_subdirectory(thrift_src)
+endif()
+
+add_subdirectory(third_party)
+add_subdirectory(src)
+add_subdirectory(include)
+
+if(WITH_THRIFT AND WITH_TARGETS)
+  add_subdirectory(tests)
+endif()
+
+if(WITH_PI)
+  add_subdirectory(PI)
+  add_subdirectory(services)
+endif()
+
+if(WITH_TARGETS)
+  add_subdirectory(targets)
+endif()
+
+add_subdirectory(tools)
+
+if(WITH_PDFIXED)
+  add_subdirectory(pdfixed)
+endif()
+
+# Installation rules
+install(FILES LICENSE README.md
+  DESTINATION share/doc/behavioral-model)
+
+# Print configuration summary
+message(STATUS "Configuration summary:")
+message(STATUS "  Version: ${BM_VERSION}")
+message(STATUS "  Coverage enabled: ${ENABLE_COVERAGE}")
+message(STATUS "  Logging macros enabled: ${ENABLE_LOGGING_MACROS}")
+message(STATUS "  With Nanomsg: ${WITH_NANOMSG}")
+message(STATUS "  Event logger enabled: ${ENABLE_ELOGGER}")
+message(STATUS "  Debugger enabled: ${ENABLE_DEBUGGER}")
+message(STATUS "  With Thrift: ${WITH_THRIFT}")
+message(STATUS "  With pdfixed: ${WITH_PDFIXED}")
+message(STATUS "  With PI: ${WITH_PI}")