p4lang · jafingerhut · Nov 11, 2022 · Oct 18, 2022 · Oct 20, 2022 · Oct 20, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -444,7 +444,8 @@ add_custom_target(update_includes ALL
 if (ENABLE_DPDK)
 add_custom_target(dpdk_includes ALL
   COMMAND ${CMAKE_COMMAND} -E make_directory ${P4C_BINARY_DIR}/p4include/dpdk
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${P4C_SOURCE_DIR}/p4include/dpdk/psa.p4 ${P4C_BINARY_DIR}/p4include/dpdk)
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${P4C_SOURCE_DIR}/p4include/dpdk/psa.p4 ${P4C_BINARY_DIR}/p4include/dpdk
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${P4C_SOURCE_DIR}/p4include/dpdk/pna.p4 ${P4C_BINARY_DIR}/p4include/dpdk)
 endif ()
 
 # Installation

diff --git a/backends/dpdk/DpdkXfail.cmake b/backends/dpdk/DpdkXfail.cmake
@@ -1,3 +1,15 @@
+p4c_add_xfail_reason("dpdk"
+  "use dpdk specific `dpdk_execute` method"
+  testdata/p4_16_samples/psa-example-dpdk-meter-execute-err.p4
+  testdata/p4_16_samples/psa-meter3.p4
+  testdata/p4_16_samples/psa-meter7-bmv2.p4
+  )
+
+p4c_add_xfail_reason("dpdk"
+  "Meter function execute not implemented, use dpdk_execute"
+  testdata/p4_16_samples/psa-meter1.p4
+  )
+
 p4c_add_xfail_reason("dpdk"
   "not implemented"
   testdata/p4_16_samples/psa-example-dpdk-byte-alignment_4.p4
@@ -39,9 +51,3 @@ p4c_add_xfail_reason("dpdk"
   "Direct counters and direct meters are unsupported for wildcard match"
   testdata/p4_16_samples/psa-example-counters-bmv2.p4
   )
-
-p4c_add_xfail_reason("dpdk"
-  "Expected atleast 2 arguments"
-  testdata/p4_16_samples/psa-meter3.p4
-  testdata/p4_16_samples/psa-meter7-bmv2.p4
-  )
diff --git a/backends/dpdk/README.md b/backends/dpdk/README.md
@@ -74,6 +74,13 @@ In P4 the second argument of the extract method is the number of bits.
 Compiler generates instructions which compute the size in bytes from the value in bits.
 If the value in bits is not a multiple of 8, the value is rounded down to the lower
 multiple of 8 bits.
+- Currently dpdk target does not support standard count and execute methods for Counter and Meter externs as defined in PSA and PNA specifications. It requires packet length as parameter in count and execute methods.
+```Meter
+PNA_MeterColor_t dpdk_execute(in S index, in PNA_MeterColor_t color, in bit<32> pkt_len);
+```
+```Counter
+void count(in S index, in bit<32> pkt_len);
+```
 
 ## Contacts
 

diff --git a/backends/dpdk/dpdkArch.cpp b/backends/dpdk/dpdkArch.cpp
@@ -2465,13 +2465,13 @@ bool CollectDirectCounterMeter::ifMethodFound(const IR::P4Action *a,
     return methodCallFound;
 }
 
-/* ifMethodFound() is called from here to make sure that an action only contains count/execute
+/* ifMethodFound() is called from here to make sure that an action only contains count/dpdk_execute
  * method calls for only one Direct counter/meter instance. The error for the same is emitted
  * in the ifMethodFound function itself and return value is not required to be checked here.
  */
 bool CollectDirectCounterMeter::preorder(const IR::P4Action* a) {
     ifMethodFound(a, "count");
-    ifMethodFound(a, "execute");
+    ifMethodFound(a, "dpdk_execute");
     return false;
 }
 
@@ -2526,10 +2526,10 @@ bool CollectDirectCounterMeter::preorder(const IR::P4Table* tbl) {
                         return false;
                     }
                 }
-                if (!ifMethodFound(defaultActionDecl, "execute", meterExternName)) {
+                if (!ifMethodFound(defaultActionDecl, "dpdk_execute", meterExternName)) {
                     if (meterInstance) {
                         ::error(ErrorType::ERR_EXPECTED, "Expected default action %1% to have "
-                                "'execute' method call for DirectMeter extern instance %2%",
+                                "'dpdk_execute' method call for DirectMeter extern instance %2%",
                                  defaultActionDecl->name, *meterInstance->name);
                         return false;
                     }
@@ -2557,7 +2557,7 @@ void ValidateDirectCounterMeter::validateMethodInvocation(P4::ExternMethod *a) {
     }
 
     if ((externName == "DirectCounter" && methodName != "count") ||
-        (externName == "DirectMeter" && methodName != "execute")) {
+        (externName == "DirectMeter" && methodName != "dpdk_execute")) {
         ::error(ErrorType::ERR_UNEXPECTED, "%1% method not supported for %2% extern",
                                            methodName, externName);
         return;

diff --git a/backends/dpdk/dpdkHelpers.cpp b/backends/dpdk/dpdkHelpers.cpp
@@ -349,6 +349,13 @@ bool ConvertStatementToDpdk::preorder(const IR::AssignmentStatement *a) {
                 }
             } else if (e->originalExternType->getName().name == "Meter") {
                 if (e->method->getName().name == "execute") {
+                    ::error(ErrorType::ERR_UNEXPECTED,
+                            "use dpdk specific `dpdk_execute` method, `%1%`"
+                            " not supported by dpdk",
+                            e->method->getName());
+                    return false;
+                }
+                if (e->method->getName().name == "dpdk_execute") {
                     auto argSize = e->expr->arguments->size();
 
                     // DPDK target needs index and packet length as mandatory parameters
@@ -371,7 +378,7 @@ bool ConvertStatementToDpdk::preorder(const IR::AssignmentStatement *a) {
                          e->object->getName(), index, length, color_in, left);
                 }
             } else if (e->originalExternType->getName().name == "DirectMeter") {
-                if (e->method->getName().name == "execute") {
+                if (e->method->getName().name == "dpdk_execute") {
                     auto argSize = e->expr->arguments->size();
 
                     // DPDK target needs packet length as mandatory parameters
@@ -1054,11 +1061,12 @@ bool ConvertStatementToDpdk::preorder(const IR::MethodCallStatement *s) {
                 }
             }
         } else if (a->originalExternType->getName().name == "Meter") {
-            if (a->method->getName().name != "execute") {
-                BUG("Meter function not implemented.");
+            if (a->method->getName().name != "dpdk_execute") {
+                BUG("Meter function %1% not implemented, use dpdk_execute",
+                    a->method->getName());
             }
         } else if (a->originalExternType->getName().name == "DirectMeter") {
-            if (a->method->getName().name != "execute") {
+            if (a->method->getName().name != "dpdk_execute") {
                 BUG("Direct Meter function %1% not implemented.", a->method->getName().name);
             }
         } else if (a->originalExternType->getName().name == "DirectCounter") {

diff --git a/backends/dpdk/midend.cpp b/backends/dpdk/midend.cpp
@@ -136,6 +136,7 @@ DpdkMidEnd::DpdkMidEnd(CompilerOptions &options,
                     {"Register", "write"},
                     {"Counter", "count"},
                     {"Meter", "execute"},
+                    {"Meter", "dpdk_execute"},
                     {"Digest", "pack"},
                 };
                 for (auto f : doNotCopyPropList) {