diff --git a/CMakeLists.txt b/CMakeLists.txt index d6c6b0d07cd..0e9314e7b27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -539,18 +539,13 @@ add_custom_target(update_includes ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different ${P4C_SOURCE_DIR}/p4include/*.p4 ${P4C_BINARY_DIR}/p4include COMMAND ${CMAKE_COMMAND} -E make_directory ${P4C_BINARY_DIR}/p4include/bmv2 COMMAND ${CMAKE_COMMAND} -E copy_if_different ${P4C_SOURCE_DIR}/p4include/bmv2/psa.p4 ${P4C_BINARY_DIR}/p4include/bmv2 + 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/pna.p4 ${P4C_BINARY_DIR}/p4include/dpdk COMMAND for h in ${OTHER_HEADERS} \; do ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/\$$h ${P4C_BINARY_DIR}/p4include \; done ) -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/pna.p4 ${P4C_BINARY_DIR}/p4include/dpdk - DEPENDS update_includes -) -endif() # Installation # Targets install themselves. Here we install the core headers diff --git a/backends/dpdk/CMakeLists.txt b/backends/dpdk/CMakeLists.txt index 6331e9a42ad..087dfe41ffb 100644 --- a/backends/dpdk/CMakeLists.txt +++ b/backends/dpdk/CMakeLists.txt @@ -116,6 +116,9 @@ set(DPDK_PTF_DRIVER "${CMAKE_CURRENT_SOURCE_DIR}/run-dpdk-ptf-test.py") set(DPDK_COMPILER_DRIVER "${CMAKE_CURRENT_SOURCE_DIR}/run-dpdk-test.py") set (P4_16_SUITES +# TODO (issue #4614): Consider moving dpdk pna and psa tests to their own +# subdirectories (e.g. p4_16_psa_samples/), similar to what is done for the +# dpdk/psa/pna errors tests. "${P4C_SOURCE_DIR}/testdata/p4_16_samples/psa-*.p4" "${P4C_SOURCE_DIR}/testdata/p4_16_samples/pna-*.p4" "${P4C_SOURCE_DIR}/testdata/p4_16_psa_errors/*.p4" diff --git a/testdata/p4_16_dpdk_errors/pna-add-on-miss-err1.p4 b/testdata/p4_16_dpdk_errors/pna-add-on-miss-err1.p4 index 1b4476296aa..0d3d6f8563d 100644 --- a/testdata/p4_16_dpdk_errors/pna-add-on-miss-err1.p4 +++ b/testdata/p4_16_dpdk_errors/pna-add-on-miss-err1.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_dpdk_errors/pna-dpdk-large-constants.p4 b/testdata/p4_16_dpdk_errors/pna-dpdk-large-constants.p4 index 2c39eefba41..16e08172778 100644 --- a/testdata/p4_16_dpdk_errors/pna-dpdk-large-constants.p4 +++ b/testdata/p4_16_dpdk_errors/pna-dpdk-large-constants.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; typedef bit<32> IPv4Address; diff --git a/testdata/p4_16_dpdk_errors/pna-dpdk-table-key-consolidation-learner-2.p4 b/testdata/p4_16_dpdk_errors/pna-dpdk-table-key-consolidation-learner-2.p4 index 1e667bf6f1e..e41e0794202 100644 --- a/testdata/p4_16_dpdk_errors/pna-dpdk-table-key-consolidation-learner-2.p4 +++ b/testdata/p4_16_dpdk_errors/pna-dpdk-table-key-consolidation-learner-2.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err1.p4 b/testdata/p4_16_dpdk_errors/pna-example-ipsec-err1.p4 index 0836da47b06..5def0ed0f55 100644 --- 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 -#include +#include #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 index e1bda36a564..7611559c640 100644 --- 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 -#include +#include #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 index 40eb3481d88..322a1f0fe03 100644 --- 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 -#include +#include #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 index 03bc26d96fc..1c16f824928 100644 --- 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 -#include +#include #define inbound(meta) (istd.direction == PNA_Direction_t.NET_TO_HOST) diff --git a/testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err1.p4 b/testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err1.p4 index b8f673c85f5..d25d77edbca 100644 --- a/testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err1.p4 +++ b/testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err1.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err2.p4 b/testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err2.p4 index 2541cf3906a..4a3062f97c5 100644 --- a/testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err2.p4 +++ b/testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err2.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_dpdk_errors/psa-dpdk-struct-field.p4 b/testdata/p4_16_dpdk_errors/psa-dpdk-struct-field.p4 index 2cc17e8aa79..dee4ac19286 100644 --- a/testdata/p4_16_dpdk_errors/psa-dpdk-struct-field.p4 +++ b/testdata/p4_16_dpdk_errors/psa-dpdk-struct-field.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_errors/psa-meter2.p4 b/testdata/p4_16_errors/psa-meter2.p4 index a5e8279902e..6c91b66802c 100644 --- a/testdata/p4_16_errors/psa-meter2.p4 +++ b/testdata/p4_16_errors/psa-meter2.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { }; diff --git a/testdata/p4_16_pna_errors/pna-add-on-miss-err.p4 b/testdata/p4_16_pna_errors/pna-add-on-miss-err.p4 index 076b1bc0134..82a2c6b6a0a 100644 --- a/testdata/p4_16_pna_errors/pna-add-on-miss-err.p4 +++ b/testdata/p4_16_pna_errors/pna-add-on-miss-err.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; 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 index 470641bcc08..86940ae5d09 100644 --- 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 -#include "pna.p4" +#include typedef bit<48> EthernetAddress; 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 index 63f1167c2d2..dcf4f83b79b 100644 --- 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 -#include +#include 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 index 614a347386a..afaa7a6d8a3 100644 --- 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 -#include "pna.p4" +#include typedef bit<48> EthernetAddress; 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 index 94b7968f94d..28bb08ce130 100644 --- 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 -#include +#include typedef bit<48> EthernetAddress; const bit<8> ETHERNET_HEADER_LEN = 14; 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 index f1039ecb407..d71b9c0ba77 100644 --- 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 -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_pna_errors/pna-example-addhit.p4 b/testdata/p4_16_pna_errors/pna-example-addhit.p4 index 683069960ed..9fd24642a07 100644 --- a/testdata/p4_16_pna_errors/pna-example-addhit.p4 +++ b/testdata/p4_16_pna_errors/pna-example-addhit.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error.p4 b/testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error.p4 index 47bd0dbf03e..068e4d7dc9b 100644 --- a/testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error.p4 +++ b/testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error.p4 @@ -1,5 +1,5 @@ #include -#include "pna.p4" +#include const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; diff --git a/testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error1.p4 b/testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error1.p4 index bae55b628d4..4c0b526ba53 100644 --- a/testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error1.p4 +++ b/testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error1.p4 @@ -1,5 +1,5 @@ #include -#include "pna.p4" +#include const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; diff --git a/testdata/p4_16_pna_errors/pna-example-mirror-packet-error1.p4 b/testdata/p4_16_pna_errors/pna-example-mirror-packet-error1.p4 index 8af7f2aff2c..027d852f4c0 100644 --- a/testdata/p4_16_pna_errors/pna-example-mirror-packet-error1.p4 +++ b/testdata/p4_16_pna_errors/pna-example-mirror-packet-error1.p4 @@ -1,5 +1,5 @@ #include -#include "pna.p4" +#include const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; diff --git a/testdata/p4_16_pna_errors/pna-example-mirror-packet-error2.p4 b/testdata/p4_16_pna_errors/pna-example-mirror-packet-error2.p4 index 163ed19b963..9ba385132d7 100644 --- a/testdata/p4_16_pna_errors/pna-example-mirror-packet-error2.p4 +++ b/testdata/p4_16_pna_errors/pna-example-mirror-packet-error2.p4 @@ -1,5 +1,5 @@ #include -#include "pna.p4" +#include const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; diff --git a/testdata/p4_16_pna_errors/pna-example-mirror-packet-error3.p4 b/testdata/p4_16_pna_errors/pna-example-mirror-packet-error3.p4 index 602bbde1647..6ca70357610 100644 --- a/testdata/p4_16_pna_errors/pna-example-mirror-packet-error3.p4 +++ b/testdata/p4_16_pna_errors/pna-example-mirror-packet-error3.p4 @@ -1,5 +1,5 @@ #include -#include "pna.p4" +#include const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; diff --git a/testdata/p4_16_pna_errors/pna-example-miss.p4 b/testdata/p4_16_pna_errors/pna-example-miss.p4 index f1ddb822a82..7212dce3d5f 100644 --- a/testdata/p4_16_pna_errors/pna-example-miss.p4 +++ b/testdata/p4_16_pna_errors/pna-example-miss.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err-1.p4 b/testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err-1.p4 index becb5bb6d7a..94a2cb22531 100644 --- a/testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err-1.p4 +++ b/testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err-1.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include // Very simple PNA program intended to demonstrate one use of an diff --git a/testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err.p4 b/testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err.p4 index bd7dc8252a7..28a16ae9c15 100644 --- a/testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err.p4 +++ b/testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include // Very simple PNA program intended to demonstrate one use of an diff --git a/testdata/p4_16_psa_errors/psa-counter6.p4 b/testdata/p4_16_psa_errors/psa-counter6.p4 index eed795da04f..bf244b34141 100644 --- a/testdata/p4_16_psa_errors/psa-counter6.p4 +++ b/testdata/p4_16_psa_errors/psa-counter6.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { }; diff --git a/testdata/p4_16_samples/fwd-bmv2-psa.p4 b/testdata/p4_16_samples/fwd-bmv2-psa.p4 index 5976bd12b16..68865914a1c 100644 --- a/testdata/p4_16_samples/fwd-bmv2-psa.p4 +++ b/testdata/p4_16_samples/fwd-bmv2-psa.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples/internet_checksum1-bmv2.p4 b/testdata/p4_16_samples/internet_checksum1-bmv2.p4 index d9d6f33170e..3ade19b04d9 100644 --- a/testdata/p4_16_samples/internet_checksum1-bmv2.p4 +++ b/testdata/p4_16_samples/internet_checksum1-bmv2.p4 @@ -1,7 +1,7 @@ #include -#include "psa.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/issue3550.p4 b/testdata/p4_16_samples/issue3550.p4 index 25c3d16d3d7..9e4635a7080 100644 --- a/testdata/p4_16_samples/issue3550.p4 +++ b/testdata/p4_16_samples/issue3550.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/m_psa-dpdk-non-zero-arg-default-action-08.p4 b/testdata/p4_16_samples/m_psa-dpdk-non-zero-arg-default-action-08.p4 index 96c36d249d3..e680240c186 100644 --- a/testdata/p4_16_samples/m_psa-dpdk-non-zero-arg-default-action-08.p4 +++ b/testdata/p4_16_samples/m_psa-dpdk-non-zero-arg-default-action-08.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/pna-action-selector-1.p4 b/testdata/p4_16_samples/pna-action-selector-1.p4 index 21341c501a9..814b3e77294 100644 --- a/testdata/p4_16_samples/pna-action-selector-1.p4 +++ b/testdata/p4_16_samples/pna-action-selector-1.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-action-selector.p4 b/testdata/p4_16_samples/pna-action-selector.p4 index 4178c487cc5..23a2a1d0fd6 100644 --- a/testdata/p4_16_samples/pna-action-selector.p4 +++ b/testdata/p4_16_samples/pna-action-selector.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-add-on-miss.p4 b/testdata/p4_16_samples/pna-add-on-miss.p4 index dd3e37c8590..3304f55ba30 100644 --- a/testdata/p4_16_samples/pna-add-on-miss.p4 +++ b/testdata/p4_16_samples/pna-add-on-miss.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-add_on_miss_action_name.p4 b/testdata/p4_16_samples/pna-add_on_miss_action_name.p4 index ff3701b4020..3953072d5b6 100644 --- a/testdata/p4_16_samples/pna-add_on_miss_action_name.p4 +++ b/testdata/p4_16_samples/pna-add_on_miss_action_name.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-direction-main-parser-err.p4 b/testdata/p4_16_samples/pna-direction-main-parser-err.p4 index d7033cebeab..06c813b601d 100644 --- a/testdata/p4_16_samples/pna-direction-main-parser-err.p4 +++ b/testdata/p4_16_samples/pna-direction-main-parser-err.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-direction.p4 b/testdata/p4_16_samples/pna-direction.p4 index 78afcafbda5..b63b07367c7 100644 --- a/testdata/p4_16_samples/pna-direction.p4 +++ b/testdata/p4_16_samples/pna-direction.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-dpdk-bvec_union.p4 b/testdata/p4_16_samples/pna-dpdk-bvec_union.p4 index 3c88269aa13..92705849711 100644 --- a/testdata/p4_16_samples/pna-dpdk-bvec_union.p4 +++ b/testdata/p4_16_samples/pna-dpdk-bvec_union.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct alt_t { bit<1> valid; diff --git a/testdata/p4_16_samples/pna-dpdk-direct-counter-learner.p4 b/testdata/p4_16_samples/pna-dpdk-direct-counter-learner.p4 index d21317aa761..e44fceb6ddb 100644 --- a/testdata/p4_16_samples/pna-dpdk-direct-counter-learner.p4 +++ b/testdata/p4_16_samples/pna-dpdk-direct-counter-learner.p4 @@ -1,5 +1,5 @@ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-dpdk-header-union-stack.p4 b/testdata/p4_16_samples/pna-dpdk-header-union-stack.p4 index 924bdeb78ad..3e4490834e2 100644 --- a/testdata/p4_16_samples/pna-dpdk-header-union-stack.p4 +++ b/testdata/p4_16_samples/pna-dpdk-header-union-stack.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples/pna-dpdk-header-union-stack1.p4 b/testdata/p4_16_samples/pna-dpdk-header-union-stack1.p4 index 8944dc27357..45b42fa98d7 100644 --- a/testdata/p4_16_samples/pna-dpdk-header-union-stack1.p4 +++ b/testdata/p4_16_samples/pna-dpdk-header-union-stack1.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples/pna-dpdk-header-union-stack2.p4 b/testdata/p4_16_samples/pna-dpdk-header-union-stack2.p4 index dc22168c134..9c6f22d5603 100644 --- a/testdata/p4_16_samples/pna-dpdk-header-union-stack2.p4 +++ b/testdata/p4_16_samples/pna-dpdk-header-union-stack2.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples/pna-dpdk-invalid-hdr-warnings5.p4 b/testdata/p4_16_samples/pna-dpdk-invalid-hdr-warnings5.p4 index dc0a5243848..dbbbe069129 100644 --- a/testdata/p4_16_samples/pna-dpdk-invalid-hdr-warnings5.p4 +++ b/testdata/p4_16_samples/pna-dpdk-invalid-hdr-warnings5.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples/pna-dpdk-invalid-hdr-warnings6.p4 b/testdata/p4_16_samples/pna-dpdk-invalid-hdr-warnings6.p4 index 979f6bdb1c7..40cf72ef0bd 100644 --- a/testdata/p4_16_samples/pna-dpdk-invalid-hdr-warnings6.p4 +++ b/testdata/p4_16_samples/pna-dpdk-invalid-hdr-warnings6.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples/pna-dpdk-small_sample.p4 b/testdata/p4_16_samples/pna-dpdk-small_sample.p4 index 8e10429f596..9118c75e8ca 100644 --- a/testdata/p4_16_samples/pna-dpdk-small_sample.p4 +++ b/testdata/p4_16_samples/pna-dpdk-small_sample.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include +#include // small_sample diff --git a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-1.p4 b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-1.p4 index f49d206b991..e108d2f8078 100644 --- a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-1.p4 +++ b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-1.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-3.p4 b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-3.p4 index 64bac37d051..3f133299b26 100644 --- a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-3.p4 +++ b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-3.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-4.p4 b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-4.p4 index 900207a4d47..9bd9b2f518a 100644 --- a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-4.p4 +++ b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-4.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-5.p4 b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-5.p4 index 4ecc9ddfccb..2b97a9a48f6 100644 --- a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-5.p4 +++ b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-5.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-6.p4 b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-6.p4 index b6f0ad38d83..91a3de6784f 100644 --- a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-6.p4 +++ b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-6.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-7.p4 b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-7.p4 index 31e0e54fcb3..244a3a9ad1d 100644 --- a/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-7.p4 +++ b/testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-7.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-dpdk-union-bmv2.p4 b/testdata/p4_16_samples/pna-dpdk-union-bmv2.p4 index 415e28212ee..fa242f4cdbf 100644 --- a/testdata/p4_16_samples/pna-dpdk-union-bmv2.p4 +++ b/testdata/p4_16_samples/pna-dpdk-union-bmv2.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include +#include header Hdr1 { bit<8> a; diff --git a/testdata/p4_16_samples/pna-dpdk-wrong-warning.p4 b/testdata/p4_16_samples/pna-dpdk-wrong-warning.p4 index 69bfa4ebac2..ee7dc011893 100644 --- a/testdata/p4_16_samples/pna-dpdk-wrong-warning.p4 +++ b/testdata/p4_16_samples/pna-dpdk-wrong-warning.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-SelectByDirection.p4 b/testdata/p4_16_samples/pna-example-SelectByDirection.p4 index 73195c6bea3..65466be65fd 100644 --- a/testdata/p4_16_samples/pna-example-SelectByDirection.p4 +++ b/testdata/p4_16_samples/pna-example-SelectByDirection.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-SelectByDirection1.p4 b/testdata/p4_16_samples/pna-example-SelectByDirection1.p4 index 6e064f654e0..31af8c2f61b 100644 --- a/testdata/p4_16_samples/pna-example-SelectByDirection1.p4 +++ b/testdata/p4_16_samples/pna-example-SelectByDirection1.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-SelectByDirection2.p4 b/testdata/p4_16_samples/pna-example-SelectByDirection2.p4 index f3065a5c7c5..38e88d6e842 100644 --- a/testdata/p4_16_samples/pna-example-SelectByDirection2.p4 +++ b/testdata/p4_16_samples/pna-example-SelectByDirection2.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-bAnd-in-tableKey.p4 b/testdata/p4_16_samples/pna-example-bAnd-in-tableKey.p4 index 8ed207d68d9..c6e212136aa 100644 --- a/testdata/p4_16_samples/pna-example-bAnd-in-tableKey.p4 +++ b/testdata/p4_16_samples/pna-example-bAnd-in-tableKey.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-dpdk-optional.p4 b/testdata/p4_16_samples/pna-example-dpdk-optional.p4 index e52a981ce49..a2bf8edbe65 100644 --- a/testdata/p4_16_samples/pna-example-dpdk-optional.p4 +++ b/testdata/p4_16_samples/pna-example-dpdk-optional.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-dpdk-varbit-1.p4 b/testdata/p4_16_samples/pna-example-dpdk-varbit-1.p4 index fe3cf5e5fb8..a5c46b3b54a 100644 --- a/testdata/p4_16_samples/pna-example-dpdk-varbit-1.p4 +++ b/testdata/p4_16_samples/pna-example-dpdk-varbit-1.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-dpdk-varbit.p4 b/testdata/p4_16_samples/pna-example-dpdk-varbit.p4 index 1af90b4a93e..bca11155b14 100644 --- a/testdata/p4_16_samples/pna-example-dpdk-varbit.p4 +++ b/testdata/p4_16_samples/pna-example-dpdk-varbit.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-mirror-packet-1.p4 b/testdata/p4_16_samples/pna-example-mirror-packet-1.p4 index 296c1e1edb1..61eacb7c724 100644 --- a/testdata/p4_16_samples/pna-example-mirror-packet-1.p4 +++ b/testdata/p4_16_samples/pna-example-mirror-packet-1.p4 @@ -1,5 +1,5 @@ #include -#include "pna.p4" +#include const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; diff --git a/testdata/p4_16_samples/pna-example-mirror-packet.p4 b/testdata/p4_16_samples/pna-example-mirror-packet.p4 index fa3b71c09d0..bc65dab7d8f 100644 --- a/testdata/p4_16_samples/pna-example-mirror-packet.p4 +++ b/testdata/p4_16_samples/pna-example-mirror-packet.p4 @@ -1,5 +1,5 @@ #include -#include "pna.p4" +#include const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; diff --git a/testdata/p4_16_samples/pna-example-pass-1.p4 b/testdata/p4_16_samples/pna-example-pass-1.p4 index 9db1fce5aec..0fdc0514dd7 100644 --- a/testdata/p4_16_samples/pna-example-pass-1.p4 +++ b/testdata/p4_16_samples/pna-example-pass-1.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-pass-2.p4 b/testdata/p4_16_samples/pna-example-pass-2.p4 index 11ee7cb596f..6742d7950bd 100644 --- a/testdata/p4_16_samples/pna-example-pass-2.p4 +++ b/testdata/p4_16_samples/pna-example-pass-2.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-pass-3.p4 b/testdata/p4_16_samples/pna-example-pass-3.p4 index 468f4b808d3..93ae938de2d 100644 --- a/testdata/p4_16_samples/pna-example-pass-3.p4 +++ b/testdata/p4_16_samples/pna-example-pass-3.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-pass-parser.p4 b/testdata/p4_16_samples/pna-example-pass-parser.p4 index 4babfa778e9..d420842bb7f 100644 --- a/testdata/p4_16_samples/pna-example-pass-parser.p4 +++ b/testdata/p4_16_samples/pna-example-pass-parser.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-pass.p4 b/testdata/p4_16_samples/pna-example-pass.p4 index e327df2159d..6d22a5022dd 100644 --- a/testdata/p4_16_samples/pna-example-pass.p4 +++ b/testdata/p4_16_samples/pna-example-pass.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-recirculate.p4 b/testdata/p4_16_samples/pna-example-recirculate.p4 index 774b5af1b74..f4ff6d79ba5 100644 --- a/testdata/p4_16_samples/pna-example-recirculate.p4 +++ b/testdata/p4_16_samples/pna-example-recirculate.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-tcp-connection-tracking.p4 b/testdata/p4_16_samples/pna-example-tcp-connection-tracking.p4 index 088d176347f..ee2102ec938 100644 --- a/testdata/p4_16_samples/pna-example-tcp-connection-tracking.p4 +++ b/testdata/p4_16_samples/pna-example-tcp-connection-tracking.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include // Very simple PNA program intended to demonstrate one use of an diff --git a/testdata/p4_16_samples/pna-example-template.p4 b/testdata/p4_16_samples/pna-example-template.p4 index da27b9f2825..f56b64bf75a 100644 --- a/testdata/p4_16_samples/pna-example-template.p4 +++ b/testdata/p4_16_samples/pna-example-template.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-varIndex-1.p4 b/testdata/p4_16_samples/pna-example-varIndex-1.p4 index a653b14a236..6266fa17407 100644 --- a/testdata/p4_16_samples/pna-example-varIndex-1.p4 +++ b/testdata/p4_16_samples/pna-example-varIndex-1.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include #define MAX_LAYERS 2 typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-varIndex-2.p4 b/testdata/p4_16_samples/pna-example-varIndex-2.p4 index 181355da576..9882ef08447 100644 --- a/testdata/p4_16_samples/pna-example-varIndex-2.p4 +++ b/testdata/p4_16_samples/pna-example-varIndex-2.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include #define MAX_LAYERS 2 typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-example-varIndex.p4 b/testdata/p4_16_samples/pna-example-varIndex.p4 index a45fb544a6c..b10fefa5227 100644 --- a/testdata/p4_16_samples/pna-example-varIndex.p4 +++ b/testdata/p4_16_samples/pna-example-varIndex.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include #define MAX_LAYERS 2 typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/pna-mux-dismantle.p4 b/testdata/p4_16_samples/pna-mux-dismantle.p4 index b3324b3976d..a60b6f05dca 100644 --- a/testdata/p4_16_samples/pna-mux-dismantle.p4 +++ b/testdata/p4_16_samples/pna-mux-dismantle.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include "pna.p4" +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-action-selector4.p4 b/testdata/p4_16_samples/psa-action-selector4.p4 index d22562c25e7..9ea7c98fbf6 100644 --- a/testdata/p4_16_samples/psa-action-selector4.p4 +++ b/testdata/p4_16_samples/psa-action-selector4.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { }; diff --git a/testdata/p4_16_samples/psa-action-selector5.p4 b/testdata/p4_16_samples/psa-action-selector5.p4 index 87aaff93745..a11f940b820 100644 --- a/testdata/p4_16_samples/psa-action-selector5.p4 +++ b/testdata/p4_16_samples/psa-action-selector5.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { }; diff --git a/testdata/p4_16_samples/psa-action-selector6.p4 b/testdata/p4_16_samples/psa-action-selector6.p4 index b3dd7c1603d..dae397ea24b 100644 --- a/testdata/p4_16_samples/psa-action-selector6.p4 +++ b/testdata/p4_16_samples/psa-action-selector6.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { }; diff --git a/testdata/p4_16_samples/psa-dpdk-128bitCast.p4 b/testdata/p4_16_samples/psa-dpdk-128bitCast.p4 index cc6c66a02c7..f680617968c 100644 --- a/testdata/p4_16_samples/psa-dpdk-128bitCast.p4 +++ b/testdata/p4_16_samples/psa-dpdk-128bitCast.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-binary-operations-1.p4 b/testdata/p4_16_samples/psa-dpdk-binary-operations-1.p4 index 1f88f69251f..bb365918439 100644 --- a/testdata/p4_16_samples/psa-dpdk-binary-operations-1.p4 +++ b/testdata/p4_16_samples/psa-dpdk-binary-operations-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H {}; struct EMPTY_RESUB {}; diff --git a/testdata/p4_16_samples/psa-dpdk-binary-operations.p4 b/testdata/p4_16_samples/psa-dpdk-binary-operations.p4 index eab21ac8af1..121dc9ab1cb 100644 --- a/testdata/p4_16_samples/psa-dpdk-binary-operations.p4 +++ b/testdata/p4_16_samples/psa-dpdk-binary-operations.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H {}; struct EMPTY_RESUB {}; diff --git a/testdata/p4_16_samples/psa-dpdk-flatten-local-struct.p4 b/testdata/p4_16_samples/psa-dpdk-flatten-local-struct.p4 index 699793faf32..dcd399dbcc5 100644 --- a/testdata/p4_16_samples/psa-dpdk-flatten-local-struct.p4 +++ b/testdata/p4_16_samples/psa-dpdk-flatten-local-struct.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct empty_metadata_t { } diff --git a/testdata/p4_16_samples/psa-dpdk-hdr-field-non-align.p4 b/testdata/p4_16_samples/psa-dpdk-hdr-field-non-align.p4 index f45b7651b30..c692fc4eab5 100644 --- a/testdata/p4_16_samples/psa-dpdk-hdr-field-non-align.p4 +++ b/testdata/p4_16_samples/psa-dpdk-hdr-field-non-align.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-header-union-typedef.p4 b/testdata/p4_16_samples/psa-dpdk-header-union-typedef.p4 index 68e9d855bd7..b2a9e1ae90d 100644 --- a/testdata/p4_16_samples/psa-dpdk-header-union-typedef.p4 +++ b/testdata/p4_16_samples/psa-dpdk-header-union-typedef.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H {}; struct EMPTY_RESUB {}; diff --git a/testdata/p4_16_samples/psa-dpdk-lpm-match-err3.p4 b/testdata/p4_16_samples/psa-dpdk-lpm-match-err3.p4 index 8fe17add0e4..58222e0935d 100644 --- a/testdata/p4_16_samples/psa-dpdk-lpm-match-err3.p4 +++ b/testdata/p4_16_samples/psa-dpdk-lpm-match-err3.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-lpm-match-err4.p4 b/testdata/p4_16_samples/psa-dpdk-lpm-match-err4.p4 index 51b77d3ab76..c1ab9d55691 100644 --- a/testdata/p4_16_samples/psa-dpdk-lpm-match-err4.p4 +++ b/testdata/p4_16_samples/psa-dpdk-lpm-match-err4.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-lpm-match-err5.p4 b/testdata/p4_16_samples/psa-dpdk-lpm-match-err5.p4 index 49995be3c28..f14575d6610 100644 --- a/testdata/p4_16_samples/psa-dpdk-lpm-match-err5.p4 +++ b/testdata/p4_16_samples/psa-dpdk-lpm-match-err5.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-lpm-match-valid.p4 b/testdata/p4_16_samples/psa-dpdk-lpm-match-valid.p4 index 5d18998394f..972fe45ac1a 100644 --- a/testdata/p4_16_samples/psa-dpdk-lpm-match-valid.p4 +++ b/testdata/p4_16_samples/psa-dpdk-lpm-match-valid.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-01.p4 b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-01.p4 index 6673d0297e4..3fcbecc4d40 100644 --- a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-01.p4 +++ b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-01.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-02.p4 b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-02.p4 index 6b927a02bb8..45ef772ffdd 100644 --- a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-02.p4 +++ b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-02.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-03.p4 b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-03.p4 index 53e395093be..58e6b3a0c58 100644 --- a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-03.p4 +++ b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-03.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-04.p4 b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-04.p4 index 0738fac911f..c20cc388f3e 100644 --- a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-04.p4 +++ b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-04.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-05.p4 b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-05.p4 index 1ecdd7c111f..5a2928fd15e 100644 --- a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-05.p4 +++ b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-05.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-06.p4 b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-06.p4 index a17c1dc65d6..4bdf3e010b7 100644 --- a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-06.p4 +++ b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-06.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-07.p4 b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-07.p4 index 1fd13d8a62b..d8dacde59d1 100644 --- a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-07.p4 +++ b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-07.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-08.p4 b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-08.p4 index ccea1b44d77..e15a7961696 100644 --- a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-08.p4 +++ b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-08.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-09.p4 b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-09.p4 index 3f48ad98d20..c5a7dae2a04 100644 --- a/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-09.p4 +++ b/testdata/p4_16_samples/psa-dpdk-non-zero-arg-default-action-09.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-struct-field.p4 b/testdata/p4_16_samples/psa-dpdk-struct-field.p4 index 80f697e9de8..f825bd7220f 100644 --- a/testdata/p4_16_samples/psa-dpdk-struct-field.p4 +++ b/testdata/p4_16_samples/psa-dpdk-struct-field.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ struct EMPTY {}; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-if-1.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-if-1.p4 index d0bb646f7b0..9ace9045819 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-if-1.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-if-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { }; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-if.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-if.p4 index 14db02a242f..c835a6fa83c 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-if.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-if.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { }; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-1.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-1.p4 index b8cd719c1f8..b205be71c8b 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-1.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-10.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-10.p4 index 036c051792a..7cbee8e46cd 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-10.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-10.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-2.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-2.p4 index 343f88a9dd7..b3494d88f1f 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-2.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-2.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-3.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-3.p4 index f20770fed6f..249211fa83c 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-3.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-3.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-4.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-4.p4 index c4a90ce52e2..5f31bf23170 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-4.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-4.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-5.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-5.p4 index 020135fcb47..5d8971f826a 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-5.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-5.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-6.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-6.p4 index a3f536c08ca..a3ad8701cb8 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-6.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-6.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-7.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-7.p4 index 256f90ce22f..e27b65d01c9 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-7.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-7.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-8.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-8.p4 index 987bc98af4c..9c6a616cde7 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-8.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-8.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-9.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-9.p4 index 5f022dbfeb0..c329f509544 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-9.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys-9.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys.p4 index bd39aeff7f3..879feaa5862 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-mixed-keys.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-switch.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-switch.p4 index d27b6c98527..0fc5d63ca73 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-switch.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-consolidation-switch.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { }; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-error-1.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-error-1.p4 index 0b3206f383c..8c3e860b1a1 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-error-1.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-error-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-error.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-error.p4 index a38863be315..2167e4565ac 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-error.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-error.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-isValid1.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-isValid1.p4 index 9b076bdca0c..eb81ddcb6d9 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-isValid1.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-isValid1.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-isValid2.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-isValid2.p4 index 3d9f3a6f0c5..b6420a950a6 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-isValid2.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-isValid2.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-isValid3.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-isValid3.p4 index 2e2ce95fc5f..6d78f823269 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-isValid3.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-isValid3.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-isValid4.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-isValid4.p4 index d6e96024f93..80e19b0266d 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-isValid4.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-isValid4.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-isValid5.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-isValid5.p4 index 362bbe119f7..ca283a2261d 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-isValid5.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-isValid5.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-isValid6.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-isValid6.p4 index 679e7b7c701..5ecbfa1d928 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-isValid6.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-isValid6.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-table-key-isValid7.p4 b/testdata/p4_16_samples/psa-dpdk-table-key-isValid7.p4 index 5a16344adbe..fe6b6a31eea 100644 --- a/testdata/p4_16_samples/psa-dpdk-table-key-isValid7.p4 +++ b/testdata/p4_16_samples/psa-dpdk-table-key-isValid7.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-dpdk-token-too-big.p4 b/testdata/p4_16_samples/psa-dpdk-token-too-big.p4 index fe5eddbb3ba..6af8c744386 100644 --- a/testdata/p4_16_samples/psa-dpdk-token-too-big.p4 +++ b/testdata/p4_16_samples/psa-dpdk-token-too-big.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct empty_metadata_t { } diff --git a/testdata/p4_16_samples/psa-example-dpdk-varbit-bmv2.p4 b/testdata/p4_16_samples/psa-example-dpdk-varbit-bmv2.p4 index 8f0d9a2a6d9..07594d954f6 100644 --- a/testdata/p4_16_samples/psa-example-dpdk-varbit-bmv2.p4 +++ b/testdata/p4_16_samples/psa-example-dpdk-varbit-bmv2.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-example-select_tuple-1.p4 b/testdata/p4_16_samples/psa-example-select_tuple-1.p4 index 1d6fd958b4e..480d0c71e97 100644 --- a/testdata/p4_16_samples/psa-example-select_tuple-1.p4 +++ b/testdata/p4_16_samples/psa-example-select_tuple-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-example-select_tuple-mask.p4 b/testdata/p4_16_samples/psa-example-select_tuple-mask.p4 index 7209a8e8793..78974868aec 100644 --- a/testdata/p4_16_samples/psa-example-select_tuple-mask.p4 +++ b/testdata/p4_16_samples/psa-example-select_tuple-mask.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-example-select_tuple-wc.p4 b/testdata/p4_16_samples/psa-example-select_tuple-wc.p4 index 450639ba825..60e6bfdee97 100644 --- a/testdata/p4_16_samples/psa-example-select_tuple-wc.p4 +++ b/testdata/p4_16_samples/psa-example-select_tuple-wc.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-example-select_tuple.p4 b/testdata/p4_16_samples/psa-example-select_tuple.p4 index 912979a2002..6135542e3a2 100644 --- a/testdata/p4_16_samples/psa-example-select_tuple.p4 +++ b/testdata/p4_16_samples/psa-example-select_tuple.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-parser-error-test-bmv2.p4 b/testdata/p4_16_samples/psa-parser-error-test-bmv2.p4 index c8e97bc5a80..5eae1709b52 100755 --- a/testdata/p4_16_samples/psa-parser-error-test-bmv2.p4 +++ b/testdata/p4_16_samples/psa-parser-error-test-bmv2.p4 @@ -15,7 +15,7 @@ limitations under the License. */ #include -#include +#include typedef bit<48> EthernetAddress; diff --git a/testdata/p4_16_samples/psa-subtract-inst1.p4 b/testdata/p4_16_samples/psa-subtract-inst1.p4 index 312f1f44f04..482777c6b2c 100644 --- a/testdata/p4_16_samples/psa-subtract-inst1.p4 +++ b/testdata/p4_16_samples/psa-subtract-inst1.p4 @@ -1,6 +1,6 @@ /* -*- P4_16 -*- */ #include -#include +#include /************ H E A D E R S ******************************/ #define MAX_LAYERS 2 diff --git a/testdata/p4_16_samples/psa-switch-expression-without-default.p4 b/testdata/p4_16_samples/psa-switch-expression-without-default.p4 index 59ce306432b..ccdce4ac140 100644 --- a/testdata/p4_16_samples/psa-switch-expression-without-default.p4 +++ b/testdata/p4_16_samples/psa-switch-expression-without-default.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { }; diff --git a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-first.p4 b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-first.p4 index 02178fc1d92..6a1b3a75d06 100644 --- a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-first.p4 +++ b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-frontend.p4 b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-frontend.p4 index 1bcbcfb50e5..4d181bbb4ca 100644 --- a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-frontend.p4 +++ b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-midend.p4 b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-midend.p4 index 2c710415c7d..068be410389 100644 --- a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-midend.p4 +++ b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4 b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4 index 36ee5f1cff8..0969c1e0eeb 100644 --- a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4 +++ b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-first.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-first.p4 index 7d7f37a6911..b5d3a8f5aad 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct alt_t { bit<1> valid; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-frontend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-frontend.p4 index 7d7f37a6911..b5d3a8f5aad 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct alt_t { bit<1> valid; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-midend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-midend.p4 index ee578f4ba1b..af3f5115666 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct alt_t { bit<1> valid; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union.p4 index 0e43d733d2e..aa8365ab861 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-bvec_union.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct alt_t { bit<1> valid; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-first.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-first.p4 index e0b6b5cce57..389fd711649 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-frontend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-frontend.p4 index 6b89e5edef8..c527007b656 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-midend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-midend.p4 index 6daf2190f3e..a8deb061cf7 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack.p4 index 4e181eacea5..26afcc338b5 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-first.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-first.p4 index 5c5f66a3b68..92fa643c6ab 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-frontend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-frontend.p4 index beeb669c1da..f88224182c5 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-midend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-midend.p4 index 4b11ccd105d..e8dd55ca688 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1.p4 index 59061671acb..9dc73e051bd 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack1.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-first.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-first.p4 index 1a7e6960dc6..ca3f3fbe1bd 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-frontend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-frontend.p4 index dbd0d9cf106..94a45d2320f 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-midend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-midend.p4 index 6f22ceaef3c..99ae42c543e 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2.p4 index 43485e566eb..6b002390622 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-header-union-stack2.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-first.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-first.p4 index 4d6381fd32d..705679dcf54 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-frontend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-frontend.p4 index 7971adc03a6..b82ea203519 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-midend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-midend.p4 index 1af3f246ead..47e49b8d22a 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4 index c85de065346..157b05e98e4 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-first.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-first.p4 index 147345a2e04..27a1d3ba304 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-frontend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-frontend.p4 index 5070d59aeff..8f70773f721 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-midend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-midend.p4 index a0b0bedb8c4..8d553381196 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6.p4 index 422a751b929..0414e9f6538 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings6.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Header1 { bit<32> data; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-first.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-first.p4 index 753823da915..a3f77a3e2be 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-frontend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-frontend.p4 index 4b308d406c3..4421e4a73dc 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-midend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-midend.p4 index e753d401891..d74ea3118a6 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-small_sample-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-small_sample.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-small_sample.p4 index a8a211f22c0..358e5ee142a 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-small_sample.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-small_sample.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-first.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-first.p4 index f5356887ea1..0f1e8e09c33 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Hdr1 { bit<8> a; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-frontend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-frontend.p4 index f5356887ea1..0f1e8e09c33 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Hdr1 { bit<8> a; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-midend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-midend.p4 index de06a3e93ea..3316f4a4c6d 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Hdr1 { bit<8> a; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2.p4 index e926d67338b..91642b5244c 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-union-bmv2.p4 @@ -1,5 +1,5 @@ #include -#include +#include header Hdr1 { bit<8> a; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-first.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-first.p4 index fee8b4093f0..762603f7a83 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-frontend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-frontend.p4 index 2a793915aeb..01a05b9a77e 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-midend.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-midend.p4 index 4f97fb2d8ce..3a4963cc8b3 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning.p4 b/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning.p4 index 5c571da5066..8f85714b115 100644 --- a/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning.p4 +++ b/testdata/p4_16_samples_outputs/pna-dpdk-wrong-warning.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-first.p4 b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-first.p4 index 59322bf9246..d5c79f98904 100644 --- a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-frontend.p4 b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-frontend.p4 index a435bc7ff39..3eae695a1d9 100644 --- a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-midend.p4 b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-midend.p4 index 478475e7890..20a4bdc7c58 100644 --- a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1.p4 b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1.p4 index 72f184c7988..687d8b4d595 100644 --- a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1.p4 +++ b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-first.p4 b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-first.p4 index a58364a50d8..fd8fe6adf35 100644 --- a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-first.p4 +++ b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-frontend.p4 b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-frontend.p4 index 120a63c0651..7dd81e77165 100644 --- a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-frontend.p4 +++ b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-midend.p4 b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-midend.p4 index 9bbc34ac363..9b41afd59c9 100644 --- a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-midend.p4 +++ b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit.p4 b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit.p4 index af865de1a30..7be206b1744 100644 --- a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit.p4 +++ b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4-first.p4 b/testdata/p4_16_samples_outputs/psa-action-selector4-first.p4 index 6ae6da4852a..668411bce17 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector4-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector4-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4-frontend.p4 b/testdata/p4_16_samples_outputs/psa-action-selector4-frontend.p4 index 60e42fead3f..8ec1059016e 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector4-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector4-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4-midend.p4 b/testdata/p4_16_samples_outputs/psa-action-selector4-midend.p4 index bc263811bfc..03f7b41e96f 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector4-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector4-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4.p4 b/testdata/p4_16_samples_outputs/psa-action-selector4.p4 index 7c7c0190cfa..ea2f602d15f 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector4.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector4.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5-first.p4 b/testdata/p4_16_samples_outputs/psa-action-selector5-first.p4 index d0cbd08372c..e9970e04c3a 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector5-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector5-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5-frontend.p4 b/testdata/p4_16_samples_outputs/psa-action-selector5-frontend.p4 index 639f3e14133..26876a62cf5 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector5-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector5-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5-midend.p4 b/testdata/p4_16_samples_outputs/psa-action-selector5-midend.p4 index 892f1d481c1..2a08ff534e4 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector5-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector5-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5.p4 b/testdata/p4_16_samples_outputs/psa-action-selector5.p4 index 6f56df9d57b..e3a7c7ec0fb 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector5.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector5.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector6-first.p4 b/testdata/p4_16_samples_outputs/psa-action-selector6-first.p4 index 5128f036793..901cf7ee28b 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector6-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector6-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector6-frontend.p4 b/testdata/p4_16_samples_outputs/psa-action-selector6-frontend.p4 index 8a018c26084..1bb6a40e843 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector6-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector6-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector6-midend.p4 b/testdata/p4_16_samples_outputs/psa-action-selector6-midend.p4 index 195830d71e3..f6df33c5894 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector6-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector6-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-action-selector6.p4 b/testdata/p4_16_samples_outputs/psa-action-selector6.p4 index 024da879b01..c1a113d51c4 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector6.p4 +++ b/testdata/p4_16_samples_outputs/psa-action-selector6.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-first.p4 index b76a1702a7e..a48c599b9f3 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-frontend.p4 index 78f37965379..63183136036 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-midend.p4 index 21a88845849..5fb5d09e6de 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4 index c0ebf9673ab..01dbcf92a26 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-first.p4 index 3211c0c4389..66c1357b452 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-frontend.p4 index e7d74669676..da380c2fc3a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-midend.p4 index 7f61422e5fc..678e27a60f9 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4 index addb6a00d81..66cbf2ca20d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-first.p4 index 5a2290d70cd..2a519eb2f9d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-frontend.p4 index d7de8468779..402d7bbe9d2 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-midend.p4 index da59e7824a3..6a5d11c9d6d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4 index 762d3a69c5a..5506fed752a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-first.p4 index f7cef9b5a81..b9ac319d08a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct empty_metadata_t { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-frontend.p4 index d28544f5ccb..92a65833bab 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct empty_metadata_t { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-midend.p4 index aa34a103a32..1a4857bb5c5 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct empty_metadata_t { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4 index 926787db6d9..16022bc416c 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct empty_metadata_t { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-first.p4 index 90519ffa7b7..b9caaf62fc1 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-frontend.p4 index 14c58c6f628..e64fc71c277 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-midend.p4 index f3ce6095074..1f327337bba 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4 index d71845db737..b2d5956a2db 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-first.p4 index f0381675f92..2a99e1dec4d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-frontend.p4 index 6e64354ea1d..ed05fb192e1 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-midend.p4 index d428533ad0e..c6176e4a5fb 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4 index f30901bb0fb..fed668a36e4 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4 @@ -1,5 +1,5 @@ #include -#include +#include header EMPTY_H { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-first.p4 index 4eeed1564a1..f2abb626c21 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-frontend.p4 index 9cff3e6c179..1fe82fe8d8d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-midend.p4 index fe49ece26fd..abfc4b13d2d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4 index 8c4ac21a3bc..9c2cf4aa824 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-first.p4 index df7ee840f54..9a75aa4a125 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-frontend.p4 index 0e21ac98127..f587964c6b3 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-midend.p4 index 93b152a58ce..2bfda1658dd 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4 index b75963c3bf4..a2b21502850 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-first.p4 index 1861700f2a5..de2baf4e347 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-frontend.p4 index f514dedd26a..e8816658c22 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-midend.p4 index 26c4c200460..92cd6819de4 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4 index 632652802e6..5869511ff3e 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-first.p4 index 9d01e81a743..1b2c20afe59 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-frontend.p4 index 75a6dd570a9..0fbe6213146 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-midend.p4 index 9724e00794b..5eba60035d7 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4 index 65c492c9d60..a275d65a6f2 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-first.p4 index 4bd81b39bc8..633b44e9c68 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-frontend.p4 index 7ec66a33489..817c4a3b757 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-midend.p4 index fff91bcc555..0f6d0080192 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4 index e33ebd1ffa7..ca3a475f25e 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-first.p4 index 3b0b98f2c07..627643fbec0 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-frontend.p4 index 19e61d5528f..3feb0df3066 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-midend.p4 index 6fcc75062b2..59c296c0c9f 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4 index 3bd68989e04..00ccf26c41a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-first.p4 index 03b86f10eb0..9cc499a21d9 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-frontend.p4 index 99c5221aec9..dd409dab53a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-midend.p4 index d255fd8ed16..c56b41ebd5b 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4 index fe13e304066..803a9d9bad8 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-first.p4 index 3381ad3fa49..5c96ba2e30f 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-frontend.p4 index 28bd611049f..2d9ddfec72e 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-midend.p4 index e8741891ad0..6c3847855c8 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4 index 267bfaff857..4e6c22dc6fb 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-first.p4 index 1ff7332d900..0056b7c08f2 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-frontend.p4 index 908b3470413..8ec72b0ddf1 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-midend.p4 index 40b23e5c8b8..956c50d293a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4 index 147ccd68004..e11af130a85 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-first.p4 index baf95e8c16b..85a9ec6c3c6 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-frontend.p4 index 402fce1530f..7a354899252 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-midend.p4 index 06f1f2fc4d9..1bde66ccdc3 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4 index 23e9116c253..b3c4141a894 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-first.p4 index 043401e3e08..8d470f4140b 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-frontend.p4 index ccbe728b39b..9745e442e64 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-midend.p4 index 67d970edb75..cd1f9469c9e 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4 index fd47a8ae1a0..6a990f831ce 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-first.p4 index 3cd6a2d8b32..59f59246c91 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-frontend.p4 index c830cf7f979..49652f362bf 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-midend.p4 index 07f35d05afc..776c605a38b 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4 index 8765aca6c03..0b84a2fb42a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-first.p4 index 17489fc6e46..1150a56b89c 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-frontend.p4 index d8489e37c0c..be095a09da1 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-midend.p4 index 5c701f0cb29..f0ae91ce28d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4 index 3629a2dd055..eb55dc56c00 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-first.p4 index 9761fbd15e9..914c07c4fbe 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-frontend.p4 index 9855ba15072..d0196ae8c28 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-midend.p4 index d79070b5f4d..d7a951f7e6a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4 index 0a9ba8075f2..aea29e7d607 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-first.p4 index ef85f821830..269e76e8e68 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-frontend.p4 index 37fe2412e69..25f7930b504 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-midend.p4 index 7c7a32e4cb0..ec41a1dff9c 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4 index 82aac4ee98a..44b61e1796f 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-first.p4 index be2122e1ec8..c2d7a30a296 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-frontend.p4 index c1ec407074e..d63e09a43de 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-midend.p4 index 8526a5b661d..78b2e78e21c 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4 index 4b14f3093fe..011d17d4603 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-first.p4 index 6fde7f50d94..181746f5324 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-frontend.p4 index 79ee4c0914a..8b14937aa3d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-midend.p4 index a497bd1c24e..2b0d17ec914 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4 index a3396116c2f..5caab91c6f7 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-first.p4 index cfb15e19759..0f4aa0e5a08 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-frontend.p4 index 6eee28f4793..86a7a19a4e0 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-midend.p4 index 2c7c569b925..4140a1656bb 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4 index e32eff46ec9..d6e9bd4ac76 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-first.p4 index 1861700f2a5..de2baf4e347 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-frontend.p4 index f514dedd26a..e8816658c22 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-midend.p4 index c53b278f33b..c357d2e9fde 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4 index 632652802e6..5869511ff3e 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-first.p4 index 872c801cd43..ae478d251f5 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-frontend.p4 index 0801cc596c6..3418d94aab6 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-midend.p4 index 6a1cb937196..6417fc82701 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4 index 2eeab5ca4c2..c4cdbec0369 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-first.p4 index 30325beb82d..5fca418e9e9 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-frontend.p4 index f4c32e1d9fb..ce1d2892245 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-midend.p4 index 19f6e9bf2c1..4b10a3467a9 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4 index 335f55f8a27..ee89c4bdeae 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-first.p4 index 51415d10637..3961b92dbb0 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-frontend.p4 index ea8437f03aa..0f5fe58a6ac 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-midend.p4 index ee89c647e0c..a97793288e5 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4 index 3a155587d8e..775a3c0879d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-first.p4 index 266bcf6532f..2d99b1ddd1d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-frontend.p4 index a50b98d337c..1a3a605ad6c 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-midend.p4 index 8769df205fc..08b2fe47327 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4 index a2c394b4c04..cc596894718 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-first.p4 index cce9c768f15..12089e2fc92 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-frontend.p4 index fc2ff69212d..f7e3bfb0b74 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-midend.p4 index d75a38a85dd..434a8256ae0 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4 index c04e01a4e36..b14606e03c8 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-first.p4 index bbd579c2171..834f2bc480d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-frontend.p4 index cf30a483b31..aa6553d818b 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-midend.p4 index 2dca3970230..9921b8f5027 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4 index adb6ce82c3d..4b607dccdb1 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-first.p4 index ae461c2fa77..5cc4e2a7c5d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-frontend.p4 index 74f9bdee1f2..3607ed72594 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-midend.p4 index 1e7a20cf437..b2fbd651b1b 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4 index 6bb0a9cd1d6..6d4f48dbf99 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-first.p4 index 0ca2b53f922..ce8615eb684 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-frontend.p4 index 3a7c058004b..387b0951f90 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-midend.p4 index 4fdc5af07ab..993564d3bc7 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4 index a0923cf5296..b470356bf8b 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-first.p4 index 00fde81a722..24cd6a9ed4d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-frontend.p4 index 9beeca5cbb6..f0bd4bae966 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-midend.p4 index a8c1a2a9665..7cf5f16ea50 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4 index fc9931490fa..d214d37b270 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-first.p4 index 1081fbf241f..200980f92af 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-frontend.p4 index 1cdbb8f660c..e3e6efca33a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-midend.p4 index 4118ffc6c2c..f22700c6acd 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4 index 326b7dd9d4c..45235e78a1e 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-first.p4 index f864603b213..7c31fa870bc 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-frontend.p4 index ccd905e7abb..caeaeb04d0c 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-midend.p4 index a0e01558a2a..f666e7e81bd 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4 index 65a233f4ce6..24e837fc297 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-first.p4 index d3e3d2b4aab..7d217d4695a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-frontend.p4 index 7e87071ab50..b8aa01f46a1 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-midend.p4 index 664990116f9..d53f10abc7d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4 index f6dd31c8c9f..56dc54471d0 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-first.p4 index 3adc1810e4e..1e5983bf5fb 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-frontend.p4 index 78ba4478c9f..e4a80ab5234 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-midend.p4 index 1749583a679..52ba9f60e0e 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4 index fc8f6a7cb5f..85acd87dd92 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-first.p4 index d2a76120b01..982c3224214 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-frontend.p4 index 00a77d72220..a7f0d09bd2b 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-midend.p4 index 442c5cd1a50..828c88d8ce0 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4 index 682d765c41e..9071e33077e 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-first.p4 index 1b1f56dfdf1..365e93128c5 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-frontend.p4 index 31d967b3083..c7e809ef818 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-midend.p4 index d26c7aa30d6..59621a594b7 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4 index 6f8a6365c89..4a76421385a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-first.p4 index 8247f375262..572445b5e22 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-frontend.p4 index f4eadf5fd71..9fc188eba2a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-midend.p4 index bc5d054bc23..411d8da4289 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4 index db3eefcef68..05269783423 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-first.p4 index 49fec5ad066..8e0618a989c 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-frontend.p4 index c720f318777..f3a07756333 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-midend.p4 index bb5ea7f4a03..6b81e41fa1f 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4 index abb678e36b0..c1f96aaf73b 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-first.p4 index 1286da3785a..0562ffa3ff1 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-frontend.p4 index ac71108d2bd..ed64eb5787c 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-midend.p4 index 66352957957..7df7d43f2ad 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4 index 66168a17fde..b52a4be2def 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-first.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-first.p4 index befed3bcfba..9d7c9263954 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct empty_metadata_t { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-frontend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-frontend.p4 index f4165f68cd2..3fc0d655704 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct empty_metadata_t { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-midend.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-midend.p4 index fc8a92d3ca2..7b601300911 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct empty_metadata_t { } diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4 b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4 index 3888ec6a1bf..e0cec1782da 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4 +++ b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct empty_metadata_t { } diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-first.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-first.p4 index db2efb50b79..f0609545945 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-frontend.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-frontend.p4 index ad4417f2619..9f1b6b546ac 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-midend.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-midend.p4 index 5fd46d24c5e..8f5b2c1d1c6 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4 index c99009253f9..c8457c2b1f7 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-first.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-first.p4 index 8bd31c07557..bcec5734879 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-frontend.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-frontend.p4 index a1efcdf3c0c..56f0a6f85a1 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-first.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-first.p4 index cb547c51df4..322045aead7 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-frontend.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-frontend.p4 index bb2da0c3bf7..a77ca2349f7 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-midend.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-midend.p4 index 1a8fff22310..966c4de7f8a 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4 index 8739b7ebee1..31af730e00e 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-midend.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-midend.p4 index 1c18e553506..2271d5481cb 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-first.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-first.p4 index 5631810e390..534a889b1a7 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-frontend.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-frontend.p4 index b06dfd51f1d..ba24bb082dc 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-midend.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-midend.p4 index 7df28164cc7..e0871ea68b8 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include header ethernet_t { bit<48> dstAddr; diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4 index 7318423668b..fb683769615 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4 b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4 index aa719282d15..842d75d00ff 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4 +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4 @@ -1,5 +1,5 @@ #include -#include +#include typedef bit<48> EthernetAddress; header ethernet_t { diff --git a/testdata/p4_16_samples_outputs/psa-subtract-inst1-first.p4 b/testdata/p4_16_samples_outputs/psa-subtract-inst1-first.p4 index 846abf1e4dd..6166be28bcc 100644 --- a/testdata/p4_16_samples_outputs/psa-subtract-inst1-first.p4 +++ b/testdata/p4_16_samples_outputs/psa-subtract-inst1-first.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-subtract-inst1-frontend.p4 b/testdata/p4_16_samples_outputs/psa-subtract-inst1-frontend.p4 index aeea8202644..ae259d345d3 100644 --- a/testdata/p4_16_samples_outputs/psa-subtract-inst1-frontend.p4 +++ b/testdata/p4_16_samples_outputs/psa-subtract-inst1-frontend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-subtract-inst1-midend.p4 b/testdata/p4_16_samples_outputs/psa-subtract-inst1-midend.p4 index fd5abb473ef..2e2f3a0e5b8 100644 --- a/testdata/p4_16_samples_outputs/psa-subtract-inst1-midend.p4 +++ b/testdata/p4_16_samples_outputs/psa-subtract-inst1-midend.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { } diff --git a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4 b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4 index b2bc2601078..f924c761ab7 100644 --- a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4 +++ b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4 @@ -1,5 +1,5 @@ #include -#include +#include struct EMPTY { }