Enable the new pass only if P4Runtime control plane API gen is enabled

Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>
p4lang · jafingerhut · Oct 7, 2024 · Oct 7, 2024 · Oct 8, 2024 · Oct 8, 2024
commit 99beb308caeefec9430b5693ecf58fba7f503b97
diff --git a/control-plane/p4RuntimeSerializer.cpp b/control-plane/p4RuntimeSerializer.cpp
@@ -1584,7 +1584,7 @@ void P4RuntimeSerializer::serializeP4RuntimeIfRequired(const IR::P4Program *prog
     std::vector<cstring> files;
     std::vector<P4::P4RuntimeFormat> formats;
 
-    // only generate P4Info is required by use-provided options
+    // only generate P4Info is required by user-provided options
     if (options.p4RuntimeFile.isNullOrEmpty() && options.p4RuntimeFiles.isNullOrEmpty() &&
         options.p4RuntimeEntriesFile.isNullOrEmpty() &&
         options.p4RuntimeEntriesFiles.isNullOrEmpty()) {

diff --git a/frontends/p4/frontend.cpp b/frontends/p4/frontend.cpp
@@ -239,7 +239,15 @@ const IR::P4Program *FrontEnd::run(const CompilerOptions &options, const IR::P4P
     if (policy->optimize(options)) {
         passes.addPasses({
             new Inline(&refMap, &typeMap, evaluator, *policy, options.optimizeParserInlining),
+        });
+    }
+    if (policy->controlPlaneAPIGenEnabled(options)) {
+        passes.addPasses({
             new DuplicateHierarchicalNameCheck(),
+        });
+    }
+    if (policy->optimize(options)) {
+        passes.addPasses({
             new InlineActions(&refMap, &typeMap, *policy),
             new LocalizeAllActions(&refMap, *policy),
             new UniqueNames(),

diff --git a/frontends/p4/frontend.h b/frontends/p4/frontend.h
@@ -60,6 +60,18 @@ class FrontEndPolicy : public RemoveUnusedPolicy {
         return options.optimizationLevel > 0;
     }
 
+    /// Indicates whether control plane API generation is enabled.
+    /// @returns default to false unless a command line option was
+    /// given explicitly enabling control plane API generation.
+    virtual bool controlPlaneAPIGenEnabled(const CompilerOptions &options) const {
+        if (options.p4RuntimeFile.isNullOrEmpty() && options.p4RuntimeFiles.isNullOrEmpty() &&
+            options.p4RuntimeEntriesFile.isNullOrEmpty() &&
+            options.p4RuntimeEntriesFiles.isNullOrEmpty()) {
+            return false;
+        }
+        return true;
+    }
+
     /// Get policy for the constant folding pass. @see ConstantFoldingPolicy
     /// @returns Defaults to nullptr, which causes constant folding to use the default policy, which
     /// does not modify the pass defaults in any way.