@command_line annotation

- per-target selectable support, though most should want it Signed-off-by: Chris Dodd <cdodd@nvidia.com>
p4lang · Feb 12, 2025 · bfb4f08 · bfb4f08
1 parent c67d1fd
commit bfb4f08
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 10 deletions.
diff --git a/backends/bmv2/pna_nic/main.cpp b/backends/bmv2/pna_nic/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char *const argv[]) {
 
         if (program == nullptr || ::P4::errorCount() > 0) return 1;
         try {
-            P4::P4COptionPragmaParser optionsPragmaParser;
+            P4::P4COptionPragmaParser optionsPragmaParser(true);
             program->apply(P4::ApplyOptionsPragmas(optionsPragmaParser));
 
             P4::FrontEnd frontend;

diff --git a/backends/bmv2/psa_switch/main.cpp b/backends/bmv2/psa_switch/main.cpp
@@ -65,7 +65,7 @@ int main(int argc, char *const argv[]) {
 
         if (program == nullptr || ::P4::errorCount() > 0) return 1;
         try {
-            P4::P4COptionPragmaParser optionsPragmaParser;
+            P4::P4COptionPragmaParser optionsPragmaParser(true);
             program->apply(P4::ApplyOptionsPragmas(optionsPragmaParser));
 
             P4::FrontEnd frontend;

diff --git a/backends/bmv2/simple_switch/main.cpp b/backends/bmv2/simple_switch/main.cpp
@@ -68,7 +68,7 @@ int main(int argc, char *const argv[]) {
 
         if (program == nullptr || ::P4::errorCount() > 0) return 1;
         try {
-            P4::P4COptionPragmaParser optionsPragmaParser;
+            P4::P4COptionPragmaParser optionsPragmaParser(true);
             program->apply(P4::ApplyOptionsPragmas(optionsPragmaParser));
 
             P4::FrontEnd frontend;

diff --git a/backends/dpdk/main.cpp b/backends/dpdk/main.cpp
@@ -86,7 +86,7 @@ int main(int argc, char *const argv[]) {
 
         if (program == nullptr || ::P4::errorCount() > 0) return 1;
         try {
-            P4::P4COptionPragmaParser optionsPragmaParser;
+            P4::P4COptionPragmaParser optionsPragmaParser(true);
             program->apply(P4::ApplyOptionsPragmas(optionsPragmaParser));
 
             P4::FrontEnd frontend;

diff --git a/backends/ebpf/p4c-ebpf.cpp b/backends/ebpf/p4c-ebpf.cpp
@@ -66,7 +66,7 @@ void compile(EbpfOptions &options) {
         program = P4::parseP4File(options);
         if (::P4::errorCount() > 0) return;
 
-        P4::P4COptionPragmaParser optionsPragmaParser;
+        P4::P4COptionPragmaParser optionsPragmaParser(true);
         program->apply(P4::ApplyOptionsPragmas(optionsPragmaParser));
 
         P4::FrontEnd frontend;

diff --git a/backends/graphs/p4c-graphs.cpp b/backends/graphs/p4c-graphs.cpp
@@ -162,7 +162,7 @@ int main(int argc, char *const argv[]) {
         if (program == nullptr || ::P4::errorCount() > 0) return 1;
 
         try {
-            P4::P4COptionPragmaParser optionsPragmaParser;
+            P4::P4COptionPragmaParser optionsPragmaParser(false);
             program->apply(P4::ApplyOptionsPragmas(optionsPragmaParser));
 
             P4::FrontEnd fe;

diff --git a/backends/p4test/p4test.cpp b/backends/p4test/p4test.cpp
@@ -135,7 +135,7 @@ int main(int argc, char *const argv[]) {
         info.emitInfo("PARSER");
 
         if (program != nullptr && ::P4::errorCount() == 0) {
-            P4::P4COptionPragmaParser optionsPragmaParser;
+            P4::P4COptionPragmaParser optionsPragmaParser(true);
             program->apply(P4::ApplyOptionsPragmas(optionsPragmaParser));
             info.emitInfo("PASS P4COptionPragmaParser");
 

diff --git a/backends/p4tools/common/compiler/compiler_target.cpp b/backends/p4tools/common/compiler/compiler_target.cpp
@@ -65,7 +65,7 @@ const IR::P4Program *CompilerTarget::runParser(const ParserOptions &options) {
 
 const IR::P4Program *CompilerTarget::runFrontend(const CompilerOptions &options,
                                                  const IR::P4Program *program) const {
-    P4COptionPragmaParser optionsPragmaParser;
+    P4COptionPragmaParser optionsPragmaParser(false);
     program->apply(ApplyOptionsPragmas(optionsPragmaParser));
 
     auto frontEnd = mkFrontEnd();

diff --git a/backends/tc/tc.cpp b/backends/tc/tc.cpp
@@ -55,7 +55,7 @@ int main(int argc, char *const argv[]) {
         return 1;
     }
     try {
-        P4::P4COptionPragmaParser optionsPragmaParser;
+        P4::P4COptionPragmaParser optionsPragmaParser(true);
         program->apply(P4::ApplyOptionsPragmas(optionsPragmaParser));
         P4::FrontEnd frontend;
         frontend.addDebugHook(hook);

diff --git a/backends/tofino/bf-p4c/bf-p4c-options.h b/backends/tofino/bf-p4c/bf-p4c-options.h
@@ -223,6 +223,9 @@ class BFNOptionPragmaParser : public P4::P4COptionPragmaParser {
  public:
     std::optional<CommandLineOptions> tryToParse(const IR::Annotation *annotation) override;
 
+    BFNOptionPragmaParser() : P4::P4COptionPragmaParser(false) {}
+    // FIXME -- should remove the tofino @command_line stuff and use the base class
+
  private:
     std::optional<CommandLineOptions> parseCompilerOption(const IR::Annotation *annotation);
 };

diff --git a/frontends/common/applyOptionsPragmas.cpp b/frontends/common/applyOptionsPragmas.cpp
@@ -51,6 +51,22 @@ std::optional<IOptionPragmaParser::CommandLineOptions> P4COptionPragmaParser::tr
     const IR::Annotation *annotation) {
     auto pragmaName = annotation->name.name;
     if (pragmaName == "diagnostic") return parseDiagnostic(annotation);
+    if (supportCommandLinePragma && pragmaName == "command_line") {
+        IOptionPragmaParser::CommandLineOptions options;
+        auto *args = annotation->needsParsing()
+                         ? P4ParserDriver::parseExpressionList(annotation->srcInfo,
+                                                               annotation->getUnparsed())
+                         : &annotation->getExpr();
+        for (auto *arg : *args) {
+            if (auto *a = arg->to<IR::StringLiteral>()) {
+                options.push_back(a->value.c_str());
+            } else {
+                // can this happen?  annotation parser should require only strings
+                warning("ignoring non-string %1% in @command_line", a);
+            }
+        }
+        return options;
+    }
     return std::nullopt;
 }
 

diff --git a/frontends/common/applyOptionsPragmas.h b/frontends/common/applyOptionsPragmas.h
@@ -76,9 +76,13 @@ class ApplyOptionsPragmas : public Inspector {
  * they're unable to parse a pragma.
  */
 class P4COptionPragmaParser : public IOptionPragmaParser {
+    bool supportCommandLinePragma;
+
  public:
     std::optional<CommandLineOptions> tryToParse(const IR::Annotation *annotation) override;
 
+    explicit P4COptionPragmaParser(bool sCLP) : supportCommandLinePragma(sCLP) {}
+
  private:
     std::optional<CommandLineOptions> parseDiagnostic(const IR::Annotation *annotation);
 };

diff --git a/frontends/p4/parseAnnotations.cpp b/frontends/p4/parseAnnotations.cpp
@@ -51,6 +51,9 @@ ParseAnnotations::HandlerMap ParseAnnotations::standardHandlers() {
 
         // @match has an expression argument
         PARSE(IR::Annotation::matchAnnotation, Expression),
+
+        // @command_line to add to the command line
+        PARSE_STRING_LITERAL_LIST("command_line"_cs),
     };
 }
 

diff --git a/test/gtest/helpers.cpp b/test/gtest/helpers.cpp
@@ -178,7 +178,7 @@ namespace P4::Test {
         return std::nullopt;
     }
 
-    P4::P4COptionPragmaParser optionsPragmaParser;
+    P4::P4COptionPragmaParser optionsPragmaParser(true);
     program->apply(P4::ApplyOptionsPragmas(optionsPragmaParser));
     if (::P4::errorCount() > 0) {
         std::cerr << "Encountered " << ::P4::errorCount()