Update some stale DPDK reference files. Make sure that the dpdk test …

…runner throws an error when the reference file is stale. (#4705)
p4lang · Jun 4, 2024 · d5df09b · d5df09b
1 parent 32f2c1d
commit d5df09b
Show file tree

Hide file tree

Showing 16 changed files with 41 additions and 17 deletions.
diff --git a/backends/dpdk/run-dpdk-test.py b/backends/dpdk/run-dpdk-test.py
@@ -181,7 +181,7 @@ def check_generated_files(options, tmpdir, expecteddir):
         result = compare_files(options, produced, expected, file[-6:] == "-error")
         # We do not want to compare stderr output generated by p4c-dpdk
         if result != SUCCESS and (file[-6:] == "-error"):
-            return SUCCESS
+            return result
         if result != SUCCESS and not ignoreStderr(options):
             return result
         if produced.endswith(".spec") and environ.get("DPDK_PIPELINE") is not None:

diff --git a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err1.p4 b/testdata/p4_16_dpdk_errors/pna-example-ipsec-err1.p4
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 
 #define inbound(meta) (istd.direction == PNA_Direction_t.NET_TO_HOST)

diff --git a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err2.p4 b/testdata/p4_16_dpdk_errors/pna-example-ipsec-err2.p4
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 
 #define inbound(meta) (istd.direction == PNA_Direction_t.NET_TO_HOST)

diff --git a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err3.p4 b/testdata/p4_16_dpdk_errors/pna-example-ipsec-err3.p4
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 
 #define inbound(meta) (istd.direction == PNA_Direction_t.NET_TO_HOST)

diff --git a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err4.p4 b/testdata/p4_16_dpdk_errors/pna-example-ipsec-err4.p4
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 
 #define inbound(meta) (istd.direction == PNA_Direction_t.NET_TO_HOST)

diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-1.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-1.p4
@@ -1,5 +1,5 @@
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 
 typedef bit<48>  EthernetAddress;

diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-2.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-2.p4
@@ -1,5 +1,5 @@
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 typedef bit<48>  EthernetAddress;
 const bit<8> ETHERNET_HEADER_LEN = 14;

diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-3.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-3.p4
@@ -1,5 +1,5 @@
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 typedef bit<48>  EthernetAddress;
 const bit<8> ETHERNET_HEADER_LEN = 14;

diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-4.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-4.p4
@@ -1,5 +1,5 @@
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 
 typedef bit<48>  EthernetAddress;

diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err.p4
@@ -1,5 +1,5 @@
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 typedef bit<48>  EthernetAddress;
 const bit<8> ETHERNET_HEADER_LEN = 14;

diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-2.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-2.p4
@@ -1,5 +1,5 @@
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 typedef bit<48>  EthernetAddress;
 const bit<8> ETHERNET_HEADER_LEN = 14;

diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-3.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-3.p4
@@ -1,5 +1,5 @@
 #include <core.p4>
-#include "dpdk/pna.p4"
+#include <dpdk/pna.p4>
 
 
 typedef bit<48>  EthernetAddress;

diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-4.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-4.p4
@@ -1,5 +1,5 @@
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 
 typedef bit<48>  EthernetAddress;

diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err.p4
@@ -1,5 +1,5 @@
 #include <core.p4>
-#include <pna.p4>
+#include <dpdk/pna.p4>
 
 typedef bit<48>  EthernetAddress;
 const bit<8> ETHERNET_HEADER_LEN = 14;

diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-3.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-3.p4-error
@@ -1,3 +1,6 @@
 pna.p4(401): [--Werror=unexpected] error: count method of per_prefix_pkt_bytes_count extern can only be invoked from within action of ownertable
   void count(in bit<32> pkt_len);
        ^^^^^
+pna.p4(401): [--Werror=unexpected] error: count method of per_prefix_bytes_count extern can only be invoked from within action of ownertable
+  void count(in bit<32> pkt_len);
+       ^^^^^
diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-4.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-4.p4-error
@@ -1,3 +1,24 @@
-pna-dpdk-direct-meter-err-4.p4(118): [--Werror=expected] error: Expected default action default_route_drop to have 'dpdk_execute' method call for DirectMeter extern instance MainControlImpl.meter0
-    action default_route_drop() {
-           ^^^^^^^^^^^^^^^^^^
+pna-dpdk-direct-meter-err-4.p4(111): [--Werror=type-error] error: meter0.execute: extern DirectMeter does not have method matching this call
+        out1 = meter0.execute(color_in, 32w1024);
+               ^^^^^^^^^^^^^^
+pna.p4(444)
+extern DirectMeter {
+       ^^^^^^^^^^^
+pna-dpdk-direct-meter-err-4.p4(113): [--Werror=type-error] error: meter1.execute: extern DirectMeter does not have method matching this call
+        color_out = meter1.execute(color_in, 32w1024);
+                    ^^^^^^^^^^^^^^
+pna.p4(444)
+extern DirectMeter {
+       ^^^^^^^^^^^
+pna-dpdk-direct-meter-err-4.p4(119): [--Werror=type-error] error: meter0.execute: extern DirectMeter does not have method matching this call
+        out1 = meter0.execute(color_in, 32w1024);
+               ^^^^^^^^^^^^^^
+pna.p4(444)
+extern DirectMeter {
+       ^^^^^^^^^^^
+pna-dpdk-direct-meter-err-4.p4(148): [--Werror=type-error] error: meter1.execute: extern DirectMeter does not have method matching this call
+            color_out = meter1.execute(color_in, 32w1024);
+                        ^^^^^^^^^^^^^^
+pna.p4(444)
+extern DirectMeter {
+       ^^^^^^^^^^^