[P4Testgen] Reenable Tofino passes without actually linking the full Tofino compiler library (p4lang#5320)

fruffy · web-flow · commit ce6444286364 · 2026-02-17T03:42:38.000Z
Signed-off-by: fruffy &lt;fruffy@nyu.edu&gt;
diff --git a/backends/p4tools/modules/testgen/targets/tofino/CMakeLists.txt b/backends/p4tools/modules/testgen/targets/tofino/CMakeLists.txt
@@ -45,11 +45,6 @@ endif()
 # that. Those transitive dependencies turn out to be most of the compiler!
 set(
 TESTGEN_LIBS
-# tofinobackend
-# bfn_p4runtime
-# p4cgraphs
-# We do not use the target library variable here because top-level testgen will not find it.
-# boost_system
 ${TESTGEN_LIBS}
 PARENT_SCOPE
 )
diff --git a/backends/p4tools/modules/testgen/targets/tofino/target.cpp b/backends/p4tools/modules/testgen/targets/tofino/target.cpp
@@ -22,11 +22,12 @@
 #include <cstddef>
 #include <map>
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "backends/p4tools/common/lib/namespace_context.h"
 #include "backends/p4tools/common/lib/util.h"
+// TOOD: We can only use this pass because it is header-only.
+#include "backends/tofino/bf-p4c/midend/rewrite_egress_intrinsic_metadata_header.h"
 #include "ir/ir.h"
 #include "lib/cstring.h"
 #include "lib/exceptions.h"
@@ -71,14 +72,14 @@ P4::FrontEnd AbstractTofinoTestgenTarget::mkFrontEnd() const {
 MidEnd AbstractTofinoTestgenTarget::mkMidEnd(const CompilerOptions &options) const {
     // We need to initialize the device to be able to use Tofino compiler passes
     // FIXME: Reenable this?
-    // Device::init(spec.deviceName);
+    Device::init(spec.deviceName, {});
     auto midEnd = CompilerTarget::mkMidEnd(options);
-    // auto *refMap = midEnd.getRefMap();
-    // auto *typeMap = midEnd.getTypeMap();
+    auto *refMap = midEnd.getRefMap();
+    auto *typeMap = midEnd.getTypeMap();
     midEnd.addPasses({
         // Remove all unused fields in the egress intrinsic metadata
         // FIXME: Reenable this.
-        // new BFN::RewriteEgressIntrinsicMetadataHeader(refMap, typeMap),
+        new BFN::RewriteEgressIntrinsicMetadataHeader(refMap, typeMap),
         // Remove trailing '$' in '$valid$' key matches and
         // replace subscript operator in header stack indices
         // with '$'
diff --git a/backends/p4tools/modules/testgen/targets/tofino/test/Tofino2PTFXfail.cmake b/backends/p4tools/modules/testgen/targets/tofino/test/Tofino2PTFXfail.cmake
@@ -93,7 +93,6 @@ p4tools_add_xfail_reason(
 p4tools_add_xfail_reason(
   "testgen-tofino2-ptf"
   "P4Testgen Bug: Unable to find var .* in the symbolic environment"
-  tna_simple_switch.p4
 )
 
 p4tools_add_xfail_reason(
diff --git a/backends/p4tools/modules/testgen/targets/tofino/test/TofinoPTFXfail.cmake b/backends/p4tools/modules/testgen/targets/tofino/test/TofinoPTFXfail.cmake
@@ -285,7 +285,6 @@ p4tools_add_xfail_reason(
 p4tools_add_xfail_reason(
   "testgen-tofino-ptf"
   "The validity bit of .* is tainted"
-  tna_simple_switch.p4
 )
 
 p4tools_add_xfail_reason(
diff --git a/backends/p4tools/modules/testgen/targets/tofino/tofino/cmd_stepper.cpp b/backends/p4tools/modules/testgen/targets/tofino/tofino/cmd_stepper.cpp
@@ -158,8 +158,8 @@ void TofinoCmdStepper::initializeTargetEnvironment(ExecutionState &nextState) co
 
 std::optional<const Constraint *> TofinoCmdStepper::startParserImpl(
     const IR::P4Parser *parser, ExecutionState &nextState) const {
-    auto programINfo = getProgramInfo();
-    auto gress = programINfo.getGress(parser);
+    auto programInfo = getProgramInfo();
+    auto gress = programInfo.getGress(parser);
 
     const auto *nineBitType = IR::Type_Bits::get(9);
     const auto *oneBitType = IR::Type_Bits::get(1);
@@ -187,25 +187,25 @@ std::optional<const Constraint *> TofinoCmdStepper::startParserImpl(
         case INGRESS: {
             // bypass_egress is not active at the beginning.
             const auto &bypassExpr =
-                programINfo.getParserParamVar(parser, oneBitType, 4, "bypass_egress"_cs);
+                programInfo.getParserParamVar(parser, oneBitType, 4, "bypass_egress"_cs);
             nextState.set(bypassExpr, IR::Constant::get(oneBitType, 0));
 
             // Check whether the parser error was referenced in this particular pipe.
-            const auto *pipes = programINfo.getPipes();
-            const auto *decl = pipes->at(programINfo.getPipeIdx(parser)).pipes.at("IngressT"_cs);
+            const auto *pipes = programInfo.getPipes();
+            const auto *decl = pipes->at(programInfo.getPipeIdx(parser)).pipes.at("IngressT"_cs);
             const auto *p4control = decl->checkedTo<IR::P4Control>();
             CheckParserError checkParserError;
             p4control->apply(checkParserError);
             nextState.setProperty("parserErrReferenced"_cs, checkParserError.hasParserError());
             // Tofino implicitly drops packets if they are not set during the ingress or egress
             // pipeline.
             nextState.set(
-                programINfo.getParserParamVar(parser, nineBitType, 4, "ucast_egress_port"_cs),
+                programInfo.getParserParamVar(parser, nineBitType, 4, "ucast_egress_port"_cs),
                 new IR::UninitializedTaintExpression(nineBitType));
             // Initialize parser_err with no error and set the parser error label.
             // This label is used by some core externs to control target's parser error.
             const auto &parserErrorLabelExpr =
-                programINfo.getParserParamVar(parser, parserErrorType, 5, "parser_err"_cs);
+                programInfo.getParserParamVar(parser, parserErrorType, 5, "parser_err"_cs);
             nextState.set(parserErrorLabelExpr, IR::Constant::get(parserErrorType, 0));
             nextState.setParserErrorLabel(parserErrorLabelExpr);
             nextState.setProperty("gress"_cs, static_cast<uint64_t>(gress_t::INGRESS));
@@ -216,12 +216,12 @@ std::optional<const Constraint *> TofinoCmdStepper::startParserImpl(
             // Retrieve the egress port associated with this parser.
             // Tofino implicitly drops packets if they are not set during the ingress or egress
             // pipeline.
-            nextState.set(programINfo.getParserParamVar(parser, nineBitType, 3, "egress_port"_cs),
+            nextState.set(programInfo.getParserParamVar(parser, nineBitType, 3, "egress_port"_cs),
                           new IR::UninitializedTaintExpression(nineBitType));
             // Initialize parser_err with no error and set the parser error label.
             // This label is used by some core externs to control target's parser error.
             const auto &parserErrorLabelExpr =
-                programINfo.getParserParamVar(parser, parserErrorType, 3, "parser_err"_cs);
+                programInfo.getParserParamVar(parser, parserErrorType, 4, "parser_err"_cs);
             nextState.set(parserErrorLabelExpr, IR::Constant::get(parserErrorType, 0));
             nextState.setParserErrorLabel(parserErrorLabelExpr);
             nextState.setProperty("gress"_cs, static_cast<uint64_t>(gress_t::EGRESS));
@@ -283,7 +283,7 @@ std::map<Continuation::Exception, Continuation> TofinoCmdStepper::getExceptionHa
         case EGRESS: {
             result.emplace(Continuation::Exception::PacketTooShort, Continuation::Body({}));
             const auto &parserErrorVariable =
-                programInfo.getParserParamVar(parser, parserErrorType, 3, "parser_err"_cs);
+                programInfo.getParserParamVar(parser, parserErrorType, 4, "parser_err"_cs);
             const auto *noMatchConst = IR::Constant::get(parserErrorVariable->type,
                                                          TofinoConstants::PARSER_ERROR_NO_MATCH);
             const auto *noMatchAssign = new IR::AssignmentStatement(
diff --git a/backends/p4tools/modules/testgen/targets/tofino/tofino2/cmd_stepper.cpp b/backends/p4tools/modules/testgen/targets/tofino/tofino2/cmd_stepper.cpp
@@ -218,7 +218,7 @@ std::optional<const Constraint *> JBayCmdStepper::startParserImpl(const IR::P4Pa
             // Initialize parser_err with no error and set the parser error label.
             // This label is used by some core externs to control target's parser error.
             const auto &parserErrorVariable =
-                programInfo.getParserParamVar(parser, parserErrorType, 3, "parser_err"_cs);
+                programInfo.getParserParamVar(parser, parserErrorType, 4, "parser_err"_cs);
             nextState.set(parserErrorVariable, IR::Constant::get(parserErrorType, 0));
             nextState.setParserErrorLabel(parserErrorVariable);
             nextState.setProperty("gress"_cs, static_cast<uint64_t>(gress_t::EGRESS));
@@ -282,7 +282,7 @@ std::map<Continuation::Exception, Continuation> JBayCmdStepper::getExceptionHand
             // Models PARSER_ERROR_NO_TCAM parser error.
             // Set the parser error label to PARSER_ERROR_NO_MATCH in case of a no-match.
             const auto &parserErrorVariable =
-                programInfo.getParserParamVar(parser, parserErrorType, 5, "parser_err"_cs);
+                programInfo.getParserParamVar(parser, parserErrorType, 4, "parser_err"_cs);
             const auto *noMatchConst =
                 IR::Constant::get(parserErrorVariable->type, JBayConstants::PARSER_ERROR_NO_MATCH);
             const auto *noMatchAssign = new IR::AssignmentStatement(
diff --git a/backends/tofino/bf-p4c/midend/rewrite_egress_intrinsic_metadata_header.h b/backends/tofino/bf-p4c/midend/rewrite_egress_intrinsic_metadata_header.h
@@ -20,19 +20,18 @@
 #define BACKENDS_TOFINO_BF_P4C_MIDEND_REWRITE_EGRESS_INTRINSIC_METADATA_HEADER_H_
 
 #include "backends/tofino/bf-p4c/specs/device.h"
-
-namespace P4 {
-class TypeMap;
-class ReferenceMap;
-}  // namespace P4
+#include "frontends/p4/typeChecking/typeChecker.h"
+#include "ir/ir.h"
+#include "ir/pass_manager.h"
+#include "ir/visitor.h"
 
 namespace BFN {
 
 /**
  * \ingroup midend
  * \brief Pass that updates egress intrinsic metadata.
  */
-class RewriteEgressIntrinsicMetadataHeader : public PassManager {
+class RewriteEgressIntrinsicMetadataHeader : public P4::PassManager {
     struct CollectUsedFields : public Inspector {
         std::set<cstring> used_fields;
         const IR::Type_Header *eg_intr_md = nullptr;
@@ -57,7 +56,7 @@ class RewriteEgressIntrinsicMetadataHeader : public PassManager {
         }
     };
 
-    struct RewriteHeader : public Transform {
+    struct RewriteHeader : public P4::Transform {
         const CollectUsedFields &used_fields;
         P4::TypeMap *typeMap;
 
@@ -155,7 +154,7 @@ class RewriteEgressIntrinsicMetadataHeader : public PassManager {
             collectUsedFields,
             new RewriteHeader(*collectUsedFields, typeMap),
             new P4::ClearTypeMap(typeMap),
-            new BFN::TypeChecking(refMap, typeMap, true),
+            new TypeChecking(refMap, typeMap, true),
         });
     }
 };

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,6 @@ p4tools_add_xfail_reason(`
`93`	`93`	`p4tools_add_xfail_reason(`
`94`	`94`	`"testgen-tofino2-ptf"`
`95`	`95`	`"P4Testgen Bug: Unable to find var .* in the symbolic environment"`
`96`		`- tna_simple_switch.p4`
`97`	`96`	`)`
`98`	`97`
`99`	`98`	`p4tools_add_xfail_reason(`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,6 @@ p4tools_add_xfail_reason(`
`285`	`285`	`p4tools_add_xfail_reason(`
`286`	`286`	`"testgen-tofino-ptf"`
`287`	`287`	`"The validity bit of .* is tainted"`
`288`		`- tna_simple_switch.p4`
`289`	`288`	`)`
`290`	`289`
`291`	`290`	`p4tools_add_xfail_reason(`