Handle bfrt Info for new type (#3103)

p4lang · Mar 3, 2022 · d1123b4 · d1123b4
1 parent 04b00f7
commit d1123b4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/backends/dpdk/DpdkXfail.cmake b/backends/dpdk/DpdkXfail.cmake
@@ -1,8 +1,3 @@
-p4c_add_xfail_reason("dpdk"
-  "error: Error when generating BF-RT info for 'Digest' .*: packed type is too complex"
-  testdata/p4_16_samples/psa-example-digest-bmv2.p4
-  )
-
 p4c_add_xfail_reason("dpdk"
   "Expected packet length argument for"
   testdata/p4_16_samples/psa-example-counters-bmv2.p4
@@ -46,6 +41,7 @@ p4c_add_xfail_reason("dpdk"
 
 p4c_add_xfail_reason("dpdk"
   "Unknown extern function"
+  testdata/p4_16_samples/psa-example-digest-bmv2.p4
   testdata/p4_16_samples/psa-example-parser-checksum.p4
   testdata/p4_16_samples/psa-meter6.p4
   )

diff --git a/control-plane/bfruntime.cpp b/control-plane/bfruntime.cpp
@@ -55,6 +55,16 @@ TypeSpecParser TypeSpecParser::make(const p4configv1::P4Info& p4info,
                 type = makeTypeBytes(fSpec.bitstring().varbit().max_bitwidth());
         } else if (fSpec.has_bool_()) {
             type = makeTypeBool(1);
+        } else if (fSpec.has_new_type()) {
+            auto newtypes = typeInfo.new_types();
+            auto typeName = fSpec.new_type().name();
+            auto newType = newtypes.find(typeName);
+            if (newType == newtypes.end()) {
+                ::error("New type '%1%' not found in typeInfo for '%2%' '%3%'",
+                        typeName, instanceType, instanceName);
+                return;
+            }
+            type = makeTypeBytes(newType->second.translated_type().sdn_bitwidth());
         }
 
         if (!type) {