Toggle P4-14 for CI build.

fruffy · fruffy · commit 189b7b2b82cb · 2025-10-21T18:10:23.000-04:00
Signed-off-by: fruffy &lt;fruffy@nyu.edu&gt;
diff --git a/.github/workflows/ci-test-debian.yml b/.github/workflows/ci-test-debian.yml
@@ -22,6 +22,8 @@ jobs:
       CTEST_PARALLEL_LEVEL: 4
       IMAGE_TYPE: test
       BUILD_GENERATOR: Ninja
+      SUPPORT_P4_14: ON
+
     steps:
       - uses: actions/checkout@v5
         with:
diff --git a/Dockerfile b/Dockerfile
@@ -37,6 +37,8 @@ ARG COMPILE_WITH_CLANG=OFF
 ARG ENABLE_SANITIZERS=OFF
 # Only execute the steps necessary to successfully run CMake.
 ARG CMAKE_ONLY=OFF
+# Support P4-14 in the compiler (legacy).
+ARG SUPPORT_P4_14=OFF
 # Build with -ftrivial-auto-var-init=pattern to catch more bugs caused by
 # uninitialized variables.
 ARG BUILD_AUTO_VAR_INIT_PATTERN=OFF
diff --git a/backends/bmv2/CMakeLists.txt b/backends/bmv2/CMakeLists.txt
@@ -144,7 +144,7 @@ add_custom_target(linkbmv2
 add_dependencies(p4c_driver linkbmv2)
 
 if (SUPPORT_P4_14)
-add_custom_target(linkp414test
+add_custom_target(linkp414bmv2
   COMMAND ${CMAKE_COMMAND} -E create_symlink ${P4C_BINARY_DIR_PATH_REL}/p4_14include ${CMAKE_CURRENT_BINARY_DIR}/p4_14include
   DEPENDS update_includes
   )
diff --git a/frontends/common/parseInput.cpp b/frontends/common/parseInput.cpp
@@ -41,9 +41,8 @@ const IR::P4Program *parseP4String(const char *sourceFile, unsigned sourceLine,
         result =
             parseV1Program<std::istringstream &, P4V1::Converter>(stream, sourceFile, sourceLine);
     else
-#else
-    result = P4ParserDriver::parse(stream, sourceFile, sourceLine);
 #endif
+    result = P4ParserDriver::parse(stream, sourceFile, sourceLine);
 
         if (::P4::errorCount() > 0) {
         ::P4::error(ErrorType::ERR_OVERLIMIT, "%1% errors encountered, aborting compilation",
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
@@ -52,6 +52,8 @@ P4C_DIR=$(readlink -f ${THIS_DIR}/..)
 : "${ENABLE_EBPF:=ON}"
 # P4TC is enabled by default.
 : "${ENABLE_P4TC:=ON}"
+# P4-14 is disabled by default.
+: "${SUPPORT_P4_14:=OFF}"
 # P4TC STF is only enabled when running p4tc tagged PRs.
 : "${INSTALL_STF_P4TC_DEPENDENCIES:=OFF}"
 # This is the list of back ends that can be enabled.
@@ -341,6 +343,8 @@ CMAKE_FLAGS+="-DENABLE_WERROR=${ENABLE_WERROR} "
 CMAKE_FLAGS+="-DENABLE_SANITIZERS=${ENABLE_SANITIZERS} "
 # Enable auto var initialization with pattern.
 CMAKE_FLAGS+="-DBUILD_AUTO_VAR_INIT_PATTERN=${BUILD_AUTO_VAR_INIT_PATTERN} "
+# Enable P4-14 support.
+CMAKE_FLAGS+="-DSUPPORT_P4_14=${SUPPORT_P4_14} "
 # Assemble the enabled back ends as a single CMake variable.
 build_cmake_enabled_backend_string
 CMAKE_FLAGS+="${CMAKE_ENABLE_BACKENDS} "

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ add_custom_target(linkbmv2`
`144`	`144`	`add_dependencies(p4c_driver linkbmv2)`
`145`	`145`
`146`	`146`	`if (SUPPORT_P4_14)`
`147`		`-add_custom_target(linkp414test`
	`147`	`+add_custom_target(linkp414bmv2`
`148`	`148`	`COMMAND ${CMAKE_COMMAND} -E create_symlink ${P4C_BINARY_DIR_PATH_REL}/p4_14include ${CMAKE_CURRENT_BINARY_DIR}/p4_14include`
`149`	`149`	`DEPENDS update_includes`
`150`	`150`	`)`