Dpdk Backend: Fixed target_name and action parameter bitwidth (#4025)

* Fixed target_name and action parameter bitwidth * Add utility function for getting Metadata width
p4lang · Jun 14, 2023 · 31efd57 · 31efd57
1 parent dff9347
commit 31efd57
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/backends/dpdk/dpdkArch.cpp b/backends/dpdk/dpdkArch.cpp
@@ -637,10 +637,7 @@ const IR::Node *ReplaceHdrMetaField::postorder(IR::Type_Struct *st) {
             if (auto t = (*field).type->to<IR::Type_Bits>()) {
                 auto width = t->width_bits();
                 if (width % 8 != 0) {
-                    if (width < 32)
-                        width = 32;
-                    else
-                        width = 64;
+                    width = getMetadataFieldWidth(width);
                     fields->push_back(
                         new IR::StructField(IR::ID(field->name), IR::Type_Bits::get(width)));
                 } else {

diff --git a/backends/dpdk/dpdkContext.cpp b/backends/dpdk/dpdkContext.cpp
@@ -18,6 +18,7 @@ limitations under the License.
 
 #include "backend.h"
 #include "control-plane/bfruntime_ext.h"
+#include "dpdkUtils.h"
 #include "printUtils.h"
 namespace DPDK {
 
@@ -190,7 +191,7 @@ void DpdkContextGenerator::addKeyField(Util::JsonArray *keyJson, const cstring n
 Util::JsonObject *DpdkContextGenerator::initTableCommonJson(const cstring name,
                                                             const struct TableAttributes &attr) {
     auto *tableJson = new Util::JsonObject();
-    cstring tableName = attr.controlName + "." + name;
+    cstring tableName = name;
     tableJson->emplace("name", attr.externalName);
     tableJson->emplace("target_name", tableName);
     tableJson->emplace("direction", attr.direction);
@@ -349,6 +350,7 @@ Util::JsonObject *DpdkContextGenerator::addMatchAttributes(const IR::P4Table *ta
             for (auto param : *(attr.params)) {
                 if (param->type->is<IR::Type_Bits>()) {
                     param_width = param->type->width_bits();
+                    param_width = getMetadataFieldWidth(param_width);
                 } else if (!param->type->is<IR::Type_Boolean>()) {
                     BUG("Unsupported parameter type %1%", param->type);
                 }
@@ -411,6 +413,7 @@ Util::JsonArray *DpdkContextGenerator::addActions(const IR::P4Table *table,
                 for (auto param : *(attr.params)) {
                     if (param->type->is<IR::Type_Bits>()) {
                         param_width = param->type->width_bits();
+                        param_width = getMetadataFieldWidth(param_width);
                     } else if (!param->type->is<IR::Type_Boolean>()) {
                         BUG("Unsupported parameter type %1%", param->type);
                     }

diff --git a/backends/dpdk/dpdkUtils.cpp b/backends/dpdk/dpdkUtils.cpp
@@ -133,4 +133,16 @@ bool reservedNames(P4::ReferenceMap *refMap, std::vector<cstring> names, cstring
     return true;
 }
 
+// Update bitwidth of Metadata fields to 32 or 64 bits if it 8-bit aligned.
+int getMetadataFieldWidth(int width) {
+    BUG_CHECK(width <= 64, "Metadata bit-width expected to be within 64-bits");
+    if (width % 8 != 0) {
+        if (width < 32)
+            return 32;
+        else
+            return 64;
+    }
+    return width;
+}
+
 }  // namespace DPDK
diff --git a/backends/dpdk/dpdkUtils.h b/backends/dpdk/dpdkUtils.h
@@ -31,7 +31,7 @@ bool isDirection(const IR::Member *m);
 bool isHeadersStruct(const IR::Type_Struct *st);
 bool isLargeFieldOperand(const IR::Expression *e);
 bool isInsideHeader(const IR::Expression *e);
-
+int getMetadataFieldWidth(int width);
 const IR::Type_Bits *getEightBitAlignedType(const IR::Type_Bits *tb);
 
 // Check for reserved names for DPDK target