From 99c774cd5b407ab8fb5a899c29160cea7af9b7b0 Mon Sep 17 00:00:00 2001 From: fruffy Date: Tue, 23 Jan 2024 16:14:18 -0500 Subject: [PATCH] Reference files. --- testdata/p4_16_bmv_errors/basic-bmv2.p4 | 160 -- testdata/p4_16_bmv_errors/basic1-bmv2.p4 | 161 -- .../header-not-multiple-of-bytes-bmv2.p4 | 76 - testdata/p4_16_bmv_errors/issue1167-bmv2.p4 | 99 - testdata/p4_16_bmv_errors/issue1672-bmv2.p4 | 62 - testdata/p4_16_bmv_errors/issue1829-1-bmv2.p4 | 107 - testdata/p4_16_bmv_errors/issue1829-2-bmv2.p4 | 105 - testdata/p4_16_bmv_errors/issue1829-3-bmv2.p4 | 106 - testdata/p4_16_bmv_errors/issue376-bmv2.p4 | 46 - .../p4_16_bmv_errors/issue383-err-bmv2.p4 | 74 - testdata/p4_16_bmv_errors/issue610-bmv2.p4 | 388 ---- testdata/p4_16_bmv_errors/issue679-bmv2.p4 | 75 - testdata/p4_16_bmv_errors/loop-bmv2.p4 | 63 - .../p4_16_bmv_errors/nested-headers-bmv2.p4 | 54 - testdata/p4_16_bmv_errors/no-externs-bmv2.p4 | 77 - testdata/p4_16_bmv_errors/no-header-bmv2.p4 | 66 - testdata/p4_16_bmv_errors/no-header1-bmv2.p4 | 70 - testdata/p4_16_bmv_errors/no-header2-bmv2.p4 | 69 - testdata/p4_16_bmv_errors/packet_in-bmv2.p4 | 35 - testdata/p4_16_bmv_errors/reused-counter.p4 | 66 - .../p4_16_dpdk_errors/pna-add-on-miss-err1.p4 | 202 -- .../pna-dpdk-direct-meter-err-1.p4 | 155 -- .../pna-dpdk-large-constants.p4 | 196 -- ...-dpdk-table-key-consolidation-learner-2.p4 | 184 -- .../pna-example-ipsec-err1.p4 | 288 --- .../pna-example-ipsec-err2.p4 | 288 --- .../pna-example-ipsec-err3.p4 | 288 --- .../pna-example-ipsec-err4.p4 | 285 --- .../psa-dpdk-lpm-match-err1.p4 | 169 -- .../psa-dpdk-lpm-match-err2.p4 | 170 -- .../psa-dpdk-struct-field.p4 | 125 -- .../psa-example-mask-range-err.p4 | 165 -- .../psa-example-register2-bmv2.p4 | 205 -- .../pna-add-on-miss-err1.p4-error | 3 - .../pna-add-on-miss-err1.p4.bfrt.json | 167 -- .../pna-dpdk-direct-meter-err-1.p4-error | 6 - .../pna-dpdk-direct-meter-err-1.p4.bfrt.json | 230 -- .../pna-dpdk-large-constants.p4-error | 6 - .../pna-dpdk-large-constants.p4.bfrt.json | 187 -- ...table-key-consolidation-learner-2.p4-error | 3 - ...e-key-consolidation-learner-2.p4.bfrt.json | 156 -- ...na-example-ipsec-accelerator-err1.p4-error | 1 - ...xample-ipsec-accelerator-err1.p4.bfrt.json | 312 --- ...na-example-ipsec-accelerator-err2.p4-error | 5 - ...xample-ipsec-accelerator-err2.p4.bfrt.json | 351 --- ...na-example-ipsec-accelerator-err3.p4-error | 14 - ...na-example-ipsec-accelerator-err4.p4-error | 3 - ...xample-ipsec-accelerator-err4.p4.bfrt.json | 312 --- .../pna-example-ipsec-err1.p4-error | 1 - .../pna-example-ipsec-err1.p4.bfrt.json | 312 --- .../pna-example-ipsec-err2.p4-error | 4 - .../pna-example-ipsec-err2.p4.bfrt.json | 351 --- .../pna-example-ipsec-err3.p4-error | 14 - .../pna-example-ipsec-err4.p4-error | 3 - .../pna-example-ipsec-err4.p4.bfrt.json | 312 --- .../psa-dpdk-lpm-match-err1.p4-error | 1 - .../psa-dpdk-lpm-match-err1.p4.bfrt.json | 60 - .../psa-dpdk-lpm-match-err2.p4-error | 1 - .../psa-dpdk-lpm-match-err2.p4.bfrt.json | 83 - .../psa-dpdk-struct-field.p4-error | 9 - .../psa-dpdk-struct-field.p4.bfrt.json | 39 - .../psa-example-mask-range-err.p4-error | 3 - .../psa-example-mask-range-err.p4.bfrt.json | 59 - .../psa-example-register2-bmv2.p4-error | 54 - .../psa-example-register2-bmv2.p4.bfrt.json | 45 - .../p4_16_ebpf_errors/header_unaligned.p4 | 28 - .../header_unaligned.p4-stderr | 6 - testdata/p4_16_errors_outputs/dup-param1.p4 | 5 - testdata/p4_16_errors_outputs/dup-param3.p4 | 5 - .../p4_16_errors_outputs/function_e-first.p4 | 14 - .../p4_16_errors_outputs/generic_e.p4-stderr | 4 - .../issue-2123_e.p4.entries.txtpb | 3 + .../issue-2123_e.p4.p4info.txtpb | 6 + testdata/p4_16_errors_outputs/issue1541.p4 | 47 - testdata/p4_16_errors_outputs/issue1724.p4 | 3 - .../p4_16_errors_outputs/issue1724.p4-stderr | 3 - .../issue1777-bmv2.p4.entries.txtpb | 3 + .../issue1777-bmv2.p4.p4info.txtpb | 51 + ...issue1803_same_table_name.p4.entries.txtpb | 3 + .../issue1803_same_table_name.p4.p4info.txtpb | 72 + testdata/p4_16_errors_outputs/issue1932.p4 | 9 - .../issue2283_2-bmv2.p4.entries.txtpb | 3 + .../issue2283_2-bmv2.p4.p4info.txtpb | 3 + .../issue2283_2-bmv2.p4info.txt | 0 .../issue2544_shadowing1_pp.p4 | 33 - .../issue3299.p4.entries.txtpb | 3 + .../issue3299.p4.p4info.txtpb | 13 + .../issue532.p4.entries.txtpb | 3 + .../issue532.p4.p4info.txtpb | 42 + .../p4_16_errors_outputs/issue774-2-first.p4 | 49 - .../p4_16_errors_outputs/nostart-first.p4 | 10 - .../not_bound-frontend.p4 | 47 - .../p4_16_errors_outputs/not_bound-midend.p4 | 54 - .../not_bound.p4.entries.txt | 0 .../not_bound.p4.p4info.txt | 0 .../push_nonconstant-first.p4 | 18 - .../table-entries-lpm-2.p4.entries.txtpb | 114 + .../table-entries-lpm-2.p4.p4info.txtpb | 49 + ...e-entries-optional-2-bmv2.p4.entries.txtpb | 83 + ...le-entries-optional-2-bmv2.p4.p4info.txtpb | 55 + .../p4_16_pna_errors/pna-add-on-miss-err.p4 | 200 -- .../pna-dpdk-direct-counter-err-1.p4 | 142 -- .../pna-dpdk-direct-counter-err-2.p4 | 122 -- .../pna-dpdk-direct-counter-err-3.p4 | 146 -- .../pna-dpdk-direct-counter-err-4.p4 | 143 -- .../pna-dpdk-direct-counter-err.p4 | 131 -- .../pna-dpdk-direct-meter-err-2.p4 | 121 - .../pna-dpdk-direct-meter-err-3.p4 | 153 -- .../pna-dpdk-direct-meter-err-4.p4 | 175 -- .../pna-dpdk-direct-meter-err.p4 | 131 -- .../p4_16_pna_errors/pna-example-addhit.p4 | 221 -- .../pna-example-mirror-packet-ctxt-error.p4 | 125 -- .../pna-example-mirror-packet-ctxt-error1.p4 | 126 -- .../pna-example-mirror-packet-error1.p4 | 125 -- .../pna-example-mirror-packet-error2.p4 | 133 -- .../pna-example-mirror-packet-error3.p4 | 124 -- testdata/p4_16_pna_errors/pna-example-miss.p4 | 220 -- ...a-example-tcp-connection-tracking-err-1.p4 | 341 --- ...pna-example-tcp-connection-tracking-err.p4 | 342 --- .../psa-example-dpdk-directmeter-1.p4 | 118 - .../pna-add-on-miss-err.p4-error | 3 - .../pna-add-on-miss-err.p4.bfrt.json | 144 -- .../pna-dpdk-direct-counter-err-1.p4-error | 6 - ...pna-dpdk-direct-counter-err-1.p4.bfrt.json | 154 -- .../pna-dpdk-direct-counter-err-2.p4-error | 1 - ...pna-dpdk-direct-counter-err-2.p4.bfrt.json | 70 - .../pna-dpdk-direct-counter-err-3.p4-error | 3 - ...pna-dpdk-direct-counter-err-3.p4.bfrt.json | 182 -- .../pna-dpdk-direct-counter-err-4.p4-error | 2 - ...pna-dpdk-direct-counter-err-4.p4.bfrt.json | 185 -- .../pna-dpdk-direct-counter-err.p4-error | 3 - .../pna-dpdk-direct-counter-err.p4.bfrt.json | 252 --- .../pna-dpdk-direct-meter-err-2.p4-error | 4 - .../pna-dpdk-direct-meter-err-2.p4.bfrt.json | 98 - .../pna-dpdk-direct-meter-err-3.p4-error | 2 - .../pna-dpdk-direct-meter-err-3.p4.bfrt.json | 230 -- .../pna-dpdk-direct-meter-err-4.p4-error | 3 - .../pna-dpdk-direct-meter-err-4.p4.bfrt.json | 230 -- .../pna-dpdk-direct-meter-err.p4-error | 3 - .../pna-dpdk-direct-meter-err.p4.bfrt.json | 252 --- .../pna-example-addhit.p4-error | 6 - .../pna-example-addhit.p4.bfrt.json | 208 -- ...-example-mirror-packet-ctxt-error.p4-error | 4 - ...mple-mirror-packet-ctxt-error.p4.bfrt.json | 92 - ...example-mirror-packet-ctxt-error1.p4-error | 4 - ...ple-mirror-packet-ctxt-error1.p4.bfrt.json | 92 - .../pna-example-mirror-packet-error1.p4-error | 2 - ...-example-mirror-packet-error1.p4.bfrt.json | 92 - .../pna-example-mirror-packet-error2.p4-error | 34 - .../pna-example-mirror-packet-error3.p4-error | 14 - .../pna-example-miss.p4-error | 6 - .../pna-example-miss.p4.bfrt.json | 208 -- ...ple-tcp-connection-tracking-err-1.p4-error | 15 - ...tcp-connection-tracking-err-1.p4.bfrt.json | 164 -- ...ample-tcp-connection-tracking-err.p4-error | 15 - ...e-tcp-connection-tracking-err.p4.bfrt.json | 164 -- .../psa-example-dpdk-directmeter-1.p4-error | 3 - ...sa-example-dpdk-directmeter-1.p4.bfrt.json | 267 --- .../p4_16_psa_errors/psa-action-profile2.p4 | 105 - testdata/p4_16_psa_errors/psa-counter6.p4 | 113 - .../psa-example-dpdk-directmeter-err.p4 | 112 - testdata/p4_16_psa_errors/psa-meter6.p4 | 112 - .../psa-action-profile2.p4-error | 6 - .../psa-action-profile2.p4.bfrt.json | 81 - .../psa-counter6.p4-error | 2 - .../psa-counter6.p4.bfrt.json | 120 - .../psa-example-dpdk-directmeter-err.p4-error | 3 - ...-example-dpdk-directmeter-err.p4.bfrt.json | 140 -- .../psa-meter6.p4-error | 4 - .../psa-meter6.p4.bfrt.json | 140 -- .../action-synth.p4.entries.txt | 2 - .../action-synth.p4.entries.txtpb | 3 + .../action-synth.p4.p4info.txt | 12 - .../action-synth.p4.p4info.txtpb | 13 + .../action-two-params.p4.entries.txt | 30 - .../action-two-params.p4.entries.txtpb | 31 + .../action-two-params.p4.p4info.txt | 54 - .../action-two-params.p4.p4info.txtpb | 55 + .../action_call_ubpf.p4.entries.txt | 2 - .../action_call_ubpf.p4.entries.txtpb | 3 + .../action_call_ubpf.p4.p4info.txt | 50 - .../action_call_ubpf.p4.p4info.txtpb | 51 + .../action_fwd_ubpf.p4.entries.txt | 2 - .../action_fwd_ubpf.p4.entries.txtpb | 3 + .../action_fwd_ubpf.p4.p4info.txt | 5 - .../action_fwd_ubpf.p4.p4info.txtpb | 6 + .../action_profile-bmv2.p4.entries.txt | 2 - .../action_profile-bmv2.p4.entries.txtpb | 3 + .../action_profile-bmv2.p4.p4info.txt | 73 - .../action_profile-bmv2.p4.p4info.txtpb | 74 + ...e_max_group_size_annotation.p4.entries.txt | 2 - ...max_group_size_annotation.p4.entries.txtpb | 3 + ...le_max_group_size_annotation.p4.p4info.txt | 74 - ..._max_group_size_annotation.p4.p4info.txtpb | 75 + ...action_selector_shared-bmv2.p4.entries.txt | 2 - ...tion_selector_shared-bmv2.p4.entries.txtpb | 3 + .../action_selector_shared-bmv2.p4.p4info.txt | 65 - ...ction_selector_shared-bmv2.p4.p4info.txtpb | 66 + ...action_selector_unused-bmv2.p4.entries.txt | 2 - ...tion_selector_unused-bmv2.p4.entries.txtpb | 3 + .../action_selector_unused-bmv2.p4.p4info.txt | 16 - ...ction_selector_unused-bmv2.p4.p4info.txtpb | 17 + .../advance_ubpf.p4.entries.txt | 2 - .../advance_ubpf.p4.entries.txtpb | 3 + .../advance_ubpf.p4.p4info.txt | 5 - .../advance_ubpf.p4.p4info.txtpb | 6 + ...annotation-inline-propagate.p4.entries.txt | 2 - ...notation-inline-propagate.p4.entries.txtpb | 3 + .../annotation-inline-propagate.p4.p4info.txt | 42 - ...nnotation-inline-propagate.p4.p4info.txtpb | 43 + .../arith-bmv2.p4.entries.txt | 2 - .../arith-bmv2.p4.entries.txtpb | 3 + .../arith-bmv2.p4.p4info.txt | 26 - .../arith-bmv2.p4.p4info.txtpb | 27 + .../arith-inline-bmv2.p4.entries.txt | 2 - .../arith-inline-bmv2.p4.entries.txtpb | 3 + .../arith-inline-bmv2.p4.p4info.txt | 26 - .../arith-inline-bmv2.p4.p4info.txtpb | 27 + .../arith1-bmv2.p4.entries.txt | 2 - .../arith1-bmv2.p4.entries.txtpb | 3 + .../arith1-bmv2.p4.p4info.txt | 26 - .../arith1-bmv2.p4.p4info.txtpb | 27 + .../arith2-bmv2.p4.entries.txt | 2 - .../arith2-bmv2.p4.entries.txtpb | 3 + .../arith2-bmv2.p4.p4info.txt | 26 - .../arith2-bmv2.p4.p4info.txtpb | 27 + .../arith2-inline-bmv2.p4.entries.txt | 2 - .../arith2-inline-bmv2.p4.entries.txtpb | 3 + .../arith2-inline-bmv2.p4.p4info.txt | 5 - .../arith2-inline-bmv2.p4.p4info.txtpb | 6 + .../arith3-bmv2.p4.entries.txt | 2 - .../arith3-bmv2.p4.entries.txtpb | 3 + .../arith3-bmv2.p4.p4info.txt | 26 - .../arith3-bmv2.p4.p4info.txtpb | 27 + .../arith4-bmv2.p4.entries.txt | 2 - .../arith4-bmv2.p4.entries.txtpb | 3 + .../arith4-bmv2.p4.p4info.txt | 26 - .../arith4-bmv2.p4.p4info.txtpb | 27 + .../arith5-bmv2.p4.entries.txt | 2 - .../arith5-bmv2.p4.entries.txtpb | 3 + .../arith5-bmv2.p4.p4info.txt | 26 - .../arith5-bmv2.p4.p4info.txtpb | 27 + .../array-copy-bmv2.p4.entries.txt | 2 - .../array-copy-bmv2.p4.entries.txtpb | 3 + .../array-copy-bmv2.p4.p4info.txt | 5 - .../array-copy-bmv2.p4.p4info.txtpb | 6 + .../basic2-bmv2.p4.entries.txt | 2 - .../basic2-bmv2.p4.entries.txtpb | 3 + .../basic2-bmv2.p4.p4info.txt | 59 - .../basic2-bmv2.p4.p4info.txtpb | 60 + .../basic_routing-bmv2.p4.entries.txt | 2 - .../basic_routing-bmv2.p4.entries.txtpb | 3 + .../basic_routing-bmv2.p4.p4info.txt | 250 --- .../basic_routing-bmv2.p4.p4info.txtpb | 251 +++ .../bitwise-and.p4.entries.txt | 2 - .../bitwise-and.p4.entries.txtpb | 3 + .../bitwise-and.p4.p4info.txt | 2 - .../bitwise-and.p4.p4info.txtpb | 3 + .../bool_to_bit_cast.p4.entries.txt | 2 - .../bool_to_bit_cast.p4.entries.txtpb | 3 + .../bool_to_bit_cast.p4.p4info.txt | 5 - .../bool_to_bit_cast.p4.p4info.txtpb | 6 + .../bvec-hdr-bmv2.p4.entries.txt | 50 - .../bvec-hdr-bmv2.p4.entries.txtpb | 51 + .../bvec-hdr-bmv2.p4.p4info.txt | 48 - .../bvec-hdr-bmv2.p4.p4info.txtpb | 49 + .../bvec_union-bmv2.p4.entries.txt | 2 - .../bvec_union-bmv2.p4.entries.txtpb | 3 + .../bvec_union-bmv2.p4.p4info.txt | 5 - .../bvec_union-bmv2.p4.p4info.txtpb | 6 + .../checksum-l4-bmv2.p4.entries.txt | 42 - .../checksum-l4-bmv2.p4.entries.txtpb | 43 + .../checksum-l4-bmv2.p4.p4info.txt | 75 - .../checksum-l4-bmv2.p4.p4info.txtpb | 76 + .../checksum1-bmv2.p4.entries.txt | 2 - .../checksum1-bmv2.p4.entries.txtpb | 3 + .../checksum1-bmv2.p4.p4info.txt | 31 - .../checksum1-bmv2.p4.p4info.txtpb | 32 + .../checksum2-bmv2.p4.entries.txt | 2 - .../checksum2-bmv2.p4.entries.txtpb | 3 + .../checksum2-bmv2.p4.p4info.txt | 7 - .../checksum2-bmv2.p4.p4info.txtpb | 8 + .../checksum3-bmv2.p4.entries.txt | 2 - .../checksum3-bmv2.p4.entries.txtpb | 3 + .../checksum3-bmv2.p4.p4info.txt | 7 - .../checksum3-bmv2.p4.p4info.txtpb | 8 + .../concat-bmv2.p4.entries.txt | 2 - .../concat-bmv2.p4.entries.txtpb | 3 + .../concat-bmv2.p4.p4info.txt | 26 - .../concat-bmv2.p4.p4info.txtpb | 27 + ...onstant-in-calculation-bmv2.p4.entries.txt | 2 - ...stant-in-calculation-bmv2.p4.entries.txtpb | 3 + ...constant-in-calculation-bmv2.p4.p4info.txt | 7 - ...nstant-in-calculation-bmv2.p4.p4info.txtpb | 8 + .../control-hs-index-test1.p4.entries.txt | 2 - .../control-hs-index-test1.p4.entries.txtpb | 3 + .../control-hs-index-test1.p4.p4info.txt | 5 - .../control-hs-index-test1.p4.p4info.txtpb | 6 + .../control-hs-index-test2.p4.entries.txt | 2 - .../control-hs-index-test2.p4.entries.txtpb | 3 + .../control-hs-index-test2.p4.p4info.txt | 5 - .../control-hs-index-test2.p4.p4info.txtpb | 6 + .../control-hs-index-test3.p4.entries.txt | 2 - .../control-hs-index-test3.p4.entries.txtpb | 3 + .../control-hs-index-test3.p4.p4info.txt | 5 - .../control-hs-index-test3.p4.p4info.txtpb | 6 + .../control-hs-index-test4.p4.entries.txt | 2 - .../control-hs-index-test4.p4.entries.txtpb | 3 + .../control-hs-index-test4.p4.p4info.txt | 5 - .../control-hs-index-test4.p4.p4info.txtpb | 6 + .../control-hs-index-test5.p4.entries.txt | 2 - .../control-hs-index-test5.p4.entries.txtpb | 3 + .../control-hs-index-test5.p4.p4info.txt | 25 - .../control-hs-index-test5.p4.p4info.txtpb | 26 + .../control-hs-index-test6.p4.entries.txt | 2 - .../control-hs-index-test6.p4.entries.txtpb | 3 + .../control-hs-index-test6.p4.p4info.txt | 44 - .../control-hs-index-test6.p4.p4info.txtpb | 45 + .../copyprop1.p4.entries.txt | 2 - .../copyprop1.p4.entries.txtpb | 3 + .../copyprop1.p4.p4info.txt | 44 - .../copyprop1.p4.p4info.txtpb | 45 + .../crc32-bmv2.p4.entries.txt | 122 -- .../crc32-bmv2.p4.entries.txtpb | 123 ++ .../crc32-bmv2.p4.p4info.txt | 94 - .../crc32-bmv2.p4.p4info.txtpb | 95 + .../csum_ubpf.p4.entries.txt | 2 - .../csum_ubpf.p4.entries.txtpb | 3 + .../csum_ubpf.p4.p4info.txt | 5 - .../csum_ubpf.p4.p4info.txtpb | 6 + ...stom-type-restricted-fields.p4.entries.txt | 2 - ...om-type-restricted-fields.p4.entries.txtpb | 3 + ...ustom-type-restricted-fields.p4.p4info.txt | 117 - ...tom-type-restricted-fields.p4.p4info.txtpb | 118 + ...ash-pipeline-v1model-bmv2.p4.entries.txtpb | 3 + ...dash-pipeline-v1model-bmv2.p4.p4info.txtpb | 1942 +++++++++++++++++ .../def-use.p4.entries.txt | 2 - .../def-use.p4.entries.txtpb | 3 + .../def-use.p4.p4info.txt | 25 - .../def-use.p4.p4info.txtpb | 26 + .../default_action-bmv2.p4.entries.txt | 2 - .../default_action-bmv2.p4.entries.txtpb | 3 + .../default_action-bmv2.p4.p4info.txt | 31 - .../default_action-bmv2.p4.p4info.txtpb | 32 + .../default_action_ubpf.p4.entries.txt | 2 - .../default_action_ubpf.p4.entries.txtpb | 3 + .../default_action_ubpf.p4.p4info.txt | 30 - .../default_action_ubpf.p4.p4info.txtpb | 31 + .../drop-bmv2.p4.entries.txt | 2 - .../drop-bmv2.p4.entries.txtpb | 3 + .../drop-bmv2.p4.p4info.txt | 26 - .../drop-bmv2.p4.p4info.txtpb | 27 + .../empty-bmv2.p4.entries.txt | 2 - .../empty-bmv2.p4.entries.txtpb | 3 + .../empty-bmv2.p4.p4info.txt | 5 - .../empty-bmv2.p4.p4info.txtpb | 6 + .../enum-bmv2.p4.entries.txt | 2 - .../enum-bmv2.p4.entries.txtpb | 3 + .../enum-bmv2.p4.p4info.txt | 5 - .../enum-bmv2.p4.p4info.txtpb | 6 + .../equality-bmv2.p4.entries.txt | 2 - .../equality-bmv2.p4.entries.txtpb | 3 + .../equality-bmv2.p4.p4info.txt | 5 - .../equality-bmv2.p4.p4info.txtpb | 6 + .../equality-varbit-bmv2.p4.entries.txt | 2 - .../equality-varbit-bmv2.p4.entries.txtpb | 3 + .../equality-varbit-bmv2.p4.p4info.txt | 5 - .../equality-varbit-bmv2.p4.p4info.txtpb | 6 + .../extern-funcs-bmv2.p4.entries.txt | 2 - .../extern-funcs-bmv2.p4.entries.txtpb | 3 + .../extern-funcs-bmv2.p4.p4info.txt | 7 - .../extern-funcs-bmv2.p4.p4info.txtpb | 8 + .../extract_for_header_union.p4.entries.txt | 2 - .../extract_for_header_union.p4.entries.txtpb | 3 + .../extract_for_header_union.p4.p4info.txt | 5 - .../extract_for_header_union.p4.p4info.txtpb | 6 + .../fabric_20190420/fabric.p4.entries.txtpb | 3 + .../fabric_20190420/fabric.p4.p4info.txtpb | 905 ++++++++ .../flag_lost-bmv2.p4.entries.txt | 2 - .../flag_lost-bmv2.p4.entries.txtpb | 3 + .../flag_lost-bmv2.p4.p4info.txt | 62 - .../flag_lost-bmv2.p4.p4info.txtpb | 63 + .../flowlet_switching-bmv2.p4.entries.txt | 2 - .../flowlet_switching-bmv2.p4.entries.txtpb | 3 + .../flowlet_switching-bmv2.p4.p4info.txt | 251 --- .../flowlet_switching-bmv2.p4.p4info.txtpb | 252 +++ .../free-form-annotation.p4.entries.txt | 2 - .../free-form-annotation.p4.entries.txtpb | 3 + .../free-form-annotation.p4.p4info.txt | 5 - .../free-form-annotation.p4.p4info.txtpb | 6 + .../fwd-bmv2-psa.p4.entries.txt | 2 - .../fwd-bmv2-psa.p4.entries.txtpb | 3 + .../fwd-bmv2-psa.p4.p4info.txt | 5 - .../fwd-bmv2-psa.p4.p4info.txtpb | 6 + .../gauntlet_action_mux-bmv2.p4.entries.txt | 2 - .../gauntlet_action_mux-bmv2.p4.entries.txtpb | 3 + .../gauntlet_action_mux-bmv2.p4.p4info.txt | 12 - .../gauntlet_action_mux-bmv2.p4.p4info.txtpb | 13 + ...gauntlet_action_return-bmv2.p4.entries.txt | 2 - ...untlet_action_return-bmv2.p4.entries.txtpb | 3 + .../gauntlet_action_return-bmv2.p4.p4info.txt | 44 - ...auntlet_action_return-bmv2.p4.p4info.txtpb | 45 + ...gauntlet_arithref_cast-bmv2.p4.entries.txt | 2 - ...untlet_arithref_cast-bmv2.p4.entries.txtpb | 3 + .../gauntlet_arithref_cast-bmv2.p4.p4info.txt | 5 - ...auntlet_arithref_cast-bmv2.p4.p4info.txtpb | 6 + ...complex_initialization-bmv2.p4.entries.txt | 2 - ...mplex_initialization-bmv2.p4.entries.txtpb | 3 + ..._complex_initialization-bmv2.p4.p4info.txt | 5 - ...omplex_initialization-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_copy_out-bmv2.p4.entries.txt | 2 - .../gauntlet_copy_out-bmv2.p4.entries.txtpb | 3 + .../gauntlet_copy_out-bmv2.p4.p4info.txt | 12 - .../gauntlet_copy_out-bmv2.p4.p4info.txtpb | 13 + .../gauntlet_enum_assign-bmv2.p4.entries.txt | 2 - ...gauntlet_enum_assign-bmv2.p4.entries.txtpb | 3 + .../gauntlet_enum_assign-bmv2.p4.p4info.txt | 12 - .../gauntlet_enum_assign-bmv2.p4.p4info.txtpb | 13 + ...ntlet_exit_after_valid-bmv2.p4.entries.txt | 2 - ...let_exit_after_valid-bmv2.p4.entries.txtpb | 3 + ...untlet_exit_after_valid-bmv2.p4.p4info.txt | 5 - ...tlet_exit_after_valid-bmv2.p4.p4info.txtpb | 6 + ...let_exit_combination_1-bmv2.p4.entries.txt | 2 - ...t_exit_combination_1-bmv2.p4.entries.txtpb | 3 + ...tlet_exit_combination_1-bmv2.p4.p4info.txt | 49 - ...et_exit_combination_1-bmv2.p4.p4info.txtpb | 50 + ...et_exit_combination_10-bmv2.p4.entries.txt | 2 - ..._exit_combination_10-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_10-bmv2.p4.p4info.txt | 44 - ...t_exit_combination_10-bmv2.p4.p4info.txtpb | 45 + ...et_exit_combination_11-bmv2.p4.entries.txt | 2 - ..._exit_combination_11-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_11-bmv2.p4.p4info.txt | 44 - ...t_exit_combination_11-bmv2.p4.p4info.txtpb | 45 + ...et_exit_combination_13-bmv2.p4.entries.txt | 2 - ..._exit_combination_13-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_13-bmv2.p4.p4info.txt | 44 - ...t_exit_combination_13-bmv2.p4.p4info.txtpb | 45 + ...et_exit_combination_14-bmv2.p4.entries.txt | 2 - ..._exit_combination_14-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_14-bmv2.p4.p4info.txt | 44 - ...t_exit_combination_14-bmv2.p4.p4info.txtpb | 45 + ...et_exit_combination_15-bmv2.p4.entries.txt | 2 - ..._exit_combination_15-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_15-bmv2.p4.p4info.txt | 42 - ...t_exit_combination_15-bmv2.p4.p4info.txtpb | 43 + ...et_exit_combination_16-bmv2.p4.entries.txt | 2 - ..._exit_combination_16-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_16-bmv2.p4.p4info.txt | 44 - ...t_exit_combination_16-bmv2.p4.p4info.txtpb | 45 + ...et_exit_combination_17-bmv2.p4.entries.txt | 2 - ..._exit_combination_17-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_17-bmv2.p4.p4info.txt | 66 - ...t_exit_combination_17-bmv2.p4.p4info.txtpb | 67 + ...et_exit_combination_18-bmv2.p4.entries.txt | 2 - ..._exit_combination_18-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_18-bmv2.p4.p4info.txt | 12 - ...t_exit_combination_18-bmv2.p4.p4info.txtpb | 13 + ...et_exit_combination_19-bmv2.p4.entries.txt | 2 - ..._exit_combination_19-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_19-bmv2.p4.p4info.txt | 44 - ...t_exit_combination_19-bmv2.p4.p4info.txtpb | 45 + ...let_exit_combination_2-bmv2.p4.entries.txt | 2 - ...t_exit_combination_2-bmv2.p4.entries.txtpb | 3 + ...tlet_exit_combination_2-bmv2.p4.p4info.txt | 44 - ...et_exit_combination_2-bmv2.p4.p4info.txtpb | 45 + ...et_exit_combination_20-bmv2.p4.entries.txt | 2 - ..._exit_combination_20-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_20-bmv2.p4.p4info.txt | 12 - ...t_exit_combination_20-bmv2.p4.p4info.txtpb | 13 + ...et_exit_combination_21-bmv2.p4.entries.txt | 2 - ..._exit_combination_21-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_21-bmv2.p4.p4info.txt | 5 - ...t_exit_combination_21-bmv2.p4.p4info.txtpb | 6 + ...et_exit_combination_22-bmv2.p4.entries.txt | 2 - ..._exit_combination_22-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_22-bmv2.p4.p4info.txt | 44 - ...t_exit_combination_22-bmv2.p4.p4info.txtpb | 45 + ...et_exit_combination_23-bmv2.p4.entries.txt | 2 - ..._exit_combination_23-bmv2.p4.entries.txtpb | 3 + ...let_exit_combination_23-bmv2.p4.p4info.txt | 44 - ...t_exit_combination_23-bmv2.p4.p4info.txtpb | 45 + ...let_exit_combination_3-bmv2.p4.entries.txt | 2 - ...t_exit_combination_3-bmv2.p4.entries.txtpb | 3 + ...tlet_exit_combination_3-bmv2.p4.p4info.txt | 44 - ...et_exit_combination_3-bmv2.p4.p4info.txtpb | 45 + ...let_exit_combination_4-bmv2.p4.entries.txt | 2 - ...t_exit_combination_4-bmv2.p4.entries.txtpb | 3 + ...tlet_exit_combination_4-bmv2.p4.p4info.txt | 44 - ...et_exit_combination_4-bmv2.p4.p4info.txtpb | 45 + ...let_exit_combination_5-bmv2.p4.entries.txt | 2 - ...t_exit_combination_5-bmv2.p4.entries.txtpb | 3 + ...tlet_exit_combination_5-bmv2.p4.p4info.txt | 5 - ...et_exit_combination_5-bmv2.p4.p4info.txtpb | 6 + ...let_exit_combination_6-bmv2.p4.entries.txt | 2 - ...t_exit_combination_6-bmv2.p4.entries.txtpb | 3 + ...tlet_exit_combination_6-bmv2.p4.p4info.txt | 5 - ...et_exit_combination_6-bmv2.p4.p4info.txtpb | 6 + ...let_exit_combination_7-bmv2.p4.entries.txt | 2 - ...t_exit_combination_7-bmv2.p4.entries.txtpb | 3 + ...tlet_exit_combination_7-bmv2.p4.p4info.txt | 5 - ...et_exit_combination_7-bmv2.p4.p4info.txtpb | 6 + ...let_exit_combination_8-bmv2.p4.entries.txt | 2 - ...t_exit_combination_8-bmv2.p4.entries.txtpb | 3 + ...tlet_exit_combination_8-bmv2.p4.p4info.txt | 5 - ...et_exit_combination_8-bmv2.p4.p4info.txtpb | 6 + ...let_exit_combination_9-bmv2.p4.entries.txt | 2 - ...t_exit_combination_9-bmv2.p4.entries.txtpb | 3 + ...tlet_exit_combination_9-bmv2.p4.p4info.txt | 44 - ...et_exit_combination_9-bmv2.p4.p4info.txtpb | 45 + ...function_if_hdr_return-bmv2.p4.entries.txt | 2 - ...nction_if_hdr_return-bmv2.p4.entries.txtpb | 3 + ..._function_if_hdr_return-bmv2.p4.p4info.txt | 5 - ...unction_if_hdr_return-bmv2.p4.p4info.txtpb | 6 + ...untlet_function_return-bmv2.p4.entries.txt | 2 - ...tlet_function_return-bmv2.p4.entries.txtpb | 3 + ...auntlet_function_return-bmv2.p4.p4info.txt | 12 - ...ntlet_function_return-bmv2.p4.p4info.txtpb | 13 + ...t_function_return_cast-bmv2.p4.entries.txt | 2 - ...function_return_cast-bmv2.p4.entries.txtpb | 3 + ...et_function_return_cast-bmv2.p4.p4info.txt | 5 - ..._function_return_cast-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_hdr_assign_1-bmv2.p4.entries.txt | 2 - ...auntlet_hdr_assign_1-bmv2.p4.entries.txtpb | 3 + .../gauntlet_hdr_assign_1-bmv2.p4.p4info.txt | 5 - ...gauntlet_hdr_assign_1-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_hdr_assign_2-bmv2.p4.entries.txt | 2 - ...auntlet_hdr_assign_2-bmv2.p4.entries.txtpb | 3 + .../gauntlet_hdr_assign_2-bmv2.p4.p4info.txt | 5 - ...gauntlet_hdr_assign_2-bmv2.p4.p4info.txtpb | 6 + ...tlet_hdr_function_cast-bmv2.p4.entries.txt | 2 - ...et_hdr_function_cast-bmv2.p4.entries.txtpb | 3 + ...ntlet_hdr_function_cast-bmv2.p4.p4info.txt | 5 - ...let_hdr_function_cast-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_hdr_in_value-bmv2.p4.entries.txt | 2 - ...auntlet_hdr_in_value-bmv2.p4.entries.txtpb | 3 + .../gauntlet_hdr_in_value-bmv2.p4.p4info.txt | 5 - ...gauntlet_hdr_in_value-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_hdr_init-bmv2.p4.entries.txt | 2 - .../gauntlet_hdr_init-bmv2.p4.entries.txtpb | 3 + .../gauntlet_hdr_init-bmv2.p4.p4info.txt | 5 - .../gauntlet_hdr_init-bmv2.p4.p4info.txtpb | 6 + ...et_hdr_int_initializer-bmv2.p4.entries.txt | 2 - ..._hdr_int_initializer-bmv2.p4.entries.txtpb | 3 + ...let_hdr_int_initializer-bmv2.p4.p4info.txt | 5 - ...t_hdr_int_initializer-bmv2.p4.p4info.txtpb | 6 + ...tlet_hdr_out_in_action-bmv2.p4.entries.txt | 2 - ...et_hdr_out_in_action-bmv2.p4.entries.txtpb | 3 + ...ntlet_hdr_out_in_action-bmv2.p4.p4info.txt | 12 - ...let_hdr_out_in_action-bmv2.p4.p4info.txtpb | 13 + ...gauntlet_hdr_set_valid-bmv2.p4.entries.txt | 2 - ...untlet_hdr_set_valid-bmv2.p4.entries.txtpb | 3 + .../gauntlet_hdr_set_valid-bmv2.p4.p4info.txt | 5 - ...auntlet_hdr_set_valid-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_index_1-bmv2.p4.entries.txt | 2 - .../gauntlet_index_1-bmv2.p4.entries.txtpb | 3 + .../gauntlet_index_1-bmv2.p4.p4info.txt | 5 - .../gauntlet_index_1-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_index_2-bmv2.p4.entries.txt | 2 - .../gauntlet_index_2-bmv2.p4.entries.txtpb | 3 + .../gauntlet_index_2-bmv2.p4.p4info.txt | 42 - .../gauntlet_index_2-bmv2.p4.p4info.txtpb | 43 + .../gauntlet_index_4-bmv2.p4.entries.txt | 2 - .../gauntlet_index_4-bmv2.p4.entries.txtpb | 3 + .../gauntlet_index_4-bmv2.p4.p4info.txt | 12 - .../gauntlet_index_4-bmv2.p4.p4info.txtpb | 13 + .../gauntlet_index_5-bmv2.p4.entries.txt | 2 - .../gauntlet_index_5-bmv2.p4.entries.txtpb | 3 + .../gauntlet_index_5-bmv2.p4.p4info.txt | 12 - .../gauntlet_index_5-bmv2.p4.p4info.txtpb | 13 + .../gauntlet_index_6-bmv2.p4.entries.txt | 2 - .../gauntlet_index_6-bmv2.p4.entries.txtpb | 3 + .../gauntlet_index_6-bmv2.p4.p4info.txt | 12 - .../gauntlet_index_6-bmv2.p4.p4info.txtpb | 13 + .../gauntlet_index_7-bmv2.p4.entries.txt | 2 - .../gauntlet_index_7-bmv2.p4.entries.txtpb | 3 + .../gauntlet_index_7-bmv2.p4.p4info.txt | 5 - .../gauntlet_index_7-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_index_8-bmv2.p4.entries.txt | 2 - .../gauntlet_index_8-bmv2.p4.entries.txtpb | 3 + .../gauntlet_index_8-bmv2.p4.p4info.txt | 5 - .../gauntlet_index_8-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_index_9-bmv2.p4.entries.txt | 2 - .../gauntlet_index_9-bmv2.p4.entries.txtpb | 3 + .../gauntlet_index_9-bmv2.p4.p4info.txt | 5 - .../gauntlet_index_9-bmv2.p4.p4info.txtpb | 6 + ..._indirect_hdr_assign_1-bmv2.p4.entries.txt | 2 - ...ndirect_hdr_assign_1-bmv2.p4.entries.txtpb | 3 + ...t_indirect_hdr_assign_1-bmv2.p4.p4info.txt | 12 - ...indirect_hdr_assign_1-bmv2.p4.p4info.txtpb | 13 + ..._indirect_hdr_assign_2-bmv2.p4.entries.txt | 2 - ...ndirect_hdr_assign_2-bmv2.p4.entries.txtpb | 3 + ...t_indirect_hdr_assign_2-bmv2.p4.p4info.txt | 12 - ...indirect_hdr_assign_2-bmv2.p4.p4info.txtpb | 13 + ..._inout_slice_table_key-bmv2.p4.entries.txt | 2 - ...nout_slice_table_key-bmv2.p4.entries.txtpb | 3 + ...t_inout_slice_table_key-bmv2.p4.p4info.txt | 39 - ...inout_slice_table_key-bmv2.p4.p4info.txtpb | 40 + ...let_instance_overwrite-bmv2.p4.entries.txt | 2 - ...t_instance_overwrite-bmv2.p4.entries.txtpb | 3 + ...tlet_instance_overwrite-bmv2.p4.p4info.txt | 44 - ...et_instance_overwrite-bmv2.p4.p4info.txtpb | 45 + .../gauntlet_int_casting-bmv2.p4.entries.txt | 2 - ...gauntlet_int_casting-bmv2.p4.entries.txtpb | 3 + .../gauntlet_int_casting-bmv2.p4.p4info.txt | 5 - .../gauntlet_int_casting-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_int_slice-bmv2.p4.entries.txt | 2 - .../gauntlet_int_slice-bmv2.p4.entries.txtpb | 3 + .../gauntlet_int_slice-bmv2.p4.p4info.txt | 5 - .../gauntlet_int_slice-bmv2.p4.p4info.txtpb | 6 + ...let_invalid_hdr_assign-bmv2.p4.entries.txt | 2 - ...t_invalid_hdr_assign-bmv2.p4.entries.txtpb | 3 + ...tlet_invalid_hdr_assign-bmv2.p4.p4info.txt | 5 - ...et_invalid_hdr_assign-bmv2.p4.p4info.txtpb | 6 + ...alid_hdr_short_circuit-bmv2.p4.entries.txt | 2 - ...id_hdr_short_circuit-bmv2.p4.entries.txtpb | 3 + ...valid_hdr_short_circuit-bmv2.p4.p4info.txt | 5 - ...lid_hdr_short_circuit-bmv2.p4.p4info.txtpb | 6 + ...et_list_as_in_argument-bmv2.p4.entries.txt | 2 - ..._list_as_in_argument-bmv2.p4.entries.txtpb | 3 + ...let_list_as_in_argument-bmv2.p4.p4info.txt | 12 - ...t_list_as_in_argument-bmv2.p4.p4info.txtpb | 13 + ...et_lookahead_expansion-bmv2.p4.entries.txt | 2 - ..._lookahead_expansion-bmv2.p4.entries.txtpb | 3 + ...let_lookahead_expansion-bmv2.p4.p4info.txt | 5 - ...t_lookahead_expansion-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_lookahead_expansion-first.p4 | 34 - .../gauntlet_lookahead_expansion-frontend.p4 | 38 - .../gauntlet_lookahead_expansion-midend.p4 | 41 - .../gauntlet_lookahead_expansion.p4 | 34 - .../gauntlet_lookahead_expansion.p4-stderr | 0 .../gauntlet_mux_eval-bmv2.p4.entries.txt | 2 - .../gauntlet_mux_eval-bmv2.p4.entries.txtpb | 3 + .../gauntlet_mux_eval-bmv2.p4.p4info.txt | 5 - .../gauntlet_mux_eval-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_mux_hdr-bmv2.p4.entries.txt | 2 - .../gauntlet_mux_hdr-bmv2.p4.entries.txtpb | 3 + .../gauntlet_mux_hdr-bmv2.p4.p4info.txt | 44 - .../gauntlet_mux_hdr-bmv2.p4.p4info.txtpb | 45 + ...untlet_mux_typecasting-bmv2.p4.entries.txt | 2 - ...tlet_mux_typecasting-bmv2.p4.entries.txtpb | 3 + ...auntlet_mux_typecasting-bmv2.p4.p4info.txt | 5 - ...ntlet_mux_typecasting-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_mux_validity-bmv2.p4.entries.txt | 2 - ...auntlet_mux_validity-bmv2.p4.entries.txtpb | 3 + .../gauntlet_mux_validity-bmv2.p4.p4info.txt | 12 - ...gauntlet_mux_validity-bmv2.p4.p4info.txtpb | 13 + ...nested_ifs_in_function-bmv2.p4.entries.txt | 2 - ...sted_ifs_in_function-bmv2.p4.entries.txtpb | 3 + ..._nested_ifs_in_function-bmv2.p4.p4info.txt | 5 - ...ested_ifs_in_function-bmv2.p4.p4info.txtpb | 6 + .../gauntlet_nested_slice-bmv2.p4.entries.txt | 2 - ...auntlet_nested_slice-bmv2.p4.entries.txtpb | 3 + .../gauntlet_nested_slice-bmv2.p4.p4info.txt | 5 - ...gauntlet_nested_slice-bmv2.p4.p4info.txtpb | 6 + ...gauntlet_nested_switch-bmv2.p4.entries.txt | 2 - ...untlet_nested_switch-bmv2.p4.entries.txtpb | 3 + .../gauntlet_nested_switch-bmv2.p4.p4info.txt | 35 - ...auntlet_nested_switch-bmv2.p4.p4info.txtpb | 36 + ...let_nested_table_calls-bmv2.p4.entries.txt | 2 - ...t_nested_table_calls-bmv2.p4.entries.txtpb | 3 + ...tlet_nested_table_calls-bmv2.p4.p4info.txt | 44 - ...et_nested_table_calls-bmv2.p4.p4info.txtpb | 45 + ...untlet_return_truncate-bmv2.p4.entries.txt | 2 - ...tlet_return_truncate-bmv2.p4.entries.txtpb | 3 + ...auntlet_return_truncate-bmv2.p4.p4info.txt | 12 - ...ntlet_return_truncate-bmv2.p4.p4info.txtpb | 13 + .../gauntlet_set_invalid-bmv2.p4.entries.txt | 2 - ...gauntlet_set_invalid-bmv2.p4.entries.txtpb | 3 + .../gauntlet_set_invalid-bmv2.p4.p4info.txt | 5 - .../gauntlet_set_invalid-bmv2.p4.p4info.txtpb | 6 + ..._set_valid_in_function-bmv2.p4.entries.txt | 2 - ...et_valid_in_function-bmv2.p4.entries.txtpb | 3 + ...t_set_valid_in_function-bmv2.p4.p4info.txt | 5 - ...set_valid_in_function-bmv2.p4.p4info.txtpb | 6 + ...gauntlet_short_circuit-bmv2.p4.entries.txt | 2 - ...untlet_short_circuit-bmv2.p4.entries.txtpb | 3 + .../gauntlet_short_circuit-bmv2.p4.p4info.txt | 5 - ...auntlet_short_circuit-bmv2.p4.p4info.txtpb | 6 + ...et_side_effect_order_1-bmv2.p4.entries.txt | 2 - ..._side_effect_order_1-bmv2.p4.entries.txtpb | 3 + ...let_side_effect_order_1-bmv2.p4.p4info.txt | 12 - ...t_side_effect_order_1-bmv2.p4.p4info.txtpb | 13 + ...et_side_effect_order_2-bmv2.p4.entries.txt | 2 - ..._side_effect_order_2-bmv2.p4.entries.txtpb | 3 + ...let_side_effect_order_2-bmv2.p4.p4info.txt | 12 - ...t_side_effect_order_2-bmv2.p4.p4info.txtpb | 13 + ...et_side_effect_order_3-bmv2.p4.entries.txt | 2 - ..._side_effect_order_3-bmv2.p4.entries.txtpb | 3 + ...let_side_effect_order_3-bmv2.p4.p4info.txt | 5 - ...t_side_effect_order_3-bmv2.p4.p4info.txtpb | 6 + ...et_side_effect_order_4-bmv2.p4.entries.txt | 2 - ..._side_effect_order_4-bmv2.p4.entries.txtpb | 3 + ...let_side_effect_order_4-bmv2.p4.p4info.txt | 5 - ...t_side_effect_order_4-bmv2.p4.p4info.txtpb | 6 + ...et_side_effect_order_5-bmv2.p4.entries.txt | 2 - ..._side_effect_order_5-bmv2.p4.entries.txtpb | 3 + ...let_side_effect_order_5-bmv2.p4.p4info.txt | 5 - ...t_side_effect_order_5-bmv2.p4.p4info.txtpb | 6 + ...et_side_effects_in_mux-bmv2.p4.entries.txt | 2 - ..._side_effects_in_mux-bmv2.p4.entries.txtpb | 3 + ...let_side_effects_in_mux-bmv2.p4.p4info.txt | 5 - ...t_side_effects_in_mux-bmv2.p4.p4info.txtpb | 6 + ...let_switch_exclusivity-bmv2.p4.entries.txt | 2 - ...t_switch_exclusivity-bmv2.p4.entries.txtpb | 3 + ...tlet_switch_exclusivity-bmv2.p4.p4info.txt | 54 - ...et_switch_exclusivity-bmv2.p4.p4info.txtpb | 55 + ...tch_nested_table_apply-bmv2.p4.entries.txt | 2 - ...h_nested_table_apply-bmv2.p4.entries.txtpb | 3 + ...itch_nested_table_apply-bmv2.p4.p4info.txt | 61 - ...ch_nested_table_apply-bmv2.p4.p4info.txtpb | 62 + ...ntlet_switch_shadowing-bmv2.p4.entries.txt | 2 - ...let_switch_shadowing-bmv2.p4.entries.txtpb | 3 + ...untlet_switch_shadowing-bmv2.p4.p4info.txt | 54 - ...tlet_switch_shadowing-bmv2.p4.p4info.txtpb | 55 + ...ble_call_in_expression-bmv2.p4.entries.txt | 2 - ...e_call_in_expression-bmv2.p4.entries.txtpb | 3 + ...able_call_in_expression-bmv2.p4.p4info.txt | 54 - ...le_call_in_expression-bmv2.p4.p4info.txtpb | 55 + .../gauntlet_typedef_cast-bmv2.p4.entries.txt | 2 - ...auntlet_typedef_cast-bmv2.p4.entries.txtpb | 3 + .../gauntlet_typedef_cast-bmv2.p4.p4info.txt | 5 - ...gauntlet_typedef_cast-bmv2.p4.p4info.txtpb | 6 + ...nitialized_bool_struct-bmv2.p4.entries.txt | 2 - ...tialized_bool_struct-bmv2.p4.entries.txtpb | 3 + ...initialized_bool_struct-bmv2.p4.p4info.txt | 44 - ...itialized_bool_struct-bmv2.p4.p4info.txtpb | 45 + ...let_variable_shadowing-bmv2.p4.entries.txt | 2 - ...t_variable_shadowing-bmv2.p4.entries.txtpb | 3 + ...tlet_variable_shadowing-bmv2.p4.p4info.txt | 42 - ...et_variable_shadowing-bmv2.p4.p4info.txtpb | 43 + .../gauntlet_various_ops-bmv2.p4.entries.txt | 2 - ...gauntlet_various_ops-bmv2.p4.entries.txtpb | 3 + .../gauntlet_various_ops-bmv2.p4.p4info.txt | 5 - .../gauntlet_various_ops-bmv2.p4.p4info.txtpb | 6 + .../global_action_after_exit.p4.entries.txt | 2 - .../global_action_after_exit.p4.entries.txtpb | 3 + .../global_action_after_exit.p4.p4info.txt | 12 - .../global_action_after_exit.p4.p4info.txtpb | 13 + .../graph-annotationless-key.p4.entries.txt | 2 - .../graph-annotationless-key.p4.entries.txtpb | 3 + .../graph-annotationless-key.p4.p4info.txt | 33 - .../graph-annotationless-key.p4.p4info.txtpb | 34 + .../hash-bmv2.p4.entries.txt | 2 - .../hash-bmv2.p4.entries.txtpb | 3 + .../hash-bmv2.p4.p4info.txt | 14 - .../hash-bmv2.p4.p4info.txtpb | 15 + .../hash-extern-bmv2.p4.entries.txt | 2 - .../hash-extern-bmv2.p4.entries.txtpb | 3 + .../hash-extern-bmv2.p4.p4info.txt | 15 - .../hash-extern-bmv2.p4.p4info.txtpb | 16 + .../hash_ubpf.p4.entries.txt | 2 - .../hash_ubpf.p4.entries.txtpb | 3 + .../hash_ubpf.p4.p4info.txt | 26 - .../hash_ubpf.p4.p4info.txtpb | 27 + .../hashing-non-tuple-bmv2.p4.entries.txt | 2 - .../hashing-non-tuple-bmv2.p4.entries.txtpb | 3 + .../hashing-non-tuple-bmv2.p4.p4info.txt | 7 - .../hashing-non-tuple-bmv2.p4.p4info.txtpb | 8 + .../hdr_stacks2345.p4.entries.txt | 2 - .../hdr_stacks2345.p4.entries.txtpb | 3 + .../hdr_stacks2345.p4.p4info.txt | 12 - .../hdr_stacks2345.p4.p4info.txtpb | 13 + .../header-bmv2.p4.entries.txt | 2 - .../header-bmv2.p4.entries.txtpb | 3 + .../header-bmv2.p4.p4info.txt | 5 - .../header-bmv2.p4.p4info.txtpb | 6 + .../header-bool-bmv2.p4.entries.txt | 2 - .../header-bool-bmv2.p4.entries.txtpb | 3 + .../header-bool-bmv2.p4.p4info.txt | 5 - .../header-bool-bmv2.p4.p4info.txtpb | 6 + .../header-stack-ops-bmv2.p4.entries.txt | 2 - .../header-stack-ops-bmv2.p4.entries.txtpb | 3 + .../header-stack-ops-bmv2.p4.p4info.txt | 5 - .../header-stack-ops-bmv2.p4.p4info.txtpb | 6 + .../hit-expr-bmv2.p4.entries.txt | 2 - .../hit-expr-bmv2.p4.entries.txtpb | 3 + .../hit-expr-bmv2.p4.p4info.txt | 26 - .../hit-expr-bmv2.p4.p4info.txtpb | 27 + .../init-entries-bmv2.p4.entries.txt | 1629 -------------- .../init-entries-bmv2.p4.entries.txtpb | 1630 ++++++++++++++ .../init-entries-bmv2.p4.p4info.txt | 269 --- .../init-entries-bmv2.p4.p4info.txtpb | 270 +++ .../inline-bmv2.p4.entries.txt | 2 - .../inline-bmv2.p4.entries.txtpb | 3 + .../inline-bmv2.p4.p4info.txt | 32 - .../inline-bmv2.p4.p4info.txtpb | 33 + .../inline-stack-bmv2.p4.entries.txt | 2 - .../inline-stack-bmv2.p4.entries.txtpb | 3 + .../inline-stack-bmv2.p4.p4info.txt | 5 - .../inline-stack-bmv2.p4.p4info.txtpb | 6 + .../inline1-bmv2.p4.entries.txt | 2 - .../inline1-bmv2.p4.entries.txtpb | 3 + .../inline1-bmv2.p4.p4info.txt | 32 - .../inline1-bmv2.p4.p4info.txtpb | 33 + .../internet_checksum1-bmv2.p4.entries.txt | 2 - .../internet_checksum1-bmv2.p4.entries.txtpb | 3 + .../internet_checksum1-bmv2.p4.p4info.txt | 15 - .../internet_checksum1-bmv2.p4.p4info.txtpb | 16 + .../intrinsic-bmv2.p4.entries.txt | 2 - .../intrinsic-bmv2.p4.entries.txtpb | 3 + .../intrinsic-bmv2.p4.p4info.txt | 5 - .../intrinsic-bmv2.p4.p4info.txtpb | 6 + .../invalid-hdr-warnings1.p4.entries.txt | 2 - .../invalid-hdr-warnings1.p4.entries.txtpb | 3 + .../invalid-hdr-warnings1.p4.p4info.txt | 5 - .../invalid-hdr-warnings1.p4.p4info.txtpb | 6 + .../invalid-hdr-warnings2.p4.entries.txt | 2 - .../invalid-hdr-warnings2.p4.entries.txtpb | 3 + .../invalid-hdr-warnings2.p4.p4info.txt | 12 - .../invalid-hdr-warnings2.p4.p4info.txtpb | 13 + .../invalid-hdr-warnings3-bmv2.p4.entries.txt | 2 - ...nvalid-hdr-warnings3-bmv2.p4.entries.txtpb | 3 + .../invalid-hdr-warnings3-bmv2.p4.p4info.txt | 5 - ...invalid-hdr-warnings3-bmv2.p4.p4info.txtpb | 6 + .../invalid-hdr-warnings4.p4.entries.txt | 2 - .../invalid-hdr-warnings4.p4.entries.txtpb | 3 + .../invalid-hdr-warnings4.p4.p4info.txt | 26 - .../invalid-hdr-warnings4.p4.p4info.txtpb | 27 + .../invalid-hdr-warnings5.p4.entries.txt | 2 - .../invalid-hdr-warnings5.p4.entries.txtpb | 3 + .../invalid-hdr-warnings5.p4.p4info.txt | 5 - .../invalid-hdr-warnings5.p4.p4info.txtpb | 6 + .../invalid-hdr-warnings6.p4.entries.txt | 2 - .../invalid-hdr-warnings6.p4.entries.txtpb | 3 + .../invalid-hdr-warnings6.p4.p4info.txt | 5 - .../invalid-hdr-warnings6.p4.p4info.txtpb | 6 + .../ipv4-actions_ubpf.p4.entries.txt | 2 - .../ipv4-actions_ubpf.p4.entries.txtpb | 3 + .../ipv4-actions_ubpf.p4.p4info.txt | 292 --- .../ipv4-actions_ubpf.p4.p4info.txtpb | 293 +++ .../ipv6-actions_ubpf.p4.entries.txt | 2 - .../ipv6-actions_ubpf.p4.entries.txtpb | 3 + .../ipv6-actions_ubpf.p4.p4info.txt | 147 -- .../ipv6-actions_ubpf.p4.p4info.txtpb | 148 ++ .../ipv6-switch-ml-bmv2.p4.entries.txt | 2 - .../ipv6-switch-ml-bmv2.p4.entries.txtpb | 3 + .../ipv6-switch-ml-bmv2.p4.p4info.txt | 133 -- .../ipv6-switch-ml-bmv2.p4.p4info.txtpb | 134 ++ .../issue-2123-2-bmv2.p4.entries.txt | 2 - .../issue-2123-2-bmv2.p4.entries.txtpb | 3 + .../issue-2123-2-bmv2.p4.p4info.txt | 5 - .../issue-2123-2-bmv2.p4.p4info.txtpb | 6 + .../issue-2123-3-bmv2.p4.entries.txt | 2 - .../issue-2123-3-bmv2.p4.entries.txtpb | 3 + .../issue-2123-3-bmv2.p4.p4info.txt | 5 - .../issue-2123-3-bmv2.p4.p4info.txtpb | 6 + .../issue-2123.p4.entries.txt | 2 - .../issue-2123.p4.entries.txtpb | 3 + .../issue-2123.p4.p4info.txt | 250 --- .../issue-2123.p4.p4info.txtpb | 251 +++ .../issue-3312-graph-bmv2.p4.entries.txt | 2 - .../issue-3312-graph-bmv2.p4.entries.txtpb | 3 + .../issue-3312-graph-bmv2.p4.p4info.txt | 60 - .../issue-3312-graph-bmv2.p4.p4info.txtpb | 61 + .../issue1000-bmv2.p4.entries.txt | 2 - .../issue1000-bmv2.p4.entries.txtpb | 3 + .../issue1000-bmv2.p4.p4info.txt | 5 - .../issue1000-bmv2.p4.p4info.txtpb | 6 + .../issue1001-1-bmv2.p4.entries.txt | 2 - .../issue1001-1-bmv2.p4.entries.txtpb | 3 + .../issue1001-1-bmv2.p4.p4info.txt | 7 - .../issue1001-1-bmv2.p4.p4info.txtpb | 8 + .../issue1001-bmv2.p4.entries.txt | 2 - .../issue1001-bmv2.p4.entries.txtpb | 3 + .../issue1001-bmv2.p4.p4info.txt | 7 - .../issue1001-bmv2.p4.p4info.txtpb | 8 + .../issue1025-bmv2.p4.entries.txt | 2 - .../issue1025-bmv2.p4.entries.txtpb | 3 + .../issue1025-bmv2.p4.p4info.txt | 5 - .../issue1025-bmv2.p4.p4info.txtpb | 6 + .../issue1043-bmv2.p4.entries.txt | 2 - .../issue1043-bmv2.p4.entries.txtpb | 3 + .../issue1043-bmv2.p4.p4info.txt | 7 - .../issue1043-bmv2.p4.p4info.txtpb | 8 + .../issue1049-bmv2.p4.entries.txt | 2 - .../issue1049-bmv2.p4.entries.txtpb | 3 + .../issue1049-bmv2.p4.p4info.txt | 62 - .../issue1049-bmv2.p4.p4info.txtpb | 63 + .../issue1062-1-bmv2.p4.entries.txt | 0 .../issue1062-1-bmv2.p4.p4info.txt | 31 - .../issue1079-bmv2.p4.entries.txt | 2 - .../issue1079-bmv2.p4.entries.txtpb | 3 + .../issue1079-bmv2.p4.p4info.txt | 7 - .../issue1079-bmv2.p4.p4info.txtpb | 8 + .../issue1097-2-bmv2.p4.entries.txt | 2 - .../issue1097-2-bmv2.p4.entries.txtpb | 3 + .../issue1097-2-bmv2.p4.p4info.txt | 22 - .../issue1097-2-bmv2.p4.p4info.txtpb | 23 + .../issue1097-bmv2.p4.entries.txt | 2 - .../issue1097-bmv2.p4.entries.txtpb | 3 + .../issue1097-bmv2.p4.p4info.txt | 22 - .../issue1097-bmv2.p4.p4info.txtpb | 23 + .../issue1107.p4.entries.txt | 62 - .../issue1107.p4.entries.txtpb | 63 + .../issue1107.p4.p4info.txt | 57 - .../issue1107.p4.p4info.txtpb | 58 + .../issue1127-bmv2.p4.entries.txt | 2 - .../issue1127-bmv2.p4.entries.txtpb | 3 + .../issue1127-bmv2.p4.p4info.txt | 5 - .../issue1127-bmv2.p4.p4info.txtpb | 6 + .../issue1193-bmv2.p4.entries.txt | 2 - .../issue1193-bmv2.p4.entries.txtpb | 3 + .../issue1193-bmv2.p4.p4info.txt | 38 - .../issue1193-bmv2.p4.p4info.txtpb | 39 + .../issue1208-1.p4.entries.txt | 2 - .../issue1208-1.p4.entries.txtpb | 3 + .../issue1208-1.p4.p4info.txt | 5 - .../issue1208-1.p4.p4info.txtpb | 6 + .../issue1210.p4.entries.txt | 2 - .../issue1210.p4.entries.txtpb | 3 + .../issue1210.p4.p4info.txt | 5 - .../issue1210.p4.p4info.txtpb | 6 + .../issue1291-bmv2.p4.entries.txt | 2 - .../issue1291-bmv2.p4.entries.txtpb | 3 + .../issue1291-bmv2.p4.p4info.txt | 5 - .../issue1291-bmv2.p4.p4info.txtpb | 6 + .../issue1304.p4.entries.txt | 0 .../issue1304.p4.p4info.txt | 38 - .../issue1325-bmv2.p4.entries.txt | 2 - .../issue1325-bmv2.p4.entries.txtpb | 3 + .../issue1325-bmv2.p4.p4info.txt | 7 - .../issue1325-bmv2.p4.p4info.txtpb | 8 + .../issue134-bmv2.p4.entries.txt | 2 - .../issue134-bmv2.p4.entries.txtpb | 3 + .../issue134-bmv2.p4.p4info.txt | 7 - .../issue134-bmv2.p4.p4info.txtpb | 8 + .../issue1352-bmv2.p4.entries.txt | 2 - .../issue1352-bmv2.p4.entries.txtpb | 3 + .../issue1352-bmv2.p4.p4info.txt | 163 -- .../issue1352-bmv2.p4.p4info.txtpb | 164 ++ .../issue1386.p4.entries.txt | 2 - .../issue1386.p4.entries.txtpb | 3 + .../issue1386.p4.p4info.txt | 5 - .../issue1386.p4.p4info.txtpb | 6 + .../issue1406.p4.entries.txt | 2 - .../issue1406.p4.entries.txtpb | 3 + .../issue1406.p4.p4info.txt | 5 - .../issue1406.p4.p4info.txtpb | 6 + .../issue1409-bmv2.p4.entries.txt | 2 - .../issue1409-bmv2.p4.entries.txtpb | 3 + .../issue1409-bmv2.p4.p4info.txt | 5 - .../issue1409-bmv2.p4.p4info.txtpb | 6 + .../issue1412-bmv2.p4.entries.txt | 2 - .../issue1412-bmv2.p4.entries.txtpb | 3 + .../issue1412-bmv2.p4.p4info.txt | 44 - .../issue1412-bmv2.p4.p4info.txtpb | 45 + .../issue1470-bmv2.p4.entries.txt | 2 - .../issue1470-bmv2.p4.entries.txtpb | 3 + .../issue1470-bmv2.p4.p4info.txt | 5 - .../issue1470-bmv2.p4.p4info.txtpb | 6 + .../issue1478-bmv2.p4.entries.txt | 22 - .../issue1478-bmv2.p4.entries.txtpb | 23 + .../issue1478-bmv2.p4.p4info.txt | 46 - .../issue1478-bmv2.p4.p4info.txtpb | 47 + .../issue1517-bmv2.p4.entries.txt | 2 - .../issue1517-bmv2.p4.entries.txtpb | 3 + .../issue1517-bmv2.p4.p4info.txt | 7 - .../issue1517-bmv2.p4.p4info.txtpb | 8 + .../issue1520-bmv2.p4.entries.txt | 2 - .../issue1520-bmv2.p4.entries.txtpb | 3 + .../issue1520-bmv2.p4.p4info.txt | 37 - .../issue1520-bmv2.p4.p4info.txtpb | 38 + .../issue1524.p4.entries.txt | 2 - .../issue1524.p4.entries.txtpb | 3 + .../issue1524.p4.p4info.txt | 2 - .../issue1524.p4.p4info.txtpb | 3 + .../issue1535.p4.entries.txt | 2 - .../issue1535.p4.entries.txtpb | 3 + .../issue1535.p4.p4info.txt | 5 - .../issue1535.p4.p4info.txtpb | 6 + .../issue1538.p4.entries.txt | 2 - .../issue1538.p4.entries.txtpb | 3 + .../issue1538.p4.p4info.txt | 46 - .../issue1538.p4.p4info.txtpb | 47 + .../issue1541.p4.entries.txt | 2 - .../issue1541.p4.entries.txtpb | 3 + .../issue1541.p4.p4info.txt | 5 - .../issue1541.p4.p4info.txtpb | 6 + .../issue1544-1-bmv2.p4.entries.txt | 2 - .../issue1544-1-bmv2.p4.entries.txtpb | 3 + .../issue1544-1-bmv2.p4.p4info.txt | 46 - .../issue1544-1-bmv2.p4.p4info.txtpb | 47 + .../issue1544-2-bmv2.p4.entries.txt | 2 - .../issue1544-2-bmv2.p4.entries.txtpb | 3 + .../issue1544-2-bmv2.p4.p4info.txt | 46 - .../issue1544-2-bmv2.p4.p4info.txtpb | 47 + .../issue1544-bmv2.p4.entries.txt | 2 - .../issue1544-bmv2.p4.entries.txtpb | 3 + .../issue1544-bmv2.p4.p4info.txt | 46 - .../issue1544-bmv2.p4.p4info.txtpb | 47 + .../issue1560-bmv2.p4.entries.txt | 2 - .../issue1560-bmv2.p4.entries.txtpb | 3 + .../issue1560-bmv2.p4.p4info.txt | 114 - .../issue1560-bmv2.p4.p4info.txtpb | 115 + .../issue1566-bmv2.p4.entries.txt | 2 - .../issue1566-bmv2.p4.entries.txtpb | 3 + .../issue1566-bmv2.p4.p4info.txt | 18 - .../issue1566-bmv2.p4.p4info.txtpb | 19 + .../issue1566.p4.entries.txt | 2 - .../issue1566.p4.entries.txtpb | 3 + .../issue1566.p4.p4info.txt | 18 - .../issue1566.p4.p4info.txtpb | 19 + .../issue1595.p4.entries.txt | 2 - .../issue1595.p4.entries.txtpb | 3 + .../issue1595.p4.p4info.txt | 72 - .../issue1595.p4.p4info.txtpb | 73 + .../issue1607-bmv2.p4.entries.txt | 2 - .../issue1607-bmv2.p4.entries.txtpb | 3 + .../issue1607-bmv2.p4.p4info.txt | 5 - .../issue1607-bmv2.p4.p4info.txtpb | 6 + .../issue1630-bmv2.p4.entries.txt | 2 - .../issue1630-bmv2.p4.entries.txtpb | 3 + .../issue1630-bmv2.p4.p4info.txt | 62 - .../issue1630-bmv2.p4.p4info.txtpb | 63 + .../issue1642-bmv2.p4.entries.txt | 2 - .../issue1642-bmv2.p4.entries.txtpb | 3 + .../issue1642-bmv2.p4.p4info.txt | 7 - .../issue1642-bmv2.p4.p4info.txtpb | 8 + .../issue1653-bmv2.p4.entries.txt | 2 - .../issue1653-bmv2.p4.entries.txtpb | 3 + .../issue1653-bmv2.p4.p4info.txt | 7 - .../issue1653-bmv2.p4.p4info.txtpb | 8 + .../issue1653-complex-bmv2.p4.entries.txt | 2 - .../issue1653-complex-bmv2.p4.entries.txtpb | 3 + .../issue1653-complex-bmv2.p4.p4info.txt | 50 - .../issue1653-complex-bmv2.p4.p4info.txtpb | 51 + .../issue1660-bmv2.p4.entries.txt | 2 - .../issue1660-bmv2.p4.entries.txtpb | 3 + .../issue1660-bmv2.p4.p4info.txt | 7 - .../issue1660-bmv2.p4.p4info.txtpb | 8 + .../issue1670-bmv2.p4.entries.txt | 2 - .../issue1670-bmv2.p4.entries.txtpb | 3 + .../issue1670-bmv2.p4.p4info.txt | 5 - .../issue1670-bmv2.p4.p4info.txtpb | 6 + .../issue1713-bmv2.p4.entries.txt | 2 - .../issue1713-bmv2.p4.entries.txtpb | 3 + .../issue1713-bmv2.p4.p4info.txt | 56 - .../issue1713-bmv2.p4.p4info.txtpb | 57 + .../issue1739-bmv2.p4.entries.txt | 2 - .../issue1739-bmv2.p4.entries.txtpb | 3 + .../issue1739-bmv2.p4.p4info.txt | 105 - .../issue1739-bmv2.p4.p4info.txtpb | 106 + .../issue1755-1-bmv2.p4.entries.txt | 2 - .../issue1755-1-bmv2.p4.entries.txtpb | 3 + .../issue1755-1-bmv2.p4.p4info.txt | 5 - .../issue1755-1-bmv2.p4.p4info.txtpb | 6 + .../issue1755-bmv2.p4.entries.txt | 2 - .../issue1755-bmv2.p4.entries.txtpb | 3 + .../issue1755-bmv2.p4.p4info.txt | 5 - .../issue1755-bmv2.p4.p4info.txtpb | 6 + .../issue1765-1-bmv2.p4.entries.txt | 2 - .../issue1765-1-bmv2.p4.entries.txtpb | 3 + .../issue1765-1-bmv2.p4.p4info.txt | 125 -- .../issue1765-1-bmv2.p4.p4info.txtpb | 126 ++ .../issue1765-bmv2.p4.entries.txt | 2 - .../issue1765-bmv2.p4.entries.txtpb | 3 + .../issue1765-bmv2.p4.p4info.txt | 31 - .../issue1765-bmv2.p4.p4info.txtpb | 32 + .../issue1768-bmv2.p4.entries.txt | 2 - .../issue1768-bmv2.p4.entries.txtpb | 3 + .../issue1768-bmv2.p4.p4info.txt | 7 - .../issue1768-bmv2.p4.p4info.txtpb | 8 + .../issue1781-bmv2.p4.entries.txt | 2 - .../issue1781-bmv2.p4.entries.txtpb | 3 + .../issue1781-bmv2.p4.p4info.txt | 12 - .../issue1781-bmv2.p4.p4info.txtpb | 13 + .../issue1806.p4.entries.txt | 0 .../issue1806.p4.p4info.txt | 42 - .../issue1814-1-bmv2.p4.entries.txt | 2 - .../issue1814-1-bmv2.p4.entries.txtpb | 3 + .../issue1814-1-bmv2.p4.p4info.txt | 69 - .../issue1814-1-bmv2.p4.p4info.txtpb | 70 + .../issue1814-bmv2.p4.entries.txt | 2 - .../issue1814-bmv2.p4.entries.txtpb | 3 + .../issue1814-bmv2.p4.p4info.txt | 47 - .../issue1814-bmv2.p4.p4info.txtpb | 48 + .../issue1824-bmv2.p4.entries.txt | 2 - .../issue1824-bmv2.p4.entries.txtpb | 3 + .../issue1824-bmv2.p4.p4info.txt | 5 - .../issue1824-bmv2.p4.p4info.txtpb | 6 + .../issue1829-4-bmv2.p4.entries.txt | 2 - .../issue1829-4-bmv2.p4.entries.txtpb | 3 + .../issue1829-4-bmv2.p4.p4info.txt | 32 - .../issue1829-4-bmv2.p4.p4info.txtpb | 33 + .../issue1834-bmv2.p4.entries.txt | 26 - .../issue1834-bmv2.p4.entries.txtpb | 27 + .../issue1834-bmv2.p4.p4info.txt | 51 - .../issue1834-bmv2.p4.p4info.txtpb | 52 + .../issue1876.p4.entries.txt | 2 - .../issue1876.p4.entries.txtpb | 3 + .../issue1876.p4.p4info.txt | 5 - .../issue1876.p4.p4info.txtpb | 6 + .../issue1879-bmv2.p4.entries.txt | 2 - .../issue1879-bmv2.p4.entries.txtpb | 3 + .../issue1879-bmv2.p4.p4info.txt | 7 - .../issue1879-bmv2.p4.p4info.txtpb | 8 + .../issue1882-1-bmv2.p4.entries.txt | 2 - .../issue1882-1-bmv2.p4.entries.txtpb | 3 + .../issue1882-1-bmv2.p4.p4info.txt | 7 - .../issue1882-1-bmv2.p4.p4info.txtpb | 8 + .../issue1882-bmv2.p4.entries.txt | 2 - .../issue1882-bmv2.p4.entries.txtpb | 3 + .../issue1882-bmv2.p4.p4info.txt | 7 - .../issue1882-bmv2.p4.p4info.txtpb | 8 + .../issue1897-bmv2.p4.entries.txt | 2 - .../issue1897-bmv2.p4.entries.txtpb | 3 + .../issue1897-bmv2.p4.p4info.txt | 5 - .../issue1897-bmv2.p4.p4info.txtpb | 6 + .../issue1937-1-bmv2.p4.entries.txt | 2 - .../issue1937-1-bmv2.p4.entries.txtpb | 3 + .../issue1937-1-bmv2.p4.p4info.txt | 12 - .../issue1937-1-bmv2.p4.p4info.txtpb | 13 + .../issue1937-2-bmv2.p4.entries.txt | 2 - .../issue1937-2-bmv2.p4.entries.txtpb | 3 + .../issue1937-2-bmv2.p4.p4info.txt | 5 - .../issue1937-2-bmv2.p4.p4info.txtpb | 6 + .../issue1937-3-bmv2.p4.entries.txt | 2 - .../issue1937-3-bmv2.p4.entries.txtpb | 3 + .../issue1937-3-bmv2.p4.p4info.txt | 5 - .../issue1937-3-bmv2.p4.p4info.txtpb | 6 + .../issue1955.p4.entries.txt | 2 - .../issue1955.p4.entries.txtpb | 3 + .../issue1955.p4.p4info.txt | 31 - .../issue1955.p4.p4info.txtpb | 32 + .../issue1958.p4.entries.txt | 2 - .../issue1958.p4.entries.txtpb | 3 + .../issue1958.p4.p4info.txt | 57 - .../issue1958.p4.p4info.txtpb | 58 + .../issue1985.p4.entries.txt | 2 - .../issue1985.p4.entries.txtpb | 3 + .../issue1985.p4.p4info.txt | 38 - .../issue1985.p4.p4info.txtpb | 39 + .../issue1989-bmv2.p4.entries.txt | 2 - .../issue1989-bmv2.p4.entries.txtpb | 3 + .../issue1989-bmv2.p4.p4info.txt | 44 - .../issue1989-bmv2.p4.p4info.txtpb | 45 + .../issue2044-bmv2.p4.entries.txt | 2 - .../issue2044-bmv2.p4.entries.txtpb | 3 + .../issue2044-bmv2.p4.p4info.txt | 32 - .../issue2044-bmv2.p4.p4info.txtpb | 33 + .../issue2104-1.p4.entries.txt | 0 .../issue2104-1.p4.p4info.txt | 3 - .../issue2104.p4.entries.txt | 0 .../issue2104.p4.p4info.txt | 10 - .../issue2105.p4.entries.txt | 0 .../issue2105.p4.p4info.txt | 3 - .../issue2147-bmv2.p4.entries.txt | 2 - .../issue2147-bmv2.p4.entries.txtpb | 3 + .../issue2147-bmv2.p4.p4info.txt | 12 - .../issue2147-bmv2.p4.p4info.txtpb | 13 + .../issue2148.p4.entries.txt | 2 - .../issue2148.p4.entries.txtpb | 3 + .../issue2148.p4.p4info.txt | 12 - .../issue2148.p4.p4info.txtpb | 13 + .../issue2153-bmv2.p4.entries.txt | 2 - .../issue2153-bmv2.p4.entries.txtpb | 3 + .../issue2153-bmv2.p4.p4info.txt | 42 - .../issue2153-bmv2.p4.p4info.txtpb | 43 + .../issue2170-bmv2.p4.entries.txt | 2 - .../issue2170-bmv2.p4.entries.txtpb | 3 + .../issue2170-bmv2.p4.p4info.txt | 42 - .../issue2170-bmv2.p4.p4info.txtpb | 43 + .../issue2176-bmv2.p4.entries.txt | 2 - .../issue2176-bmv2.p4.entries.txtpb | 3 + .../issue2176-bmv2.p4.p4info.txt | 12 - .../issue2176-bmv2.p4.p4info.txtpb | 13 + .../issue2190.p4.entries.txt | 2 - .../issue2190.p4.entries.txtpb | 3 + .../issue2190.p4.p4info.txt | 5 - .../issue2190.p4.p4info.txtpb | 6 + .../issue2201-bmv2.p4.entries.txt | 2 - .../issue2201-bmv2.p4.entries.txtpb | 3 + .../issue2201-bmv2.p4.p4info.txt | 7 - .../issue2201-bmv2.p4.p4info.txtpb | 8 + .../issue2205-1-bmv2.p4.entries.txt | 2 - .../issue2205-1-bmv2.p4.entries.txtpb | 3 + .../issue2205-1-bmv2.p4.p4info.txt | 5 - .../issue2205-1-bmv2.p4.p4info.txtpb | 6 + .../issue2205-bmv2.p4.entries.txt | 2 - .../issue2205-bmv2.p4.entries.txtpb | 3 + .../issue2205-bmv2.p4.p4info.txt | 5 - .../issue2205-bmv2.p4.p4info.txtpb | 6 + .../issue2208.p4.entries.txt | 2 - .../issue2208.p4.entries.txtpb | 3 + .../issue2208.p4.p4info.txt | 5 - .../issue2208.p4.p4info.txtpb | 6 + .../issue2213-bmv2.p4.entries.txt | 2 - .../issue2213-bmv2.p4.entries.txtpb | 3 + .../issue2213-bmv2.p4.p4info.txt | 5 - .../issue2213-bmv2.p4.p4info.txtpb | 6 + .../issue2221-bmv2.p4.entries.txt | 2 - .../issue2221-bmv2.p4.entries.txtpb | 3 + .../issue2221-bmv2.p4.p4info.txt | 5 - .../issue2221-bmv2.p4.p4info.txtpb | 6 + .../issue2225-bmv2.p4.entries.txt | 2 - .../issue2225-bmv2.p4.entries.txtpb | 3 + .../issue2225-bmv2.p4.p4info.txt | 12 - .../issue2225-bmv2.p4.p4info.txtpb | 13 + .../issue2248.p4.entries.txt | 2 - .../issue2248.p4.entries.txtpb | 3 + .../issue2248.p4.p4info.txt | 12 - .../issue2248.p4.p4info.txtpb | 13 + .../issue2258-bmv2.p4.entries.txt | 2 - .../issue2258-bmv2.p4.entries.txtpb | 3 + .../issue2258-bmv2.p4.p4info.txt | 34 - .../issue2258-bmv2.p4.p4info.txtpb | 35 + .../issue2261.p4.entries.txt | 2 - .../issue2261.p4.entries.txtpb | 3 + .../issue2261.p4.p4info.txt | 5 - .../issue2261.p4.p4info.txtpb | 6 + .../issue2266.p4.entries.txt | 2 - .../issue2266.p4.entries.txtpb | 3 + .../issue2266.p4.p4info.txt | 38 - .../issue2266.p4.p4info.txtpb | 39 + .../issue2283_1-bmv2.p4.entries.txt | 2 - .../issue2283_1-bmv2.p4.entries.txtpb | 3 + .../issue2283_1-bmv2.p4.p4info.txt | 80 - .../issue2283_1-bmv2.p4.p4info.txtpb | 81 + .../issue2287-bmv2.p4.entries.txt | 2 - .../issue2287-bmv2.p4.entries.txtpb | 3 + .../issue2287-bmv2.p4.p4info.txt | 5 - .../issue2287-bmv2.p4.p4info.txtpb | 6 + .../issue2289.p4.entries.txt | 2 - .../issue2289.p4.entries.txtpb | 3 + .../issue2289.p4.p4info.txt | 12 - .../issue2289.p4.p4info.txtpb | 13 + .../issue2291-bmv2.p4.entries.txt | 2 - .../issue2291-bmv2.p4.entries.txtpb | 3 + .../issue2291-bmv2.p4.p4info.txt | 12 - .../issue2291-bmv2.p4.p4info.txtpb | 13 + .../issue2303.p4.entries.txt | 2 - .../issue2303.p4.entries.txtpb | 3 + .../issue2303.p4.p4info.txt | 5 - .../issue2303.p4.p4info.txtpb | 6 + .../issue2314.p4.entries.txt | 2 - .../issue2314.p4.entries.txtpb | 3 + .../issue2314.p4.p4info.txt | 5 - .../issue2314.p4.p4info.txtpb | 6 + .../issue232-bmv2.p4.entries.txt | 2 - .../issue232-bmv2.p4.entries.txtpb | 3 + .../issue232-bmv2.p4.p4info.txt | 12 - .../issue232-bmv2.p4.p4info.txtpb | 13 + .../issue2321.p4.entries.txt | 2 - .../issue2321.p4.entries.txtpb | 3 + .../issue2321.p4.p4info.txt | 63 - .../issue2321.p4.p4info.txtpb | 64 + .../issue2330-1.p4.entries.txt | 2 - .../issue2330-1.p4.entries.txtpb | 3 + .../issue2330-1.p4.p4info.txt | 12 - .../issue2330-1.p4.p4info.txtpb | 13 + .../issue2330.p4.entries.txt | 2 - .../issue2330.p4.entries.txtpb | 3 + .../issue2330.p4.p4info.txt | 12 - .../issue2330.p4.p4info.txtpb | 13 + .../issue2343-bmv2.p4.entries.txt | 2 - .../issue2343-bmv2.p4.entries.txtpb | 3 + .../issue2343-bmv2.p4.p4info.txt | 5 - .../issue2343-bmv2.p4.p4info.txtpb | 6 + .../issue2344.p4.entries.txt | 2 - .../issue2344.p4.entries.txtpb | 3 + .../issue2344.p4.p4info.txt | 44 - .../issue2344.p4.p4info.txtpb | 45 + .../issue2345-1.p4.entries.txt | 2 - .../issue2345-1.p4.entries.txtpb | 3 + .../issue2345-1.p4.p4info.txt | 12 - .../issue2345-1.p4.p4info.txtpb | 13 + .../issue2345-2.p4.entries.txt | 2 - .../issue2345-2.p4.entries.txtpb | 3 + .../issue2345-2.p4.p4info.txt | 12 - .../issue2345-2.p4.p4info.txtpb | 13 + ...e2345-multiple_dependencies.p4.entries.txt | 2 - ...345-multiple_dependencies.p4.entries.txtpb | 3 + ...ue2345-multiple_dependencies.p4.p4info.txt | 12 - ...2345-multiple_dependencies.p4.p4info.txtpb | 13 + .../issue2345-with_nested_if.p4.entries.txt | 2 - .../issue2345-with_nested_if.p4.entries.txtpb | 3 + .../issue2345-with_nested_if.p4.p4info.txt | 12 - .../issue2345-with_nested_if.p4.p4info.txtpb | 13 + .../issue2345.p4.entries.txt | 2 - .../issue2345.p4.entries.txtpb | 3 + .../issue2345.p4.p4info.txt | 12 - .../issue2345.p4.p4info.txtpb | 13 + .../issue2355.p4.entries.txt | 2 - .../issue2355.p4.entries.txtpb | 3 + .../issue2355.p4.p4info.txt | 5 - .../issue2355.p4.p4info.txtpb | 6 + .../issue2356.p4.entries.txt | 2 - .../issue2356.p4.entries.txtpb | 3 + .../issue2356.p4.p4info.txt | 5 - .../issue2356.p4.p4info.txtpb | 6 + .../issue2359.p4.entries.txt | 2 - .../issue2359.p4.entries.txtpb | 3 + .../issue2359.p4.p4info.txt | 12 - .../issue2359.p4.p4info.txtpb | 13 + .../issue2362-bmv2.p4.entries.txt | 2 - .../issue2362-bmv2.p4.entries.txtpb | 3 + .../issue2362-bmv2.p4.p4info.txt | 53 - .../issue2362-bmv2.p4.p4info.txtpb | 54 + .../issue2375-1-bmv2.p4.entries.txt | 2 - .../issue2375-1-bmv2.p4.entries.txtpb | 3 + .../issue2375-1-bmv2.p4.p4info.txt | 12 - .../issue2375-1-bmv2.p4.p4info.txtpb | 13 + .../issue2375-bmv2.p4.entries.txt | 2 - .../issue2375-bmv2.p4.entries.txtpb | 3 + .../issue2375-bmv2.p4.p4info.txt | 38 - .../issue2375-bmv2.p4.p4info.txtpb | 39 + .../issue2383-bmv2.p4.entries.txt | 2 - .../issue2383-bmv2.p4.entries.txtpb | 3 + .../issue2383-bmv2.p4.p4info.txt | 5 - .../issue2383-bmv2.p4.p4info.txtpb | 6 + .../issue2392-bmv2.p4.entries.txt | 2 - .../issue2392-bmv2.p4.entries.txtpb | 3 + .../issue2392-bmv2.p4.p4info.txt | 5 - .../issue2392-bmv2.p4.p4info.txtpb | 6 + .../issue242.p4.entries.txt | 2 - .../issue242.p4.entries.txtpb | 3 + .../issue242.p4.p4info.txt | 44 - .../issue242.p4.p4info.txtpb | 45 + .../issue2465-bmv2.p4.entries.txt | 2 - .../issue2465-bmv2.p4.entries.txtpb | 3 + .../issue2465-bmv2.p4.p4info.txt | 5 - .../issue2465-bmv2.p4.p4info.txtpb | 6 + .../issue2488-bmv2.p4.entries.txt | 2 - .../issue2488-bmv2.p4.entries.txtpb | 3 + .../issue2488-bmv2.p4.p4info.txt | 5 - .../issue2488-bmv2.p4.p4info.txtpb | 6 + .../issue249.p4.entries.txt | 2 - .../issue249.p4.entries.txtpb | 3 + .../issue249.p4.p4info.txt | 7 - .../issue249.p4.p4info.txtpb | 8 + .../issue2495-bmv2.p4.entries.txt | 2 - .../issue2495-bmv2.p4.entries.txtpb | 3 + .../issue2495-bmv2.p4.p4info.txt | 28 - .../issue2495-bmv2.p4.p4info.txtpb | 29 + .../issue2498-bmv2.p4.entries.txt | 2 - .../issue2498-bmv2.p4.entries.txtpb | 3 + .../issue2498-bmv2.p4.p4info.txt | 12 - .../issue2498-bmv2.p4.p4info.txtpb | 13 + .../issue2614-bmv2.p4.entries.txt | 2 - .../issue2614-bmv2.p4.entries.txtpb | 3 + .../issue2614-bmv2.p4.p4info.txt | 5 - .../issue2614-bmv2.p4.p4info.txtpb | 6 + .../issue2657-bmv2.p4.entries.txt | 2 - .../issue2657-bmv2.p4.entries.txtpb | 3 + .../issue2657-bmv2.p4.p4info.txt | 7 - .../issue2657-bmv2.p4.p4info.txtpb | 8 + .../issue2664-bmv2.p4.entries.txt | 2 - .../issue2664-bmv2.p4.entries.txtpb | 3 + .../issue2664-bmv2.p4.p4info.txt | 7 - .../issue2664-bmv2.p4.p4info.txtpb | 8 + .../issue270-bmv2.p4.entries.txt | 2 - .../issue270-bmv2.p4.entries.txtpb | 3 + .../issue270-bmv2.p4.p4info.txt | 7 - .../issue270-bmv2.p4.p4info.txtpb | 8 + .../issue272-1-bmv2.p4.entries.txt | 2 - .../issue272-1-bmv2.p4.entries.txtpb | 3 + .../issue272-1-bmv2.p4.p4info.txt | 5 - .../issue272-1-bmv2.p4.p4info.txtpb | 6 + .../issue272-2-bmv2.p4.entries.txt | 2 - .../issue272-2-bmv2.p4.entries.txtpb | 3 + .../issue272-2-bmv2.p4.p4info.txt | 5 - .../issue272-2-bmv2.p4.p4info.txtpb | 6 + .../issue2726-bmv2.p4.entries.txt | 2 - .../issue2726-bmv2.p4.entries.txtpb | 3 + .../issue2726-bmv2.p4.p4info.txt | 5 - .../issue2726-bmv2.p4.p4info.txtpb | 6 + .../issue2735-bmv2.p4.entries.txt | 2 - .../issue2735-bmv2.p4.entries.txtpb | 3 + .../issue2735-bmv2.p4.p4info.txt | 5 - .../issue2735-bmv2.p4.p4info.txtpb | 6 + .../issue2735.p4.entries.txt | 2 - .../issue2735.p4.entries.txtpb | 3 + .../issue2735.p4.p4info.txt | 2 - .../issue2735.p4.p4info.txtpb | 3 + .../issue281.p4.entries.txt | 2 - .../issue281.p4.entries.txtpb | 3 + .../issue281.p4.p4info.txt | 5 - .../issue281.p4.p4info.txtpb | 6 + .../issue2844-enum.p4.entries.txt | 2 - .../issue2844-enum.p4.entries.txtpb | 3 + .../issue2844-enum.p4.p4info.txt | 18 - .../issue2844-enum.p4.p4info.txtpb | 19 + .../issue2890.p4.entries.txt | 0 .../issue2890.p4.p4info.txt | 3 - .../issue2904.p4.entries.txt | 73 - .../issue2904.p4.entries.txtpb | 74 + .../issue2904.p4.p4info.txt | 67 - .../issue2904.p4.p4info.txtpb | 68 + .../issue2905-bmv2.p4.entries.txt | 2 - .../issue2905-bmv2.p4.entries.txtpb | 3 + .../issue2905-bmv2.p4.p4info.txt | 47 - .../issue2905-bmv2.p4.p4info.txtpb | 48 + .../issue297-bmv2.p4.entries.txt | 2 - .../issue297-bmv2.p4.entries.txtpb | 3 + .../issue297-bmv2.p4.p4info.txt | 73 - .../issue297-bmv2.p4.p4info.txtpb | 74 + .../issue298-bmv2.p4.entries.txt | 2 - .../issue298-bmv2.p4.entries.txtpb | 3 + .../issue298-bmv2.p4.p4info.txt | 75 - .../issue298-bmv2.p4.p4info.txtpb | 76 + .../issue3001-1.p4.entries.txt | 2 - .../issue3001-1.p4.entries.txtpb | 3 + .../issue3001-1.p4.p4info.txt | 7 - .../issue3001-1.p4.p4info.txtpb | 8 + .../issue3057-2.p4.entries.txt | 0 .../issue3057-2.p4.p4info.txt | 3 - .../issue3091.p4.entries.txt | 2 - .../issue3091.p4.entries.txtpb | 3 + .../issue3091.p4.p4info.txt | 7 - .../issue3091.p4.p4info.txtpb | 8 + .../issue3118-bmv2.p4.entries.txt | 2 - .../issue3118-bmv2.p4.entries.txtpb | 3 + .../issue3118-bmv2.p4.p4info.txt | 5 - .../issue3118-bmv2.p4.p4info.txtpb | 6 + .../issue3225.p4.entries.txt | 2 - .../issue3225.p4.entries.txtpb | 3 + .../issue3225.p4.p4info.txt | 5 - .../issue3225.p4.p4info.txtpb | 6 + .../issue323.p4.entries.txt | 2 - .../issue323.p4.entries.txtpb | 3 + .../issue323.p4.p4info.txt | 12 - .../issue323.p4.p4info.txtpb | 13 + .../issue3329-bmv2.p4.entries.txt | 2 - .../issue3329-bmv2.p4.entries.txtpb | 3 + .../issue3329-bmv2.p4.p4info.txt | 20 - .../issue3329-bmv2.p4.p4info.txtpb | 21 + .../issue3374.p4.entries.txt | 2 - .../issue3374.p4.entries.txtpb | 3 + .../issue3374.p4.p4info.txt | 57 - .../issue3374.p4.p4info.txtpb | 58 + .../issue3394.p4.entries.txt | 2 - .../issue3394.p4.entries.txtpb | 3 + .../issue3394.p4.p4info.txt | 5 - .../issue3394.p4.p4info.txtpb | 6 + .../issue3483_ubpf.p4.entries.txt | 2 - .../issue3483_ubpf.p4.entries.txtpb | 3 + .../issue3483_ubpf.p4.p4info.txt | 47 - .../issue3483_ubpf.p4.p4info.txtpb | 48 + .../issue3488-1-bmv2.p4.entries.txt | 2 - .../issue3488-1-bmv2.p4.entries.txtpb | 3 + .../issue3488-1-bmv2.p4.p4info.txt | 146 -- .../issue3488-1-bmv2.p4.p4info.txtpb | 147 ++ .../issue3488-bmv2.p4.entries.txt | 2 - .../issue3488-bmv2.p4.entries.txtpb | 3 + .../issue3488-bmv2.p4.p4info.txt | 134 -- .../issue3488-bmv2.p4.p4info.txtpb | 135 ++ .../issue3531.p4.entries.txt | 2 - .../issue3531.p4.entries.txtpb | 3 + .../issue3531.p4.p4info.txt | 5 - .../issue3531.p4.p4info.txtpb | 6 + .../issue355-bmv2.p4.entries.txt | 2 - .../issue355-bmv2.p4.entries.txtpb | 3 + .../issue355-bmv2.p4.p4info.txt | 5 - .../issue355-bmv2.p4.p4info.txtpb | 6 + .../issue3550.p4.entries.txt | 320 --- .../issue3550.p4.entries.txtpb | 321 +++ .../issue3550.p4.p4info.txt | 125 -- .../issue3550.p4.p4info.txtpb | 126 ++ .../issue356-bmv2.p4.entries.txt | 2 - .../issue356-bmv2.p4.entries.txtpb | 3 + .../issue356-bmv2.p4.p4info.txt | 5 - .../issue356-bmv2.p4.p4info.txtpb | 6 + .../issue361-bmv2.p4.entries.txt | 2 - .../issue361-bmv2.p4.entries.txtpb | 3 + .../issue361-bmv2.p4.p4info.txt | 5 - .../issue361-bmv2.p4.p4info.txtpb | 6 + .../issue364-bmv2.p4.entries.txt | 2 - .../issue364-bmv2.p4.entries.txtpb | 3 + .../issue364-bmv2.p4.p4info.txt | 43 - .../issue364-bmv2.p4.p4info.txtpb | 44 + .../issue3650.p4.entries.txt | 2 - .../issue3650.p4.entries.txtpb | 3 + .../issue3650.p4.p4info.txt | 5 - .../issue3650.p4.p4info.txtpb | 6 + .../issue3702-bmv2.p4.entries.txt | 2 - .../issue3702-bmv2.p4.entries.txtpb | 3 + .../issue3702-bmv2.p4.p4info.txt | 5 - .../issue3702-bmv2.p4.p4info.txtpb | 6 + .../issue383-bmv2.p4.entries.txt | 2 - .../issue383-bmv2.p4.entries.txtpb | 3 + .../issue383-bmv2.p4.p4info.txt | 50 - .../issue383-bmv2.p4.p4info.txtpb | 51 + .../issue4057.p4.entries.txt | 2 - .../issue4057.p4.entries.txtpb | 3 + .../issue4057.p4.p4info.txt | 5 - .../issue4057.p4.p4info.txtpb | 6 + .../issue407-2.p4.entries.txt | 2 - .../issue407-2.p4.entries.txtpb | 3 + .../issue407-2.p4.p4info.txt | 2 - .../issue407-2.p4.p4info.txtpb | 3 + .../issue407-3.p4.entries.txt | 2 - .../issue407-3.p4.entries.txtpb | 3 + .../issue407-3.p4.p4info.txt | 2 - .../issue407-3.p4.p4info.txtpb | 3 + .../issue414-bmv2.p4.entries.txt | 2 - .../issue414-bmv2.p4.entries.txtpb | 3 + .../issue414-bmv2.p4.p4info.txt | 31 - .../issue414-bmv2.p4.p4info.txtpb | 32 + .../issue420.p4.entries.txt | 2 - .../issue420.p4.entries.txtpb | 3 + .../issue420.p4.p4info.txt | 41 - .../issue420.p4.p4info.txtpb | 42 + .../issue422.p4.entries.txt | 2 - .../issue422.p4.entries.txtpb | 3 + .../issue422.p4.p4info.txt | 36 - .../issue422.p4.p4info.txtpb | 37 + .../issue430-1-bmv2.p4.entries.txt | 2 - .../issue430-1-bmv2.p4.entries.txtpb | 3 + .../issue430-1-bmv2.p4.p4info.txt | 25 - .../issue430-1-bmv2.p4.p4info.txtpb | 26 + .../issue430-bmv2.p4.entries.txt | 2 - .../issue430-bmv2.p4.entries.txtpb | 3 + .../issue430-bmv2.p4.p4info.txt | 7 - .../issue430-bmv2.p4.p4info.txtpb | 8 + .../issue447-1-bmv2.p4.entries.txt | 2 - .../issue447-1-bmv2.p4.entries.txtpb | 3 + .../issue447-1-bmv2.p4.p4info.txt | 5 - .../issue447-1-bmv2.p4.p4info.txtpb | 6 + .../issue447-2-bmv2.p4.entries.txt | 2 - .../issue447-2-bmv2.p4.entries.txtpb | 3 + .../issue447-2-bmv2.p4.p4info.txt | 5 - .../issue447-2-bmv2.p4.p4info.txtpb | 6 + .../issue447-3-bmv2.p4.entries.txt | 2 - .../issue447-3-bmv2.p4.entries.txtpb | 3 + .../issue447-3-bmv2.p4.p4info.txt | 5 - .../issue447-3-bmv2.p4.p4info.txtpb | 6 + .../issue447-4-bmv2.p4.entries.txt | 2 - .../issue447-4-bmv2.p4.entries.txtpb | 3 + .../issue447-4-bmv2.p4.p4info.txt | 5 - .../issue447-4-bmv2.p4.p4info.txtpb | 6 + .../issue447-5-bmv2.p4.entries.txt | 2 - .../issue447-5-bmv2.p4.entries.txtpb | 3 + .../issue447-5-bmv2.p4.p4info.txt | 5 - .../issue447-5-bmv2.p4.p4info.txtpb | 6 + .../issue447-bmv2.p4.entries.txt | 2 - .../issue447-bmv2.p4.entries.txtpb | 3 + .../issue447-bmv2.p4.p4info.txt | 5 - .../issue447-bmv2.p4.p4info.txtpb | 6 + .../issue461-bmv2.p4.entries.txt | 2 - .../issue461-bmv2.p4.entries.txtpb | 3 + .../issue461-bmv2.p4.p4info.txt | 139 -- .../issue461-bmv2.p4.p4info.txtpb | 140 ++ .../issue486-bmv2.p4.entries.txt | 2 - .../issue486-bmv2.p4.entries.txtpb | 3 + .../issue486-bmv2.p4.p4info.txt | 49 - .../issue486-bmv2.p4.p4info.txtpb | 50 + .../issue496.p4.entries.txt | 2 - .../issue496.p4.entries.txtpb | 3 + .../issue496.p4.p4info.txt | 5 - .../issue496.p4.p4info.txtpb | 6 + .../issue510-bmv2.p4.entries.txt | 2 - .../issue510-bmv2.p4.entries.txtpb | 3 + .../issue510-bmv2.p4.p4info.txt | 5 - .../issue510-bmv2.p4.p4info.txtpb | 6 + .../issue512.p4.entries.txt | 2 - .../issue512.p4.entries.txtpb | 3 + .../issue512.p4.p4info.txt | 31 - .../issue512.p4.p4info.txtpb | 32 + .../issue561-1-bmv2.p4.entries.txt | 2 - .../issue561-1-bmv2.p4.entries.txtpb | 3 + .../issue561-1-bmv2.p4.p4info.txt | 45 - .../issue561-1-bmv2.p4.p4info.txtpb | 46 + .../issue561-2-bmv2.p4.entries.txt | 2 - .../issue561-2-bmv2.p4.entries.txtpb | 3 + .../issue561-2-bmv2.p4.p4info.txt | 45 - .../issue561-2-bmv2.p4.p4info.txtpb | 46 + .../issue561-3-bmv2.p4.entries.txt | 2 - .../issue561-3-bmv2.p4.entries.txtpb | 3 + .../issue561-3-bmv2.p4.p4info.txt | 45 - .../issue561-3-bmv2.p4.p4info.txtpb | 46 + .../issue561-4-bmv2.p4.entries.txt | 2 - .../issue561-4-bmv2.p4.entries.txtpb | 3 + .../issue561-4-bmv2.p4.p4info.txt | 57 - .../issue561-4-bmv2.p4.p4info.txtpb | 58 + .../issue561-5-bmv2.p4.entries.txt | 2 - .../issue561-5-bmv2.p4.entries.txtpb | 3 + .../issue561-5-bmv2.p4.p4info.txt | 45 - .../issue561-5-bmv2.p4.p4info.txtpb | 46 + .../issue561-6-bmv2.p4.entries.txt | 2 - .../issue561-6-bmv2.p4.entries.txtpb | 3 + .../issue561-6-bmv2.p4.p4info.txt | 57 - .../issue561-6-bmv2.p4.p4info.txtpb | 58 + .../issue561-7-bmv2.p4.entries.txt | 2 - .../issue561-7-bmv2.p4.entries.txtpb | 3 + .../issue561-7-bmv2.p4.p4info.txt | 45 - .../issue561-7-bmv2.p4.p4info.txtpb | 46 + .../issue561-bmv2.p4.entries.txt | 2 - .../issue561-bmv2.p4.entries.txtpb | 3 + .../issue561-bmv2.p4.p4info.txt | 120 - .../issue561-bmv2.p4.p4info.txtpb | 121 + .../issue562-bmv2.p4.entries.txt | 2 - .../issue562-bmv2.p4.entries.txtpb | 3 + .../issue562-bmv2.p4.p4info.txt | 7 - .../issue562-bmv2.p4.p4info.txtpb | 8 + .../issue584-1-bmv2.p4.entries.txt | 2 - .../issue584-1-bmv2.p4.entries.txtpb | 3 + .../issue584-1-bmv2.p4.p4info.txt | 7 - .../issue584-1-bmv2.p4.p4info.txtpb | 8 + .../issue635-bmv2.p4.entries.txt | 2 - .../issue635-bmv2.p4.entries.txtpb | 3 + .../issue635-bmv2.p4.p4info.txt | 5 - .../issue635-bmv2.p4.p4info.txtpb | 6 + .../issue655-bmv2.p4.entries.txt | 2 - .../issue655-bmv2.p4.entries.txtpb | 3 + .../issue655-bmv2.p4.p4info.txt | 7 - .../issue655-bmv2.p4.p4info.txtpb | 8 + .../issue655.p4.entries.txt | 2 - .../issue655.p4.entries.txtpb | 3 + .../issue655.p4.p4info.txt | 7 - .../issue655.p4.p4info.txtpb | 8 + .../issue677-bmv2.p4.entries.txt | 2 - .../issue677-bmv2.p4.entries.txtpb | 3 + .../issue677-bmv2.p4.p4info.txt | 5 - .../issue677-bmv2.p4.p4info.txtpb | 6 + .../issue692-bmv2.p4.entries.txt | 2 - .../issue692-bmv2.p4.entries.txtpb | 3 + .../issue692-bmv2.p4.p4info.txt | 5 - .../issue692-bmv2.p4.p4info.txtpb | 6 + .../issue696-bmv2.p4.entries.txt | 2 - .../issue696-bmv2.p4.entries.txtpb | 3 + .../issue696-bmv2.p4.p4info.txt | 44 - .../issue696-bmv2.p4.p4info.txtpb | 45 + .../issue737-bmv2.p4.entries.txt | 2 - .../issue737-bmv2.p4.entries.txtpb | 3 + .../issue737-bmv2.p4.p4info.txt | 5 - .../issue737-bmv2.p4.p4info.txtpb | 6 + .../issue774-4-bmv2.p4.entries.txt | 2 - .../issue774-4-bmv2.p4.entries.txtpb | 3 + .../issue774-4-bmv2.p4.p4info.txt | 5 - .../issue774-4-bmv2.p4.p4info.txtpb | 6 + .../issue841.p4.entries.txt | 2 - .../issue841.p4.entries.txtpb | 3 + .../issue841.p4.p4info.txt | 7 - .../issue841.p4.p4info.txtpb | 8 + .../issue887.p4.entries.txt | 2 - .../issue887.p4.entries.txtpb | 3 + .../issue887.p4.p4info.txt | 5 - .../issue887.p4.p4info.txtpb | 6 + .../issue891-bmv2.p4.entries.txt | 2 - .../issue891-bmv2.p4.entries.txtpb | 3 + .../issue891-bmv2.p4.p4info.txt | 5 - .../issue891-bmv2.p4.p4info.txtpb | 6 + .../issue907-bmv2.p4.entries.txt | 2 - .../issue907-bmv2.p4.entries.txtpb | 3 + .../issue907-bmv2.p4.p4info.txt | 35 - .../issue907-bmv2.p4.p4info.txtpb | 36 + .../issue914-bmv2.p4.entries.txt | 2 - .../issue914-bmv2.p4.entries.txtpb | 3 + .../issue914-bmv2.p4.p4info.txt | 5 - .../issue914-bmv2.p4.p4info.txtpb | 6 + .../issue949.p4.entries.txt | 2 - .../issue949.p4.entries.txtpb | 3 + .../issue949.p4.p4info.txt | 44 - .../issue949.p4.p4info.txtpb | 45 + .../issue955.p4.entries.txt | 2 - .../issue955.p4.entries.txtpb | 3 + .../issue955.p4.p4info.txt | 5 - .../issue955.p4.p4info.txtpb | 6 + .../issue983-bmv2.p4.entries.txt | 2 - .../issue983-bmv2.p4.entries.txtpb | 3 + .../issue983-bmv2.p4.p4info.txt | 104 - .../issue983-bmv2.p4.p4info.txtpb | 105 + .../issue986-1-bmv2.p4.entries.txt | 2 - .../issue986-1-bmv2.p4.entries.txtpb | 3 + .../issue986-1-bmv2.p4.p4info.txt | 37 - .../issue986-1-bmv2.p4.p4info.txtpb | 38 + .../issue986-bmv2.p4.entries.txt | 2 - .../issue986-bmv2.p4.entries.txtpb | 3 + .../issue986-bmv2.p4.p4info.txt | 26 - .../issue986-bmv2.p4.p4info.txtpb | 27 + .../issue995-bmv2.p4.entries.txt | 2 - .../issue995-bmv2.p4.entries.txtpb | 3 + .../issue995-bmv2.p4.p4info.txt | 5 - .../issue995-bmv2.p4.p4info.txtpb | 6 + .../junk-prop-bmv2.p4.entries.txt | 2 - .../junk-prop-bmv2.p4.entries.txtpb | 3 + .../junk-prop-bmv2.p4.p4info.txt | 26 - .../junk-prop-bmv2.p4.p4info.txtpb | 27 + .../key-bmv2.p4.entries.txt | 2 - .../key-bmv2.p4.entries.txtpb | 3 + .../key-bmv2.p4.p4info.txt | 42 - .../key-bmv2.p4.p4info.txtpb | 43 + .../key1-bmv2.p4.entries.txt | 2 - .../key1-bmv2.p4.entries.txtpb | 3 + .../key1-bmv2.p4.p4info.txt | 42 - .../key1-bmv2.p4.p4info.txtpb | 43 + .../logging-bmv2.p4.entries.txt | 2 - .../logging-bmv2.p4.entries.txtpb | 3 + .../logging-bmv2.p4.p4info.txt | 38 - .../logging-bmv2.p4.p4info.txtpb | 39 + .../lookahead_ubpf.p4.entries.txt | 2 - .../lookahead_ubpf.p4.entries.txtpb | 3 + .../lookahead_ubpf.p4.p4info.txt | 5 - .../lookahead_ubpf.p4.p4info.txtpb | 6 + .../lpm_ubpf.p4.entries.txt | 2 - .../lpm_ubpf.p4.entries.txtpb | 3 + .../lpm_ubpf.p4.p4info.txt | 53 - .../lpm_ubpf.p4.p4info.txtpb | 54 + ...-zero-arg-default-action-08.p4.entries.txt | 2 - ...ero-arg-default-action-08.p4.entries.txtpb | 3 + ...n-zero-arg-default-action-08.p4.p4info.txt | 40 - ...zero-arg-default-action-08.p4.p4info.txtpb | 41 + .../match-on-exprs-bmv2.p4.entries.txt | 2 - .../match-on-exprs-bmv2.p4.entries.txtpb | 3 + .../match-on-exprs-bmv2.p4.p4info.txt | 70 - .../match-on-exprs-bmv2.p4.p4info.txtpb | 71 + .../match-on-exprs2-bmv2.p4.entries.txt | 2 - .../match-on-exprs2-bmv2.p4.entries.txtpb | 3 + .../match-on-exprs2-bmv2.p4.p4info.txt | 70 - .../match-on-exprs2-bmv2.p4.p4info.txtpb | 71 + .../metadata_ubpf.p4.entries.txt | 2 - .../metadata_ubpf.p4.entries.txtpb | 3 + .../metadata_ubpf.p4.p4info.txt | 69 - .../metadata_ubpf.p4.p4info.txtpb | 70 + .../multicast-bmv2.p4.entries.txt | 2 - .../multicast-bmv2.p4.entries.txtpb | 3 + .../multicast-bmv2.p4.p4info.txt | 161 -- .../multicast-bmv2.p4.p4info.txtpb | 162 ++ .../mux-bmv2.p4.entries.txt | 2 - .../mux-bmv2.p4.entries.txtpb | 3 + .../mux-bmv2.p4.p4info.txt | 12 - .../mux-bmv2.p4.p4info.txtpb | 13 + .../named_meter_1-bmv2.p4.entries.txt | 2 - .../named_meter_1-bmv2.p4.entries.txtpb | 3 + .../named_meter_1-bmv2.p4.p4info.txt | 99 - .../named_meter_1-bmv2.p4.p4info.txtpb | 100 + .../named_meter_bmv2.p4.entries.txt | 2 - .../named_meter_bmv2.p4.entries.txtpb | 3 + .../named_meter_bmv2.p4.p4info.txt | 99 - .../named_meter_bmv2.p4.p4info.txtpb | 100 + .../nested_if_else.p4.entries.txt | 2 - .../nested_if_else.p4.entries.txtpb | 3 + .../nested_if_else.p4.p4info.txt | 52 - .../nested_if_else.p4.p4info.txtpb | 53 + ...sted_if_lvalue_dependencies.p4.entries.txt | 2 - ...ed_if_lvalue_dependencies.p4.entries.txtpb | 3 + ...ested_if_lvalue_dependencies.p4.p4info.txt | 52 - ...ted_if_lvalue_dependencies.p4.p4info.txtpb | 53 + .../nested_if_statement.p4.entries.txt | 2 - .../nested_if_statement.p4.entries.txtpb | 3 + .../nested_if_statement.p4.p4info.txt | 52 - .../nested_if_statement.p4.p4info.txtpb | 53 + .../next-def-use.p4.entries.txt | 2 - .../next-def-use.p4.entries.txtpb | 3 + .../next-def-use.p4.p4info.txt | 5 - .../next-def-use.p4.p4info.txtpb | 6 + .../noMatch.p4.entries.txt | 0 .../noMatch.p4.p4info.txt | 3 - ...onstandard_table_names-bmv2.p4.entries.txt | 2 - ...standard_table_names-bmv2.p4.entries.txtpb | 3 + ...nonstandard_table_names-bmv2.p4.p4info.txt | 122 -- ...nstandard_table_names-bmv2.p4.p4info.txtpb | 123 ++ .../omec/up4.p4.entries.txtpb | 3 + .../omec/up4.p4.p4info.txtpb | 835 +++++++ .../p416-type-use3.p4.entries.txt | 2 - .../p416-type-use3.p4.entries.txtpb | 3 + .../p416-type-use3.p4.p4info.txt | 358 --- .../p416-type-use3.p4.p4info.txtpb | 359 +++ .../p4rt_digest_complex.p4.entries.txt | 2 - .../p4rt_digest_complex.p4.entries.txtpb | 3 + .../p4rt_digest_complex.p4.p4info.txt | 134 -- .../p4rt_digest_complex.p4.p4info.txtpb | 135 ++ .../parenthesis-test_ubpf.p4.entries.txt | 2 - .../parenthesis-test_ubpf.p4.entries.txtpb | 3 + .../parenthesis-test_ubpf.p4.p4info.txt | 42 - .../parenthesis-test_ubpf.p4.p4info.txtpb | 43 + .../parser-if.p4.entries.txt | 2 - .../parser-if.p4.entries.txtpb | 3 + .../parser-if.p4.p4info.txt | 5 - .../parser-if.p4.p4info.txtpb | 6 + .../parser-locals2.p4.entries.txt | 2 - .../parser-locals2.p4.entries.txtpb | 3 + .../parser-locals2.p4.p4info.txt | 31 - .../parser-locals2.p4.p4info.txtpb | 32 + .../parser-pragma.p4.entries.txt | 2 - .../parser-pragma.p4.entries.txtpb | 3 + .../parser-pragma.p4.p4info.txt | 5 - .../parser-pragma.p4.p4info.txtpb | 6 + .../parser-unroll-issue3537-1.p4.entries.txt | 2 - ...parser-unroll-issue3537-1.p4.entries.txtpb | 3 + .../parser-unroll-issue3537-1.p4.p4info.txt | 5 - .../parser-unroll-issue3537-1.p4.p4info.txtpb | 6 + .../parser-unroll-issue3537.p4.entries.txt | 2 - .../parser-unroll-issue3537.p4.entries.txtpb | 3 + .../parser-unroll-issue3537.p4.p4info.txt | 5 - .../parser-unroll-issue3537.p4.p4info.txtpb | 6 + .../parser-unroll-t1-cond.p4.entries.txt | 2 - .../parser-unroll-t1-cond.p4.entries.txtpb | 3 + .../parser-unroll-t1-cond.p4.p4info.txt | 5 - .../parser-unroll-t1-cond.p4.p4info.txtpb | 6 + .../parser-unroll-test1.p4.entries.txt | 2 - .../parser-unroll-test1.p4.entries.txtpb | 3 + .../parser-unroll-test1.p4.p4info.txt | 5 - .../parser-unroll-test1.p4.p4info.txtpb | 6 + .../parser-unroll-test10.p4.entries.txt | 2 - .../parser-unroll-test10.p4.entries.txtpb | 3 + .../parser-unroll-test10.p4.p4info.txt | 5 - .../parser-unroll-test10.p4.p4info.txtpb | 6 + .../parser-unroll-test2.p4.entries.txt | 2 - .../parser-unroll-test2.p4.entries.txtpb | 3 + .../parser-unroll-test2.p4.p4info.txt | 5 - .../parser-unroll-test2.p4.p4info.txtpb | 6 + .../parser-unroll-test3.p4.entries.txt | 2 - .../parser-unroll-test3.p4.entries.txtpb | 3 + .../parser-unroll-test3.p4.p4info.txt | 5 - .../parser-unroll-test3.p4.p4info.txtpb | 6 + .../parser-unroll-test4.p4.entries.txt | 2 - .../parser-unroll-test4.p4.entries.txtpb | 3 + .../parser-unroll-test4.p4.p4info.txt | 5 - .../parser-unroll-test4.p4.p4info.txtpb | 6 + .../parser-unroll-test5.p4.entries.txt | 2 - .../parser-unroll-test5.p4.entries.txtpb | 3 + .../parser-unroll-test5.p4.p4info.txt | 5 - .../parser-unroll-test5.p4.p4info.txtpb | 6 + .../parser-unroll-test6.p4.entries.txt | 2 - .../parser-unroll-test6.p4.entries.txtpb | 3 + .../parser-unroll-test6.p4.p4info.txt | 5 - .../parser-unroll-test6.p4.p4info.txtpb | 6 + .../parser-unroll-test7.p4.entries.txt | 2 - .../parser-unroll-test7.p4.entries.txtpb | 3 + .../parser-unroll-test7.p4.p4info.txt | 5 - .../parser-unroll-test7.p4.p4info.txtpb | 6 + .../parser-unroll-test8.p4.entries.txt | 2 - .../parser-unroll-test8.p4.entries.txtpb | 3 + .../parser-unroll-test8.p4.p4info.txt | 5 - .../parser-unroll-test8.p4.p4info.txtpb | 6 + .../parser-unroll-test9.p4.entries.txt | 2 - .../parser-unroll-test9.p4.entries.txtpb | 3 + .../parser-unroll-test9.p4.p4info.txt | 5 - .../parser-unroll-test9.p4.p4info.txtpb | 6 + .../parser-unroll-t1-cond.p4.entries.txt | 0 .../parser-unroll-t1-cond.p4.p4info.txt | 3 - .../parser-unroll-test1.p4.entries.txt | 0 .../parser-unroll-test1.p4.p4info.txt | 3 - .../parser-unroll-test2.p4.entries.txt | 0 .../parser-unroll-test2.p4.p4info.txt | 3 - .../parser-unroll-test3.p4.entries.txt | 0 .../parser-unroll-test3.p4.p4info.txt | 3 - .../parser-unroll-test4.p4.entries.txt | 0 .../parser-unroll-test4.p4.p4info.txt | 3 - .../parser-unroll-test5.p4.entries.txt | 0 .../parser-unroll-test5.p4.p4info.txt | 3 - .../parser_error-bmv2.p4.entries.txt | 2 - .../parser_error-bmv2.p4.entries.txtpb | 3 + .../parser_error-bmv2.p4.p4info.txt | 5 - .../parser_error-bmv2.p4.p4info.txtpb | 6 + .../pins/pins_fabric.p4.entries.txtpb | 3 + .../pins/pins_fabric.p4.p4info.txtpb | 1284 +++++++++++ .../pins/pins_middleblock.p4.entries.txtpb | 3 + .../pins/pins_middleblock.p4.p4info.txtpb | 1148 ++++++++++ .../pins/pins_wbb.p4.entries.txtpb | 3 + .../pins/pins_wbb.p4.p4info.txtpb | 840 +++++++ .../pna-dpdk-invalid-hdr-warnings5.p4-error | 33 - ...na-dpdk-invalid-hdr-warnings5.p4.bfrt.json | 5 - .../pna-dpdk-invalid-hdr-warnings5.p4.spec | 118 - .../pna-example-ipsec-accelerator.p4-error | 1 - .../pna-example-ipsec-accelerator.p4-stderr | 0 ...pna-example-ipsec-accelerator.p4.bfrt.json | 312 --- ...ple-tcp-connection-tracking-err-1.p4-error | 10 - ...tcp-connection-tracking-err-1.p4.bfrt.json | 164 -- ...mple-tcp-connection-tracking-err-1.p4.spec | 175 -- ...ample-tcp-connection-tracking-err.p4-error | 10 - ...e-tcp-connection-tracking-err.p4.bfrt.json | 164 -- ...xample-tcp-connection-tracking-err.p4.spec | 175 -- .../p4_16_samples_outputs/pred.p4.entries.txt | 0 .../p4_16_samples_outputs/pred.p4.p4info.txt | 10 - .../pred1.p4.entries.txt | 0 .../p4_16_samples_outputs/pred1.p4.p4info.txt | 10 - .../pred2.p4.entries.txt | 0 .../p4_16_samples_outputs/pred2.p4.p4info.txt | 24 - .../predication_issue.p4.entries.txt | 2 - .../predication_issue.p4.entries.txtpb | 3 + .../predication_issue.p4.p4info.txt | 12 - .../predication_issue.p4.p4info.txtpb | 13 + .../predication_issue_1.p4.entries.txt | 2 - .../predication_issue_1.p4.entries.txtpb | 3 + .../predication_issue_1.p4.p4info.txt | 12 - .../predication_issue_1.p4.p4info.txtpb | 13 + .../predication_issue_2.p4.entries.txt | 2 - .../predication_issue_2.p4.entries.txtpb | 3 + .../predication_issue_2.p4.p4info.txt | 12 - .../predication_issue_2.p4.p4info.txtpb | 13 + .../predication_issue_3.p4.entries.txt | 2 - .../predication_issue_3.p4.entries.txtpb | 3 + .../predication_issue_3.p4.p4info.txt | 12 - .../predication_issue_3.p4.p4info.txtpb | 13 + .../predication_issue_4.p4.entries.txt | 2 - .../predication_issue_4.p4.entries.txtpb | 3 + .../predication_issue_4.p4.p4info.txt | 12 - .../predication_issue_4.p4.p4info.txtpb | 13 + .../proliferation1.p4.entries.txt | 2 - .../proliferation1.p4.entries.txtpb | 3 + .../proliferation1.p4.p4info.txt | 12 - .../proliferation1.p4.p4info.txtpb | 13 + .../psa-action-profile1.p4.entries.txt | 2 - .../psa-action-profile1.p4.entries.txtpb | 3 + .../psa-action-profile1.p4.p4info.txt | 72 - .../psa-action-profile1.p4.p4info.txtpb | 73 + .../psa-action-profile3.p4.entries.txt | 2 - .../psa-action-profile3.p4.entries.txtpb | 3 + .../psa-action-profile3.p4.p4info.txt | 97 - .../psa-action-profile3.p4.p4info.txtpb | 98 + .../psa-action-profile4.p4.entries.txt | 2 - .../psa-action-profile4.p4.entries.txtpb | 3 + .../psa-action-profile4.p4.p4info.txt | 91 - .../psa-action-profile4.p4.p4info.txtpb | 92 + .../psa-action-selector1.p4.entries.txt | 2 - .../psa-action-selector1.p4.entries.txtpb | 3 + .../psa-action-selector1.p4.p4info.txt | 73 - .../psa-action-selector1.p4.p4info.txtpb | 74 + .../psa-action-selector2.p4.entries.txt | 2 - .../psa-action-selector2.p4.entries.txtpb | 3 + .../psa-action-selector2.p4.p4info.txt | 73 - .../psa-action-selector2.p4.p4info.txtpb | 74 + .../psa-action-selector3.p4.entries.txt | 2 - .../psa-action-selector3.p4.entries.txtpb | 3 + .../psa-action-selector3.p4.p4info.txt | 62 - .../psa-action-selector3.p4.p4info.txtpb | 63 + .../psa-action-selector4.p4.entries.txt | 2 - .../psa-action-selector4.p4.entries.txtpb | 3 + .../psa-action-selector4.p4.p4info.txt | 84 - .../psa-action-selector4.p4.p4info.txtpb | 85 + .../psa-action-selector5.p4.entries.txt | 2 - .../psa-action-selector5.p4.entries.txtpb | 3 + .../psa-action-selector5.p4.p4info.txt | 95 - .../psa-action-selector5.p4.p4info.txtpb | 96 + .../psa-action-selector6.p4.entries.txt | 2 - .../psa-action-selector6.p4.entries.txtpb | 3 + .../psa-action-selector6.p4.p4info.txt | 128 -- .../psa-action-selector6.p4.p4info.txtpb | 129 ++ .../psa-basic-counter-bmv2.p4.entries.txt | 2 - .../psa-basic-counter-bmv2.p4.entries.txtpb | 3 + .../psa-basic-counter-bmv2.p4.p4info.txt | 44 - .../psa-basic-counter-bmv2.p4.p4info.txtpb | 45 + .../psa-conditional_operator.p4.entries.txt | 2 - .../psa-conditional_operator.p4.entries.txtpb | 3 + .../psa-conditional_operator.p4.p4info.txt | 42 - .../psa-conditional_operator.p4.p4info.txtpb | 43 + .../psa-counter1.p4.entries.txt | 2 - .../psa-counter1.p4.entries.txtpb | 3 + .../psa-counter1.p4.p4info.txt | 53 - .../psa-counter1.p4.p4info.txtpb | 54 + .../psa-counter2.p4.entries.txt | 2 - .../psa-counter2.p4.entries.txtpb | 3 + .../psa-counter2.p4.p4info.txt | 64 - .../psa-counter2.p4.p4info.txtpb | 65 + .../psa-counter3.p4.entries.txt | 2 - .../psa-counter3.p4.entries.txtpb | 3 + .../psa-counter3.p4.p4info.txt | 29 - .../psa-counter3.p4.p4info.txtpb | 30 + .../psa-counter4.p4.entries.txt | 2 - .../psa-counter4.p4.entries.txtpb | 3 + .../psa-counter4.p4.p4info.txt | 44 - .../psa-counter4.p4.p4info.txtpb | 45 + ...a-custom-type-counter-index.p4.entries.txt | 2 - ...custom-type-counter-index.p4.entries.txtpb | 3 + ...sa-custom-type-counter-index.p4.p4info.txt | 68 - ...-custom-type-counter-index.p4.p4info.txtpb | 69 + .../psa-dpdk-128bitCast.p4.entries.txt | 2 - .../psa-dpdk-128bitCast.p4.entries.txtpb | 3 + .../psa-dpdk-128bitCast.p4.p4info.txt | 38 - .../psa-dpdk-128bitCast.p4.p4info.txtpb | 39 + ...sa-dpdk-binary-operations-1.p4.entries.txt | 2 - ...-dpdk-binary-operations-1.p4.entries.txtpb | 3 + ...psa-dpdk-binary-operations-1.p4.p4info.txt | 42 - ...a-dpdk-binary-operations-1.p4.p4info.txtpb | 43 + .../psa-dpdk-binary-operations.p4.entries.txt | 2 - ...sa-dpdk-binary-operations.p4.entries.txtpb | 3 + .../psa-dpdk-binary-operations.p4.p4info.txt | 42 - ...psa-dpdk-binary-operations.p4.p4info.txtpb | 43 + ...sa-dpdk-checksum-arg-header.p4.entries.txt | 2 - ...-dpdk-checksum-arg-header.p4.entries.txtpb | 3 + ...psa-dpdk-checksum-arg-header.p4.p4info.txt | 147 -- ...a-dpdk-checksum-arg-header.p4.p4info.txtpb | 148 ++ .../psa-dpdk-errorcode-1.p4.entries.txt | 2 - .../psa-dpdk-errorcode-1.p4.entries.txtpb | 3 + .../psa-dpdk-errorcode-1.p4.p4info.txt | 42 - .../psa-dpdk-errorcode-1.p4.p4info.txtpb | 43 + .../psa-dpdk-errorcode-2.p4.entries.txt | 2 - .../psa-dpdk-errorcode-2.p4.entries.txtpb | 3 + .../psa-dpdk-errorcode-2.p4.p4info.txt | 42 - .../psa-dpdk-errorcode-2.p4.p4info.txtpb | 43 + .../psa-dpdk-errorcode.p4.entries.txt | 2 - .../psa-dpdk-errorcode.p4.entries.txtpb | 3 + .../psa-dpdk-errorcode.p4.p4info.txt | 42 - .../psa-dpdk-errorcode.p4.p4info.txtpb | 43 + ...a-dpdk-flatten-local-struct.p4.entries.txt | 2 - ...dpdk-flatten-local-struct.p4.entries.txtpb | 3 + ...sa-dpdk-flatten-local-struct.p4.p4info.txt | 52 - ...-dpdk-flatten-local-struct.p4.p4info.txtpb | 53 + ...sa-dpdk-hdr-field-non-align.p4.entries.txt | 2 - ...-dpdk-hdr-field-non-align.p4.entries.txtpb | 3 + ...psa-dpdk-hdr-field-non-align.p4.p4info.txt | 38 - ...a-dpdk-hdr-field-non-align.p4.p4info.txtpb | 39 + ...a-dpdk-header-union-typedef.p4.entries.txt | 2 - ...dpdk-header-union-typedef.p4.entries.txtpb | 3 + ...sa-dpdk-header-union-typedef.p4.p4info.txt | 42 - ...-dpdk-header-union-typedef.p4.p4info.txtpb | 43 + ...sa-dpdk-large-header-fields.p4.entries.txt | 2 - ...-dpdk-large-header-fields.p4.entries.txtpb | 3 + ...psa-dpdk-large-header-fields.p4.p4info.txt | 44 - ...a-dpdk-large-header-fields.p4.p4info.txtpb | 45 + ...sa-dpdk-large-struct-fields.p4.entries.txt | 2 - ...-dpdk-large-struct-fields.p4.entries.txtpb | 3 + ...psa-dpdk-large-struct-fields.p4.p4info.txt | 44 - ...a-dpdk-large-struct-fields.p4.p4info.txtpb | 45 + .../psa-dpdk-lpm-match-err3.p4.entries.txt | 2 - .../psa-dpdk-lpm-match-err3.p4.entries.txtpb | 3 + .../psa-dpdk-lpm-match-err3.p4.p4info.txt | 48 - .../psa-dpdk-lpm-match-err3.p4.p4info.txtpb | 49 + .../psa-dpdk-lpm-match-err4.p4.entries.txt | 2 - .../psa-dpdk-lpm-match-err4.p4.entries.txtpb | 3 + .../psa-dpdk-lpm-match-err4.p4.p4info.txt | 48 - .../psa-dpdk-lpm-match-err4.p4.p4info.txtpb | 49 + .../psa-dpdk-lpm-match-err5.p4.entries.txt | 2 - .../psa-dpdk-lpm-match-err5.p4.entries.txtpb | 3 + .../psa-dpdk-lpm-match-err5.p4.p4info.txt | 54 - .../psa-dpdk-lpm-match-err5.p4.p4info.txtpb | 55 + .../psa-dpdk-lpm-match-valid.p4.entries.txt | 2 - .../psa-dpdk-lpm-match-valid.p4.entries.txtpb | 3 + .../psa-dpdk-lpm-match-valid.p4.p4info.txt | 48 - .../psa-dpdk-lpm-match-valid.p4.p4info.txtpb | 49 + ...-zero-arg-default-action-01.p4.entries.txt | 2 - ...ero-arg-default-action-01.p4.entries.txtpb | 3 + ...n-zero-arg-default-action-01.p4.p4info.txt | 46 - ...zero-arg-default-action-01.p4.p4info.txtpb | 47 + ...-zero-arg-default-action-02.p4.entries.txt | 2 - ...ero-arg-default-action-02.p4.entries.txtpb | 3 + ...n-zero-arg-default-action-02.p4.p4info.txt | 45 - ...zero-arg-default-action-02.p4.p4info.txtpb | 46 + ...-zero-arg-default-action-03.p4.entries.txt | 2 - ...ero-arg-default-action-03.p4.entries.txtpb | 3 + ...n-zero-arg-default-action-03.p4.p4info.txt | 36 - ...zero-arg-default-action-03.p4.p4info.txtpb | 37 + ...-zero-arg-default-action-04.p4.entries.txt | 2 - ...ero-arg-default-action-04.p4.entries.txtpb | 3 + ...n-zero-arg-default-action-04.p4.p4info.txt | 35 - ...zero-arg-default-action-04.p4.p4info.txtpb | 36 + ...-zero-arg-default-action-05.p4.entries.txt | 2 - ...ero-arg-default-action-05.p4.entries.txtpb | 3 + ...n-zero-arg-default-action-05.p4.p4info.txt | 57 - ...zero-arg-default-action-05.p4.p4info.txtpb | 58 + ...-zero-arg-default-action-06.p4.entries.txt | 2 - ...ero-arg-default-action-06.p4.entries.txtpb | 3 + ...n-zero-arg-default-action-06.p4.p4info.txt | 56 - ...zero-arg-default-action-06.p4.p4info.txtpb | 57 + ...-zero-arg-default-action-07.p4.entries.txt | 2 - ...ero-arg-default-action-07.p4.entries.txtpb | 3 + ...n-zero-arg-default-action-07.p4.p4info.txt | 56 - ...zero-arg-default-action-07.p4.p4info.txtpb | 57 + ...-zero-arg-default-action-08.p4.entries.txt | 2 - ...ero-arg-default-action-08.p4.entries.txtpb | 3 + ...n-zero-arg-default-action-08.p4.p4info.txt | 40 - ...zero-arg-default-action-08.p4.p4info.txtpb | 41 + ...-zero-arg-default-action-09.p4.entries.txt | 2 - ...ero-arg-default-action-09.p4.entries.txtpb | 3 + ...n-zero-arg-default-action-09.p4.p4info.txt | 46 - ...zero-arg-default-action-09.p4.p4info.txtpb | 47 + .../psa-dpdk-struct-field.p4.entries.txt | 2 - .../psa-dpdk-struct-field.p4.entries.txtpb | 3 + .../psa-dpdk-struct-field.p4.p4info.txt | 38 - .../psa-dpdk-struct-field.p4.p4info.txtpb | 39 + ...table-entries-exact-ternary.p4.entries.txt | 123 -- ...ble-entries-exact-ternary.p4.entries.txtpb | 124 ++ ...-table-entries-exact-ternary.p4.p4info.txt | 54 - ...able-entries-exact-ternary.p4.p4info.txtpb | 55 + ...able-key-consolidation-if-1.p4.entries.txt | 2 - ...le-key-consolidation-if-1.p4.entries.txtpb | 3 + ...table-key-consolidation-if-1.p4.p4info.txt | 132 -- ...ble-key-consolidation-if-1.p4.p4info.txtpb | 133 ++ ...-table-key-consolidation-if.p4.entries.txt | 2 - ...able-key-consolidation-if.p4.entries.txtpb | 3 + ...k-table-key-consolidation-if.p4.p4info.txt | 96 - ...table-key-consolidation-if.p4.p4info.txtpb | 97 + ...-consolidation-mixed-keys-1.p4.entries.txt | 2 - ...onsolidation-mixed-keys-1.p4.entries.txtpb | 3 + ...y-consolidation-mixed-keys-1.p4.p4info.txt | 60 - ...consolidation-mixed-keys-1.p4.p4info.txtpb | 61 + ...consolidation-mixed-keys-10.p4.entries.txt | 2 - ...nsolidation-mixed-keys-10.p4.entries.txtpb | 3 + ...-consolidation-mixed-keys-10.p4.p4info.txt | 60 - ...onsolidation-mixed-keys-10.p4.p4info.txtpb | 61 + ...-consolidation-mixed-keys-2.p4.entries.txt | 2 - ...onsolidation-mixed-keys-2.p4.entries.txtpb | 3 + ...y-consolidation-mixed-keys-2.p4.p4info.txt | 54 - ...consolidation-mixed-keys-2.p4.p4info.txtpb | 55 + ...-consolidation-mixed-keys-3.p4.entries.txt | 2 - ...onsolidation-mixed-keys-3.p4.entries.txtpb | 3 + ...y-consolidation-mixed-keys-3.p4.p4info.txt | 48 - ...consolidation-mixed-keys-3.p4.p4info.txtpb | 49 + ...-consolidation-mixed-keys-4.p4.entries.txt | 2 - ...onsolidation-mixed-keys-4.p4.entries.txtpb | 3 + ...y-consolidation-mixed-keys-4.p4.p4info.txt | 48 - ...consolidation-mixed-keys-4.p4.p4info.txtpb | 49 + ...-consolidation-mixed-keys-5.p4.entries.txt | 2 - ...onsolidation-mixed-keys-5.p4.entries.txtpb | 3 + ...y-consolidation-mixed-keys-5.p4.p4info.txt | 48 - ...consolidation-mixed-keys-5.p4.p4info.txtpb | 49 + ...-consolidation-mixed-keys-6.p4.entries.txt | 2 - ...onsolidation-mixed-keys-6.p4.entries.txtpb | 3 + ...y-consolidation-mixed-keys-6.p4.p4info.txt | 48 - ...consolidation-mixed-keys-6.p4.p4info.txtpb | 49 + ...-consolidation-mixed-keys-7.p4.entries.txt | 2 - ...onsolidation-mixed-keys-7.p4.entries.txtpb | 3 + ...y-consolidation-mixed-keys-7.p4.p4info.txt | 54 - ...consolidation-mixed-keys-7.p4.p4info.txtpb | 55 + ...-consolidation-mixed-keys-8.p4.entries.txt | 2 - ...onsolidation-mixed-keys-8.p4.entries.txtpb | 3 + ...y-consolidation-mixed-keys-8.p4.p4info.txt | 48 - ...consolidation-mixed-keys-8.p4.p4info.txtpb | 49 + ...-consolidation-mixed-keys-9.p4.entries.txt | 2 - ...onsolidation-mixed-keys-9.p4.entries.txtpb | 3 + ...y-consolidation-mixed-keys-9.p4.p4info.txt | 84 - ...consolidation-mixed-keys-9.p4.p4info.txtpb | 85 + ...ey-consolidation-mixed-keys.p4.entries.txt | 2 - ...-consolidation-mixed-keys.p4.entries.txtpb | 3 + ...key-consolidation-mixed-keys.p4.p4info.txt | 60 - ...y-consolidation-mixed-keys.p4.p4info.txtpb | 61 + ...le-key-consolidation-switch.p4.entries.txt | 2 - ...-key-consolidation-switch.p4.entries.txtpb | 3 + ...ble-key-consolidation-switch.p4.p4info.txt | 90 - ...e-key-consolidation-switch.p4.p4info.txtpb | 91 + .../psa-dpdk-table-key-error-1.p4.entries.txt | 2 - ...sa-dpdk-table-key-error-1.p4.entries.txtpb | 3 + .../psa-dpdk-table-key-error-1.p4.p4info.txt | 90 - ...psa-dpdk-table-key-error-1.p4.p4info.txtpb | 91 + .../psa-dpdk-table-key-error.p4.entries.txt | 2 - .../psa-dpdk-table-key-error.p4.entries.txtpb | 3 + .../psa-dpdk-table-key-error.p4.p4info.txt | 60 - .../psa-dpdk-table-key-error.p4.p4info.txtpb | 61 + ...psa-dpdk-table-key-isValid1.p4.entries.txt | 2 - ...a-dpdk-table-key-isValid1.p4.entries.txtpb | 3 + .../psa-dpdk-table-key-isValid1.p4.p4info.txt | 54 - ...sa-dpdk-table-key-isValid1.p4.p4info.txtpb | 55 + ...psa-dpdk-table-key-isValid2.p4.entries.txt | 2 - ...a-dpdk-table-key-isValid2.p4.entries.txtpb | 3 + .../psa-dpdk-table-key-isValid2.p4.p4info.txt | 54 - ...sa-dpdk-table-key-isValid2.p4.p4info.txtpb | 55 + ...psa-dpdk-table-key-isValid3.p4.entries.txt | 2 - ...a-dpdk-table-key-isValid3.p4.entries.txtpb | 3 + .../psa-dpdk-table-key-isValid3.p4.p4info.txt | 54 - ...sa-dpdk-table-key-isValid3.p4.p4info.txtpb | 55 + ...psa-dpdk-table-key-isValid4.p4.entries.txt | 2 - ...a-dpdk-table-key-isValid4.p4.entries.txtpb | 3 + .../psa-dpdk-table-key-isValid4.p4.p4info.txt | 54 - ...sa-dpdk-table-key-isValid4.p4.p4info.txtpb | 55 + ...psa-dpdk-table-key-isValid5.p4.entries.txt | 2 - ...a-dpdk-table-key-isValid5.p4.entries.txtpb | 3 + .../psa-dpdk-table-key-isValid5.p4.p4info.txt | 54 - ...sa-dpdk-table-key-isValid5.p4.p4info.txtpb | 55 + ...psa-dpdk-table-key-isValid6.p4.entries.txt | 2 - ...a-dpdk-table-key-isValid6.p4.entries.txtpb | 3 + .../psa-dpdk-table-key-isValid6.p4.p4info.txt | 54 - ...sa-dpdk-table-key-isValid6.p4.p4info.txtpb | 55 + ...psa-dpdk-table-key-isValid7.p4.entries.txt | 2 - ...a-dpdk-table-key-isValid7.p4.entries.txtpb | 3 + .../psa-dpdk-table-key-isValid7.p4.p4info.txt | 54 - ...sa-dpdk-table-key-isValid7.p4.p4info.txtpb | 55 + .../psa-dpdk-tmp-mask-align.p4.entries.txt | 2 - .../psa-dpdk-tmp-mask-align.p4.entries.txtpb | 3 + .../psa-dpdk-tmp-mask-align.p4.p4info.txt | 42 - .../psa-dpdk-tmp-mask-align.p4.p4info.txtpb | 43 + .../psa-dpdk-token-too-big.p4.entries.txt | 2 - .../psa-dpdk-token-too-big.p4.entries.txtpb | 3 + .../psa-dpdk-token-too-big.p4.p4info.txt | 152 -- .../psa-dpdk-token-too-big.p4.p4info.txtpb | 153 ++ .../psa-drop-all-bmv2.p4.entries.txt | 2 - .../psa-drop-all-bmv2.p4.entries.txtpb | 3 + .../psa-drop-all-bmv2.p4.p4info.txt | 5 - .../psa-drop-all-bmv2.p4.p4info.txtpb | 6 + ...psa-drop-all-corrected-bmv2.p4.entries.txt | 2 - ...a-drop-all-corrected-bmv2.p4.entries.txtpb | 3 + .../psa-drop-all-corrected-bmv2.p4.p4info.txt | 5 - ...sa-drop-all-corrected-bmv2.p4.p4info.txtpb | 6 + .../p4_16_samples_outputs/psa-drop.p4.spec | 83 - .../psa-e2e-cloning-basic-bmv2.p4.entries.txt | 2 - ...sa-e2e-cloning-basic-bmv2.p4.entries.txtpb | 3 + .../psa-e2e-cloning-basic-bmv2.p4.p4info.txt | 28 - ...psa-e2e-cloning-basic-bmv2.p4.p4info.txtpb | 29 + ...sa-end-of-ingress-test-bmv2.p4.entries.txt | 2 - ...-end-of-ingress-test-bmv2.p4.entries.txtpb | 3 + ...psa-end-of-ingress-test-bmv2.p4.p4info.txt | 22 - ...a-end-of-ingress-test-bmv2.p4.p4info.txtpb | 23 + .../psa-example-counters-bmv2.p4.entries.txt | 2 - ...psa-example-counters-bmv2.p4.entries.txtpb | 3 + .../psa-example-counters-bmv2.p4.p4info.txt | 98 - .../psa-example-counters-bmv2.p4.p4info.txtpb | 99 + .../psa-example-digest-bmv2.p4.entries.txt | 2 - .../psa-example-digest-bmv2.p4.entries.txtpb | 3 + .../psa-example-digest-bmv2.p4.p4info.txt | 200 -- .../psa-example-digest-bmv2.p4.p4info.txtpb | 201 ++ ...ample-dpdk-byte-alignment_1.p4.entries.txt | 2 - ...ple-dpdk-byte-alignment_1.p4.entries.txtpb | 3 + ...xample-dpdk-byte-alignment_1.p4.p4info.txt | 113 - ...mple-dpdk-byte-alignment_1.p4.p4info.txtpb | 114 + ...ample-dpdk-byte-alignment_2.p4.entries.txt | 2 - ...ple-dpdk-byte-alignment_2.p4.entries.txtpb | 3 + ...xample-dpdk-byte-alignment_2.p4.p4info.txt | 113 - ...mple-dpdk-byte-alignment_2.p4.p4info.txtpb | 114 + ...ample-dpdk-byte-alignment_3.p4.entries.txt | 2 - ...ple-dpdk-byte-alignment_3.p4.entries.txtpb | 3 + ...xample-dpdk-byte-alignment_3.p4.p4info.txt | 125 -- ...mple-dpdk-byte-alignment_3.p4.p4info.txtpb | 126 ++ ...psa-example-dpdk-byte-alignment_4.p4-error | 0 ...example-dpdk-byte-alignment_4.p4.bfrt.json | 84 - ...ample-dpdk-byte-alignment_4.p4.entries.txt | 2 - ...ple-dpdk-byte-alignment_4.p4.entries.txtpb | 3 + ...xample-dpdk-byte-alignment_4.p4.p4info.txt | 76 - ...mple-dpdk-byte-alignment_4.p4.p4info.txtpb | 77 + .../psa-example-dpdk-byte-alignment_4.p4.spec | 190 -- ...ample-dpdk-byte-alignment_5.p4.entries.txt | 2 - ...ple-dpdk-byte-alignment_5.p4.entries.txtpb | 3 + ...xample-dpdk-byte-alignment_5.p4.p4info.txt | 113 - ...mple-dpdk-byte-alignment_5.p4.p4info.txtpb | 114 + ...ample-dpdk-byte-alignment_6.p4.entries.txt | 2 - ...ple-dpdk-byte-alignment_6.p4.entries.txtpb | 3 + ...xample-dpdk-byte-alignment_6.p4.p4info.txt | 113 - ...mple-dpdk-byte-alignment_6.p4.p4info.txtpb | 114 + ...ample-dpdk-byte-alignment_7.p4.entries.txt | 2 - ...ple-dpdk-byte-alignment_7.p4.entries.txtpb | 3 + ...xample-dpdk-byte-alignment_7.p4.p4info.txt | 113 - ...mple-dpdk-byte-alignment_7.p4.p4info.txtpb | 114 + ...ample-dpdk-byte-alignment_8.p4.entries.txt | 2 - ...ple-dpdk-byte-alignment_8.p4.entries.txtpb | 3 + ...xample-dpdk-byte-alignment_8.p4.p4info.txt | 113 - ...mple-dpdk-byte-alignment_8.p4.p4info.txtpb | 114 + ...ample-dpdk-byte-alignment_9.p4.entries.txt | 2 - ...ple-dpdk-byte-alignment_9.p4.entries.txtpb | 3 + ...xample-dpdk-byte-alignment_9.p4.p4info.txt | 125 -- ...mple-dpdk-byte-alignment_9.p4.p4info.txtpb | 126 ++ .../psa-example-dpdk-counter.p4.entries.txt | 2 - .../psa-example-dpdk-counter.p4.entries.txtpb | 3 + .../psa-example-dpdk-counter.p4.p4info.txt | 40 - .../psa-example-dpdk-counter.p4.p4info.txtpb | 41 + ...sa-example-dpdk-directmeter.p4.entries.txt | 2 - ...-example-dpdk-directmeter.p4.entries.txtpb | 3 + ...psa-example-dpdk-directmeter.p4.p4info.txt | 54 - ...a-example-dpdk-directmeter.p4.p4info.txtpb | 55 + .../psa-example-dpdk-externs.p4.entries.txt | 2 - .../psa-example-dpdk-externs.p4.entries.txtpb | 3 + .../psa-example-dpdk-externs.p4.p4info.txt | 106 - .../psa-example-dpdk-externs.p4.p4info.txtpb | 107 + ...example-dpdk-local-variable.p4.entries.txt | 2 - ...ample-dpdk-local-variable.p4.entries.txtpb | 3 + ...-example-dpdk-local-variable.p4.p4info.txt | 5 - ...xample-dpdk-local-variable.p4.p4info.txtpb | 6 + ...mple-dpdk-meter-execute-err.p4.entries.txt | 2 - ...le-dpdk-meter-execute-err.p4.entries.txtpb | 3 + ...ample-dpdk-meter-execute-err.p4.p4info.txt | 113 - ...ple-dpdk-meter-execute-err.p4.p4info.txtpb | 114 + .../psa-example-dpdk-meter.p4.entries.txt | 2 - .../psa-example-dpdk-meter.p4.entries.txtpb | 3 + .../psa-example-dpdk-meter.p4.p4info.txt | 58 - .../psa-example-dpdk-meter.p4.p4info.txtpb | 59 + .../psa-example-dpdk-meter1.p4.entries.txt | 2 - .../psa-example-dpdk-meter1.p4.entries.txtpb | 3 + .../psa-example-dpdk-meter1.p4.p4info.txt | 58 - .../psa-example-dpdk-meter1.p4.p4info.txtpb | 59 + ...sa-example-dpdk-varbit-bmv2.p4.entries.txt | 2 - ...-example-dpdk-varbit-bmv2.p4.entries.txtpb | 3 + ...psa-example-dpdk-varbit-bmv2.p4.p4info.txt | 99 - ...a-example-dpdk-varbit-bmv2.p4.p4info.txtpb | 100 + ...xample-incremental-checksum.p4.entries.txt | 2 - ...mple-incremental-checksum.p4.entries.txtpb | 3 + ...example-incremental-checksum.p4.p4info.txt | 76 - ...ample-incremental-checksum.p4.p4info.txtpb | 77 + ...-example-logical-operations.p4.entries.txt | 2 - ...xample-logical-operations.p4.entries.txtpb | 3 + ...a-example-logical-operations.p4.p4info.txt | 42 - ...example-logical-operations.p4.p4info.txtpb | 43 + .../psa-example-mask-range.p4.entries.txt | 2 - .../psa-example-mask-range.p4.entries.txtpb | 3 + .../psa-example-mask-range.p4.p4info.txt | 42 - .../psa-example-mask-range.p4.p4info.txtpb | 43 + .../psa-example-mask-range1.p4.entries.txt | 2 - .../psa-example-mask-range1.p4.entries.txtpb | 3 + .../psa-example-mask-range1.p4.p4info.txt | 42 - .../psa-example-mask-range1.p4.p4info.txtpb | 43 + .../psa-example-optional-match.p4.entries.txt | 2 - ...sa-example-optional-match.p4.entries.txtpb | 3 + .../psa-example-optional-match.p4.p4info.txt | 48 - ...psa-example-optional-match.p4.p4info.txtpb | 49 + .../psa-example-range-match.p4.entries.txt | 2 - .../psa-example-range-match.p4.entries.txtpb | 3 + .../psa-example-range-match.p4.p4info.txt | 48 - .../psa-example-range-match.p4.p4info.txtpb | 49 + .../psa-example-register2-bmv2.p4.entries.txt | 2 - ...sa-example-register2-bmv2.p4.entries.txtpb | 3 + .../psa-example-register2-bmv2.p4.p4info.txt | 41 - ...psa-example-register2-bmv2.p4.p4info.txtpb | 42 + .../psa-example-select_tuple-1.p4.entries.txt | 2 - ...sa-example-select_tuple-1.p4.entries.txtpb | 3 + .../psa-example-select_tuple-1.p4.p4info.txt | 42 - ...psa-example-select_tuple-1.p4.p4info.txtpb | 43 + ...a-example-select_tuple-mask.p4.entries.txt | 2 - ...example-select_tuple-mask.p4.entries.txtpb | 3 + ...sa-example-select_tuple-mask.p4.p4info.txt | 42 - ...-example-select_tuple-mask.p4.p4info.txtpb | 43 + ...psa-example-select_tuple-wc.p4.entries.txt | 2 - ...a-example-select_tuple-wc.p4.entries.txtpb | 3 + .../psa-example-select_tuple-wc.p4.p4info.txt | 42 - ...sa-example-select_tuple-wc.p4.p4info.txtpb | 43 + .../psa-example-select_tuple.p4.entries.txt | 2 - .../psa-example-select_tuple.p4.entries.txtpb | 3 + .../psa-example-select_tuple.p4.p4info.txt | 42 - .../psa-example-select_tuple.p4.p4info.txtpb | 43 + ...e-switch-with-constant-expr.p4.entries.txt | 2 - ...switch-with-constant-expr.p4.entries.txtpb | 3 + ...le-switch-with-constant-expr.p4.p4info.txt | 32 - ...-switch-with-constant-expr.p4.p4info.txtpb | 33 + .../psa-fwd-bmv2.p4.entries.txt | 2 - .../psa-fwd-bmv2.p4.entries.txtpb | 3 + .../psa-fwd-bmv2.p4.p4info.txt | 5 - .../psa-fwd-bmv2.p4.p4info.txtpb | 6 + .../psa-hash-02.p4.entries.txt | 2 - .../psa-hash-02.p4.entries.txtpb | 3 + .../psa-hash-02.p4.p4info.txt | 42 - .../psa-hash-02.p4.p4info.txtpb | 43 + .../psa-hash-03.p4.entries.txt | 2 - .../psa-hash-03.p4.entries.txtpb | 3 + .../psa-hash-03.p4.p4info.txt | 42 - .../psa-hash-03.p4.p4info.txtpb | 43 + .../psa-hash-04.p4.entries.txt | 2 - .../psa-hash-04.p4.entries.txtpb | 3 + .../psa-hash-04.p4.p4info.txt | 42 - .../psa-hash-04.p4.p4info.txtpb | 43 + .../psa-hash-05.p4.entries.txt | 2 - .../psa-hash-05.p4.entries.txtpb | 3 + .../psa-hash-05.p4.p4info.txt | 42 - .../psa-hash-05.p4.p4info.txtpb | 43 + .../psa-hash-06.p4.entries.txt | 2 - .../psa-hash-06.p4.entries.txtpb | 3 + .../psa-hash-06.p4.p4info.txt | 42 - .../psa-hash-06.p4.p4info.txtpb | 43 + .../psa-hash-07.p4.entries.txt | 2 - .../psa-hash-07.p4.entries.txtpb | 3 + .../psa-hash-07.p4.p4info.txt | 42 - .../psa-hash-07.p4.p4info.txtpb | 43 + .../psa-hash-08.p4.entries.txt | 2 - .../psa-hash-08.p4.entries.txtpb | 3 + .../psa-hash-08.p4.p4info.txt | 42 - .../psa-hash-08.p4.p4info.txtpb | 43 + .../psa-hash-09.p4.entries.txt | 2 - .../psa-hash-09.p4.entries.txtpb | 3 + .../psa-hash-09.p4.p4info.txt | 42 - .../psa-hash-09.p4.p4info.txtpb | 43 + .../psa-hash-10.p4.entries.txt | 2 - .../psa-hash-10.p4.entries.txtpb | 3 + .../psa-hash-10.p4.p4info.txt | 42 - .../psa-hash-10.p4.p4info.txtpb | 43 + .../psa-hash.p4.entries.txt | 2 - .../psa-hash.p4.entries.txtpb | 3 + .../psa-hash.p4.p4info.txt | 42 - .../psa-hash.p4.p4info.txtpb | 43 + .../psa-header-stack.p4.entries.txt | 2 - .../psa-header-stack.p4.entries.txtpb | 3 + .../psa-header-stack.p4.p4info.txt | 58 - .../psa-header-stack.p4.p4info.txtpb | 59 + .../psa-i2e-cloning-basic-bmv2.p4.entries.txt | 2 - ...sa-i2e-cloning-basic-bmv2.p4.entries.txtpb | 3 + .../psa-i2e-cloning-basic-bmv2.p4.p4info.txt | 28 - ...psa-i2e-cloning-basic-bmv2.p4.p4info.txtpb | 29 + .../psa-idle-timeout.p4.entries.txt | 2 - .../psa-idle-timeout.p4.entries.txtpb | 3 + .../psa-idle-timeout.p4.p4info.txt | 109 - .../psa-idle-timeout.p4.p4info.txtpb | 110 + .../psa-isvalid.p4.entries.txt | 2 - .../psa-isvalid.p4.entries.txtpb | 3 + .../psa-isvalid.p4.p4info.txt | 32 - .../psa-isvalid.p4.p4info.txtpb | 33 + .../p4_16_samples_outputs/psa-meter1.p4-error | 3 - .../psa-meter1.p4.bfrt.json | 153 -- .../psa-meter1.p4.entries.txt | 2 - .../psa-meter1.p4.entries.txtpb | 3 + .../psa-meter1.p4.p4info.txt | 79 - .../psa-meter1.p4.p4info.txtpb | 80 + .../p4_16_samples_outputs/psa-meter1.p4.spec | 77 - .../psa-meter3.p4.entries.txt | 2 - .../psa-meter3.p4.entries.txtpb | 3 + .../psa-meter3.p4.p4info.txt | 43 - .../psa-meter3.p4.p4info.txtpb | 44 + .../psa-meter4.p4.entries.txt | 2 - .../psa-meter4.p4.entries.txtpb | 3 + .../psa-meter4.p4.p4info.txt | 44 - .../psa-meter4.p4.p4info.txtpb | 45 + .../psa-meter5.p4.entries.txt | 2 - .../psa-meter5.p4.entries.txtpb | 3 + .../psa-meter5.p4.p4info.txt | 44 - .../psa-meter5.p4.p4info.txtpb | 45 + .../psa-meter7-bmv2.p4.entries.txt | 2 - .../psa-meter7-bmv2.p4.entries.txtpb | 3 + .../psa-meter7-bmv2.p4.p4info.txt | 26 - .../psa-meter7-bmv2.p4.p4info.txtpb | 27 + .../psa-multicast-basic-2-bmv2.p4.entries.txt | 2 - ...sa-multicast-basic-2-bmv2.p4.entries.txtpb | 3 + .../psa-multicast-basic-2-bmv2.p4.p4info.txt | 13 - ...psa-multicast-basic-2-bmv2.p4.p4info.txtpb | 14 + .../psa-multicast-basic-bmv2.p4.entries.txt | 2 - .../psa-multicast-basic-bmv2.p4.entries.txtpb | 3 + .../psa-multicast-basic-bmv2.p4.p4info.txt | 13 - .../psa-multicast-basic-bmv2.p4.p4info.txtpb | 14 + ...ticast-basic-corrected-bmv2.p4.entries.txt | 2 - ...cast-basic-corrected-bmv2.p4.entries.txtpb | 3 + ...lticast-basic-corrected-bmv2.p4.p4info.txt | 13 - ...icast-basic-corrected-bmv2.p4.p4info.txtpb | 14 + .../psa-parser-error-test-bmv2.p4.entries.txt | 2 - ...sa-parser-error-test-bmv2.p4.entries.txtpb | 3 + .../psa-parser-error-test-bmv2.p4.p4info.txt | 13 - ...psa-parser-error-test-bmv2.p4.p4info.txtpb | 14 + .../psa-random.p4.entries.txt | 2 - .../psa-random.p4.entries.txtpb | 3 + .../psa-random.p4.p4info.txt | 42 - .../psa-random.p4.p4info.txtpb | 43 + ...sa-recirculate-no-meta-bmv2.p4.entries.txt | 2 - ...-recirculate-no-meta-bmv2.p4.entries.txtpb | 3 + ...psa-recirculate-no-meta-bmv2.p4.p4info.txt | 40 - ...a-recirculate-no-meta-bmv2.p4.p4info.txtpb | 41 + .../psa-register-complex-bmv2.p4.entries.txt | 2 - ...psa-register-complex-bmv2.p4.entries.txtpb | 3 + .../psa-register-complex-bmv2.p4.p4info.txt | 30 - .../psa-register-complex-bmv2.p4.p4info.txtpb | 31 + ...-register-read-write-2-bmv2.p4.entries.txt | 2 - ...egister-read-write-2-bmv2.p4.entries.txtpb | 3 + ...a-register-read-write-2-bmv2.p4.p4info.txt | 30 - ...register-read-write-2-bmv2.p4.p4info.txtpb | 31 + ...sa-register-read-write-bmv2.p4.entries.txt | 2 - ...-register-read-write-bmv2.p4.entries.txtpb | 3 + ...psa-register-read-write-bmv2.p4.p4info.txt | 38 - ...a-register-read-write-bmv2.p4.p4info.txtpb | 39 + .../psa-register1.p4.entries.txt | 2 - .../psa-register1.p4.entries.txtpb | 3 + .../psa-register1.p4.p4info.txt | 62 - .../psa-register1.p4.p4info.txtpb | 63 + .../psa-register2.p4.entries.txt | 2 - .../psa-register2.p4.entries.txtpb | 3 + .../psa-register2.p4.p4info.txt | 62 - .../psa-register2.p4.p4info.txtpb | 63 + .../psa-register3.p4.entries.txt | 2 - .../psa-register3.p4.entries.txtpb | 3 + .../psa-register3.p4.p4info.txt | 62 - .../psa-register3.p4.p4info.txtpb | 63 + .../psa-remove-action-param.p4.spec | 68 - .../psa-remove-header.p4.entries.txt | 2 - .../psa-remove-header.p4.entries.txtpb | 3 + .../psa-remove-header.p4.p4info.txt | 42 - .../psa-remove-header.p4.p4info.txtpb | 43 + .../psa-resubmit-bmv2.p4.entries.txt | 2 - .../psa-resubmit-bmv2.p4.entries.txtpb | 3 + .../psa-resubmit-bmv2.p4.p4info.txt | 13 - .../psa-resubmit-bmv2.p4.p4info.txtpb | 14 + .../psa-subtract-inst1.p4.entries.txt | 2 - .../psa-subtract-inst1.p4.entries.txtpb | 3 + .../psa-subtract-inst1.p4.p4info.txt | 26 - .../psa-subtract-inst1.p4.p4info.txtpb | 27 + ...-expression-without-default.p4.entries.txt | 2 - ...xpression-without-default.p4.entries.txtpb | 3 + ...h-expression-without-default.p4.p4info.txt | 90 - ...expression-without-default.p4.p4info.txtpb | 91 + .../psa-table-hit-miss.p4.entries.txt | 2 - .../psa-table-hit-miss.p4.entries.txtpb | 3 + .../psa-table-hit-miss.p4.p4info.txt | 56 - .../psa-table-hit-miss.p4.p4info.txtpb | 57 + .../psa-test.p4.entries.txt | 2 - .../psa-test.p4.entries.txtpb | 3 + .../psa-test.p4.p4info.txt | 18 - .../psa-test.p4.p4info.txtpb | 19 + ...-top-level-assignments-bmv2.p4.entries.txt | 2 - ...op-level-assignments-bmv2.p4.entries.txtpb | 3 + ...a-top-level-assignments-bmv2.p4.p4info.txt | 5 - ...top-level-assignments-bmv2.p4.p4info.txtpb | 6 + .../psa-unicast-or-drop-bmv2.p4.entries.txt | 2 - .../psa-unicast-or-drop-bmv2.p4.entries.txtpb | 3 + .../psa-unicast-or-drop-bmv2.p4.p4info.txt | 21 - .../psa-unicast-or-drop-bmv2.p4.p4info.txtpb | 22 + ...cast-or-drop-corrected-bmv2.p4.entries.txt | 2 - ...st-or-drop-corrected-bmv2.p4.entries.txtpb | 3 + ...icast-or-drop-corrected-bmv2.p4.p4info.txt | 21 - ...ast-or-drop-corrected-bmv2.p4.p4info.txtpb | 22 + .../psa-variable-index.p4.entries.txt | 2 - .../psa-variable-index.p4.entries.txtpb | 3 + .../psa-variable-index.p4.p4info.txt | 32 - .../psa-variable-index.p4.p4info.txtpb | 33 + .../pvs-bitstring-bmv2.p4.entries.txt | 2 - .../pvs-bitstring-bmv2.p4.entries.txtpb | 3 + .../pvs-bitstring-bmv2.p4.p4info.txt | 57 - .../pvs-bitstring-bmv2.p4.p4info.txtpb | 58 + .../pvs-struct-1-bmv2.p4.entries.txt | 2 - .../pvs-struct-1-bmv2.p4.entries.txtpb | 3 + .../pvs-struct-1-bmv2.p4.p4info.txt | 58 - .../pvs-struct-1-bmv2.p4.p4info.txtpb | 59 + .../pvs-struct-2-bmv2.p4.entries.txt | 2 - .../pvs-struct-2-bmv2.p4.entries.txtpb | 3 + .../pvs-struct-2-bmv2.p4.p4info.txt | 64 - .../pvs-struct-2-bmv2.p4.p4info.txtpb | 65 + .../pvs-struct-3-bmv2.p4.entries.txt | 2 - .../pvs-struct-3-bmv2.p4.entries.txtpb | 3 + .../pvs-struct-3-bmv2.p4.p4info.txt | 76 - .../pvs-struct-3-bmv2.p4.p4info.txtpb | 77 + .../register-serenum-bmv2.p4.entries.txt | 2 - .../register-serenum-bmv2.p4.entries.txtpb | 3 + .../register-serenum-bmv2.p4.p4info.txt | 56 - .../register-serenum-bmv2.p4.p4info.txtpb | 57 + .../runtime-index-2-bmv2.p4.entries.txt | 2 - .../runtime-index-2-bmv2.p4.entries.txtpb | 3 + .../runtime-index-2-bmv2.p4.p4info.txt | 5 - .../runtime-index-2-bmv2.p4.p4info.txtpb | 6 + .../runtime-index-bmv2.p4.entries.txt | 2 - .../runtime-index-bmv2.p4.entries.txtpb | 3 + .../runtime-index-bmv2.p4.p4info.txt | 5 - .../runtime-index-bmv2.p4.p4info.txtpb | 6 + ...e_name_for_table_and_action.p4.entries.txt | 2 - ...name_for_table_and_action.p4.entries.txtpb | 3 + ...me_name_for_table_and_action.p4.p4info.txt | 43 - ..._name_for_table_and_action.p4.p4info.txtpb | 44 + .../saturated-bmv2.p4.entries.txt | 82 - .../saturated-bmv2.p4.entries.txtpb | 83 + .../saturated-bmv2.p4.p4info.txt | 73 - .../saturated-bmv2.p4.p4info.txtpb | 74 + .../scalarmeta-bmv2.p4.entries.txt | 2 - .../scalarmeta-bmv2.p4.entries.txtpb | 3 + .../scalarmeta-bmv2.p4.p4info.txt | 5 - .../scalarmeta-bmv2.p4.p4info.txtpb | 6 + .../simple-actions_ubpf.p4.entries.txt | 2 - .../simple-actions_ubpf.p4.entries.txtpb | 3 + .../simple-actions_ubpf.p4.p4info.txt | 167 -- .../simple-actions_ubpf.p4.p4info.txtpb | 168 ++ .../simple-firewall_ubpf.p4.entries.txt | 2 - .../simple-firewall_ubpf.p4.entries.txtpb | 3 + .../simple-firewall_ubpf.p4.p4info.txt | 58 - .../simple-firewall_ubpf.p4.p4info.txtpb | 59 + .../simplify_slice.p4.entries.txt | 2 - .../simplify_slice.p4.entries.txtpb | 3 + .../simplify_slice.p4.p4info.txt | 22 - .../simplify_slice.p4.p4info.txtpb | 23 + .../slice-def-use.p4.entries.txt | 2 - .../slice-def-use.p4.entries.txtpb | 3 + .../slice-def-use.p4.p4info.txt | 22 - .../slice-def-use.p4.p4info.txtpb | 23 + .../slice-def-use1.p4.entries.txt | 2 - .../slice-def-use1.p4.entries.txtpb | 3 + .../slice-def-use1.p4.p4info.txt | 41 - .../slice-def-use1.p4.p4info.txtpb | 42 + .../stack-bmv2.p4.entries.txt | 2 - .../stack-bmv2.p4.entries.txtpb | 3 + .../stack-bmv2.p4.p4info.txt | 5 - .../stack-bmv2.p4.p4info.txtpb | 6 + .../stack-bvec-bmv2.p4.entries.txt | 2 - .../stack-bvec-bmv2.p4.entries.txtpb | 3 + .../stack-bvec-bmv2.p4.p4info.txt | 5 - .../stack-bvec-bmv2.p4.p4info.txtpb | 6 + .../stack_complex-bmv2.p4.entries.txt | 2 - .../stack_complex-bmv2.p4.entries.txtpb | 3 + .../stack_complex-bmv2.p4.p4info.txt | 26 - .../stack_complex-bmv2.p4.p4info.txtpb | 27 + .../std_meta_inlining.p4.entries.txt | 2 - .../std_meta_inlining.p4.entries.txtpb | 3 + .../std_meta_inlining.p4.p4info.txt | 44 - .../std_meta_inlining.p4.p4info.txtpb | 45 + .../strength3.p4.entries.txt | 2 - .../strength3.p4.entries.txtpb | 3 + .../strength3.p4.p4info.txt | 96 - .../strength3.p4.p4info.txtpb | 97 + .../strength4-bmv2.p4.entries.txt | 2 - .../strength4-bmv2.p4.entries.txtpb | 3 + .../strength4-bmv2.p4.p4info.txt | 5 - .../strength4-bmv2.p4.p4info.txtpb | 6 + .../strength6.p4.entries.txt | 2 - .../strength6.p4.entries.txtpb | 3 + .../strength6.p4.p4info.txt | 66 - .../strength6.p4.p4info.txtpb | 67 + ...uct_assignment_optimization.p4.entries.txt | 2 - ...t_assignment_optimization.p4.entries.txtpb | 3 + ...ruct_assignment_optimization.p4.p4info.txt | 12 - ...ct_assignment_optimization.p4.p4info.txtpb | 13 + ...cture-valued-expr-ok-1-bmv2.p4.entries.txt | 2 - ...ure-valued-expr-ok-1-bmv2.p4.entries.txtpb | 3 + ...ucture-valued-expr-ok-1-bmv2.p4.p4info.txt | 5 - ...ture-valued-expr-ok-1-bmv2.p4.p4info.txtpb | 6 + .../structured_annotations.p4.entries.txt | 2 - .../structured_annotations.p4.entries.txtpb | 3 + .../structured_annotations.p4.p4info.txt | 105 - .../structured_annotations.p4.p4info.txtpb | 106 + ...rser-with-header-stack-bmv2.p4.entries.txt | 2 - ...er-with-header-stack-bmv2.p4.entries.txtpb | 3 + ...arser-with-header-stack-bmv2.p4.p4info.txt | 5 - ...ser-with-header-stack-bmv2.p4.p4info.txtpb | 6 + .../table-entries-exact-bmv2.p4.entries.txt | 50 - .../table-entries-exact-bmv2.p4.entries.txtpb | 51 + .../table-entries-exact-bmv2.p4.p4info.txt | 48 - .../table-entries-exact-bmv2.p4.p4info.txtpb | 49 + ...-entries-exact-ternary-bmv2.p4.entries.txt | 123 -- ...ntries-exact-ternary-bmv2.p4.entries.txtpb | 124 ++ ...e-entries-exact-ternary-bmv2.p4.p4info.txt | 54 - ...entries-exact-ternary-bmv2.p4.p4info.txtpb | 55 + .../table-entries-lpm-bmv2.p4.entries.txt | 70 - .../table-entries-lpm-bmv2.p4.entries.txtpb | 71 + .../table-entries-lpm-bmv2.p4.p4info.txt | 48 - .../table-entries-lpm-bmv2.p4.p4info.txtpb | 49 + ...table-entries-optional-bmv2.p4.entries.txt | 102 - ...ble-entries-optional-bmv2.p4.entries.txtpb | 103 + .../table-entries-optional-bmv2.p4.p4info.txt | 54 - ...able-entries-optional-bmv2.p4.p4info.txtpb | 55 + ...table-entries-priority-bmv2.p4.entries.txt | 80 - ...ble-entries-priority-bmv2.p4.entries.txtpb | 81 + .../table-entries-priority-bmv2.p4.p4info.txt | 48 - ...able-entries-priority-bmv2.p4.p4info.txtpb | 49 + .../table-entries-range-bmv2.p4.entries.txt | 99 - .../table-entries-range-bmv2.p4.entries.txtpb | 100 + .../table-entries-range-bmv2.p4.p4info.txt | 48 - .../table-entries-range-bmv2.p4.p4info.txtpb | 49 + ...table-entries-ser-enum-bmv2.p4.entries.txt | 84 - ...ble-entries-ser-enum-bmv2.p4.entries.txtpb | 85 + .../table-entries-ser-enum-bmv2.p4.p4info.txt | 87 - ...able-entries-ser-enum-bmv2.p4.p4info.txtpb | 88 + .../table-entries-ternary-bmv2.p4.entries.txt | 99 - ...able-entries-ternary-bmv2.p4.entries.txtpb | 100 + .../table-entries-ternary-bmv2.p4.p4info.txt | 48 - ...table-entries-ternary-bmv2.p4.p4info.txtpb | 49 + .../table-entries-valid-bmv2.p4.entries.txt | 62 - .../table-entries-valid-bmv2.p4.entries.txtpb | 63 + .../table-entries-valid-bmv2.p4.p4info.txt | 54 - .../table-entries-valid-bmv2.p4.p4info.txtpb | 55 + .../table-key-serenum-bmv2.p4.entries.txt | 50 - .../table-key-serenum-bmv2.p4.entries.txtpb | 51 + .../table-key-serenum-bmv2.p4.p4info.txt | 87 - .../table-key-serenum-bmv2.p4.p4info.txtpb | 88 + .../ternary2-bmv2.p4.entries.txt | 2 - .../ternary2-bmv2.p4.entries.txtpb | 3 + .../ternary2-bmv2.p4.p4info.txt | 188 -- .../ternary2-bmv2.p4.p4info.txtpb | 189 ++ ...rinvalidargument-error-bmv2.p4.entries.txt | 2 - ...nvalidargument-error-bmv2.p4.entries.txtpb | 3 + ...erinvalidargument-error-bmv2.p4.p4info.txt | 5 - ...invalidargument-error-bmv2.p4.p4info.txtpb | 6 + .../truncate_ubpf.p4.entries.txt | 2 - .../truncate_ubpf.p4.entries.txtpb | 3 + .../truncate_ubpf.p4.p4info.txt | 5 - .../truncate_ubpf.p4.p4info.txtpb | 6 + .../tunneling_ubpf.p4.entries.txt | 2 - .../tunneling_ubpf.p4.entries.txtpb | 3 + .../tunneling_ubpf.p4.p4info.txt | 69 - .../tunneling_ubpf.p4.p4info.txtpb | 70 + .../ubpf_checksum_extern.p4.entries.txt | 2 - .../ubpf_checksum_extern.p4.entries.txtpb | 3 + .../ubpf_checksum_extern.p4.p4info.txt | 5 - .../ubpf_checksum_extern.p4.p4info.txtpb | 6 + .../ubpf_hash_extern.p4.entries.txt | 2 - .../ubpf_hash_extern.p4.entries.txtpb | 3 + .../ubpf_hash_extern.p4.p4info.txt | 5 - .../ubpf_hash_extern.p4.p4info.txtpb | 6 + .../union-bmv2.p4.entries.txt | 2 - .../union-bmv2.p4.entries.txtpb | 3 + .../union-bmv2.p4.p4info.txt | 5 - .../union-bmv2.p4.p4info.txtpb | 6 + .../union-valid-bmv2.p4.entries.txt | 2 - .../union-valid-bmv2.p4.entries.txtpb | 3 + .../union-valid-bmv2.p4.p4info.txt | 31 - .../union-valid-bmv2.p4.p4info.txtpb | 32 + .../union1-bmv2.p4.entries.txt | 2 - .../union1-bmv2.p4.entries.txtpb | 3 + .../union1-bmv2.p4.p4info.txt | 5 - .../union1-bmv2.p4.p4info.txtpb | 6 + .../union2-bmv2.p4.entries.txt | 2 - .../union2-bmv2.p4.entries.txtpb | 3 + .../union2-bmv2.p4.p4info.txt | 5 - .../union2-bmv2.p4.p4info.txtpb | 6 + .../union3-bmv2.p4.entries.txt | 2 - .../union3-bmv2.p4.entries.txtpb | 3 + .../union3-bmv2.p4.p4info.txt | 5 - .../union3-bmv2.p4.p4info.txtpb | 6 + .../union4-bmv2.p4.entries.txt | 2 - .../union4-bmv2.p4.entries.txtpb | 3 + .../union4-bmv2.p4.p4info.txt | 5 - .../union4-bmv2.p4.p4info.txtpb | 6 + .../unused-counter-bmv2.p4.entries.txt | 2 - .../unused-counter-bmv2.p4.entries.txtpb | 3 + .../unused-counter-bmv2.p4.p4info.txt | 43 - .../unused-counter-bmv2.p4.p4info.txtpb | 44 + .../use-priority-as-name.p4.entries.txt | 2 - .../use-priority-as-name.p4.entries.txtpb | 3 + .../use-priority-as-name.p4.p4info.txt | 132 -- .../use-priority-as-name.p4.p4info.txtpb | 133 ++ .../v1model-const-entries-bmv2.p4.entries.txt | 70 - ...1model-const-entries-bmv2.p4.entries.txtpb | 71 + .../v1model-const-entries-bmv2.p4.p4info.txt | 49 - ...v1model-const-entries-bmv2.p4.p4info.txtpb | 50 + ...-digest-containing-ser-enum.p4.entries.txt | 2 - ...igest-containing-ser-enum.p4.entries.txtpb | 3 + ...l-digest-containing-ser-enum.p4.p4info.txt | 281 --- ...digest-containing-ser-enum.p4.p4info.txtpb | 282 +++ .../v1model-digest-custom-type.p4.entries.txt | 2 - ...1model-digest-custom-type.p4.entries.txtpb | 3 + .../v1model-digest-custom-type.p4.p4info.txt | 249 --- ...v1model-digest-custom-type.p4.p4info.txtpb | 250 +++ ...el-p4runtime-enumint-types1.p4.entries.txt | 2 - ...-p4runtime-enumint-types1.p4.entries.txtpb | 3 + ...del-p4runtime-enumint-types1.p4.p4info.txt | 908 -------- ...l-p4runtime-enumint-types1.p4.p4info.txtpb | 909 ++++++++ ...model-p4runtime-most-types1.p4.entries.txt | 2 - ...del-p4runtime-most-types1.p4.entries.txtpb | 3 + ...1model-p4runtime-most-types1.p4.p4info.txt | 908 -------- ...odel-p4runtime-most-types1.p4.p4info.txtpb | 909 ++++++++ .../v1model-special-ops-bmv2.p4.entries.txt | 2 - .../v1model-special-ops-bmv2.p4.entries.txtpb | 3 + .../v1model-special-ops-bmv2.p4.p4info.txt | 243 --- .../v1model-special-ops-bmv2.p4.p4info.txtpb | 244 +++ .../verify-bmv2.p4.entries.txt | 2 - .../verify-bmv2.p4.entries.txtpb | 3 + .../verify-bmv2.p4.p4info.txt | 5 - .../verify-bmv2.p4.p4info.txtpb | 6 + .../verify_disjunction.p4.entries.txt | 2 - .../verify_disjunction.p4.entries.txtpb | 3 + .../verify_disjunction.p4.p4info.txt | 7 - .../verify_disjunction.p4.p4info.txtpb | 8 + .../wrong-warning.p4.entries.txt | 2 - .../wrong-warning.p4.entries.txtpb | 3 + .../wrong-warning.p4.p4info.txt | 5 - .../wrong-warning.p4.p4info.txtpb | 6 + .../x-bmv2.p4.entries.txt | 2 - .../x-bmv2.p4.entries.txtpb | 3 + .../x-bmv2.p4.p4info.txt | 5 - .../x-bmv2.p4.p4info.txtpb | 6 + .../xor_test.p4.entries.txt | 50 - .../xor_test.p4.entries.txtpb | 51 + .../xor_test.p4.p4info.txt | 108 - .../xor_test.p4.p4info.txtpb | 109 + 2727 files changed, 38519 insertions(+), 47584 deletions(-) delete mode 100644 testdata/p4_16_bmv_errors/basic-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/basic1-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/header-not-multiple-of-bytes-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/issue1167-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/issue1672-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/issue1829-1-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/issue1829-2-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/issue1829-3-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/issue376-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/issue383-err-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/issue610-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/issue679-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/loop-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/nested-headers-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/no-externs-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/no-header-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/no-header1-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/no-header2-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/packet_in-bmv2.p4 delete mode 100644 testdata/p4_16_bmv_errors/reused-counter.p4 delete mode 100644 testdata/p4_16_dpdk_errors/pna-add-on-miss-err1.p4 delete mode 100644 testdata/p4_16_dpdk_errors/pna-dpdk-direct-meter-err-1.p4 delete mode 100644 testdata/p4_16_dpdk_errors/pna-dpdk-large-constants.p4 delete mode 100644 testdata/p4_16_dpdk_errors/pna-dpdk-table-key-consolidation-learner-2.p4 delete mode 100644 testdata/p4_16_dpdk_errors/pna-example-ipsec-err1.p4 delete mode 100644 testdata/p4_16_dpdk_errors/pna-example-ipsec-err2.p4 delete mode 100644 testdata/p4_16_dpdk_errors/pna-example-ipsec-err3.p4 delete mode 100644 testdata/p4_16_dpdk_errors/pna-example-ipsec-err4.p4 delete mode 100644 testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err1.p4 delete mode 100644 testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err2.p4 delete mode 100644 testdata/p4_16_dpdk_errors/psa-dpdk-struct-field.p4 delete mode 100644 testdata/p4_16_dpdk_errors/psa-example-mask-range-err.p4 delete mode 100644 testdata/p4_16_dpdk_errors/psa-example-register2-bmv2.p4 delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-add-on-miss-err1.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-add-on-miss-err1.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-dpdk-direct-meter-err-1.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-dpdk-direct-meter-err-1.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-dpdk-large-constants.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-dpdk-large-constants.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-dpdk-table-key-consolidation-learner-2.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-dpdk-table-key-consolidation-learner-2.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err1.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err1.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err2.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err2.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err3.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err4.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err4.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err1.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err1.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err2.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err2.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err3.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err4.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err4.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err1.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err1.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err2.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err2.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/psa-dpdk-struct-field.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/psa-dpdk-struct-field.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/psa-example-mask-range-err.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/psa-example-mask-range-err.p4.bfrt.json delete mode 100644 testdata/p4_16_dpdk_errors_outputs/psa-example-register2-bmv2.p4-error delete mode 100644 testdata/p4_16_dpdk_errors_outputs/psa-example-register2-bmv2.p4.bfrt.json delete mode 100644 testdata/p4_16_ebpf_errors/header_unaligned.p4 delete mode 100644 testdata/p4_16_ebpf_errors_outputs/header_unaligned.p4-stderr delete mode 100644 testdata/p4_16_errors_outputs/dup-param1.p4 delete mode 100644 testdata/p4_16_errors_outputs/dup-param3.p4 delete mode 100644 testdata/p4_16_errors_outputs/function_e-first.p4 delete mode 100644 testdata/p4_16_errors_outputs/generic_e.p4-stderr create mode 100644 testdata/p4_16_errors_outputs/issue-2123_e.p4.entries.txtpb create mode 100644 testdata/p4_16_errors_outputs/issue-2123_e.p4.p4info.txtpb delete mode 100644 testdata/p4_16_errors_outputs/issue1541.p4 delete mode 100644 testdata/p4_16_errors_outputs/issue1724.p4 delete mode 100644 testdata/p4_16_errors_outputs/issue1724.p4-stderr create mode 100644 testdata/p4_16_errors_outputs/issue1777-bmv2.p4.entries.txtpb create mode 100644 testdata/p4_16_errors_outputs/issue1777-bmv2.p4.p4info.txtpb create mode 100644 testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.entries.txtpb create mode 100644 testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb delete mode 100644 testdata/p4_16_errors_outputs/issue1932.p4 create mode 100644 testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4.entries.txtpb create mode 100644 testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4info.txt delete mode 100644 testdata/p4_16_errors_outputs/issue2544_shadowing1_pp.p4 create mode 100644 testdata/p4_16_errors_outputs/issue3299.p4.entries.txtpb create mode 100644 testdata/p4_16_errors_outputs/issue3299.p4.p4info.txtpb create mode 100644 testdata/p4_16_errors_outputs/issue532.p4.entries.txtpb create mode 100644 testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb delete mode 100644 testdata/p4_16_errors_outputs/issue774-2-first.p4 delete mode 100644 testdata/p4_16_errors_outputs/nostart-first.p4 delete mode 100644 testdata/p4_16_errors_outputs/not_bound-frontend.p4 delete mode 100644 testdata/p4_16_errors_outputs/not_bound-midend.p4 delete mode 100644 testdata/p4_16_errors_outputs/not_bound.p4.entries.txt delete mode 100644 testdata/p4_16_errors_outputs/not_bound.p4.p4info.txt delete mode 100644 testdata/p4_16_errors_outputs/push_nonconstant-first.p4 create mode 100644 testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.entries.txtpb create mode 100644 testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb create mode 100644 testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.entries.txtpb create mode 100644 testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_pna_errors/pna-add-on-miss-err.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-1.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-2.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-3.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-4.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-2.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-3.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-4.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-example-addhit.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error1.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-example-mirror-packet-error1.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-example-mirror-packet-error2.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-example-mirror-packet-error3.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-example-miss.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err-1.p4 delete mode 100644 testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err.p4 delete mode 100644 testdata/p4_16_pna_errors/psa-example-dpdk-directmeter-1.p4 delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-add-on-miss-err.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-add-on-miss-err.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-1.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-1.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-2.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-2.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-3.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-3.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-4.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-4.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-2.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-2.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-3.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-3.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-4.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-4.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-addhit.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-addhit.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error1.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error1.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error1.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error1.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error2.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error3.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-miss.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-miss.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err-1.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err-1.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err.p4.bfrt.json delete mode 100644 testdata/p4_16_pna_errors_outputs/psa-example-dpdk-directmeter-1.p4-error delete mode 100644 testdata/p4_16_pna_errors_outputs/psa-example-dpdk-directmeter-1.p4.bfrt.json delete mode 100644 testdata/p4_16_psa_errors/psa-action-profile2.p4 delete mode 100644 testdata/p4_16_psa_errors/psa-counter6.p4 delete mode 100644 testdata/p4_16_psa_errors/psa-example-dpdk-directmeter-err.p4 delete mode 100644 testdata/p4_16_psa_errors/psa-meter6.p4 delete mode 100644 testdata/p4_16_psa_errors_outputs/psa-action-profile2.p4-error delete mode 100644 testdata/p4_16_psa_errors_outputs/psa-action-profile2.p4.bfrt.json delete mode 100644 testdata/p4_16_psa_errors_outputs/psa-counter6.p4-error delete mode 100644 testdata/p4_16_psa_errors_outputs/psa-counter6.p4.bfrt.json delete mode 100644 testdata/p4_16_psa_errors_outputs/psa-example-dpdk-directmeter-err.p4-error delete mode 100644 testdata/p4_16_psa_errors_outputs/psa-example-dpdk-directmeter-err.p4.bfrt.json delete mode 100644 testdata/p4_16_psa_errors_outputs/psa-meter6.p4-error delete mode 100644 testdata/p4_16_psa_errors_outputs/psa-meter6.p4.bfrt.json delete mode 100644 testdata/p4_16_samples_outputs/action-synth.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/action-synth.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action-synth.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/action-synth.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action-two-params.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/action-two-params.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_call_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/action_call_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_profile-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/action_profile-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/advance_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/advance_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/advance_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/advance_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/arith-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/arith1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/arith2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/arith3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/arith4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith5-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/arith5-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/array-copy-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/array-copy-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/array-copy-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/array-copy-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/basic2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/basic2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/bitwise-and.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/bitwise-and.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/bitwise-and.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/bitwise-and.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/checksum1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/checksum1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/checksum2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/checksum2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/checksum2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/checksum2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/checksum3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/checksum3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/checksum3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/checksum3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/concat-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/concat-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test5.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test5.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test5.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test5.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test6.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test6.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/copyprop1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/copyprop1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/crc32-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/crc32-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/csum_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/csum_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/csum_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/csum_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb create mode 100644 testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.entries.txtpb create mode 100644 testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/def-use.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/def-use.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/def-use.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/default_action-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/default_action-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/default_action_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/default_action_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/drop-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/drop-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/empty-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/empty-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/empty-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/empty-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/enum-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/enum-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/enum-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/enum-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/equality-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/equality-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/equality-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/equality-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/extract_for_header_union.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/extract_for_header_union.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/extract_for_header_union.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/extract_for_header_union.p4.p4info.txtpb create mode 100644 testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.entries.txtpb create mode 100644 testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/free-form-annotation.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/free-form-annotation.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/free-form-annotation.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/free-form-annotation.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-first.p4 delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-frontend.p4 delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-midend.p4 delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion.p4 delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion.p4-stderr delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/global_action_after_exit.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/global_action_after_exit.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/global_action_after_exit.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/global_action_after_exit.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/graph-annotationless-key.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/graph-annotationless-key.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hash-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/hash-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hash-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/hash-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hash_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/hash_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hash_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/hash_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hdr_stacks2345.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/hdr_stacks2345.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hdr_stacks2345.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/hdr_stacks2345.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/header-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/header-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/header-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/header-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/header-bool-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/header-bool-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/header-bool-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/header-bool-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/init-entries-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/init-entries-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/inline-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/inline-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/inline1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/inline1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue-2123.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue-2123.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1000-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1000-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1000-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1000-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1001-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1001-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1001-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1001-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1025-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1025-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1025-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1025-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1043-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1043-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1043-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1043-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1049-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1049-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1062-1-bmv2.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/issue1062-1-bmv2.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/issue1079-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1079-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1079-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1079-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1097-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1097-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1097-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1097-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1107.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1107.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1107.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1127-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1127-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1127-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1127-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1193-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1193-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1208-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1208-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1208-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1208-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1210.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1210.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1210.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1210.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1291-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1291-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1291-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1291-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1304.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/issue1304.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/issue1325-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1325-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1325-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1325-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue134-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue134-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue134-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue134-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1352-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1352-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1386.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1386.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1386.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1386.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1406.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1406.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1406.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1406.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1409-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1409-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1409-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1409-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1412-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1412-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1470-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1470-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1470-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1470-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1478-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1478-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1517-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1517-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1517-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1517-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1520-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1520-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1520-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1520-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1524.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1524.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1524.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1524.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1535.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1535.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1535.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1535.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1538.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1538.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1538.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1541.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1541.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1541.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1541.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1544-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1544-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1560-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1560-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1566-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1566-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1566-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1566-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1566.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1566.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1566.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1566.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1595.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1595.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1595.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1607-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1607-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1607-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1607-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1630-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1630-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1642-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1642-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1642-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1642-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1653-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1653-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1653-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1653-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1660-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1660-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1660-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1660-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1670-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1670-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1670-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1670-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1713-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1713-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1739-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1739-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1755-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1755-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1755-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1755-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1765-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1765-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1768-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1768-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1768-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1768-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1781-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1781-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1781-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1781-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1806.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/issue1806.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1814-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1814-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1824-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1824-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1824-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1824-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1834-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1834-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1876.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1876.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1876.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1876.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1879-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1879-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1879-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1879-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1882-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1882-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1882-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1882-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1897-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1897-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1897-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1897-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1955.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1955.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1955.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1955.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1958.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1958.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1958.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1985.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1985.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1985.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1989-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue1989-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2044-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2044-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2104-1.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/issue2104-1.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/issue2104.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/issue2104.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/issue2105.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/issue2105.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/issue2147-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2147-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2147-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2147-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2148.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2148.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2148.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2148.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2153-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2153-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2170-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2170-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2176-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2176-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2176-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2176-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2190.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2190.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2190.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2190.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2201-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2201-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2201-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2201-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2205-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2205-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2205-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2205-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2208.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2208.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2208.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2208.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2213-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2213-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2213-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2213-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2221-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2221-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2221-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2221-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2225-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2225-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2225-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2225-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2248.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2248.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2248.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2248.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2258-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2258-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2261.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2261.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2261.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2261.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2266.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2266.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2266.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2287-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2287-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2287-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2287-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2289.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2289.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2289.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2289.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2291-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2291-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2291-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2291-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2303.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2303.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2303.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2303.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2314.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2314.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2314.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2314.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue232-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue232-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue232-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue232-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2321.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2321.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2321.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2330-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2330-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2330-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2330-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2330.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2330.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2330.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2330.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2343-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2343-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2343-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2343-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2344.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2344.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2344.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2345-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2345-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2345-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2345-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2345-2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2345-2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2345-2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2345-2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2345.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2345.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2345.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2345.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2355.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2355.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2355.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2355.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2356.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2356.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2356.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2356.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2359.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2359.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2359.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2359.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2362-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2362-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2375-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2375-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2383-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2383-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2383-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2383-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2392-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2392-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2392-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2392-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue242.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue242.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue242.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue242.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2465-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2465-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2465-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2465-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2488-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2488-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2488-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2488-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue249.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue249.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue249.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue249.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2495-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2495-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2498-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2498-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2498-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2498-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2614-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2614-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2614-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2614-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2657-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2657-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2657-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2657-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2664-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2664-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2664-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2664-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue270-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue270-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue270-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue270-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2726-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2726-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2726-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2726-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2735-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2735-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2735-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2735-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2735.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2735.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2735.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2735.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue281.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue281.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue281.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue281.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2844-enum.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2844-enum.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2844-enum.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2844-enum.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2890.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/issue2890.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/issue2904.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2904.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2904.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2905-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue2905-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue297-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue297-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue298-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue298-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3001-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3001-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3001-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3001-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3057-2.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/issue3057-2.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/issue3091.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3091.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3091.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3091.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3118-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3118-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3118-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3118-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3225.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3225.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3225.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3225.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue323.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue323.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue323.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue323.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3329-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3329-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3329-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3329-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3374.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3374.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3374.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3394.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3394.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3394.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3394.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3483_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3483_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3488-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3488-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3531.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3531.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3531.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3531.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue355-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue355-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue355-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue355-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3550.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3550.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3550.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue356-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue356-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue356-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue356-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue361-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue361-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue361-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue361-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue364-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue364-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3650.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3650.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3650.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3650.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3702-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue3702-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue3702-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue3702-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue383-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue383-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue4057.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue4057.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue4057.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue4057.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue407-2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue407-2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue407-2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue407-2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue407-3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue407-3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue407-3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue407-3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue414-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue414-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue420.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue420.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue420.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue422.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue422.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue422.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue430-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue430-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue430-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue430-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue447-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue447-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue461-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue461-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue486-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue486-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue496.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue496.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue496.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue496.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue510-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue510-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue510-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue510-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue512.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue512.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue512.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue562-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue562-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue562-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue562-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue635-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue635-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue635-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue635-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue655-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue655-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue655-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue655-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue655.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue655.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue655.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue655.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue677-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue677-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue677-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue677-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue692-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue692-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue692-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue692-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue696-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue696-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue696-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue696-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue737-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue737-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue737-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue737-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue841.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue841.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue841.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue841.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue887.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue887.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue887.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue887.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue891-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue891-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue891-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue891-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue907-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue907-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue907-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue907-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue914-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue914-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue914-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue914-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue949.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue949.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue949.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue955.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue955.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue955.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue955.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue983-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue983-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue986-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue986-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue995-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/issue995-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/issue995-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/issue995-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/key-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/key-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/key1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/key1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/logging-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/logging-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/lookahead_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/lookahead_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/lookahead_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/lookahead_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/lpm_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/lpm_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/metadata_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/metadata_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/multicast-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/multicast-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/mux-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/mux-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/mux-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/mux-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/named_meter_bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/named_meter_bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/nested_if_else.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/nested_if_else.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/nested_if_statement.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/nested_if_statement.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/next-def-use.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/next-def-use.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/next-def-use.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/next-def-use.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/noMatch.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/noMatch.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb create mode 100644 testdata/p4_16_samples_outputs/omec/up4.p4.entries.txtpb create mode 100644 testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/p416-type-use3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/p416-type-use3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-if.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-if.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-if.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-if.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-locals2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-locals2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-pragma.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-pragma.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-pragma.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-pragma.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test10.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test10.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test10.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test10.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test5.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test5.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test5.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test5.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test6.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test6.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test6.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test6.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test7.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test7.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test7.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test7.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test8.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test8.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test8.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test8.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test9.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test9.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test9.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser-unroll-test9.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-t1-cond.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-t1-cond.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test1.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test1.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test2.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test2.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test3.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test3.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test4.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test4.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test5.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test5.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/parser_error-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/parser_error-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/parser_error-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/parser_error-bmv2.p4.p4info.txtpb create mode 100644 testdata/p4_16_samples_outputs/pins/pins_fabric.p4.entries.txtpb create mode 100644 testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb create mode 100644 testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.entries.txtpb create mode 100644 testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb create mode 100644 testdata/p4_16_samples_outputs/pins/pins_wbb.p4.entries.txtpb create mode 100644 testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4-error delete mode 100644 testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4.bfrt.json delete mode 100644 testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4.spec delete mode 100644 testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4-error delete mode 100644 testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4-stderr delete mode 100644 testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4.bfrt.json delete mode 100644 testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4-error delete mode 100644 testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4.bfrt.json delete mode 100644 testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4.spec delete mode 100644 testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4-error delete mode 100644 testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4.bfrt.json delete mode 100644 testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4.spec delete mode 100644 testdata/p4_16_samples_outputs/pred.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/pred.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/pred1.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/pred1.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/pred2.p4.entries.txt delete mode 100644 testdata/p4_16_samples_outputs/pred2.p4.p4info.txt delete mode 100644 testdata/p4_16_samples_outputs/predication_issue.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/predication_issue.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/predication_issue.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/predication_issue.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/predication_issue_1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/predication_issue_1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/predication_issue_1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/predication_issue_1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/predication_issue_2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/predication_issue_2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/predication_issue_2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/predication_issue_2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/predication_issue_3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/predication_issue_3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/predication_issue_3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/predication_issue_3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/predication_issue_4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/predication_issue_4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/predication_issue_4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/predication_issue_4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/proliferation1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/proliferation1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/proliferation1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/proliferation1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-profile1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-profile1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-profile3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-profile3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-profile4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-profile4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector5.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector5.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector6.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector6.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-conditional_operator.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-conditional_operator.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-counter1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-counter1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-counter2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-counter2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-counter3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-counter3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-counter3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-counter3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-counter4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-counter4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-drop.p4.spec delete mode 100644 testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4-error delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.bfrt.json delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.spec delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-mask-range.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-mask-range.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-optional-match.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-optional-match.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-range-match.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-range-match.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-02.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-02.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-03.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-03.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-04.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-04.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-05.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-05.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-06.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-06.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-07.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-07.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-08.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-08.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-09.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-09.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-10.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-10.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-header-stack.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-header-stack.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-idle-timeout.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-idle-timeout.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-isvalid.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-isvalid.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-meter1.p4-error delete mode 100644 testdata/p4_16_samples_outputs/psa-meter1.p4.bfrt.json delete mode 100644 testdata/p4_16_samples_outputs/psa-meter1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-meter1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-meter1.p4.spec delete mode 100644 testdata/p4_16_samples_outputs/psa-meter3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-meter3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-meter4.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-meter4.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-meter5.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-meter5.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-random.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-random.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-random.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-remove-action-param.p4.spec delete mode 100644 testdata/p4_16_samples_outputs/psa-remove-header.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-remove-header.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-test.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-test.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-test.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-test.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-variable-index.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/psa-variable-index.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/saturated-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/saturated-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/simplify_slice.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/simplify_slice.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/simplify_slice.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/simplify_slice.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/slice-def-use.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/slice-def-use.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/slice-def-use.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/slice-def-use.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/slice-def-use1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/slice-def-use1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/stack-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/stack-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/stack-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/stack-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/std_meta_inlining.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/std_meta_inlining.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/strength3.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/strength3.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/strength3.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/strength4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/strength4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/strength4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/strength4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/strength6.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/strength6.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/strength6.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/structured_annotations.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/structured_annotations.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ternary2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/ternary2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/truncate_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/truncate_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/truncate_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/truncate_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/tunneling_ubpf.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/tunneling_ubpf.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/union-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/union-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union-valid-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/union-valid-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union1-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/union1-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union1-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/union1-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union2-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/union2-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union2-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/union2-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union3-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/union3-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union3-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/union3-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union4-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/union4-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/union4-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/union4-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/use-priority-as-name.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/use-priority-as-name.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/verify-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/verify-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/verify-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/verify-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/verify_disjunction.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/verify_disjunction.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/verify_disjunction.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/verify_disjunction.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/wrong-warning.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/wrong-warning.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/wrong-warning.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/wrong-warning.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/x-bmv2.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/x-bmv2.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/x-bmv2.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/x-bmv2.p4.p4info.txtpb delete mode 100644 testdata/p4_16_samples_outputs/xor_test.p4.entries.txt create mode 100644 testdata/p4_16_samples_outputs/xor_test.p4.entries.txtpb delete mode 100644 testdata/p4_16_samples_outputs/xor_test.p4.p4info.txt create mode 100644 testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb diff --git a/testdata/p4_16_bmv_errors/basic-bmv2.p4 b/testdata/p4_16_bmv_errors/basic-bmv2.p4 deleted file mode 100644 index 7e2397b8e95..00000000000 --- a/testdata/p4_16_bmv_errors/basic-bmv2.p4 +++ /dev/null @@ -1,160 +0,0 @@ -#include - -const bit<16> TYPE_IPV4 = 0x800; - -/************************************************************************* -*********************** H E A D E R S *********************************** -*************************************************************************/ - -typedef bit<9> egressSpec_t; -typedef bit<48> macAddr_t; -typedef bit<32> ip4Addr_t; - -header ethernet_t { - macAddr_t dstAddr; - macAddr_t srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - ip4Addr_t srcAddr; - ip4Addr_t dstAddr; -} - -struct metadata { - /* empty */ -} - -struct headers { - ethernet_t ethernet; - ipv4_t ipv4; -} - -/************************************************************************* -*********************** P A R S E R *********************************** -*************************************************************************/ - -parser MyParser(packet_in packet, - out headers hdr, - inout metadata meta, - inout standard_metadata_t standard_metadata) { - - state start { - transition accept; - } -} - - -/************************************************************************* -************ C H E C K S U M V E R I F I C A T I O N ************* -*************************************************************************/ - -control MyVerifyChecksum(inout headers hdr, inout metadata meta) { - apply { } -} - - -/************************************************************************* -************** I N G R E S S P R O C E S S I N G ******************* -*************************************************************************/ - -control MyIngress(inout headers hdr, - inout metadata meta, - inout standard_metadata_t standard_metadata) { - action drop() { - mark_to_drop(standard_metadata); - } - - action ipv4_forward() { - } - - table ipv4_lpm { - key = { - hdr.ipv4.dstAddr: lpm; - hdr.ipv4.srcAddr: lpm; - } - actions = { - ipv4_forward; - drop; - NoAction; - } - size = 1024; - default_action = NoAction(); - } - - apply { - /* TODO: fix ingress control logic - * - ipv4_lpm should be applied only when IPv4 header is valid - */ - ipv4_lpm.apply(); - } -} - -/************************************************************************* -**************** E G R E S S P R O C E S S I N G ******************* -*************************************************************************/ - -control MyEgress(inout headers hdr, - inout metadata meta, - inout standard_metadata_t standard_metadata) { - apply { } -} - -/************************************************************************* -************* C H E C K S U M C O M P U T A T I O N ************** -*************************************************************************/ - -control MyComputeChecksum(inout headers hdr, inout metadata meta) { - apply { - update_checksum( - hdr.ipv4.isValid(), - { hdr.ipv4.version, - hdr.ipv4.ihl, - hdr.ipv4.diffserv, - hdr.ipv4.totalLen, - hdr.ipv4.identification, - hdr.ipv4.flags, - hdr.ipv4.fragOffset, - hdr.ipv4.ttl, - hdr.ipv4.protocol, - hdr.ipv4.srcAddr, - hdr.ipv4.dstAddr }, - hdr.ipv4.hdrChecksum, - HashAlgorithm.csum16); - } -} - - -/************************************************************************* -*********************** D E P A R S E R ******************************* -*************************************************************************/ - -control MyDeparser(packet_out packet, in headers hdr) { - apply { - /* TODO: add deparser logic */ - } -} - -/************************************************************************* -*********************** S W I T C H ******************************* -*************************************************************************/ - -V1Switch( -MyParser(), -MyVerifyChecksum(), -MyIngress(), -MyEgress(), -MyComputeChecksum(), -MyDeparser() -) main; - diff --git a/testdata/p4_16_bmv_errors/basic1-bmv2.p4 b/testdata/p4_16_bmv_errors/basic1-bmv2.p4 deleted file mode 100644 index 1bcdc38b5d7..00000000000 --- a/testdata/p4_16_bmv_errors/basic1-bmv2.p4 +++ /dev/null @@ -1,161 +0,0 @@ -#include - -const bit<16> TYPE_IPV4 = 0x800; - -/************************************************************************* -*********************** H E A D E R S *********************************** -*************************************************************************/ - -typedef bit<9> egressSpec_t; -typedef bit<48> macAddr_t; -typedef bit<32> ip4Addr_t; - -header ethernet_t { - macAddr_t dstAddr; - macAddr_t srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - ip4Addr_t srcAddr; - ip4Addr_t dstAddr; -} - -struct metadata { - /* empty */ -} - -struct headers { - ethernet_t ethernet; - ipv4_t ipv4; -} - -/************************************************************************* -*********************** P A R S E R *********************************** -*************************************************************************/ - -parser MyParser(packet_in packet, - out headers hdr, - inout metadata meta, - inout standard_metadata_t standard_metadata) { - - state start { - transition accept; - } -} - - -/************************************************************************* -************ C H E C K S U M V E R I F I C A T I O N ************* -*************************************************************************/ - -control MyVerifyChecksum(inout headers hdr, inout metadata meta) { - apply { } -} - - -/************************************************************************* -************** I N G R E S S P R O C E S S I N G ******************* -*************************************************************************/ - -control MyIngress(inout headers hdr, - inout metadata meta, - inout standard_metadata_t standard_metadata) { - action drop() { - mark_to_drop(standard_metadata); - } - - action ipv4_forward() { - } - - table ipv4_lpm { - key = { - hdr.ipv4.version: ternary; - hdr.ipv4.dstAddr: lpm; - hdr.ipv4.srcAddr: lpm; - } - actions = { - ipv4_forward; - drop; - NoAction; - } - size = 1024; - default_action = NoAction(); - } - - apply { - /* TODO: fix ingress control logic - * - ipv4_lpm should be applied only when IPv4 header is valid - */ - ipv4_lpm.apply(); - } -} - -/************************************************************************* -**************** E G R E S S P R O C E S S I N G ******************* -*************************************************************************/ - -control MyEgress(inout headers hdr, - inout metadata meta, - inout standard_metadata_t standard_metadata) { - apply { } -} - -/************************************************************************* -************* C H E C K S U M C O M P U T A T I O N ************** -*************************************************************************/ - -control MyComputeChecksum(inout headers hdr, inout metadata meta) { - apply { - update_checksum( - hdr.ipv4.isValid(), - { hdr.ipv4.version, - hdr.ipv4.ihl, - hdr.ipv4.diffserv, - hdr.ipv4.totalLen, - hdr.ipv4.identification, - hdr.ipv4.flags, - hdr.ipv4.fragOffset, - hdr.ipv4.ttl, - hdr.ipv4.protocol, - hdr.ipv4.srcAddr, - hdr.ipv4.dstAddr }, - hdr.ipv4.hdrChecksum, - HashAlgorithm.csum16); - } -} - - -/************************************************************************* -*********************** D E P A R S E R ******************************* -*************************************************************************/ - -control MyDeparser(packet_out packet, in headers hdr) { - apply { - /* TODO: add deparser logic */ - } -} - -/************************************************************************* -*********************** S W I T C H ******************************* -*************************************************************************/ - -V1Switch( -MyParser(), -MyVerifyChecksum(), -MyIngress(), -MyEgress(), -MyComputeChecksum(), -MyDeparser() -) main; - diff --git a/testdata/p4_16_bmv_errors/header-not-multiple-of-bytes-bmv2.p4 b/testdata/p4_16_bmv_errors/header-not-multiple-of-bytes-bmv2.p4 deleted file mode 100644 index c757aac6617..00000000000 --- a/testdata/p4_16_bmv_errors/header-not-multiple-of-bytes-bmv2.p4 +++ /dev/null @@ -1,76 +0,0 @@ -/* -Copyright 2013-present Barefoot Networks, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - -header hdr { - bit<8> e; - bit<16> t; - bit<8> l; - bit<8> r; - bit<1> v; -} - -struct Header_t { - hdr h; -} -struct Meta_t {} - -parser p(packet_in b, out Header_t h, inout Meta_t m, inout standard_metadata_t sm) { - state start { - b.extract(h.h); - transition accept; - } -} - -control vrfy(inout Header_t h, inout Meta_t m) { apply {} } -control update(inout Header_t h, inout Meta_t m) { apply {} } -control egress(inout Header_t h, inout Meta_t m, inout standard_metadata_t sm) { apply {} } -control deparser(packet_out b, in Header_t h) { apply { b.emit(h.h); } } - -control ingress(inout Header_t h, inout Meta_t m, inout standard_metadata_t standard_meta) { - - action a() { standard_meta.egress_spec = 0; } - action a_with_control_params(bit<9> x) { standard_meta.egress_spec = x; } - - table t_lpm { - - key = { - h.h.l : lpm; - } - - actions = { - a; - a_with_control_params; - } - - default_action = a; - - const entries = { - 0x11 &&& 0xF0 : a_with_control_params(11); - 0x12 : a_with_control_params(12); - _ : a_with_control_params(13); - } - } - - apply { - t_lpm.apply(); - } -} - - -V1Switch(p(), vrfy(), ingress(), egress(), update(), deparser()) main; diff --git a/testdata/p4_16_bmv_errors/issue1167-bmv2.p4 b/testdata/p4_16_bmv_errors/issue1167-bmv2.p4 deleted file mode 100644 index 94194c07875..00000000000 --- a/testdata/p4_16_bmv_errors/issue1167-bmv2.p4 +++ /dev/null @@ -1,99 +0,0 @@ -/* -Copyright 2017 Cisco Systems, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - -typedef bit<48> EthernetAddress; - -header Ethernet_h { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -struct Parsed_packet { - Ethernet_h ethernet; -} - -struct mystruct1 { - bit<4> a; - bit<4> b; -} - -enum MeterColor_t {GREEN, YELLOW, RED}; - -control DeparserI(packet_out packet, - in Parsed_packet hdr) { - apply { packet.emit(hdr.ethernet); } -} - -parser parserI(packet_in pkt, - out Parsed_packet hdr, - inout mystruct1 meta, - inout standard_metadata_t stdmeta) { - state start { - pkt.extract(hdr.ethernet); - transition accept; - } -} - -control cIngress(inout Parsed_packet hdr, - inout mystruct1 meta, - inout standard_metadata_t stdmeta) { - direct_meter(MeterType.bytes) my_meter; - MeterColor_t egress_color = MeterColor_t.GREEN; - action foo() { - meta.b = meta.b + 5; - // Uncommenting the following line causes "Compiler Bug" in - // output to go away, but the BMv2 JSON file produced has no - // "read" method call in the definition of the action "foo". - //my_meter.read(egress_color); - } - table guh { - key = { hdr.ethernet.srcAddr : exact; } - actions = { foo; } - default_action = foo; - meters = my_meter; - } - - apply { - guh.apply(); - } -} - -control cEgress(inout Parsed_packet hdr, - inout mystruct1 meta, - inout standard_metadata_t stdmeta) { - apply { } -} - -control vc(inout Parsed_packet hdr, - inout mystruct1 meta) { - apply { } -} - -control uc(inout Parsed_packet hdr, - inout mystruct1 meta) { - apply { } -} - -V1Switch(parserI(), - vc(), - cIngress(), - cEgress(), - uc(), - DeparserI()) main; diff --git a/testdata/p4_16_bmv_errors/issue1672-bmv2.p4 b/testdata/p4_16_bmv_errors/issue1672-bmv2.p4 deleted file mode 100644 index d9127bf5657..00000000000 --- a/testdata/p4_16_bmv_errors/issue1672-bmv2.p4 +++ /dev/null @@ -1,62 +0,0 @@ -#include - -header hdr { - bit<31> f; - bit<1> x; -} - -struct metadata { -} -parser parserI(packet_in pkt, out hdr h, inout metadata meta, - inout standard_metadata_t stdmeta) -{ - state start { - pkt.extract(h); - transition accept; - } -} - -control cIngressI(inout hdr h, inout metadata meta, - inout standard_metadata_t stdmeta) -{ - apply { - hdr tmp; - tmp.x = 0; - h.x = 1; - tmp.f = h.f + 1; - h.f = tmp.f; - h.x = tmp.x; - } -} - -control cEgress(inout hdr h, inout metadata meta, - inout standard_metadata_t stdmeta) -{ - apply { } -} - -control vc(inout hdr h, - inout metadata meta) -{ - apply { } -} - -control uc(inout hdr h, - inout metadata meta) -{ - apply { } -} - -control DeparserI(packet_out packet, in hdr h) -{ - apply { - packet.emit(h); - } -} - -V1Switch(parserI(), -vc(), -cIngressI(), -cEgress(), -uc(), -DeparserI()) main; diff --git a/testdata/p4_16_bmv_errors/issue1829-1-bmv2.p4 b/testdata/p4_16_bmv_errors/issue1829-1-bmv2.p4 deleted file mode 100644 index da4bdd582a0..00000000000 --- a/testdata/p4_16_bmv_errors/issue1829-1-bmv2.p4 +++ /dev/null @@ -1,107 +0,0 @@ -/* -Copyright 2019 Cisco Systems, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -struct headers_t { - ethernet_t ethernet; -} - -struct metadata_t { -} - -parser parserImpl(packet_in packet, - out headers_t hdr, - inout metadata_t meta, - inout standard_metadata_t stdmeta) -{ - state start { - packet.extract(hdr.ethernet); - transition accept; - } -} - -control verifyChecksum(inout headers_t hdr, inout metadata_t meta) { - apply { } -} - -control ingressImpl(inout headers_t hdr, - inout metadata_t meta, - inout standard_metadata_t stdmeta) -{ - bit<2> da_meter_result1; - bit<2> da_meter_result2; - - direct_meter >(MeterType.packets) da_meter; - - action do_meter() { - // Everything looks good when the following line is present. - // The p4c bmv2 simple_switch back end (with latest p4c as of - // 2019-Mar-23) gives 'Compiler Bug' when the following line - // is commented out. - //da_meter.read(da_meter_result1); - } - table mac_da { - key = { - hdr.ethernet.dstAddr: exact; - } - actions = { - do_meter; - } - const default_action = do_meter; - meters = da_meter; - } - - apply { - stdmeta.egress_spec = 1; - mac_da.apply(); - } -} - -control egressImpl(inout headers_t hdr, - inout metadata_t meta, - inout standard_metadata_t stdmeta) -{ - apply { } -} - -control updateChecksum(inout headers_t hdr, inout metadata_t meta) { - apply { } -} - -control deparserImpl(packet_out packet, - in headers_t hdr) -{ - apply { - packet.emit(hdr.ethernet); - } -} - -V1Switch(parserImpl(), - verifyChecksum(), - ingressImpl(), - egressImpl(), - updateChecksum(), - deparserImpl()) main; diff --git a/testdata/p4_16_bmv_errors/issue1829-2-bmv2.p4 b/testdata/p4_16_bmv_errors/issue1829-2-bmv2.p4 deleted file mode 100644 index 5bdaa313cb6..00000000000 --- a/testdata/p4_16_bmv_errors/issue1829-2-bmv2.p4 +++ /dev/null @@ -1,105 +0,0 @@ -/* -Copyright 2019 Cisco Systems, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -struct headers_t { - ethernet_t ethernet; -} - -struct metadata_t { -} - -parser parserImpl(packet_in packet, - out headers_t hdr, - inout metadata_t meta, - inout standard_metadata_t stdmeta) -{ - state start { - packet.extract(hdr.ethernet); - transition accept; - } -} - -control verifyChecksum(inout headers_t hdr, inout metadata_t meta) { - apply { } -} - -control ingressImpl(inout headers_t hdr, - inout metadata_t meta, - inout standard_metadata_t stdmeta) -{ - bit<2> da_meter_result1; - bit<2> da_meter_result2; - - direct_meter >(MeterType.packets) da_meter; - - action do_meter() { - da_meter.read(da_meter_result1); - } - table mac_da { - key = { - hdr.ethernet.dstAddr: exact; - } - actions = { - do_meter; - } - const default_action = do_meter; - // This line is wrong for a direct_meter instance da_meter. - // Causes Compiler Bug with 2019-Mar-23 version of p4c. - counters = da_meter; - } - - apply { - stdmeta.egress_spec = 1; - mac_da.apply(); - } -} - -control egressImpl(inout headers_t hdr, - inout metadata_t meta, - inout standard_metadata_t stdmeta) -{ - apply { } -} - -control updateChecksum(inout headers_t hdr, inout metadata_t meta) { - apply { } -} - -control deparserImpl(packet_out packet, - in headers_t hdr) -{ - apply { - packet.emit(hdr.ethernet); - } -} - -V1Switch(parserImpl(), - verifyChecksum(), - ingressImpl(), - egressImpl(), - updateChecksum(), - deparserImpl()) main; diff --git a/testdata/p4_16_bmv_errors/issue1829-3-bmv2.p4 b/testdata/p4_16_bmv_errors/issue1829-3-bmv2.p4 deleted file mode 100644 index 7c0b797caa2..00000000000 --- a/testdata/p4_16_bmv_errors/issue1829-3-bmv2.p4 +++ /dev/null @@ -1,106 +0,0 @@ -/* -Copyright 2019 Cisco Systems, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -struct headers_t { - ethernet_t ethernet; -} - -struct metadata_t { -} - -parser parserImpl(packet_in packet, - out headers_t hdr, - inout metadata_t meta, - inout standard_metadata_t stdmeta) -{ - state start { - packet.extract(hdr.ethernet); - transition accept; - } -} - -control verifyChecksum(inout headers_t hdr, inout metadata_t meta) { - apply { } -} - -control ingressImpl(inout headers_t hdr, - inout metadata_t meta, - inout standard_metadata_t stdmeta) -{ - bit<2> da_meter_result1; - bit<2> da_meter_result2; - - direct_meter >(MeterType.packets) da_meter; - - action do_meter() { - da_meter.read(da_meter_result1); - } - table mac_da { - key = { - hdr.ethernet.dstAddr: exact; - } - actions = { - do_meter; - } - const default_action = do_meter; - // With the following line uncommented, everything is fine. - // With it commented out, Compiler Bug with 2019-Mar-23 - // version of p4c. - //meters = da_meter; - } - - apply { - stdmeta.egress_spec = 1; - mac_da.apply(); - } -} - -control egressImpl(inout headers_t hdr, - inout metadata_t meta, - inout standard_metadata_t stdmeta) -{ - apply { } -} - -control updateChecksum(inout headers_t hdr, inout metadata_t meta) { - apply { } -} - -control deparserImpl(packet_out packet, - in headers_t hdr) -{ - apply { - packet.emit(hdr.ethernet); - } -} - -V1Switch(parserImpl(), - verifyChecksum(), - ingressImpl(), - egressImpl(), - updateChecksum(), - deparserImpl()) main; diff --git a/testdata/p4_16_bmv_errors/issue376-bmv2.p4 b/testdata/p4_16_bmv_errors/issue376-bmv2.p4 deleted file mode 100644 index 2a9babc34b3..00000000000 --- a/testdata/p4_16_bmv_errors/issue376-bmv2.p4 +++ /dev/null @@ -1,46 +0,0 @@ -/* -Copyright 2017 VMWare, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include "v1model.p4" - -struct headers_t { bit<8> h; } -struct meta_t { bit<8> unused; } - -parser p(packet_in b, out headers_t hdrs, inout meta_t m, inout standard_metadata_t meta) -{ - state start { - b.extract(hdrs); - transition accept; - } -} - -control i(inout headers_t hdrs, inout meta_t m, inout standard_metadata_t meta) { - action a() { meta.egress_spec = 1; } - apply { a(); } -} - -control e(inout headers_t hdrs, inout meta_t m, inout standard_metadata_t meta) { - apply { } -} - -control d1(packet_out packet, in headers_t hdrs) { - apply { packet.emit(hdrs); } -} - -control vc(in headers_t hdrs, inout meta_t meta) { apply { } } -control cc(inout headers_t hdrs, inout meta_t meta) { apply { } } - -V1Switch(p(), vc(), i(), e(), cc(), d1()) main; diff --git a/testdata/p4_16_bmv_errors/issue383-err-bmv2.p4 b/testdata/p4_16_bmv_errors/issue383-err-bmv2.p4 deleted file mode 100644 index cffbb737ff5..00000000000 --- a/testdata/p4_16_bmv_errors/issue383-err-bmv2.p4 +++ /dev/null @@ -1,74 +0,0 @@ -#include - -struct alt_t { - bit<1> valid; - bit<7> port; -}; - -struct row_t { - alt_t alt0; - alt_t alt1; -}; - -struct local_metadata_t { - row_t row; -}; - -struct mac_t -{ - bit<28> lower28Bits; - bit<20> upper20Bits; -} - -struct macDA_t -{ - mac_t macDA; -} - - -struct parsed_packet_t {}; - -parser parse(packet_in pk, out parsed_packet_t h, - inout local_metadata_t local_metadata, - inout standard_metadata_t standard_metadata) { - state start { - transition accept; - } -} - -control ingress(inout parsed_packet_t h, - inout local_metadata_t local_metadata, - inout standard_metadata_t standard_metadata) { - apply { - bit<48> mac; - macDA_t sip; - - sip.macDA = (macDA_t) mac; - mac = (bit<48>) sip.macDA; - - } -} - -control egress(inout parsed_packet_t hdr, - inout local_metadata_t local_metadata, - inout standard_metadata_t standard_metadata) { - apply { } -} - -control deparser(packet_out b, in parsed_packet_t h) { - apply { - } -} - -control verify_checksum(inout parsed_packet_t hdr, - inout local_metadata_t local_metadata) { - apply { } -} - -control compute_checksum(inout parsed_packet_t hdr, - inout local_metadata_t local_metadata) { - apply { } -} - -V1Switch(parse(), verify_checksum(), ingress(), egress(), - compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_bmv_errors/issue610-bmv2.p4 b/testdata/p4_16_bmv_errors/issue610-bmv2.p4 deleted file mode 100644 index 43e8db6d65f..00000000000 --- a/testdata/p4_16_bmv_errors/issue610-bmv2.p4 +++ /dev/null @@ -1,388 +0,0 @@ -/* -*- P4_16 -*- */ - -#include -#include - -/************************************************************************* - *********************** C O N S T A N T S ***************************** - *************************************************************************/ - /* Define the useful global constants for your program */ -const bit<16> ETHERTYPE_VLAN = 0x8100; -const bit<16> ETHERTYPE_IPV4 = 0x0800; -const bit<16> ETHERTYPE_ARP = 0x0806; -const bit<8> IPPROTO_ICMP = 0x01; - -/************************************************************************* - *********************** H E A D E R S ********************************* - *************************************************************************/ - /* Define the headers the program will recognize */ - -/* - * Standard ethernet header - */ -typedef bit<48> mac_addr_t; -typedef bit<32> ipv4_addr_t; -typedef bit<9> port_id_t; - -header ethernet_t { - mac_addr_t dstAddr; - mac_addr_t srcAddr; - bit<16> etherType; -} - -header vlan_tag_t { - bit<3> pri; - bit cfi; - bit<12> vid; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - ipv4_addr_t srcAddr; - ipv4_addr_t dstAddr; -} - -const bit<16> ARP_HTYPE_ETHERNET = 0x0001; -const bit<16> ARP_PTYPE_IPV4 = 0x0800; -const bit<8> ARP_HLEN_ETHERNET = 6; -const bit<8> ARP_PLEN_IPV4 = 4; -const bit<16> ARP_OPER_REQUEST = 1; -const bit<16> ARP_OPER_REPLY = 2; - -header arp_t { - bit<16> htype; - bit<16> ptype; - bit<8> hlen; - bit<8> plen; - bit<16> oper; -} - -header arp_ipv4_t { - mac_addr_t sha; - ipv4_addr_t spa; - mac_addr_t tha; - ipv4_addr_t tpa; -} - -const bit<8> ICMP_ECHO_REQUEST = 8; -const bit<8> ICMP_ECHO_REPLY = 0; - -header icmp_t { - bit<8> type; - bit<8> code; - bit<16> checksum; -} - -header tcp_t { - bit<16> srcPort; - bit<16> dstPort; -} - -header udp_t { - bit<16> srcPort; - bit<16> dstPort; -} - -header_union layer4_t { - icmp_t icmp; - tcp_t tcp; - udp_t udp; -} - -/* Assemble headers in a single struct */ -struct my_headers_t { - ethernet_t ethernet; - vlan_tag_t[2] vlan_tag; - arp_t arp; - arp_ipv4_t arp_ipv4; - ipv4_t ipv4; - icmp_t icmp; -} - - -/************************************************************************* - *********************** M E T A D A T A ******************************* - *************************************************************************/ - /* Define the global metadata for your program */ - -struct my_metadata_t { - ipv4_addr_t dst_ipv4; - mac_addr_t mac_da; - mac_addr_t mac_sa; - port_id_t egress_port; - mac_addr_t my_mac; -} - -/************************************************************************* - *********************** P A R S E R *********************************** - *************************************************************************/ -error { - IPv4_InvalidHeader, - IPv4_ChecksumError -} - -parser MyParser( - packet_in packet, - out my_headers_t hdr, - inout my_metadata_t meta, - inout standard_metadata_t standard_metadata) -{ - Checksum16() ipv4_checksum; - bit<16> ck; - - state start { - packet.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - ETHERTYPE_VLAN : parse_vlan_tag; - ETHERTYPE_IPV4 : parse_ipv4; - ETHERTYPE_ARP : parse_arp; - default : accept; - } - } - - state parse_vlan_tag { - packet.extract(hdr.vlan_tag.next); - transition select(hdr.ethernet.etherType) { - ETHERTYPE_VLAN : parse_vlan_tag; - ETHERTYPE_ARP : parse_arp; - ETHERTYPE_IPV4 : parse_ipv4; - default : accept; - } - } - - state parse_arp { - packet.extract(hdr.arp); - transition select(hdr.arp.htype, hdr.arp.ptype, - hdr.arp.hlen, hdr.arp.plen) { - (ARP_HTYPE_ETHERNET, ARP_PTYPE_IPV4, - ARP_HLEN_ETHERNET, ARP_PLEN_IPV4) : parse_arp_ipv4; - default : accept; - } - } - - state parse_arp_ipv4 { - packet.extract(hdr.arp_ipv4); - meta.dst_ipv4 = hdr.arp_ipv4.tpa; - transition accept; - } - - state parse_ipv4 { - packet.extract(hdr.ipv4); - verify(hdr.ipv4.version == 4, error.IPv4_InvalidHeader); - verify(hdr.ipv4.ihl < 5, error.IPv4_InvalidHeader); - ck = ipv4_checksum.get( - { - hdr.ipv4.version, - hdr.ipv4.ihl, - hdr.ipv4.diffserv, - hdr.ipv4.totalLen, - hdr.ipv4.identification, - hdr.ipv4.flags, - hdr.ipv4.fragOffset, - hdr.ipv4.ttl, - hdr.ipv4.protocol, - hdr.ipv4.srcAddr, - hdr.ipv4.dstAddr - }); - verify(hdr.ipv4.hdrChecksum == ck, error.IPv4_ChecksumError); - - meta.dst_ipv4 = hdr.ipv4.dstAddr; - transition select(hdr.ipv4.protocol) { - IPPROTO_ICMP : parse_icmp; - default : accept; - } - } - - state parse_icmp { - packet.extract(hdr.icmp); - transition accept; - } -} - -/************************************************************************* - ************ C H E C K S U M V E R I F I C A T I O N ************* - *************************************************************************/ -control MyVerifyChecksum( - in my_headers_t hdr, - inout my_metadata_t meta) -{ - apply { } -} - -/************************************************************************* - ************** I N G R E S S P R O C E S S I N G ******************* - *************************************************************************/ -control MyIngress( - inout my_headers_t hdr, - inout my_metadata_t meta, - inout standard_metadata_t standard_metadata) -{ - action drop() { - mark_to_drop(); - exit; - } - - action set_dst_info(mac_addr_t mac_da, - mac_addr_t mac_sa, - port_id_t egress_port) - { - meta.mac_da = mac_da; - meta.mac_sa = mac_sa; - meta.egress_port = egress_port; - } - - table ipv4_lpm { - key = { meta.dst_ipv4 : lpm; } - actions = { set_dst_info; drop; } - default_action = drop(); - } - - action forward_ipv4() { - hdr.ethernet.dstAddr = meta.mac_da; - hdr.ethernet.srcAddr = meta.mac_sa; - hdr.ipv4.ttl = hdr.ipv4.ttl - 1; - - standard_metadata.egress_spec = meta.egress_port; - } - - action send_arp_reply() { - hdr.ethernet.dstAddr = hdr.arp_ipv4.sha; - hdr.ethernet.srcAddr = meta.mac_da; - - hdr.arp.oper = ARP_OPER_REPLY; - - hdr.arp_ipv4.tha = hdr.arp_ipv4.sha; - hdr.arp_ipv4.tpa = hdr.arp_ipv4.spa; - hdr.arp_ipv4.sha = meta.mac_da; - hdr.arp_ipv4.spa = meta.dst_ipv4; - - standard_metadata.egress_spec = standard_metadata.ingress_port; - } - - action send_icmp_reply() { - mac_addr_t tmp_mac; - ipv4_addr_t tmp_ip; - - tmp_mac = hdr.ethernet.dstAddr; - hdr.ethernet.dstAddr = hdr.ethernet.srcAddr; - hdr.ethernet.srcAddr = tmp_mac; - - tmp_ip = hdr.ipv4.dstAddr; - hdr.ipv4.dstAddr = hdr.ipv4.srcAddr; - hdr.ipv4.srcAddr = tmp_ip; - - hdr.icmp.type = ICMP_ECHO_REPLY; - hdr.icmp.checksum = 0; // For now - - standard_metadata.egress_spec = standard_metadata.ingress_port; - } - - table forward { - key = { - hdr.arp.isValid() : exact; - hdr.arp.oper : ternary; - hdr.arp_ipv4.isValid() : exact; - hdr.ipv4.isValid() : exact; - hdr.icmp.isValid() : exact; - hdr.icmp.type : ternary; - } - actions = { - forward_ipv4; - send_arp_reply; - send_icmp_reply; - drop; - } - const default_action = drop(); - const entries = { - ( true, ARP_OPER_REQUEST, true, false, false, _ ) : - send_arp_reply(); - ( false, _, false, true, false, _ ) : - forward_ipv4(); - ( false, _, false, true, true, ICMP_ECHO_REQUEST ) : - send_icmp_reply(); - } - } - - apply { - meta.my_mac = 0x000102030405; - ipv4_lpm.apply(); - forward.apply(); - } -} - -/************************************************************************* - **************** E G R E S S P R O C E S S I N G ******************* - *************************************************************************/ -control MyEgress( - inout my_headers_t hdr, - inout my_metadata_t meta, - inout standard_metadata_t standard_metadata) { - apply { } -} - -/************************************************************************* - ************* C H E C K S U M C O M P U T A T I O N ************** - *************************************************************************/ -control MyComputeChecksum( - inout my_headers_t hdr, - inout my_metadata_t meta) -{ - Checksum16() ipv4_checksum; - - apply { - if (hdr.ipv4.isValid()) { - hdr.ipv4.hdrChecksum = ipv4_checksum.get( - { - hdr.ipv4.version, - hdr.ipv4.ihl, - hdr.ipv4.diffserv, - hdr.ipv4.totalLen, - hdr.ipv4.identification, - hdr.ipv4.flags, - hdr.ipv4.fragOffset, - hdr.ipv4.ttl, - hdr.ipv4.protocol, - hdr.ipv4.srcAddr, - hdr.ipv4.dstAddr - }); - } - } -} - -/************************************************************************* - *********************** D E P A R S E R ******************************* - *************************************************************************/ -control MyDeparser( - packet_out packet, - in my_headers_t hdr) -{ - apply { - packet.emit(hdr.ethernet); - packet.emit(hdr.vlan_tag); - /* ARP Case */ - packet.emit(hdr.arp); - packet.emit(hdr.arp_ipv4); - /* IPv4 case */ - packet.emit(hdr.ipv4); - packet.emit(hdr.icmp); - } -} - -V1Switch( - MyParser(), - MyVerifyChecksum(), - MyIngress(), - MyEgress(), - MyComputeChecksum(), - MyDeparser() -) main; diff --git a/testdata/p4_16_bmv_errors/issue679-bmv2.p4 b/testdata/p4_16_bmv_errors/issue679-bmv2.p4 deleted file mode 100644 index 2874ff91eb1..00000000000 --- a/testdata/p4_16_bmv_errors/issue679-bmv2.p4 +++ /dev/null @@ -1,75 +0,0 @@ -/* -Copyright 2013-present Barefoot Networks, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - -struct H { }; -struct M { - bit<32> hash1; - bit<32> hash2; -} - -parser ParserI(packet_in pk, out H hdr, inout M meta, inout standard_metadata_t smeta) { - state start { transition accept; } -} - -control IngressI(inout H hdr, inout M meta, inout standard_metadata_t smeta) { - - action drop() { mark_to_drop(); } - - action_selector (HashAlgorithm.identity, 32w1024, 32w10) as; - - table indirect_ws { - key = { meta.hash2 : selector; meta.hash1 : selector; } - actions = { drop; NoAction; } - const default_action = NoAction(); - @name("ap_ws") implementation = as; - } - - - table indirect_ws_1 { - key = { meta.hash1 : selector; meta.hash2 : selector; } - actions = { drop; NoAction; } - const default_action = NoAction(); - @name("ap_ws") implementation = as; - } - - apply { - indirect_ws.apply(); - indirect_ws_1.apply(); - } - -}; - -control EgressI(inout H hdr, inout M meta, inout standard_metadata_t smeta) { - apply { } -}; - -control DeparserI(packet_out pk, in H hdr) { - apply { } -} - -control VerifyChecksumI(in H hdr, inout M meta) { - apply { } -} - -control ComputeChecksumI(inout H hdr, inout M meta) { - apply { } -} - -V1Switch(ParserI(), VerifyChecksumI(), IngressI(), EgressI(), - ComputeChecksumI(), DeparserI()) main; diff --git a/testdata/p4_16_bmv_errors/loop-bmv2.p4 b/testdata/p4_16_bmv_errors/loop-bmv2.p4 deleted file mode 100644 index 14ad94be957..00000000000 --- a/testdata/p4_16_bmv_errors/loop-bmv2.p4 +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright 2016 VMware, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include - -header p_t { - bit<8> fst; - bit<8> snd; -} - -struct h { - p_t p; -} - -struct m { } - -parser MyParser(packet_in b, out h hdr, inout m meta, inout standard_metadata_t std) { - state start { - transition accept; - } -} - -control MyVerifyChecksum(in h hdr, inout m meta) { - apply {} -} -control MyIngress(inout h hdr, inout m meta, inout standard_metadata_t std) { - action Nop() { } - table t(inout bit<8> b) { - key = { b : exact; } - actions = { Nop; } - default_action = Nop; - } - apply { - t.apply(hdr.p.fst); - t.apply(hdr.p.snd); - } -} - -control MyEgress(inout h hdr, inout m meta, inout standard_metadata_t std) { - apply { } -} - -control MyComputeChecksum(inout h hdr, inout m meta) { - apply {} -} -control MyDeparser(packet_out b, in h hdr) { - apply { } -} - -V1Switch(MyParser(), MyVerifyChecksum(), MyIngress(), MyEgress(), MyComputeChecksum(), MyDeparser()) main; diff --git a/testdata/p4_16_bmv_errors/nested-headers-bmv2.p4 b/testdata/p4_16_bmv_errors/nested-headers-bmv2.p4 deleted file mode 100644 index 9fa85cac753..00000000000 --- a/testdata/p4_16_bmv_errors/nested-headers-bmv2.p4 +++ /dev/null @@ -1,54 +0,0 @@ -/* -Copyright 2016 VMware, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - -header foo { - bit<8> foo_1; - bit<7> foo_2; - bit<8> foo_3; -} - -header bar { - bit<2> bar_1; -} - -struct baz { - foo baz_1; -} - -struct Headers { - bar a; - baz b; -} - -struct Meta {} - -parser p(packet_in b, out Headers h, inout Meta m, inout standard_metadata_t sm) { - state start { - transition accept; - } -} - -control vrfy(in Headers h, inout Meta m) { apply {} } -control update(inout Headers h, inout Meta m) { apply {} } - -control egress(inout Headers h, inout Meta m, inout standard_metadata_t sm) { apply {} } -control ingress(inout Headers h, inout Meta m, inout standard_metadata_t sm) { apply {} } -control deparser(packet_out b, in Headers h) { apply {} } - -V1Switch(p(), vrfy(), ingress(), egress(), update(), deparser()) main; diff --git a/testdata/p4_16_bmv_errors/no-externs-bmv2.p4 b/testdata/p4_16_bmv_errors/no-externs-bmv2.p4 deleted file mode 100644 index f5865359bb2..00000000000 --- a/testdata/p4_16_bmv_errors/no-externs-bmv2.p4 +++ /dev/null @@ -1,77 +0,0 @@ -/* -Copyright 2016 VMware, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include - -/** Test extern function. Set d <- s. Will cause compilation failure since - * default compilation is without --emit-extern. */ -extern void extern_func(out bit<32> d, bit<32> s); - -header h { - bit<8> n; -} - -struct s_h { - h h; -} - -struct m { - bit<32> mf; -} - -parser MyParser(packet_in b, - out s_h parsedHdr, - inout m meta, - inout standard_metadata_t standard_metadata) { - state start { - b.extract(parsedHdr.h); - transition accept; - } -} - -control MyVerifyChecksum(inout s_h hdr, - inout m meta) { - apply {} - -} -control MyIngress(inout s_h hdr, - inout m meta, - inout standard_metadata_t standard_metadata) { - apply { - extern_func(meta.mf, 32); - } -} -control MyEgress(inout s_h hdr, - inout m meta, - inout standard_metadata_t standard_metadata) { - apply {} -} - -control MyComputeChecksum(inout s_h hdr, - inout m meta) { - apply {} -} - -control MyDeparser(packet_out b, in s_h hdr) { - apply {} -} - -V1Switch(MyParser(), - MyVerifyChecksum(), - MyIngress(), - MyEgress(), - MyComputeChecksum(), - MyDeparser()) main; diff --git a/testdata/p4_16_bmv_errors/no-header-bmv2.p4 b/testdata/p4_16_bmv_errors/no-header-bmv2.p4 deleted file mode 100644 index 585e3b81981..00000000000 --- a/testdata/p4_16_bmv_errors/no-header-bmv2.p4 +++ /dev/null @@ -1,66 +0,0 @@ -/* -Copyright 2016 VMware, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include - -struct h { - bit<8> n; -} - -struct m { -} - -parser MyParser(packet_in b, - out h parsedHdr, - inout m meta, - inout standard_metadata_t standard_metadata) { - state start { - transition accept; - } -} - -control MyVerifyChecksum(in h hdr, - inout m meta, - inout standard_metadata_t standard_metadata) { - apply {} - -} -control MyIngress(inout h hdr, - inout m meta, - inout standard_metadata_t standard_metadata) { - apply {} -} -control MyEgress(inout h hdr, - inout m meta, - inout standard_metadata_t standard_metadata) { - apply {} -} - -control MyComputeChecksum(inout h hdr, - inout m meta, - inout standard_metadata_t standard_metadata) { - apply {} -} -control MyDeparser(packet_out b, in h hdr) { - apply {} -} - -V1Switch(MyParser(), - MyVerifyChecksum(), - MyIngress(), - MyEgress(), - MyComputeChecksum(), - MyDeparser()) main; \ No newline at end of file diff --git a/testdata/p4_16_bmv_errors/no-header1-bmv2.p4 b/testdata/p4_16_bmv_errors/no-header1-bmv2.p4 deleted file mode 100644 index 8c943696f9f..00000000000 --- a/testdata/p4_16_bmv_errors/no-header1-bmv2.p4 +++ /dev/null @@ -1,70 +0,0 @@ -/* -Copyright 2016 VMware, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - -struct H { }; -struct M { }; - -parser ParserI(packet_in b, out H parsedHdr, inout M meta, - inout standard_metadata_t standard_metadata) { - state start { - b.extract(parsedHdr); // illegal data type - transition accept; - } -} - - -control VerifyChecksumI(in H hdr, - inout M meta, - inout standard_metadata_t standard_metadata) { - apply { } -} - - -control IngressI(inout H hdr, - inout M meta, - inout standard_metadata_t standard_metadata) { - apply { } -} - - -control EgressI(inout H hdr, - inout M meta, - inout standard_metadata_t standard_metadata) { - apply { } -} - - -control ComputeChecksumI(inout H hdr, - inout M meta, - inout standard_metadata_t standard_metadata) { - apply { } -} - - -control DeparserI(packet_out b, in H hdr) { - apply { } -} - - -V1Switch(ParserI(), - VerifyChecksumI(), - IngressI(), - EgressI(), - ComputeChecksumI(), - DeparserI()) main; diff --git a/testdata/p4_16_bmv_errors/no-header2-bmv2.p4 b/testdata/p4_16_bmv_errors/no-header2-bmv2.p4 deleted file mode 100644 index 2a9ccf5bc7a..00000000000 --- a/testdata/p4_16_bmv_errors/no-header2-bmv2.p4 +++ /dev/null @@ -1,69 +0,0 @@ -/* -Copyright 2016 VMware, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - -struct H { bit<32> x; }; -struct M { }; - -parser ParserI(packet_in b, out H parsedHdr, inout M meta, - inout standard_metadata_t standard_metadata) { - state start { - transition accept; - } -} - - -control VerifyChecksumI(in H hdr, - inout M meta) { - apply { } -} - - -control IngressI(inout H hdr, - inout M meta, - inout standard_metadata_t standard_metadata) { - apply { } -} - - -control EgressI(inout H hdr, - inout M meta, - inout standard_metadata_t standard_metadata) { - apply { } -} - - -control ComputeChecksumI(inout H hdr, - inout M meta) { - apply { } -} - - -control DeparserI(packet_out b, in H hdr) { - apply { - b.emit(hdr); // illegal data type - } -} - - -V1Switch(ParserI(), - VerifyChecksumI(), - IngressI(), - EgressI(), - ComputeChecksumI(), - DeparserI()) main; diff --git a/testdata/p4_16_bmv_errors/packet_in-bmv2.p4 b/testdata/p4_16_bmv_errors/packet_in-bmv2.p4 deleted file mode 100644 index da26d584beb..00000000000 --- a/testdata/p4_16_bmv_errors/packet_in-bmv2.p4 +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2016 VMware, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include - -header H { - bit<32> f; -} - -control c() { - packet_in() p; - H h; - - apply { - p.extract(h); - } -} - -control proto(); -package top(proto _p); - -top(c()) main; diff --git a/testdata/p4_16_bmv_errors/reused-counter.p4 b/testdata/p4_16_bmv_errors/reused-counter.p4 deleted file mode 100644 index 0ff707d8fcd..00000000000 --- a/testdata/p4_16_bmv_errors/reused-counter.p4 +++ /dev/null @@ -1,66 +0,0 @@ -/* -Copyright 2017 VMWare, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - -header hdr { - bit<32> a; -} - -struct Headers { - hdr h; -} - -struct Meta {} - -parser p(packet_in b, out Headers h, - inout Meta m, inout standard_metadata_t sm) { - state start { - b.extract(h.h); - transition accept; - } -} - -control vrfy(in Headers h, inout Meta m) { apply {} } -control update(inout Headers h, inout Meta m) { apply {} } - -control egress(inout Headers h, inout Meta m, inout standard_metadata_t sm) { - apply {} -} - -control deparser(packet_out b, in Headers h) { - apply { b.emit(h.h); } -} - -control ingress(inout Headers h, inout Meta m, inout standard_metadata_t sm) { - direct_counter(CounterType.packets) c; - - action my_action(bit<32> a) { sm.egress_spec = a; } - table t1 { - actions = { my_action; } - const default_action = my_action(0); - counters = c; - } - table t2 { - actions = { my_action; } - const default_action = my_action(0); - counters = c; - } - apply { t1.apply(); t2.apply(); } -} - -V1Switch(p(), vrfy(), ingress(), egress(), update(), deparser()) main; 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 deleted file mode 100644 index 1b4476296aa..00000000000 --- a/testdata/p4_16_dpdk_errors/pna-add-on-miss-err1.p4 +++ /dev/null @@ -1,202 +0,0 @@ -/* -Copyright 2022 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include "pna.p4" - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - -// BEGIN:Counter_Example_Part1 -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; - -const bit<32> NUM_PORTS = 4; -// END:Counter_Example_Part1 - - -////////////////////////////////////////////////////////////////////// -// Struct types for holding user-defined collections of headers and -// metadata in the P4 developer's program. -// -// Note: The names of these struct types are completely up to the P4 -// developer, as are their member fields, with the only restriction -// being that the structs intended to contain headers should only -// contain members whose types are header, header stack, or -// header_union. -////////////////////////////////////////////////////////////////////// - -struct main_metadata_t { - // empty for this skeleton - ExpireTimeProfileId_t timeout; -} - -// User-defined struct containing all of those headers parsed in the -// main parser. -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - // Note: This program does not demonstrate all of the code - // that would be necessary if you were implementing IPsec - // packet decryption. - - // If it did, then this pre control implementation would do - // one or more table lookups in order to determine whether the - // packet was IPsec encapsulated, and if so, whether it is - // part of a security association that was established by the - // control plane software. - - // It would also likely perform anti-replay attack detection - // on the IPsec sequence number, which is in the unencrypted - // part of the packet. - - // Any headers parsed by the pre parser in pre_hdr will be - // forgotten after this point. The main parser will start - // parsing over from the beginning, either on the same packet - // if the inline extern block did nothing, or on the packet as - // modified by the inline extern block. - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -// BEGIN:Counter_Example_Part2 -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action next_hop(PortId_t vport) { - send_to_port(vport); - } - action add_on_miss_action() { - bit<32> tmp = 0; - add_entry(action_name="next_hop", action_params = tmp, expire_time_profile_id = user_meta.timeout); - } - table ipv4_da { - key = { - hdr.ipv4.dstAddr: exact; - hdr.ipv4.srcAddr: ternary; - } - actions = { - @tableonly next_hop; - @defaultonly add_on_miss_action; - } - add_on_miss = true; - const default_action = add_on_miss_action; - } - action next_hop2(PortId_t vport, bit<32> newAddr) { - send_to_port(vport); - hdr.ipv4.srcAddr = newAddr; - } - action add_on_miss_action2() { - add_entry(action_name="next_hop2", action_params = {32w0, 32w1234}, expire_time_profile_id = user_meta.timeout); - } - table ipv4_da2 { - key = { - hdr.ipv4.dstAddr: exact; - } - actions = { - @tableonly next_hop2; - @defaultonly add_on_miss_action2; - } - add_on_miss = true; - const default_action = add_on_miss_action2; - } - apply { - if (hdr.ipv4.isValid()) { - ipv4_da.apply(); - ipv4_da2.apply(); - } - } -} -// END:Counter_Example_Part2 - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - // Hoping to make this optional parameter later, but not supported - // by p4c yet. - //, PreParserImpl() - ) main; -// END:Package_Instantiation_Example diff --git a/testdata/p4_16_dpdk_errors/pna-dpdk-direct-meter-err-1.p4 b/testdata/p4_16_dpdk_errors/pna-dpdk-direct-meter-err-1.p4 deleted file mode 100644 index c2b8199a5d4..00000000000 --- a/testdata/p4_16_dpdk_errors/pna-dpdk-direct-meter-err-1.p4 +++ /dev/null @@ -1,155 +0,0 @@ -#include -#include - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - -// BEGIN:Counter_Example_Part1 -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; - -const bit<32> NUM_PORTS = 512; -// END:Counter_Example_Part1 - -struct main_metadata_t { - bit<32> port_out; - bit<32> port_out1; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -// BEGIN:Counter_Example_Part2 -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - PNA_MeterColor_t color_out; - PNA_MeterColor_t out1; - PNA_MeterColor_t color_in = PNA_MeterColor_t.RED; - DirectMeter(PNA_MeterType_t.BYTES) meter0; - DirectMeter(PNA_MeterType_t.BYTES) meter1; - - action next_hop(PortId_t oport) { - out1 = meter0.dpdk_execute(color_in, 32w1024); - user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - color_out = meter1.dpdk_execute(color_in, 32w1024); - user_meta.port_out1 = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - send_to_port(oport); - } - - action default_route_drop() { - out1 = meter0.dpdk_execute(color_in, 32w1024); - user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - drop_packet(); - } - - table ipv4_da { - key = { hdr.ipv4.dstAddr: exact; } - actions = { - next_hop; - default_route_drop; - } - default_action = default_route_drop; - // table ipv4_da owns this DirectCounter instance - pna_direct_meter = meter0; - } - - table ipv4_da_lpm { - key = { hdr.ipv4.dstAddr: lpm; } - actions = { - next_hop; - default_route_drop; - } - default_action = default_route_drop; - // table ipv4_da_lpm owns this DirectCounter instance - pna_direct_meter = meter1; - } - apply { - if (hdr.ipv4.isValid()) { - color_out = meter1.dpdk_execute(color_in, 32w1024); - user_meta.port_out1 = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - ipv4_da_lpm.apply(); - ipv4_da.apply(); - } - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - ) main; -// END:Package_Instantiation_Example diff --git a/testdata/p4_16_dpdk_errors/pna-dpdk-large-constants.p4 b/testdata/p4_16_dpdk_errors/pna-dpdk-large-constants.p4 deleted file mode 100644 index 2c39eefba41..00000000000 --- a/testdata/p4_16_dpdk_errors/pna-dpdk-large-constants.p4 +++ /dev/null @@ -1,196 +0,0 @@ -#include -#include - -typedef bit<48> EthernetAddress; -typedef bit<32> IPv4Address; - -// standard Ethernet header -header Ethernet_h -{ - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -// IPv4 header without options -header IPv4_h { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - IPv4Address srcAddr; - IPv4Address dstAddr; -} - -header IPv6_h { - bit<4> version; - bit<8> trafficClass; - bit<20> flowLabel; - bit<16> payloadLen; - bit<8> nextHdr; - bit<8> hopLimit; - bit<128> srcAddr; - bit<128> dstAddr; -} - -header mpls_h { - bit<20> label; - bit<3> tc; - bit<1> stack; - bit<8> ttl; -} - -struct headers_t -{ - Ethernet_h ethernet; - mpls_h mpls; - IPv4_h ipv4; - IPv6_h ipv6; -} - -struct main_metadata_t {} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -parser MainParserImpl( - packet_in p, - out headers_t headers, - inout main_metadata_t meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - p.extract(headers.ethernet); - transition select(headers.ethernet.etherType) { - 16w0x800 : ipv4; - 0x86DD : ipv6; - 0x8847 : mpls; - default : reject; - } - } - - state mpls { - p.extract(headers.mpls); - transition ipv4; - } - - state ipv4 { - p.extract(headers.ipv4); - transition accept; - } - - state ipv6 { - p.extract(headers.ipv6); - transition accept; - } - -} - -// BEGIN:Counter_Example_Part2 -control MainControlImpl( - inout headers_t headers, // from main parser - inout main_metadata_t meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - bit<128> tmp = 128w0x123456789abcdef12345678; - bit<32> tmp1; - action Reject() { - drop_packet(); - } - - action ipv6_modify_dstAddr(bit<32> dstAddr) { - headers.ipv6.dstAddr = (bit<128>)dstAddr; - tmp1 = (bit<32>)headers.ipv6.srcAddr; - } - - action ipv6_swap_addr() { - headers.ipv6.dstAddr = headers.ipv6.srcAddr; - headers.ipv6.srcAddr = tmp; - } - - action set_flowlabel(bit<20> label) { - headers.ipv6.flowLabel = label; - } - - action set_traffic_class(bit<8> trafficClass) { - headers.ipv6.trafficClass = trafficClass; - } - - action set_traffic_class_flow_label(bit<8> trafficClass, bit<20> label) { - headers.ipv6.trafficClass = trafficClass; - headers.ipv6.flowLabel = label; - headers.ipv6.srcAddr = (bit<128>)tmp1; - } - - action set_ipv6_version(bit<4> version) { - headers.ipv6.version = version; - } - - action set_next_hdr(bit<8> nextHdr) { - headers.ipv6.nextHdr = nextHdr; - } - - action set_hop_limit(bit<8> hopLimit) { - headers.ipv6.hopLimit = hopLimit; - } - - table filter_tbl { - key = { - headers.ipv6.srcAddr : exact; - } - actions = { - ipv6_modify_dstAddr; - ipv6_swap_addr; - set_flowlabel; - set_traffic_class_flow_label; - set_ipv6_version; - set_next_hdr; - set_hop_limit; - Reject; - NoAction; - } - } - - apply { - filter_tbl.apply(); - } -} - -control MainDeparserImpl( - packet_out packet, - in headers_t headers, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - packet.emit(headers.ethernet); - packet.emit(headers.mpls); - packet.emit(headers.ipv6); - packet.emit(headers.ipv4); - } -} -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - // Hoping to make this optional parameter later, but not supported - // by p4c yet. - //, PreParserImpl() - ) main; -// END:Package_Instantiation_Example 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 deleted file mode 100644 index 1e667bf6f1e..00000000000 --- a/testdata/p4_16_dpdk_errors/pna-dpdk-table-key-consolidation-learner-2.p4 +++ /dev/null @@ -1,184 +0,0 @@ -/* -Copyright 2020 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include "pna.p4" - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - -// BEGIN:Counter_Example_Part1 -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; - -const bit<32> NUM_PORTS = 4; -// END:Counter_Example_Part1 - - -////////////////////////////////////////////////////////////////////// -// Struct types for holding user-defined collections of headers and -// metadata in the P4 developer's program. -// -// Note: The names of these struct types are completely up to the P4 -// developer, as are their member fields, with the only restriction -// being that the structs intended to contain headers should only -// contain members whose types are header, header stack, or -// header_union. -////////////////////////////////////////////////////////////////////// - -struct main_metadata_t { - // empty for this skeleton - ExpireTimeProfileId_t timeout; - bit<32> meta; -} - -// User-defined struct containing all of those headers parsed in the -// main parser. -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -// BEGIN:Counter_Example_Part2 -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action next_hop(PortId_t vport) { - send_to_port(vport); - } - action add_on_miss_action() { - bit<32> tmp = 0; - add_entry(action_name="next_hop", action_params = tmp, expire_time_profile_id = user_meta.timeout); - } - table ipv4_da { - key = { - hdr.ipv4.dstAddr: exact; - user_meta.meta : lpm; - } - actions = { - @tableonly next_hop; - @defaultonly add_on_miss_action; - } - add_on_miss = true; - const default_action = add_on_miss_action; - } - action next_hop2(PortId_t vport, bit<32> newAddr) { - send_to_port(vport); - hdr.ipv4.srcAddr = newAddr; - } - action add_on_miss_action2() { - add_entry(action_name="next_hop2", action_params = {32w0, 32w1234}, expire_time_profile_id = user_meta.timeout); - } - table ipv4_da2 { - key = { - hdr.ipv4.dstAddr: exact; - } - actions = { - @tableonly next_hop2; - @defaultonly add_on_miss_action2; - } - add_on_miss = true; - const default_action = add_on_miss_action2; - } - apply { - if (hdr.ipv4.isValid()) { - ipv4_da.apply(); - ipv4_da2.apply(); - } - } -} -// END:Counter_Example_Part2 - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - // Hoping to make this optional parameter later, but not supported - // by p4c yet. - //, PreParserImpl() - ) main; -// END:Package_Instantiation_Example diff --git a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err1.p4 b/testdata/p4_16_dpdk_errors/pna-example-ipsec-err1.p4 deleted file mode 100644 index 0836da47b06..00000000000 --- a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err1.p4 +++ /dev/null @@ -1,288 +0,0 @@ -/* -Copyright 2023 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - - -#define inbound(meta) (istd.direction == PNA_Direction_t.NET_TO_HOST) -#define outbound(meta) (istd.direction == PNA_Direction_t.HOST_TO_NET) - -// -// Packet headers. -// -header ethernet_t { - bit<48> dst_addr; - bit<48> src_addr; - bit<16> ether_type; -} - -#define ETHERNET_ETHERTYPE_IPV4 0x0800 - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<6> dscp; - bit<2> ecn; - bit<16> total_length; - bit<16> identification; - bit<3> flags; - bit<13> fragment_offset; - bit<8> ttl; - bit<8> protocol; - bit<16> header_checksum; - bit<32> src_addr; - bit<32> dst_addr; -} - -#define IP_PROTOCOL_ESP 0x32 - -header esp_t { - bit<32> spi; - bit<32> seq; -} - -header platform_hdr_t { - bit<32> my_hdr1; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; - esp_t esp; -} - -// -// Packet metadata. -// -struct metadata_t { - bit<32> next_hop_id; -} - -// -// Extern objects. -// -ipsec_accelerator() ipsec; - -// -// Parser. -// -parser MainParserImpl( - packet_in pkt, - out headers_t hdrs, - inout metadata_t meta, - in pna_main_parser_input_metadata_t istd) -{ - bool from_ipsec; - ipsec_status status; - - state start { - from_ipsec = ipsec.from_ipsec(status); - transition select(from_ipsec) { - true : parse_ipv4; - default : parse_ethernet; - } - } - - state parse_ethernet { - pkt.extract(hdrs.ethernet); - transition select(hdrs.ethernet.ether_type) { - ETHERNET_ETHERTYPE_IPV4 : parse_ipv4; - default : accept; - } - } - - state parse_ipv4 { - pkt.extract(hdrs.ipv4); - transition select(hdrs.ipv4.protocol) { - IP_PROTOCOL_ESP : parse_esp; - default : accept; - } - } - - state parse_esp { - pkt.extract(hdrs.esp); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -// -// Control block. -// -control MainControlImpl( - inout headers_t hdrs, - inout metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - - action ipsec_enable(bit<32> sa_index) { - ipsec.enable(); - ipsec.set_sa_index>(sa_index); - hdrs.ethernet.setInvalid(); - } - - action ipsec_bypass() { - ipsec.disable(); - } - - action drop() { - drop_packet(); - } - - table inbound_table { - key = { - hdrs.ipv4.src_addr : exact; - hdrs.ipv4.dst_addr : exact; - hdrs.esp.spi : exact; - } - - actions = { - ipsec_enable; - ipsec_bypass; - drop; - } - - const default_action = drop; - } - - table outbound_table { - key = { - hdrs.ipv4.src_addr : exact; - hdrs.ipv4.dst_addr : exact; - } - - actions = { - ipsec_enable; - ipsec_bypass; - drop; - } - - default_action = ipsec_bypass(); - } - - action next_hop_id_set(bit<32> next_hop_id) { - meta.next_hop_id = next_hop_id; - } - - table routing_table { - key = { - hdrs.ipv4.dst_addr : lpm; - } - - actions = { - next_hop_id_set; - drop; - } - - default_action = next_hop_id_set(0); - } - - action next_hop_set(bit<48> dst_addr, bit<48> src_addr, bit<16> ether_type, bit<32> port_id) { - hdrs.ethernet.setValid(); - hdrs.ethernet.dst_addr = dst_addr; - hdrs.ethernet.src_addr = src_addr; - hdrs.ethernet.ether_type = ether_type; - send_to_port((PortId_t)port_id); - } - - table next_hop_table { - key = { - meta.next_hop_id : exact; - } - - actions = { - next_hop_set; - drop; - } - - default_action = drop; - } - - apply { - if (inbound(meta)) { - ipsec_status status; - - if (!ipsec.from_ipsec(status)) { - // Pre-decrypt processing. - if (hdrs.ipv4.isValid()) { - if (hdrs.esp.isValid() ) { - inbound_table.apply(); - } - - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } else { - // Post-decrypt processing. - if (status == ipsec_status.IPSEC_SUCCESS) { - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } - } else { - ipsec_status status; - - if (!ipsec.from_ipsec(status)) { - // Pre-encrypt processing. - if (hdrs.ipv4.isValid()) { - outbound_table.apply(); - } else - drop_packet(); - } else { - // Post-encrypt processing. - if (status == ipsec_status.IPSEC_SUCCESS) { - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } - } - } -} - -// -// Deparser. -// -control MainDeparserImpl( - packet_out pkt, - in headers_t hdrs, - in metadata_t meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdrs.ethernet); - pkt.emit(hdrs.ipv4); - pkt.emit(hdrs.esp); - } -} - -// -// Package. -// -PNA_NIC(MainParserImpl(), PreControlImpl(), MainControlImpl(), MainDeparserImpl()) main; diff --git a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err2.p4 b/testdata/p4_16_dpdk_errors/pna-example-ipsec-err2.p4 deleted file mode 100644 index e1bda36a564..00000000000 --- a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err2.p4 +++ /dev/null @@ -1,288 +0,0 @@ -/* -Copyright 2023 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - - -#define inbound(meta) (istd.direction == PNA_Direction_t.NET_TO_HOST) -#define outbound(meta) (istd.direction == PNA_Direction_t.HOST_TO_NET) - -// -// Packet headers. -// -header ethernet_t { - bit<48> dst_addr; - bit<48> src_addr; - bit<16> ether_type; -} - -#define ETHERNET_ETHERTYPE_IPV4 0x0800 - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<6> dscp; - bit<2> ecn; - bit<16> total_length; - bit<16> identification; - bit<3> flags; - bit<13> fragment_offset; - bit<8> ttl; - bit<8> protocol; - bit<16> header_checksum; - bit<32> src_addr; - bit<32> dst_addr; -} - -#define IP_PROTOCOL_ESP 0x32 - -header esp_t { - bit<32> spi; - bit<32> seq; -} - -header platform_hdr_t { - bit<32> my_hdr1; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; - esp_t esp; -} - -// -// Packet metadata. -// -struct metadata_t { - bit<32> next_hop_id; -} - -// -// Extern objects. -// -ipsec_accelerator() ipsec; -Register, bit<32>>(1) ipsec_port_out_inbound; -// -// Parser. -// -parser MainParserImpl( - packet_in pkt, - out headers_t hdrs, - inout metadata_t meta, - in pna_main_parser_input_metadata_t istd) -{ - bool from_ipsec; - ipsec_status status; - - state start { - from_ipsec = ipsec.from_ipsec(status); - transition select(from_ipsec) { - true : parse_ipv4; - default : parse_ethernet; - } - } - - state parse_ethernet { - pkt.extract(hdrs.ethernet); - transition select(hdrs.ethernet.ether_type) { - ETHERNET_ETHERTYPE_IPV4 : parse_ipv4; - default : accept; - } - } - - state parse_ipv4 { - pkt.extract(hdrs.ipv4); - transition select(hdrs.ipv4.protocol) { - IP_PROTOCOL_ESP : parse_esp; - default : accept; - } - } - - state parse_esp { - pkt.extract(hdrs.esp); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -// -// Control block. -// -control MainControlImpl( - inout headers_t hdrs, - inout metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - - action ipsec_enable(bit<32> sa_index) { - ipsec.enable(); - ipsec.set_sa_index>(sa_index); - hdrs.ethernet.setInvalid(); - } - - action ipsec_bypass() { - ipsec.disable(); - } - - action drop() { - drop_packet(); - } - - table inbound_table { - key = { - hdrs.ipv4.src_addr : exact; - hdrs.ipv4.dst_addr : exact; - hdrs.esp.spi : exact; - } - - actions = { - ipsec_enable; - ipsec_bypass; - drop; - } - - const default_action = drop; - } - - table outbound_table { - key = { - hdrs.ipv4.src_addr : exact; - hdrs.ipv4.dst_addr : exact; - } - - actions = { - ipsec_enable; - ipsec_bypass; - drop; - } - - default_action = ipsec_bypass(); - } - - action next_hop_id_set(bit<32> next_hop_id) { - meta.next_hop_id = next_hop_id; - } - - table routing_table { - key = { - hdrs.ipv4.dst_addr : lpm; - } - - actions = { - next_hop_id_set; - drop; - } - - default_action = next_hop_id_set(0); - } - - action next_hop_set(bit<48> dst_addr, bit<48> src_addr, bit<16> ether_type, bit<32> port_id) { - hdrs.ethernet.setValid(); - hdrs.ethernet.dst_addr = dst_addr; - hdrs.ethernet.src_addr = src_addr; - hdrs.ethernet.ether_type = ether_type; - send_to_port((PortId_t)port_id); - } - - table next_hop_table { - key = { - meta.next_hop_id : exact; - } - - actions = { - next_hop_set; - drop; - } - - default_action = drop; - } - - apply { - if (inbound(meta)) { - ipsec_status status; - - if (!ipsec.from_ipsec(status)) { - // Pre-decrypt processing. - if (hdrs.ipv4.isValid()) { - if (hdrs.esp.isValid() ) { - inbound_table.apply(); - } - - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } else { - // Post-decrypt processing. - if (status == ipsec_status.IPSEC_SUCCESS) { - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } - } else { - ipsec_status status; - - if (!ipsec.from_ipsec(status)) { - // Pre-encrypt processing. - if (hdrs.ipv4.isValid()) { - outbound_table.apply(); - } else - drop_packet(); - } else { - // Post-encrypt processing. - if (status == ipsec_status.IPSEC_SUCCESS) { - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } - } - } -} - -// -// Deparser. -// -control MainDeparserImpl( - packet_out pkt, - in headers_t hdrs, - in metadata_t meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdrs.ethernet); - pkt.emit(hdrs.ipv4); - pkt.emit(hdrs.esp); - } -} - -// -// Package. -// -PNA_NIC(MainParserImpl(), PreControlImpl(), MainControlImpl(), MainDeparserImpl()) main; diff --git a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err3.p4 b/testdata/p4_16_dpdk_errors/pna-example-ipsec-err3.p4 deleted file mode 100644 index 40eb3481d88..00000000000 --- a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err3.p4 +++ /dev/null @@ -1,288 +0,0 @@ -/* -Copyright 2023 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - - -#define inbound(meta) (istd.direction == PNA_Direction_t.NET_TO_HOST) -#define outbound(meta) (istd.direction == PNA_Direction_t.HOST_TO_NET) - -// -// Packet headers. -// -header ethernet_t { - bit<48> dst_addr; - bit<48> src_addr; - bit<16> ether_type; -} - -#define ETHERNET_ETHERTYPE_IPV4 0x0800 - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<6> dscp; - bit<2> ecn; - bit<16> total_length; - bit<16> identification; - bit<3> flags; - bit<13> fragment_offset; - bit<8> ttl; - bit<8> protocol; - bit<16> header_checksum; - bit<32> src_addr; - bit<32> dst_addr; -} - -#define IP_PROTOCOL_ESP 0x32 - -header esp_t { - bit<32> spi; - bit<32> seq; -} - -header platform_hdr_t { - bit<32> my_hdr1; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; - esp_t esp; -} - -// -// Packet metadata. -// -struct metadata_t { - bit<32> next_hop_id; -} - -// -// Extern objects. -// -ipsec_accelerator() ipsec; - -// -// Parser. -// -parser MainParserImpl( - packet_in pkt, - out headers_t hdrs, - inout metadata_t meta, - in pna_main_parser_input_metadata_t istd) -{ - bool from_ipsec; - ipsec_status status; - - state start { - from_ipsec = ipsec.from_ipsec(status); - transition select(from_ipsec) { - true : parse_ipv4; - default : parse_ethernet; - } - } - - state parse_ethernet { - pkt.extract(hdrs.ethernet); - transition select(hdrs.ethernet.ether_type) { - ETHERNET_ETHERTYPE_IPV4 : parse_ipv4; - default : accept; - } - } - - state parse_ipv4 { - pkt.extract(hdrs.ipv4); - transition select(hdrs.ipv4.protocol) { - IP_PROTOCOL_ESP : parse_esp; - default : accept; - } - } - - state parse_esp { - pkt.extract(hdrs.esp); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -// -// Control block. -// -control MainControlImpl( - inout headers_t hdrs, - inout metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - - action ipsec_enable(bit<32> sa_index) { - ipsec.enable(); - ipsec.set_sa_index, bit<8>>(sa_index); - hdrs.ethernet.setInvalid(); - } - - action ipsec_bypass() { - ipsec.disable(); - } - - action drop() { - drop_packet(); - } - - table inbound_table { - key = { - hdrs.ipv4.src_addr : exact; - hdrs.ipv4.dst_addr : exact; - hdrs.esp.spi : exact; - } - - actions = { - ipsec_enable; - ipsec_bypass; - drop; - } - - const default_action = drop; - } - - table outbound_table { - key = { - hdrs.ipv4.src_addr : exact; - hdrs.ipv4.dst_addr : exact; - } - - actions = { - ipsec_enable; - ipsec_bypass; - drop; - } - - default_action = ipsec_bypass(); - } - - action next_hop_id_set(bit<32> next_hop_id) { - meta.next_hop_id = next_hop_id; - } - - table routing_table { - key = { - hdrs.ipv4.dst_addr : lpm; - } - - actions = { - next_hop_id_set; - drop; - } - - default_action = next_hop_id_set(0); - } - - action next_hop_set(bit<48> dst_addr, bit<48> src_addr, bit<16> ether_type, bit<32> port_id) { - hdrs.ethernet.setValid(); - hdrs.ethernet.dst_addr = dst_addr; - hdrs.ethernet.src_addr = src_addr; - hdrs.ethernet.ether_type = ether_type; - send_to_port((PortId_t)port_id); - } - - table next_hop_table { - key = { - meta.next_hop_id : exact; - } - - actions = { - next_hop_set; - drop; - } - - default_action = drop; - } - - apply { - if (inbound(meta)) { - ipsec_status status; - - if (!ipsec.from_ipsec(status)) { - // Pre-decrypt processing. - if (hdrs.ipv4.isValid()) { - if (hdrs.esp.isValid() ) { - inbound_table.apply(); - } - - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } else { - // Post-decrypt processing. - if (status == ipsec_status.IPSEC_SUCCESS) { - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } - } else { - ipsec_status status; - - if (!ipsec.from_ipsec(status)) { - // Pre-encrypt processing. - if (hdrs.ipv4.isValid()) { - outbound_table.apply(); - } else - drop_packet(); - } else { - // Post-encrypt processing. - if (status == ipsec_status.IPSEC_SUCCESS) { - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } - } - } -} - -// -// Deparser. -// -control MainDeparserImpl( - packet_out pkt, - in headers_t hdrs, - in metadata_t meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdrs.ethernet); - pkt.emit(hdrs.ipv4); - pkt.emit(hdrs.esp); - } -} - -// -// Package. -// -PNA_NIC(MainParserImpl(), PreControlImpl(), MainControlImpl(), MainDeparserImpl()) main; diff --git a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err4.p4 b/testdata/p4_16_dpdk_errors/pna-example-ipsec-err4.p4 deleted file mode 100644 index 03bc26d96fc..00000000000 --- a/testdata/p4_16_dpdk_errors/pna-example-ipsec-err4.p4 +++ /dev/null @@ -1,285 +0,0 @@ -/* -Copyright 2023 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include - - -#define inbound(meta) (istd.direction == PNA_Direction_t.NET_TO_HOST) -#define outbound(meta) (istd.direction == PNA_Direction_t.HOST_TO_NET) - -// -// Packet headers. -// -header ethernet_t { - bit<48> dst_addr; - bit<48> src_addr; - bit<16> ether_type; -} - -#define ETHERNET_ETHERTYPE_IPV4 0x0800 - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<6> dscp; - bit<2> ecn; - bit<16> total_length; - bit<16> identification; - bit<3> flags; - bit<13> fragment_offset; - bit<8> ttl; - bit<8> protocol; - bit<16> header_checksum; - bit<32> src_addr; - bit<32> dst_addr; -} - -#define IP_PROTOCOL_ESP 0x32 - -header esp_t { - bit<32> spi; - bit<32> seq; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; - esp_t esp; -} - -// -// Packet metadata. -// -struct metadata_t { - bit<32> next_hop_id; -} - -// -// Extern objects. -// -ipsec_accelerator() ipsec; - -// -// Parser. -// -parser MainParserImpl( - packet_in pkt, - out headers_t hdrs, - inout metadata_t meta, - in pna_main_parser_input_metadata_t istd) -{ - bool from_ipsec; - ipsec_status status; - - state start { - from_ipsec = ipsec.from_ipsec(status); - transition select(from_ipsec) { - true : parse_ipv4; - default : parse_ethernet; - } - } - - state parse_ethernet { - pkt.extract(hdrs.ethernet); - transition select(hdrs.ethernet.ether_type) { - ETHERNET_ETHERTYPE_IPV4 : parse_ipv4; - default : accept; - } - } - - state parse_ipv4 { - pkt.extract(hdrs.ipv4); - transition select(hdrs.ipv4.protocol) { - IP_PROTOCOL_ESP : parse_esp; - default : accept; - } - } - - state parse_esp { - pkt.extract(hdrs.esp); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -// -// Control block. -// -control MainControlImpl( - inout headers_t hdrs, - inout metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - - action ipsec_enable(bit<32> sa_index) { - ipsec.enable(); - meta.next_hop_id = sa_index; - ipsec.set_sa_index(meta); - hdrs.ethernet.setInvalid(); - } - - action ipsec_bypass() { - ipsec.disable(); - } - - action drop() { - drop_packet(); - } - - table inbound_table { - key = { - hdrs.ipv4.src_addr : exact; - hdrs.ipv4.dst_addr : exact; - hdrs.esp.spi : exact; - } - - actions = { - ipsec_enable; - ipsec_bypass; - drop; - } - - const default_action = drop; - } - - table outbound_table { - key = { - hdrs.ipv4.src_addr : exact; - hdrs.ipv4.dst_addr : exact; - } - - actions = { - ipsec_enable; - ipsec_bypass; - drop; - } - - default_action = ipsec_bypass(); - } - - action next_hop_id_set(bit<32> next_hop_id) { - meta.next_hop_id = next_hop_id; - } - - table routing_table { - key = { - hdrs.ipv4.dst_addr : lpm; - } - - actions = { - next_hop_id_set; - drop; - } - - default_action = next_hop_id_set(0); - } - - action next_hop_set(bit<48> dst_addr, bit<48> src_addr, bit<16> ether_type, bit<32> port_id) { - hdrs.ethernet.setValid(); - hdrs.ethernet.dst_addr = dst_addr; - hdrs.ethernet.src_addr = src_addr; - hdrs.ethernet.ether_type = ether_type; - send_to_port((PortId_t)port_id); - } - - table next_hop_table { - key = { - meta.next_hop_id : exact; - } - - actions = { - next_hop_set; - drop; - } - - default_action = drop; - } - - apply { - if (inbound(meta)) { - ipsec_status status; - - if (!ipsec.from_ipsec(status)) { - // Pre-decrypt processing. - if (hdrs.ipv4.isValid()) { - if (hdrs.esp.isValid() ) { - inbound_table.apply(); - } - - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } else { - // Post-decrypt processing. - if (status == ipsec_status.IPSEC_SUCCESS) { - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } - } else { - ipsec_status status; - - if (!ipsec.from_ipsec(status)) { - // Pre-encrypt processing. - if (hdrs.ipv4.isValid()) { - outbound_table.apply(); - } else - drop_packet(); - } else { - // Post-encrypt processing. - if (status == ipsec_status.IPSEC_SUCCESS) { - routing_table.apply(); - next_hop_table.apply(); - } else - drop_packet(); - } - } - } -} - -// -// Deparser. -// -control MainDeparserImpl( - packet_out pkt, - in headers_t hdrs, - in metadata_t meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdrs.ethernet); - pkt.emit(hdrs.ipv4); - pkt.emit(hdrs.esp); - } -} - -// -// Package. -// -PNA_NIC(MainParserImpl(), PreControlImpl(), MainControlImpl(), MainDeparserImpl()) main; 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 deleted file mode 100644 index b8f673c85f5..00000000000 --- a/testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err1.p4 +++ /dev/null @@ -1,169 +0,0 @@ -#include -#include - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; - bit<80> newfield; -} - -header tcp_t { - bit<16> srcPort; - bit<16> dstPort; - bit<32> seqNo; - bit<32> ackNo; - bit<4> dataOffset; - bit<3> res; - bit<3> ecn; - bit<6> ctrl; - bit<16> window; - bit<16> checksum; - bit<16> urgentPtr; -} - -struct empty_metadata_t { -} - - -struct metadata { - bit<16> data; -} - -struct headers { - ethernet_t ethernet; - ipv4_t ipv4; - tcp_t tcp; -} - - -parser IngressParserImpl(packet_in buffer, - out headers hdr, - inout metadata user_meta, - in psa_ingress_parser_input_metadata_t istd, - in empty_metadata_t resubmit_meta, - in empty_metadata_t recirculate_meta) -{ - state start { - buffer.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800 &&& 0x0F00 : parse_ipv4; - 16w0x0d00 : parse_tcp; - default : accept; - } - } - state parse_ipv4 { - buffer.extract(hdr.ipv4); - //transition select(hdr.ipv4.protocol, 48w0x123456789012) { - transition select(hdr.ipv4.protocol) { - 8w4 .. 8w7: parse_tcp; - default: accept; - } - } - state parse_tcp { - buffer.extract(hdr.tcp); - transition accept; - } -} - -control ingress(inout headers hdr, - inout metadata user_meta, - in psa_ingress_input_metadata_t istd, - inout psa_ingress_output_metadata_t ostd) -{ - action execute() { - user_meta.data = 1; - } - table tbl { - key = { - hdr.ethernet.srcAddr : lpm; - hdr.ethernet.dstAddr : lpm; - } - actions = { NoAction; execute; } - } - apply { - tbl.apply(); - } -} -// END:Parse_Error_Example - -parser EgressParserImpl(packet_in buffer, - out headers hdr, - inout metadata user_meta, - in psa_egress_parser_input_metadata_t istd, - in empty_metadata_t normal_meta, - in empty_metadata_t clone_i2e_meta, - in empty_metadata_t clone_e2e_meta) -{ - state start { - transition accept; - } -} - -control egress(inout headers hdr, - inout metadata user_meta, - in psa_egress_input_metadata_t istd, - inout psa_egress_output_metadata_t ostd) -{ - apply { } -} - -control IngressDeparserImpl(packet_out packet, - out empty_metadata_t clone_i2e_meta, - out empty_metadata_t resubmit_meta, - out empty_metadata_t normal_meta, - inout headers hdr, - in metadata meta, - in psa_ingress_output_metadata_t istd) -{ - apply { - packet.emit(hdr.ethernet); - packet.emit(hdr.ipv4); - packet.emit(hdr.tcp); - } -} - -// BEGIN:Compute_New_IPv4_Checksum_Example -control EgressDeparserImpl(packet_out packet, - out empty_metadata_t clone_e2e_meta, - out empty_metadata_t recirculate_meta, - inout headers hdr, - in metadata meta, - in psa_egress_output_metadata_t istd, - in psa_egress_deparser_input_metadata_t edstd) -{ - apply { - packet.emit(hdr.ethernet); - packet.emit(hdr.ipv4); - packet.emit(hdr.tcp); - } -} -// END:Compute_New_IPv4_Checksum_Example - -IngressPipeline(IngressParserImpl(), - ingress(), - IngressDeparserImpl()) ip; - -EgressPipeline(EgressParserImpl(), - egress(), - EgressDeparserImpl()) ep; - -PSA_Switch(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) main; 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 deleted file mode 100644 index 2541cf3906a..00000000000 --- a/testdata/p4_16_dpdk_errors/psa-dpdk-lpm-match-err2.p4 +++ /dev/null @@ -1,170 +0,0 @@ -#include -#include - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; - bit<80> newfield; -} - -header tcp_t { - bit<16> srcPort; - bit<16> dstPort; - bit<32> seqNo; - bit<32> ackNo; - bit<4> dataOffset; - bit<3> res; - bit<3> ecn; - bit<6> ctrl; - bit<16> window; - bit<16> checksum; - bit<16> urgentPtr; -} - -struct empty_metadata_t { -} - - -struct metadata { - bit<16> data; -} - -struct headers { - ethernet_t ethernet; - ipv4_t ipv4; - tcp_t tcp; -} - - -parser IngressParserImpl(packet_in buffer, - out headers hdr, - inout metadata user_meta, - in psa_ingress_parser_input_metadata_t istd, - in empty_metadata_t resubmit_meta, - in empty_metadata_t recirculate_meta) -{ - state start { - buffer.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800 &&& 0x0F00 : parse_ipv4; - 16w0x0d00 : parse_tcp; - default : accept; - } - } - state parse_ipv4 { - buffer.extract(hdr.ipv4); - //transition select(hdr.ipv4.protocol, 48w0x123456789012) { - transition select(hdr.ipv4.protocol) { - 8w4 .. 8w7: parse_tcp; - default: accept; - } - } - state parse_tcp { - buffer.extract(hdr.tcp); - transition accept; - } -} - -control ingress(inout headers hdr, - inout metadata user_meta, - in psa_ingress_input_metadata_t istd, - inout psa_ingress_output_metadata_t ostd) -{ - action execute() { - user_meta.data = 1; - } - table tbl { - key = { - hdr.ethernet.srcAddr : lpm; - hdr.ethernet.dstAddr : exact; - hdr.ethernet.etherType : ternary; - } - actions = { NoAction; execute; } - } - apply { - tbl.apply(); - } -} -// END:Parse_Error_Example - -parser EgressParserImpl(packet_in buffer, - out headers hdr, - inout metadata user_meta, - in psa_egress_parser_input_metadata_t istd, - in empty_metadata_t normal_meta, - in empty_metadata_t clone_i2e_meta, - in empty_metadata_t clone_e2e_meta) -{ - state start { - transition accept; - } -} - -control egress(inout headers hdr, - inout metadata user_meta, - in psa_egress_input_metadata_t istd, - inout psa_egress_output_metadata_t ostd) -{ - apply { } -} - -control IngressDeparserImpl(packet_out packet, - out empty_metadata_t clone_i2e_meta, - out empty_metadata_t resubmit_meta, - out empty_metadata_t normal_meta, - inout headers hdr, - in metadata meta, - in psa_ingress_output_metadata_t istd) -{ - apply { - packet.emit(hdr.ethernet); - packet.emit(hdr.ipv4); - packet.emit(hdr.tcp); - } -} - -// BEGIN:Compute_New_IPv4_Checksum_Example -control EgressDeparserImpl(packet_out packet, - out empty_metadata_t clone_e2e_meta, - out empty_metadata_t recirculate_meta, - inout headers hdr, - in metadata meta, - in psa_egress_output_metadata_t istd, - in psa_egress_deparser_input_metadata_t edstd) -{ - apply { - packet.emit(hdr.ethernet); - packet.emit(hdr.ipv4); - packet.emit(hdr.tcp); - } -} -// END:Compute_New_IPv4_Checksum_Example - -IngressPipeline(IngressParserImpl(), - ingress(), - IngressDeparserImpl()) ip; - -EgressPipeline(EgressParserImpl(), - egress(), - EgressDeparserImpl()) ep; - -PSA_Switch(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) main; diff --git a/testdata/p4_16_dpdk_errors/psa-dpdk-struct-field.p4 b/testdata/p4_16_dpdk_errors/psa-dpdk-struct-field.p4 deleted file mode 100644 index 2cc17e8aa79..00000000000 --- a/testdata/p4_16_dpdk_errors/psa-dpdk-struct-field.p4 +++ /dev/null @@ -1,125 +0,0 @@ -/* -*- P4_16 -*- */ -#include -#include - -/************ H E A D E R S ******************************/ -struct EMPTY {}; - -header ethernet_t { - bit<48> dst_addr; - bit<48> src_addr; - bit<16> ether_type; - // bit<80> val; -} - -struct headers_t { - ethernet_t ethernet; -} - -struct user_meta_data_t { - bit<48> addr; - // bit<80> val; -} - - - -/************************************************************************* - **************** I N G R E S S P R O C E S S I N G ***************** - *************************************************************************/ -parser MyIngressParser( - packet_in pkt, - out headers_t hdr, - inout user_meta_data_t m, - in psa_ingress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e) { - - state start { - pkt.extract(hdr.ethernet); - transition accept; - } -} - -control MyIngressControl( - inout headers_t hdr, - inout user_meta_data_t m, - in psa_ingress_input_metadata_t c, - inout psa_ingress_output_metadata_t d) { - bit<80> flg; - action macswp() { - //if (m.val == 0x1 && hdr.ethernet.val == 0x2) { - if (flg == 0x2) { - m.addr = hdr.ethernet.dst_addr; - hdr.ethernet.dst_addr = hdr.ethernet.src_addr; - hdr.ethernet.src_addr = m.addr; - } - } - table stub { - key = {} - - actions = { - macswp; - } - size=1000000; - } - - apply { - d.egress_port = (PortId_t) ((bit <32>) c.ingress_port ^ 1); - stub.apply(); - } -} - -control MyIngressDeparser( - packet_out pkt, - out EMPTY a, - out EMPTY b, - out EMPTY c, - inout headers_t hdr, - in user_meta_data_t e, - in psa_ingress_output_metadata_t f) { - - apply { - pkt.emit(hdr.ethernet); - } -} - -/************************************************************************* - **************** E G R E S S P R O C E S S I N G ******************* - *************************************************************************/ -parser MyEgressParser( - packet_in pkt, - out EMPTY a, - inout EMPTY b, - in psa_egress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e, - in EMPTY f) { - state start { - transition accept; - } -} - -control MyEgressControl( - inout EMPTY a, - inout EMPTY b, - in psa_egress_input_metadata_t c, - inout psa_egress_output_metadata_t d) { - apply {} -} -control MyEgressDeparser( - packet_out pkt, - out EMPTY a, - out EMPTY b, - inout EMPTY c, - in EMPTY d, - in psa_egress_output_metadata_t e, - in psa_egress_deparser_input_metadata_t f) { - apply {} -} - -/************ F I N A L P A C K A G E ******************************/ -IngressPipeline(MyIngressParser(), MyIngressControl(), MyIngressDeparser()) ip; - -EgressPipeline(MyEgressParser(), MyEgressControl(), MyEgressDeparser()) ep; - -PSA_Switch(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) main; diff --git a/testdata/p4_16_dpdk_errors/psa-example-mask-range-err.p4 b/testdata/p4_16_dpdk_errors/psa-example-mask-range-err.p4 deleted file mode 100644 index 2a0a21b498c..00000000000 --- a/testdata/p4_16_dpdk_errors/psa-example-mask-range-err.p4 +++ /dev/null @@ -1,165 +0,0 @@ -#include -#include - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -header tcp_t { - bit<16> srcPort; - bit<16> dstPort; - bit<32> seqNo; - bit<32> ackNo; - bit<4> dataOffset; - bit<3> res; - bit<3> ecn; - bit<6> ctrl; - bit<16> window; - bit<16> checksum; - bit<16> urgentPtr; -} - -struct empty_metadata_t { -} - - -struct metadata { - bit<16> data; -} - -struct headers { - ethernet_t ethernet; - ipv4_t ipv4; - tcp_t tcp; -} - - -parser IngressParserImpl(packet_in buffer, - out headers hdr, - inout metadata user_meta, - in psa_ingress_parser_input_metadata_t istd, - in empty_metadata_t resubmit_meta, - in empty_metadata_t recirculate_meta) -{ - state start { - buffer.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - user_meta.data &&& 0x0F00: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - buffer.extract(hdr.ipv4); - transition select(hdr.ipv4.protocol) { - 8w4 .. 8w7: parse_tcp; - default: accept; - } - } - state parse_tcp { - buffer.extract(hdr.tcp); - transition accept; - } -} - -control ingress(inout headers hdr, - inout metadata user_meta, - in psa_ingress_input_metadata_t istd, - inout psa_ingress_output_metadata_t ostd) -{ - action execute() { - user_meta.data = 1; - } - table tbl { - key = { - hdr.ethernet.srcAddr : ternary; - } - actions = { NoAction; execute; } - } - apply { - tbl.apply(); - } -} -// END:Parse_Error_Example - -parser EgressParserImpl(packet_in buffer, - out headers hdr, - inout metadata user_meta, - in psa_egress_parser_input_metadata_t istd, - in empty_metadata_t normal_meta, - in empty_metadata_t clone_i2e_meta, - in empty_metadata_t clone_e2e_meta) -{ - state start { - transition accept; - } -} - -control egress(inout headers hdr, - inout metadata user_meta, - in psa_egress_input_metadata_t istd, - inout psa_egress_output_metadata_t ostd) -{ - apply { } -} - -control IngressDeparserImpl(packet_out packet, - out empty_metadata_t clone_i2e_meta, - out empty_metadata_t resubmit_meta, - out empty_metadata_t normal_meta, - inout headers hdr, - in metadata meta, - in psa_ingress_output_metadata_t istd) -{ - apply { - packet.emit(hdr.ethernet); - packet.emit(hdr.ipv4); - packet.emit(hdr.tcp); - } -} - -// BEGIN:Compute_New_IPv4_Checksum_Example -control EgressDeparserImpl(packet_out packet, - out empty_metadata_t clone_e2e_meta, - out empty_metadata_t recirculate_meta, - inout headers hdr, - in metadata meta, - in psa_egress_output_metadata_t istd, - in psa_egress_deparser_input_metadata_t edstd) -{ - apply { - packet.emit(hdr.ethernet); - packet.emit(hdr.ipv4); - packet.emit(hdr.tcp); - } -} -// END:Compute_New_IPv4_Checksum_Example - -IngressPipeline(IngressParserImpl(), - ingress(), - IngressDeparserImpl()) ip; - -EgressPipeline(EgressParserImpl(), - egress(), - EgressDeparserImpl()) ep; - -PSA_Switch(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) main; diff --git a/testdata/p4_16_dpdk_errors/psa-example-register2-bmv2.p4 b/testdata/p4_16_dpdk_errors/psa-example-register2-bmv2.p4 deleted file mode 100644 index b60371ff3d6..00000000000 --- a/testdata/p4_16_dpdk_errors/psa-example-register2-bmv2.p4 +++ /dev/null @@ -1,205 +0,0 @@ -/* -Copyright 2017 Cisco Systems, Inc. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include "bmv2/psa.p4" - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - -struct fwd_metadata_t { -} - -struct metadata { - fwd_metadata_t fwd_metadata; -} - -struct headers { - ethernet_t ethernet; - ipv4_t ipv4; -} - -// BEGIN:Register_Example2_Part1 -const bit<32> NUM_PORTS = 512; - -// It would be more convenient to use a struct type to represent the -// state of a combined packet and byte count, and many other compound -// values one might wish to store in a Register instance. However, -// the latest p4test as of 2018-Feb-10 does not allow a struct type to -// be returned from a method call like Register.read(). - -// Refer to this Github issue for status of generalizing this: -// https://github.com/p4lang/p4-spec/issues/383 - -#define PACKET_COUNT_WIDTH 32 -#define BYTE_COUNT_WIDTH 48 -//#define PACKET_BYTE_COUNT_WIDTH (PACKET_COUNT_WIDTH + BYTE_COUNT_WIDTH) -#define PACKET_BYTE_COUNT_WIDTH 80 - -#define PACKET_COUNT_RANGE (PACKET_BYTE_COUNT_WIDTH-1):BYTE_COUNT_WIDTH -#define BYTE_COUNT_RANGE (BYTE_COUNT_WIDTH-1):0 - -typedef bit PacketByteCountState_t; - -action update_pkt_ip_byte_count (inout PacketByteCountState_t s, - in bit<16> ip_length_bytes) -{ - s[PACKET_COUNT_RANGE] = s[PACKET_COUNT_RANGE] + 1; - s[BYTE_COUNT_RANGE] = (s[BYTE_COUNT_RANGE] + - (bit) ip_length_bytes); -} -// END:Register_Example2_Part1 - -parser IngressParserImpl(packet_in buffer, - out headers parsed_hdr, - inout metadata user_meta, - in psa_ingress_parser_input_metadata_t istd, - in empty_metadata_t resubmit_meta, - in empty_metadata_t recirculate_meta) -{ - state start { - transition parse_ethernet; - } - state parse_ethernet { - buffer.extract(parsed_hdr.ethernet); - transition select(parsed_hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - buffer.extract(parsed_hdr.ipv4); - transition accept; - } -} - -// BEGIN:Register_Example2_Part2 -control ingress(inout headers hdr, - inout metadata user_meta, - in psa_ingress_input_metadata_t istd, - inout psa_ingress_output_metadata_t ostd) -{ - Register(NUM_PORTS) - port_pkt_ip_bytes_in; - - apply { - ostd.egress_port = (PortId_t) 0; - hdr.ipv4.setValid(); - // dstAddr (48 bits), srcAddr (48 bits), etherType (16 bits) - hdr.ipv4.totalLen = (48 + 48 + 16) / 8; - if (hdr.ipv4.isValid()) { - @atomic { - PacketByteCountState_t tmp; - tmp = port_pkt_ip_bytes_in.read(istd.ingress_port); - update_pkt_ip_byte_count(tmp, hdr.ipv4.totalLen); - port_pkt_ip_bytes_in.write(istd.ingress_port, tmp); - } - } - } -} -// END:Register_Example2_Part2 - -parser EgressParserImpl(packet_in buffer, - out headers parsed_hdr, - inout metadata user_meta, - in psa_egress_parser_input_metadata_t istd, - in empty_metadata_t normal_meta, - in empty_metadata_t clone_i2e_meta, - in empty_metadata_t clone_e2e_meta) -{ - state start { - transition accept; - } -} - -control egress(inout headers hdr, - inout metadata user_meta, - in psa_egress_input_metadata_t istd, - inout psa_egress_output_metadata_t ostd) -{ - apply { } -} - -control CommonDeparserImpl(packet_out packet, - inout headers hdr) -{ - apply { - packet.emit(hdr.ethernet); - packet.emit(hdr.ipv4); - } -} - -control IngressDeparserImpl(packet_out buffer, - out empty_metadata_t clone_i2e_meta, - out empty_metadata_t resubmit_meta, - out empty_metadata_t normal_meta, - inout headers hdr, - in metadata meta, - in psa_ingress_output_metadata_t istd) -{ - CommonDeparserImpl() cp; - apply { - cp.apply(buffer, hdr); - } -} - -control EgressDeparserImpl(packet_out buffer, - out empty_metadata_t clone_e2e_meta, - out empty_metadata_t recirculate_meta, - inout headers hdr, - in metadata meta, - in psa_egress_output_metadata_t istd, - in psa_egress_deparser_input_metadata_t edstd) -{ - CommonDeparserImpl() cp; - apply { - cp.apply(buffer, hdr); - } -} - -IngressPipeline(IngressParserImpl(), - ingress(), - IngressDeparserImpl()) ip; - -EgressPipeline(EgressParserImpl(), - egress(), - EgressDeparserImpl()) ep; - -PSA_Switch(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) main; diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-add-on-miss-err1.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-add-on-miss-err1.p4-error deleted file mode 100644 index 10409084bf0..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-add-on-miss-err1.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -pna-add-on-miss-err1.p4(141): [--Werror=expected] error: Learner table ipv4_da must have all exact match keys - table ipv4_da { - ^^^^^^^ diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-add-on-miss-err1.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/pna-add-on-miss-err1.p4.bfrt.json deleted file mode 100644 index bd166fdaf59..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-add-on-miss-err1.p4.bfrt.json +++ /dev/null @@ -1,167 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_da", - "id" : 38237845, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdr.ipv4.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Ternary", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 65537, - "name" : "$MATCH_PRIORITY", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 18241179, - "name" : "MainControlImpl.add_on_miss_action", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_da2", - "id" : 36615223, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26610824, - "name" : "MainControlImpl.next_hop2", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "newAddr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 25338952, - "name" : "MainControlImpl.add_on_miss_action2", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-direct-meter-err-1.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-direct-meter-err-1.p4-error deleted file mode 100644 index a2701de545b..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-direct-meter-err-1.p4-error +++ /dev/null @@ -1,6 +0,0 @@ -[--Werror=unexpected] error: dpdk_execute method for different DirectMeter instances (meter0_0 and meter1_0) called within same action -[--Werror=unexpected] error: dpdk_execute method for different DirectMeter instances (meter0_0 and meter1_0) called within same action -pna-dpdk-direct-meter-err-1.p4(116): [--Werror=target-error] error: Direct counters and direct meters are unsupported for wildcard match table ipv4_da_lpm - table ipv4_da_lpm { - ^^^^^^^^^^^ -[--Werror=unexpected] error: dpdk_execute method for different DirectMeter instances (meter0_0 and meter1_0) called within same action diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-direct-meter-err-1.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-direct-meter-err-1.p4.bfrt.json deleted file mode 100644 index 0370378b67e..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-direct-meter-err-1.p4.bfrt.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_da", - "id" : 38237845, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "oport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 19071441, - "name" : "MainControlImpl.default_route_drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65545, - "name" : "$METER_SPEC_CIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65546, - "name" : "$METER_SPEC_PIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65547, - "name" : "$METER_SPEC_CBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65548, - "name" : "$METER_SPEC_PBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust", "EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_da_lpm", - "id" : 40097106, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "oport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 19071441, - "name" : "MainControlImpl.default_route_drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65545, - "name" : "$METER_SPEC_CIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65546, - "name" : "$METER_SPEC_PIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65547, - "name" : "$METER_SPEC_CBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65548, - "name" : "$METER_SPEC_PBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust", "EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-large-constants.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-large-constants.p4-error deleted file mode 100644 index 5c90cf27fc5..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-large-constants.p4-error +++ /dev/null @@ -1,6 +0,0 @@ -pna-dpdk-large-constants.p4(136): [--Wwarn=uninitialized_use] warning: tmp1 may be uninitialized - headers.ipv6.srcAddr = (bit<128>)tmp1; - ^^^^ -pna-dpdk-large-constants.p4(109): [--Werror=overlimit] error: DPDK target supports up-to 64-bit immediate values, 128w0x123456789abcdef12345678 exceeds the limit - bit<128> tmp = 128w0x123456789abcdef12345678; - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-large-constants.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-large-constants.p4.bfrt.json deleted file mode 100644 index 03ee286a952..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-large-constants.p4.bfrt.json +++ /dev/null @@ -1,187 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.filter_tbl", - "id" : 34917681, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "headers.ipv6.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 128 - } - } - ], - "action_specs" : [ - { - "id" : 29705768, - "name" : "MainControlImpl.ipv6_modify_dstAddr", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "dstAddr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22459520, - "name" : "MainControlImpl.ipv6_swap_addr", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 23653337, - "name" : "MainControlImpl.set_flowlabel", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "label", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 20 - } - } - ] - }, - { - "id" : 31572308, - "name" : "MainControlImpl.set_traffic_class_flow_label", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "trafficClass", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 8 - } - }, - { - "id" : 2, - "name" : "label", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 20 - } - } - ] - }, - { - "id" : 28719183, - "name" : "MainControlImpl.set_ipv6_version", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "version", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 4 - } - } - ] - }, - { - "id" : 31932328, - "name" : "MainControlImpl.set_next_hdr", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "nextHdr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 8 - } - } - ] - }, - { - "id" : 20663179, - "name" : "MainControlImpl.set_hop_limit", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "hopLimit", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 8 - } - } - ] - }, - { - "id" : 29705564, - "name" : "MainControlImpl.Reject", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-table-key-consolidation-learner-2.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-table-key-consolidation-learner-2.p4-error deleted file mode 100644 index 69f8e0d5ca6..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-table-key-consolidation-learner-2.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -pna-dpdk-table-key-consolidation-learner-2.p4(123): [--Werror=expected] error: Learner table ipv4_da must have all exact match keys - table ipv4_da { - ^^^^^^^ diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-table-key-consolidation-learner-2.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-table-key-consolidation-learner-2.p4.bfrt.json deleted file mode 100644 index a952368bf76..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-dpdk-table-key-consolidation-learner-2.p4.bfrt.json +++ /dev/null @@ -1,156 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_da", - "id" : 38237845, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "user_meta.meta", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 18241179, - "name" : "MainControlImpl.add_on_miss_action", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_da2", - "id" : 36615223, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26610824, - "name" : "MainControlImpl.next_hop2", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "newAddr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 25338952, - "name" : "MainControlImpl.add_on_miss_action2", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err1.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err1.p4-error deleted file mode 100644 index 5aaa250820f..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err1.p4-error +++ /dev/null @@ -1 +0,0 @@ -[--Werror=reserved] error: platform_hdr_t type name is reserved for DPDK platform header diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err1.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err1.p4.bfrt.json deleted file mode 100644 index 07c3cd9b258..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err1.p4.bfrt.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.inbound_table", - "id" : 35540122, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdrs.esp.spi", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.outbound_table", - "id" : 48399063, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.routing_table", - "id" : 40259446, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26920063, - "name" : "MainControlImpl.next_hop_id_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "next_hop_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.next_hop_table", - "id" : 40586775, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "meta.next_hop_id", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 19398794, - "name" : "MainControlImpl.next_hop_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "dst_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 2, - "name" : "src_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 3, - "name" : "ether_type", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 4, - "name" : "port_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err2.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err2.p4-error deleted file mode 100644 index 34e7a39b346..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err2.p4-error +++ /dev/null @@ -1,5 +0,0 @@ -pna-example-ipsec-accelerator-err2.p4(79): [--Wwarn=unused] warning: ipsec_port_out_inbound: unused instance -Register, bit<32>>(1) ipsec_port_out_inbound; - ^^^^^^^^^^^^^^^^^^^^^^ -[--Werror=reserved] error: ipsec_port_out_inbound name is reserved for DPDK IPSec port register -[--Werror=reserved] error: platform_hdr_t type name is reserved for DPDK platform header diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err2.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err2.p4.bfrt.json deleted file mode 100644 index b2d6378c3bd..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err2.p4.bfrt.json +++ /dev/null @@ -1,351 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.inbound_table", - "id" : 35540122, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdrs.esp.spi", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.outbound_table", - "id" : 48399063, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.routing_table", - "id" : 40259446, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26920063, - "name" : "MainControlImpl.next_hop_id_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "next_hop_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.next_hop_table", - "id" : 40586775, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "meta.next_hop_id", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 19398794, - "name" : "MainControlImpl.next_hop_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "dst_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 2, - "name" : "src_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 3, - "name" : "ether_type", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 4, - "name" : "port_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.ipsec_port_out_inbound", - "id" : 370281730, - "table_type" : "Register", - "size" : 1, - "annotations" : [], - "depends_on" : [], - "key" : [ - { - "id" : 65557, - "name" : "$REGISTER_INDEX", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65557, - "name" : "$REGISTER_INDEX", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - } - ], - "supported_operations" : ["Sync"], - "attributes" : [] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err3.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err3.p4-error deleted file mode 100644 index bae192ac13c..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err3.p4-error +++ /dev/null @@ -1,14 +0,0 @@ -pna-example-ipsec-accelerator-err3.p4(144): [--Werror=type-error] error: ipsec.set_sa_index - ipsec.set_sa_index, bit<8>>(sa_index); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ---- Actual error: -pna.p4(516): set_sa_index: 1 type parameters expected, but 2 type arguments supplied - void set_sa_index(in T sa_index); - ^^^^^^^^^^^^ - ---- Originating from: -pna.p4(516): Function type 'set_sa_index' does not match invocation type '' - void set_sa_index(in T sa_index); - ^^^^^^^^^^^^ -pna-example-ipsec-accelerator-err3.p4(144) - ipsec.set_sa_index, bit<8>>(sa_index); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err4.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err4.p4-error deleted file mode 100644 index 44d3a0a94ef..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err4.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -pna-example-ipsec-accelerator-err4.p4(141): [--Werror=unexpected] error: Unexpected width type metadata_t for sa_index - ipsec.set_sa_index(meta); - ^^^^^^^^^^ diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err4.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err4.p4.bfrt.json deleted file mode 100644 index 07c3cd9b258..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-accelerator-err4.p4.bfrt.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.inbound_table", - "id" : 35540122, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdrs.esp.spi", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.outbound_table", - "id" : 48399063, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.routing_table", - "id" : 40259446, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26920063, - "name" : "MainControlImpl.next_hop_id_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "next_hop_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.next_hop_table", - "id" : 40586775, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "meta.next_hop_id", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 19398794, - "name" : "MainControlImpl.next_hop_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "dst_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 2, - "name" : "src_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 3, - "name" : "ether_type", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 4, - "name" : "port_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err1.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err1.p4-error deleted file mode 100644 index 5aaa250820f..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err1.p4-error +++ /dev/null @@ -1 +0,0 @@ -[--Werror=reserved] error: platform_hdr_t type name is reserved for DPDK platform header diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err1.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err1.p4.bfrt.json deleted file mode 100644 index 07c3cd9b258..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err1.p4.bfrt.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.inbound_table", - "id" : 35540122, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdrs.esp.spi", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.outbound_table", - "id" : 48399063, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.routing_table", - "id" : 40259446, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26920063, - "name" : "MainControlImpl.next_hop_id_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "next_hop_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.next_hop_table", - "id" : 40586775, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "meta.next_hop_id", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 19398794, - "name" : "MainControlImpl.next_hop_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "dst_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 2, - "name" : "src_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 3, - "name" : "ether_type", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 4, - "name" : "port_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err2.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err2.p4-error deleted file mode 100644 index 4e78c6a4337..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err2.p4-error +++ /dev/null @@ -1,4 +0,0 @@ -pna-example-ipsec-err2.p4(79): [--Wwarn=unused] warning: ipsec_port_out_inbound: unused instance -Register, bit<32>>(1) ipsec_port_out_inbound; - ^^^^^^^^^^^^^^^^^^^^^^ -[--Werror=reserved] error: ipsec_port_out_inbound name is reserved for DPDK IPSec port register diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err2.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err2.p4.bfrt.json deleted file mode 100644 index b2d6378c3bd..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err2.p4.bfrt.json +++ /dev/null @@ -1,351 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.inbound_table", - "id" : 35540122, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdrs.esp.spi", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.outbound_table", - "id" : 48399063, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.routing_table", - "id" : 40259446, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26920063, - "name" : "MainControlImpl.next_hop_id_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "next_hop_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.next_hop_table", - "id" : 40586775, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "meta.next_hop_id", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 19398794, - "name" : "MainControlImpl.next_hop_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "dst_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 2, - "name" : "src_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 3, - "name" : "ether_type", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 4, - "name" : "port_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.ipsec_port_out_inbound", - "id" : 370281730, - "table_type" : "Register", - "size" : 1, - "annotations" : [], - "depends_on" : [], - "key" : [ - { - "id" : 65557, - "name" : "$REGISTER_INDEX", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65557, - "name" : "$REGISTER_INDEX", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - } - ], - "supported_operations" : ["Sync"], - "attributes" : [] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err3.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err3.p4-error deleted file mode 100644 index 62503b8432d..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err3.p4-error +++ /dev/null @@ -1,14 +0,0 @@ -pna-example-ipsec-err3.p4(144): [--Werror=type-error] error: ipsec.set_sa_index - ipsec.set_sa_index, bit<8>>(sa_index); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ---- Actual error: -pna.p4(524): set_sa_index: 1 type parameters expected, but 2 type arguments supplied - void set_sa_index(in T sa_index); - ^^^^^^^^^^^^ - ---- Originating from: -pna.p4(524): Function type 'set_sa_index' does not match invocation type '' - void set_sa_index(in T sa_index); - ^^^^^^^^^^^^ -pna-example-ipsec-err3.p4(144) - ipsec.set_sa_index, bit<8>>(sa_index); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err4.p4-error b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err4.p4-error deleted file mode 100644 index c746960763e..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err4.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -pna-example-ipsec-err4.p4(141): [--Werror=Target model error] error: Unexpected width type metadata_t for sa_index - ipsec.set_sa_index(meta); - ^^^^^^^^^^ diff --git a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err4.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err4.p4.bfrt.json deleted file mode 100644 index 07c3cd9b258..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/pna-example-ipsec-err4.p4.bfrt.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.inbound_table", - "id" : 35540122, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdrs.esp.spi", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.outbound_table", - "id" : 48399063, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.routing_table", - "id" : 40259446, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26920063, - "name" : "MainControlImpl.next_hop_id_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "next_hop_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.next_hop_table", - "id" : 40586775, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "meta.next_hop_id", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 19398794, - "name" : "MainControlImpl.next_hop_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "dst_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 2, - "name" : "src_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 3, - "name" : "ether_type", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 4, - "name" : "port_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err1.p4-error b/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err1.p4-error deleted file mode 100644 index 8685a8f2d1a..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err1.p4-error +++ /dev/null @@ -1 +0,0 @@ -[--Werror=unexpected] error: Only one LPM match field is permitted per table, more than one lpm field found in table (tbl) diff --git a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err1.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err1.p4.bfrt.json deleted file mode 100644 index f056e97a143..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err1.p4.bfrt.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.ingress.tbl", - "id" : 44506256, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 2, - "name" : "hdr.ethernet.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 29480552, - "name" : "ingress.execute", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err2.p4-error b/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err2.p4-error deleted file mode 100644 index 9b4583dd251..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err2.p4-error +++ /dev/null @@ -1 +0,0 @@ -[--Werror=unexpected] error: Non 'exact' match kind not permitted in table (tbl) with 'lpm' match kind diff --git a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err2.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err2.p4.bfrt.json deleted file mode 100644 index 12faabcd62e..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-lpm-match-err2.p4.bfrt.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.ingress.tbl", - "id" : 44506256, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 2, - "name" : "hdr.ethernet.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 3, - "name" : "hdr.ethernet.etherType", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Ternary", - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 65537, - "name" : "$MATCH_PRIORITY", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 29480552, - "name" : "ingress.execute", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-struct-field.p4-error b/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-struct-field.p4-error deleted file mode 100644 index 68e139cc680..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-struct-field.p4-error +++ /dev/null @@ -1,9 +0,0 @@ -psa-dpdk-struct-field.p4(51): [--Wwarn=uninitialized_use] warning: flg may be uninitialized - if (flg == 0x2) { - ^^^ -psa-dpdk-struct-field.p4(51): [--Werror=target-error] error: Unsupported bitwidth 80 in flg - if (flg == 0x2) { - ^^^ -psa-dpdk-struct-field.p4(51): [--Werror=target-error] error: Unsupported bitwidth 80 in 80w0x2 - if (flg == 0x2) { - ^^^ diff --git a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-struct-field.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-struct-field.p4.bfrt.json deleted file mode 100644 index 70676b2554e..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/psa-dpdk-struct-field.p4.bfrt.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.MyIngressControl.stub", - "id" : 43002152, - "table_type" : "MatchAction_Direct", - "size" : 1000000, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [], - "action_specs" : [ - { - "id" : 20013177, - "name" : "MyIngressControl.macswp", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/psa-example-mask-range-err.p4-error b/testdata/p4_16_dpdk_errors_outputs/psa-example-mask-range-err.p4-error deleted file mode 100644 index d2c1c45a7e8..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/psa-example-mask-range-err.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -psa-example-mask-range-err.p4(67): [--Werror=invalid] error: user_meta.data: must be a compile-time constant - user_meta.data &&& 0x0F00: parse_ipv4; - ^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_dpdk_errors_outputs/psa-example-mask-range-err.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/psa-example-mask-range-err.p4.bfrt.json deleted file mode 100644 index 7c754951f6b..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/psa-example-mask-range-err.p4.bfrt.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.ingress.tbl", - "id" : 44506256, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Ternary", - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 65537, - "name" : "$MATCH_PRIORITY", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 29480552, - "name" : "ingress.execute", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_dpdk_errors_outputs/psa-example-register2-bmv2.p4-error b/testdata/p4_16_dpdk_errors_outputs/psa-example-register2-bmv2.p4-error deleted file mode 100644 index 9e86999ec05..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/psa-example-register2-bmv2.p4-error +++ /dev/null @@ -1,54 +0,0 @@ -psa-example-register2-bmv2.p4(84): [--Werror=target-error] error: Unsupported bitwidth 80 in 80w0xffffffff000000000000 - s[(80 -1):48] = s[(80 -1):48] + 1; - ^^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(84): [--Werror=target-error] error: Unsupported bitwidth 80 in s - s[(80 -1):48] = s[(80 -1):48] + 1; - ^ -psa-example-register2-bmv2.p4(84): [--Werror=target-error] error: Unsupported bitwidth 80 in ~80w0xffffffff000000000000 - s[(80 -1):48] = s[(80 -1):48] + 1; - ^^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(84): [--Werror=target-error] error: Unsupported bitwidth 80 in tmp - s[(80 -1):48] = s[(80 -1):48] + 1; - ^ -psa-example-register2-bmv2.p4(84): [--Werror=target-error] error: Unsupported bitwidth 80 in (bit<80>)tmp_0/tmp[79:48] + 1 - s[(80 -1):48] = s[(80 -1):48] + 1; - ^^^^^^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(84): [--Werror=target-error] error: Unsupported bitwidth 80 in (bit<80>)(tmp_0/tmp[79:48] + 1) << 48 - s[(80 -1):48] = s[(80 -1):48] + 1; - ^^^^^^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(84): [--Werror=target-error] error: Unsupported bitwidth 80 in 80w0xffffffff000000000000 - s[(80 -1):48] = s[(80 -1):48] + 1; - ^^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(84): [--Werror=target-error] error: Unsupported bitwidth 80 in s_0/s & ~1208925819333154197995520 - s[(80 -1):48] = s[(80 -1):48] + 1; - ^^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(84): [--Werror=target-error] error: Unsupported bitwidth 80 in (bit<80>)(tmp_0/tmp[79:48] + 1) << 48 & 1208925819333154197995520 - s[(80 -1):48] = s[(80 -1):48] + 1; - ^^^^^^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(85): [--Werror=target-error] error: Unsupported bitwidth 80 in 80w0xffffffffffff - s[(48 -1):0] = (s[(48 -1):0] + - ^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(85): [--Werror=target-error] error: Unsupported bitwidth 80 in s - s[(48 -1):0] = (s[(48 -1):0] + - ^ -psa-example-register2-bmv2.p4(85): [--Werror=target-error] error: Unsupported bitwidth 80 in ~80w0xffffffffffff - s[(48 -1):0] = (s[(48 -1):0] + - ^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(85): [--Werror=target-error] error: Unsupported bitwidth 80 in s - s[(48 -1):0] = (s[(48 -1):0] + - ^ -psa-example-register2-bmv2.p4(85): [--Werror=target-error] error: Unsupported bitwidth 80 in (bit<80>)s_0/s[47:0] + (bit<48>)hdr.ipv4.totalLen - s[(48 -1):0] = (s[(48 -1):0] + - ^ -psa-example-register2-bmv2.p4(85): [--Werror=target-error] error: Unsupported bitwidth 80 in (bit<80>)(s_0/s[47:0] + (bit<48>)hdr.ipv4.totalLen) << 0 - s[(48 -1):0] = (s[(48 -1):0] + - ^ -psa-example-register2-bmv2.p4(85): [--Werror=target-error] error: Unsupported bitwidth 80 in 80w0xffffffffffff - s[(48 -1):0] = (s[(48 -1):0] + - ^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(85): [--Werror=target-error] error: Unsupported bitwidth 80 in s_0/s & ~281474976710655 - s[(48 -1):0] = (s[(48 -1):0] + - ^^^^^^^^^^^^ -psa-example-register2-bmv2.p4(85): [--Werror=target-error] error: Unsupported bitwidth 80 in (bit<80>)(s_0/s[47:0] + (bit<48>)hdr.ipv4.totalLen) << 0 & 281474976710655 - s[(48 -1):0] = (s[(48 -1):0] + - ^ diff --git a/testdata/p4_16_dpdk_errors_outputs/psa-example-register2-bmv2.p4.bfrt.json b/testdata/p4_16_dpdk_errors_outputs/psa-example-register2-bmv2.p4.bfrt.json deleted file mode 100644 index 85169e74e84..00000000000 --- a/testdata/p4_16_dpdk_errors_outputs/psa-example-register2-bmv2.p4.bfrt.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.ingress.port_pkt_ip_bytes_in", - "id" : 383813656, - "table_type" : "Register", - "size" : 512, - "annotations" : [], - "depends_on" : [], - "key" : [ - { - "id" : 65557, - "name" : "$REGISTER_INDEX", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65557, - "name" : "$REGISTER_INDEX", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 80 - } - } - } - ], - "supported_operations" : ["Sync"], - "attributes" : [] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_ebpf_errors/header_unaligned.p4 b/testdata/p4_16_ebpf_errors/header_unaligned.p4 deleted file mode 100644 index 8317c204677..00000000000 --- a/testdata/p4_16_ebpf_errors/header_unaligned.p4 +++ /dev/null @@ -1,28 +0,0 @@ -#include -#include - -header ThreeBit_h { - bit<3> x; -} - -struct Headers_t { - ThreeBit_h foo; - ThreeBit_h bar; -} - -parser prs(packet_in p, out Headers_t headers) { - state start { - p.extract(headers.foo); - p.extract(headers.bar); - transition accept; - } -} - -control pipe(inout Headers_t headers, out bool pass) { - - apply { - pass = true; - } -} - -ebpfFilter(prs(), pipe()) main; diff --git a/testdata/p4_16_ebpf_errors_outputs/header_unaligned.p4-stderr b/testdata/p4_16_ebpf_errors_outputs/header_unaligned.p4-stderr deleted file mode 100644 index f8538551349..00000000000 --- a/testdata/p4_16_ebpf_errors_outputs/header_unaligned.p4-stderr +++ /dev/null @@ -1,6 +0,0 @@ -header_unaligned.p4(15): [--Werror=target-error] error: Header headers.foo size 3 is not a multiple of 8 bits. - p.extract(headers.foo); - ^^^^^^^^^^^ -header_unaligned.p4(16): [--Werror=target-error] error: Header headers.bar size 3 is not a multiple of 8 bits. - p.extract(headers.bar); - ^^^^^^^^^^^ diff --git a/testdata/p4_16_errors_outputs/dup-param1.p4 b/testdata/p4_16_errors_outputs/dup-param1.p4 deleted file mode 100644 index 0d7467c5e2b..00000000000 --- a/testdata/p4_16_errors_outputs/dup-param1.p4 +++ /dev/null @@ -1,5 +0,0 @@ -control MyIngress

(inout bit<32> p) { - apply { - } -} - diff --git a/testdata/p4_16_errors_outputs/dup-param3.p4 b/testdata/p4_16_errors_outputs/dup-param3.p4 deleted file mode 100644 index f3766b585e6..00000000000 --- a/testdata/p4_16_errors_outputs/dup-param3.p4 +++ /dev/null @@ -1,5 +0,0 @@ -control MyIngress

(inout bit<32> p)(bit<32> p) { - apply { - } -} - diff --git a/testdata/p4_16_errors_outputs/function_e-first.p4 b/testdata/p4_16_errors_outputs/function_e-first.p4 deleted file mode 100644 index 67356b3b3ec..00000000000 --- a/testdata/p4_16_errors_outputs/function_e-first.p4 +++ /dev/null @@ -1,14 +0,0 @@ -bit<16> max(in bit<16> left, in bit<16> right) { - if (left > right) - return left; -} -control c(out bit<16> b) { - apply { - b = max(16w10, 16w12); - } -} - -control ctrl(out bit<16> b); -package top(ctrl _c); -top(c()) main; - diff --git a/testdata/p4_16_errors_outputs/generic_e.p4-stderr b/testdata/p4_16_errors_outputs/generic_e.p4-stderr deleted file mode 100644 index 54ec810b65e..00000000000 --- a/testdata/p4_16_errors_outputs/generic_e.p4-stderr +++ /dev/null @@ -1,4 +0,0 @@ -../testdata/p4_16_errors/generic_e.p4(18):syntax error, unexpected TYPE - void f -#define V1MODEL_VERSION 20180101 -#include - -struct metadata { - bit<3> x; -} - -struct headers { -} - -parser MyParser(packet_in packet, out headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - state start { - transition accept; - } -} - -control MyVerifyChecksum(inout headers hdr, inout metadata meta) { - apply { - } -} - -control MyIngress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - action hash() { - hash(meta.x, HashAlgorithm.crc16, 3w0, { }, 3w7); - } - apply { - } -} - -control MyEgress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - apply { - } -} - -control MyComputeChecksum(inout headers hdr, inout metadata meta) { - apply { - } -} - -control MyDeparser(packet_out packet, in headers hdr) { - apply { - } -} - -V1Switch(MyParser(), MyVerifyChecksum(), MyIngress(), MyEgress(), MyComputeChecksum(), MyDeparser()) main; - diff --git a/testdata/p4_16_errors_outputs/issue1724.p4 b/testdata/p4_16_errors_outputs/issue1724.p4 deleted file mode 100644 index 10940cd04f4..00000000000 --- a/testdata/p4_16_errors_outputs/issue1724.p4 +++ /dev/null @@ -1,3 +0,0 @@ -action test(inout bit<16> a, inout bit<2> b) { - b = (a << 3)[1:0]; -} diff --git a/testdata/p4_16_errors_outputs/issue1724.p4-stderr b/testdata/p4_16_errors_outputs/issue1724.p4-stderr deleted file mode 100644 index 3559da072b5..00000000000 --- a/testdata/p4_16_errors_outputs/issue1724.p4-stderr +++ /dev/null @@ -1,3 +0,0 @@ -issue1724.p4(3): [--Werror=type-error] error: a[-2:0]: negative bit index -2 - b = (a << 3)[1:0]; - ^^^^^^^^^^^^^ diff --git a/testdata/p4_16_errors_outputs/issue1777-bmv2.p4.entries.txtpb b/testdata/p4_16_errors_outputs/issue1777-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue1777-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_errors_outputs/issue1777-bmv2.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/issue1777-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..b8b6123fa6d --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue1777-bmv2.p4.p4info.txtpb @@ -0,0 +1,51 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +registers { + preamble { + id: 369563462 + name: "ingress.reg1" + alias: "reg1" + } + type_spec { + bitstring { + bit { + bitwidth: 8 + } + } + } + size: 16 +} +registers { + preamble { + id: 382138564 + name: "ingress.reg2" + alias: "reg2" + } + type_spec { + struct { + name: "reg_data2_t" + } + } + size: 16 +} +type_info { + structs { + key: "reg_data2_t" + value { + members { + name: "reg_fld1" + type_spec { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + } +} diff --git a/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.entries.txtpb b/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb new file mode 100644 index 00000000000..32e70c7db92 --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.p4info.txtpb @@ -0,0 +1,72 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 33777489 + name: "t0" + alias: "t0" + } + match_fields { + id: 1 + name: "smeta.ingress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 24155194 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +tables { + preamble { + id: 33777489 + name: "t0" + alias: "t0" + } + match_fields { + id: 1 + name: "smeta.ingress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 29700889 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 24155194 + name: "IngressI.c1.drop" + alias: "c1.drop" + } +} +actions { + preamble { + id: 29700889 + name: "IngressI.c2.drop" + alias: "c2.drop" + } +} +type_info { +} diff --git a/testdata/p4_16_errors_outputs/issue1932.p4 b/testdata/p4_16_errors_outputs/issue1932.p4 deleted file mode 100644 index 71e74aaaaf6..00000000000 --- a/testdata/p4_16_errors_outputs/issue1932.p4 +++ /dev/null @@ -1,9 +0,0 @@ -control foo(in bit<8> x, out bit<8> y) { - apply { - y = x + 7; - } -} - -bool foo() { - return true; -} diff --git a/testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4.entries.txtpb b/testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..707a7400ea3 --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4.p4info.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + diff --git a/testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4info.txt b/testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4info.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_errors_outputs/issue2544_shadowing1_pp.p4 b/testdata/p4_16_errors_outputs/issue2544_shadowing1_pp.p4 deleted file mode 100644 index 340e0c1bbe4..00000000000 --- a/testdata/p4_16_errors_outputs/issue2544_shadowing1_pp.p4 +++ /dev/null @@ -1,33 +0,0 @@ -#include - -header ethernet_t { - bit<48> dst_addr; - bit<48> src_addr; - bit<16> eth_type; -} - -struct Headers { - ethernet_t eth_hdr; -} - -parser p(packet_in pkt, out Headers hdr) { - state start { - transition parse_hdrs; - } - state parse_hdrs { - pkt.extract(hdr.eth_hdr); - transition accept; - } -} - -control ingress(inout Headers h) { - apply { - Headers h = h; - } -} - -parser Parser(packet_in b, out Headers hdr); -control Ingress(inout Headers hdr); -package top(Parser p, Ingress ig); -top(p(), ingress()) main; - diff --git a/testdata/p4_16_errors_outputs/issue3299.p4.entries.txtpb b/testdata/p4_16_errors_outputs/issue3299.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue3299.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_errors_outputs/issue3299.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/issue3299.p4.p4info.txtpb new file mode 100644 index 00000000000..9d59c3af333 --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue3299.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 20083844 + name: "I.a0" + alias: "a0" + } +} diff --git a/testdata/p4_16_errors_outputs/issue532.p4.entries.txtpb b/testdata/p4_16_errors_outputs/issue532.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue532.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb new file mode 100644 index 00000000000..102d122c522 --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue532.p4.p4info.txtpb @@ -0,0 +1,42 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 31981161 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 31981161 + name: "ingress.select_entry" + alias: "select_entry" + } + params { + id: 1 + name: "choices" + } +} +type_info { +} diff --git a/testdata/p4_16_errors_outputs/issue774-2-first.p4 b/testdata/p4_16_errors_outputs/issue774-2-first.p4 deleted file mode 100644 index 2e7206d732b..00000000000 --- a/testdata/p4_16_errors_outputs/issue774-2-first.p4 +++ /dev/null @@ -1,49 +0,0 @@ -#include -#define V1MODEL_VERSION 20180101 -#include - -header Header { - bit<32> data; -} - -struct M { -} - -parser ParserI(packet_in b, out Header p, inout M m, inout standard_metadata_t s) { - state start { - b.extract<_>(_); - transition next; - } - state next { - b.extract

(p); - transition accept; - } -} - -control IngressI(inout Header p, inout M meta, inout standard_metadata_t s) { - apply { - } -} - -control EgressI(inout Header hdr, inout M meta, inout standard_metadata_t smeta) { - apply { - } -} - -control DeparserI(packet_out pk, in Header hdr) { - apply { - } -} - -control VerifyChecksumI(inout Header hdr, inout M meta) { - apply { - } -} - -control ComputeChecksumI(inout Header hdr, inout M meta) { - apply { - } -} - -V1Switch(ParserI(), VerifyChecksumI(), IngressI(), EgressI(), ComputeChecksumI(), DeparserI()) main; - diff --git a/testdata/p4_16_errors_outputs/nostart-first.p4 b/testdata/p4_16_errors_outputs/nostart-first.p4 deleted file mode 100644 index baa04295f0e..00000000000 --- a/testdata/p4_16_errors_outputs/nostart-first.p4 +++ /dev/null @@ -1,10 +0,0 @@ -parser p() { - state next { - transition reject; - } -} - -parser nothing(); -package top(nothing _n); -top(p()) main; - diff --git a/testdata/p4_16_errors_outputs/not_bound-frontend.p4 b/testdata/p4_16_errors_outputs/not_bound-frontend.p4 deleted file mode 100644 index 687d10cd083..00000000000 --- a/testdata/p4_16_errors_outputs/not_bound-frontend.p4 +++ /dev/null @@ -1,47 +0,0 @@ -struct headers { -} - -struct metadata { -} - -#include -#define V1MODEL_VERSION 20180101 -#include - -parser ParserImpl(packet_in packet, out headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - state start { - transition accept; - } -} - -control egress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - apply { - } -} - -control ingress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - @name("ingress.set_nhop") action set_nhop(@name("port") bit<9> port) { - standard_metadata.egress_spec = port; - } - apply { - set_nhop(); - } -} - -control DeparserImpl(packet_out packet, in headers hdr) { - apply { - } -} - -control verifyChecksum(inout headers hdr, inout metadata meta) { - apply { - } -} - -control computeChecksum(inout headers hdr, inout metadata meta) { - apply { - } -} - -V1Switch(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main; - diff --git a/testdata/p4_16_errors_outputs/not_bound-midend.p4 b/testdata/p4_16_errors_outputs/not_bound-midend.p4 deleted file mode 100644 index 18618eeeac5..00000000000 --- a/testdata/p4_16_errors_outputs/not_bound-midend.p4 +++ /dev/null @@ -1,54 +0,0 @@ -struct headers { -} - -struct metadata { -} - -#include -#define V1MODEL_VERSION 20180101 -#include - -parser ParserImpl(packet_in packet, out headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - state start { - transition accept; - } -} - -control egress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - apply { - } -} - -control ingress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - @name("port") bit<9> port; - @name("ingress.set_nhop") action set_nhop() { - standard_metadata.egress_spec = port; - } - @hidden table tbl_set_nhop { - actions = { - set_nhop(); - } - const default_action = set_nhop(); - } - apply { - tbl_set_nhop.apply(); - } -} - -control DeparserImpl(packet_out packet, in headers hdr) { - apply { - } -} - -control verifyChecksum(inout headers hdr, inout metadata meta) { - apply { - } -} - -control computeChecksum(inout headers hdr, inout metadata meta) { - apply { - } -} - -V1Switch(ParserImpl(), verifyChecksum(), ingress(), egress(), computeChecksum(), DeparserImpl()) main; - diff --git a/testdata/p4_16_errors_outputs/not_bound.p4.entries.txt b/testdata/p4_16_errors_outputs/not_bound.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_errors_outputs/not_bound.p4.p4info.txt b/testdata/p4_16_errors_outputs/not_bound.p4.p4info.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_errors_outputs/push_nonconstant-first.p4 b/testdata/p4_16_errors_outputs/push_nonconstant-first.p4 deleted file mode 100644 index f180a8e885b..00000000000 --- a/testdata/p4_16_errors_outputs/push_nonconstant-first.p4 +++ /dev/null @@ -1,18 +0,0 @@ -#include - -header H { - bit<32> u; -} - -control c() { - apply { - H[3] h; - bit<32> x = 32w1; - h.push_front(x); - } -} - -control proto(); -package top(proto _p); -top(c()) main; - diff --git a/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.entries.txtpb b/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.entries.txtpb new file mode 100644 index 00000000000..0b41133a418 --- /dev/null +++ b/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.entries.txtpb @@ -0,0 +1,114 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 42140569 + match { + field_id: 1 + lpm { + value: "\000" + prefix_len: 4 + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\013" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 42140569 + match { + field_id: 1 + lpm { + value: "\020" + prefix_len: 4 + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\014" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 42140569 + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\r" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 42140569 + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\016" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 42140569 + match { + field_id: 1 + lpm { + value: "\000" + prefix_len: 8 + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\017" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb new file mode 100644 index 00000000000..1693608bd91 --- /dev/null +++ b/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 42140569 + name: "ingress.t_lpm" + alias: "t_lpm" + } + match_fields { + id: 1 + name: "h.h.l" + bitwidth: 8 + match_type: LPM + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.entries.txtpb b/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..e3e5797aea3 --- /dev/null +++ b/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.entries.txtpb @@ -0,0 +1,83 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 38131002 + match { + field_id: 1 + optional { + } + } + match { + field_id: 2 + optional { + value: "\021\021" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\001" + } + } + } + priority: 3 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38131002 + match { + field_id: 1 + optional { + value: "\000" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\002" + } + } + } + priority: 2 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38131002 + match { + field_id: 2 + optional { + value: "\000\000" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\003" + } + } + } + priority: 1 + is_const: true + } + } +} diff --git a/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..16fea8f083b --- /dev/null +++ b/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 38131002 + name: "ingress.t_optional" + alias: "t_optional" + } + match_fields { + id: 1 + name: "h.h.e" + bitwidth: 8 + match_type: OPTIONAL + } + match_fields { + id: 2 + name: "h.h.t" + bitwidth: 16 + match_type: OPTIONAL + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} 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 deleted file mode 100644 index 076b1bc0134..00000000000 --- a/testdata/p4_16_pna_errors/pna-add-on-miss-err.p4 +++ /dev/null @@ -1,200 +0,0 @@ -/* -Copyright 2020 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include "pna.p4" - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - -// BEGIN:Counter_Example_Part1 -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; - -const bit<32> NUM_PORTS = 4; -// END:Counter_Example_Part1 - - -////////////////////////////////////////////////////////////////////// -// Struct types for holding user-defined collections of headers and -// metadata in the P4 developer's program. -// -// Note: The names of these struct types are completely up to the P4 -// developer, as are their member fields, with the only restriction -// being that the structs intended to contain headers should only -// contain members whose types are header, header stack, or -// header_union. -////////////////////////////////////////////////////////////////////// - -struct main_metadata_t { - ExpireTimeProfileId_t timeout; -} - -// User-defined struct containing all of those headers parsed in the -// main parser. -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - // Note: This program does not demonstrate all of the code - // that would be necessary if you were implementing IPsec - // packet decryption. - - // If it did, then this pre control implementation would do - // one or more table lookups in order to determine whether the - // packet was IPsec encapsulated, and if so, whether it is - // part of a security association that was established by the - // control plane software. - - // It would also likely perform anti-replay attack detection - // on the IPsec sequence number, which is in the unencrypted - // part of the packet. - - // Any headers parsed by the pre parser in pre_hdr will be - // forgotten after this point. The main parser will start - // parsing over from the beginning, either on the same packet - // if the inline extern block did nothing, or on the packet as - // modified by the inline extern block. - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -// BEGIN:Counter_Example_Part2 -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action next_hop(PortId_t vport) { - send_to_port(vport); - } - action add_on_miss_action() { - bit<32> tmp = 0; - add_entry(action_name="next_hop", action_params = tmp, expire_time_profile_id = user_meta.timeout); - } - table ipv4_da { - key = { - hdr.ipv4.dstAddr: exact; - } - actions = { - @tableonly next_hop; - @defaultonly add_on_miss_action; - } - add_on_miss = false; - const default_action = add_on_miss_action; - } - action next_hop2(PortId_t vport, bit<32> newAddr) { - send_to_port(vport); - hdr.ipv4.srcAddr = newAddr; - } - action add_on_miss_action2() { - add_entry(action_name="next_hop2", action_params = {32w0, 32w1234}, expire_time_profile_id = user_meta.timeout); - } - table ipv4_da2 { - key = { - hdr.ipv4.dstAddr: exact; - } - actions = { - @tableonly next_hop2; - @defaultonly add_on_miss_action2; - } - add_on_miss = true; - const default_action = add_on_miss_action2; - } - apply { - if (hdr.ipv4.isValid()) { - ipv4_da.apply(); - ipv4_da2.apply(); - } - } -} -// END:Counter_Example_Part2 - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - // Hoping to make this optional parameter later, but not supported - // by p4c yet. - //, PreParserImpl() - ) main; -// END:Package_Instantiation_Example 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 deleted file mode 100644 index 470641bcc08..00000000000 --- a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-1.p4 +++ /dev/null @@ -1,142 +0,0 @@ -#include -#include "pna.p4" - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - -// BEGIN:Counter_Example_Part1 -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; - -const bit<32> NUM_PORTS = 512; -// END:Counter_Example_Part1 - -struct main_metadata_t { -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -// BEGIN:Counter_Example_Part2 -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - DirectCounter(PNA_CounterType_t.PACKETS_AND_BYTES) - per_prefix_pkt_byte_count; - DirectCounter(PNA_CounterType_t.PACKETS_AND_BYTES) - per_prefix_pkt_byte_count1; - - action next_hop(PortId_t oport) { - per_prefix_pkt_byte_count.count(); - send_to_port(oport); - } - action default_route_drop() { - per_prefix_pkt_byte_count.count(); - drop_packet(); - } - table ipv4_tbl1 { - key = { hdr.ipv4.dstAddr: exact; } - actions = { - default_route_drop; - } - default_action = default_route_drop; - // table ipv4_tbl1 owns this DirectCounter instance - pna_direct_counter = per_prefix_pkt_byte_count1; - } - table ipv4_tbl { - key = { hdr.ipv4.dstAddr: lpm; } - actions = { - next_hop; - default_route_drop; - } - default_action = default_route_drop; - // table ipv4_tbl owns this DirectCounter instance - pna_direct_counter = per_prefix_pkt_byte_count; - } - apply { - if (hdr.ipv4.isValid()) { - per_prefix_pkt_byte_count.count(); - ipv4_tbl.apply(); - ipv4_tbl1.apply(); - } - } -} -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - ) main; -// END:Package_Instantiation_Example diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-2.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-2.p4 deleted file mode 100644 index 1185b2d51c4..00000000000 --- a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-2.p4 +++ /dev/null @@ -1,122 +0,0 @@ -#include -#include - -typedef bit<48> EthernetAddress; -const bit<8> ETHERNET_HEADER_LEN = 14; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - - -struct main_metadata_t { -} - - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; -typedef bit<16> FlowIdx_t; -const bit<32> IPV4_HOST_TABLE_MAX_ENTRIES = 1024; - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { } -} - - -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - DirectCounter(PNA_CounterType_t.PACKETS_AND_BYTES) per_prefix_pkt_bytes_count; - - action send_pktbytecount() { - per_prefix_pkt_bytes_count.count(1024); - } - - table ipv4_host_pkt_byte_count { - key = { - hdr.ipv4.dstAddr : exact; - } - - actions = { - send_pktbytecount; - } - - const default_action = send_pktbytecount; - size = IPV4_HOST_TABLE_MAX_ENTRIES; - pna_direct_counter = per_prefix_pkt_bytes_count; - } - - apply { - per_prefix_pkt_bytes_count.count(1024); - ipv4_host_pkt_byte_count.apply(); - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in main_metadata_t user_meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -PNA_NIC(MainParserImpl(), PreControlImpl(), MainControlImpl(), MainDeparserImpl()) main; - 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 deleted file mode 100644 index 63f1167c2d2..00000000000 --- a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-3.p4 +++ /dev/null @@ -1,146 +0,0 @@ -#include -#include - -typedef bit<48> EthernetAddress; -const bit<8> ETHERNET_HEADER_LEN = 14; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - - -struct main_metadata_t { -} - - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; -typedef bit<16> FlowIdx_t; -const bit<32> IPV4_HOST_TABLE_MAX_ENTRIES = 1024; - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { } -} - - -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - DirectCounter(PNA_CounterType_t.BYTES) per_prefix_bytes_count; - DirectCounter(PNA_CounterType_t.PACKETS_AND_BYTES) per_prefix_pkt_bytes_count; - action drop() { - drop_packet(); - } - - action send_bytecount(PortId_t port) { - send_to_port(port); - per_prefix_pkt_bytes_count.count(1024); - } - - action send_pktbytecount(PortId_t port) { - send_to_port(port); - per_prefix_bytes_count.count(1024); - } - - table ipv4_host_byte_count { - key = { - hdr.ipv4.dstAddr : exact; - } - - actions = { - drop; - send_bytecount; - } - - size = IPV4_HOST_TABLE_MAX_ENTRIES; - pna_direct_counter = per_prefix_bytes_count; - } - - table ipv4_host_pkt_byte_count { - key = { - hdr.ipv4.dstAddr : exact; - } - - actions = { - drop; - send_pktbytecount; - } - - size = IPV4_HOST_TABLE_MAX_ENTRIES; - pna_direct_counter = per_prefix_pkt_bytes_count; - } - - apply { - ipv4_host_byte_count.apply(); - ipv4_host_pkt_byte_count.apply(); - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in main_metadata_t user_meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -PNA_NIC(MainParserImpl(), PreControlImpl(), MainControlImpl(), MainDeparserImpl()) main; - 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 deleted file mode 100644 index 614a347386a..00000000000 --- a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-4.p4 +++ /dev/null @@ -1,143 +0,0 @@ -#include -#include "pna.p4" - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - -// BEGIN:Counter_Example_Part1 -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; - -const bit<32> NUM_PORTS = 512; -// END:Counter_Example_Part1 - -struct main_metadata_t { - // empty for this skeleton -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -// BEGIN:Counter_Example_Part2 -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - DirectCounter(PNA_CounterType_t.PACKETS_AND_BYTES) - per_prefix_pkt_byte_count; - DirectCounter(PNA_CounterType_t.PACKETS_AND_BYTES) - per_prefix_pkt_byte_count1; - - action next_hop(PortId_t oport) { - per_prefix_pkt_byte_count.count(); - per_prefix_pkt_byte_count1.count(); - send_to_port(oport); - } - action default_route_drop() { - per_prefix_pkt_byte_count1.count(); - drop_packet(); - } - table ipv4_tbl1 { - key = { hdr.ipv4.dstAddr: exact; } - actions = { - next_hop; - default_route_drop; - } - default_action = default_route_drop; - // table ipv4_tbl1 owns this DirectCounter instance - pna_direct_counter = per_prefix_pkt_byte_count1; - } - table ipv4_tbl { - key = { hdr.ipv4.dstAddr: exact; } - actions = { - next_hop; - default_route_drop; - } - // table ipv4_tbl owns this DirectCounter instance - pna_direct_counter = per_prefix_pkt_byte_count; - } - apply { - if (hdr.ipv4.isValid()) { - ipv4_tbl.apply(); - ipv4_tbl1.apply(); - } - } -} -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - ) main; -// END:Package_Instantiation_Example diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err.p4 deleted file mode 100644 index 54084e467dc..00000000000 --- a/testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err.p4 +++ /dev/null @@ -1,131 +0,0 @@ -#include -#include - -typedef bit<48> EthernetAddress; -const bit<8> ETHERNET_HEADER_LEN = 14; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - - -struct main_metadata_t { - bit<32> data; -} - - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; -typedef bit<16> FlowIdx_t; -const bit<32> IPV4_HOST_TABLE_MAX_ENTRIES = 1024; - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { } -} - - -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - DirectCounter(PNA_CounterType_t.PACKETS_AND_BYTES) per_prefix_pkt_count; - ActionSelector(PNA_HashAlgorithm_t.TARGET_DEFAULT, 32w1024, 32w16) as; - action drop() { - drop_packet(); - } - - action send(PortId_t port) { - send_to_port(port); - per_prefix_pkt_count.count(1024); - } - - table ipv4_host { - key = { - hdr.ipv4.dstAddr : exact; - user_meta.data : selector; - } - - actions = { - drop; - send; - } - - const default_action = drop; - size = IPV4_HOST_TABLE_MAX_ENTRIES; - // Direct counter and implementation property cannot co-exist - pna_direct_counter = per_prefix_pkt_count; - pna_implementation = as; - } - - apply { - ipv4_host.apply(); - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in main_metadata_t user_meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -PNA_NIC(MainParserImpl(), PreControlImpl(), MainControlImpl(), MainDeparserImpl()) main; - 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 deleted file mode 100644 index 94b7968f94d..00000000000 --- a/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-2.p4 +++ /dev/null @@ -1,121 +0,0 @@ -#include -#include - -typedef bit<48> EthernetAddress; -const bit<8> ETHERNET_HEADER_LEN = 14; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - -struct main_metadata_t { - bit<32> port_out; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -const bit<32> IPV4_HOST_TABLE_MAX_ENTRIES = 1024; - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { } -} - - -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - PNA_MeterColor_t color_out; - PNA_MeterColor_t out1; - PNA_MeterColor_t color_in = PNA_MeterColor_t.RED; - DirectMeter(PNA_MeterType_t.PACKETS) meter0; - action send() { - out1 = meter0.dpdk_execute(color_in, 32w1024); - user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - } - - table ipv4_host { - key = { - hdr.ipv4.dstAddr : exact; - } - - actions = { - send; - } - - const default_action = send; - size = IPV4_HOST_TABLE_MAX_ENTRIES; - pna_direct_meter = meter0; - } - - apply { - color_out = meter0.dpdk_execute(color_in, 32w1024); - user_meta.port_out = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - ipv4_host.apply(); - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in main_metadata_t user_meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -PNA_NIC(MainParserImpl(), PreControlImpl(), MainControlImpl(), MainDeparserImpl()) main; - diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-3.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-3.p4 deleted file mode 100644 index fa745f7efbc..00000000000 --- a/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-3.p4 +++ /dev/null @@ -1,153 +0,0 @@ -#include -#include "dpdk/pna.p4" - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - -// BEGIN:Counter_Example_Part1 -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; - -const bit<32> NUM_PORTS = 512; -// END:Counter_Example_Part1 - -struct main_metadata_t { - bit<32> port_out; - bit<32> port_out1; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -// BEGIN:Counter_Example_Part2 -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - PNA_MeterColor_t color_out; - PNA_MeterColor_t out1; - PNA_MeterColor_t color_in = PNA_MeterColor_t.RED; - DirectMeter(PNA_MeterType_t.BYTES) meter0; - DirectMeter(PNA_MeterType_t.BYTES) meter1; - action next_hop(PortId_t oport) { - out1 = meter0.dpdk_execute(color_in, 32w1024); - user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - color_out = meter1.dpdk_execute(color_in, 32w1024); - user_meta.port_out1 = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - send_to_port(oport); - } - action default_route_drop() { - out1 = meter0.dpdk_execute(color_in, 32w1024); - user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - drop_packet(); - } - action default_route_drop1() { - out1 = meter1.dpdk_execute(color_in, 32w1024); - user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - drop_packet(); - } - table ipv4_da1 { - key = { hdr.ipv4.dstAddr: exact; } - actions = { - next_hop; - default_route_drop; - } - default_action = default_route_drop; - // table ipv4_da1 owns this DirectCounter instance - pna_direct_meter = meter0; - } - table ipv4_da { - key = { hdr.ipv4.dstAddr: exact; } - actions = { - next_hop; - default_route_drop1; - } - default_action = default_route_drop1; - // table ipv4_da owns this DirectCounter instance - pna_direct_meter = meter1; - } - apply { - if (hdr.ipv4.isValid()) { - ipv4_da.apply(); - ipv4_da1.apply(); - } - } -} -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - ) main; -// END:Package_Instantiation_Example 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 deleted file mode 100644 index f1039ecb407..00000000000 --- a/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-4.p4 +++ /dev/null @@ -1,175 +0,0 @@ -#include -#include "pna.p4" - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - -// BEGIN:Counter_Example_Part1 -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; - -const bit<32> NUM_PORTS = 512; -// END:Counter_Example_Part1 - -struct main_metadata_t { - bit<32> port_out; - bit<32> port_out1; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - // Note: This program does not demonstrate all of the code - // that would be necessary if you were implementing IPsec - // packet decryption. - - // If it did, then this pre control implementation would do - // one or more table lookups in order to determine whether the - // packet was IPsec encapsulated, and if so, whether it is - // part of a security association that was established by the - // control plane software. - - // It would also likely perform anti-replay attack detection - // on the IPsec sequence number, which is in the unencrypted - // part of the packet. - - // Any headers parsed by the pre parser in pre_hdr will be - // forgotten after this point. The main parser will start - // parsing over from the beginning, either on the same packet - // if the inline extern block did nothing, or on the packet as - // modified by the inline extern block. - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -// BEGIN:Counter_Example_Part2 -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - PNA_MeterColor_t color_out; - PNA_MeterColor_t out1; - PNA_MeterColor_t color_in = PNA_MeterColor_t.RED; - DirectMeter(PNA_MeterType_t.BYTES) meter0; - DirectMeter(PNA_MeterType_t.BYTES) meter1; - - action next_hop(PortId_t oport) { - out1 = meter0.execute(color_in, 32w1024); - user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - color_out = meter1.execute(color_in, 32w1024); - user_meta.port_out1 = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - send_to_port(oport); - } - - action default_route_drop() { - out1 = meter0.execute(color_in, 32w1024); - user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - drop_packet(); - } - - table ipv4_da_1 { - key = { hdr.ipv4.dstAddr: exact; } - actions = { - next_hop; - default_route_drop; - } - default_action = default_route_drop; - // table ipv4_da_lpm owns this DirectCounter instance - pna_direct_meter = meter0; - } - - table ipv4_da_2 { - key = { hdr.ipv4.dstAddr: exact; } - actions = { - next_hop; - default_route_drop; - } - default_action = default_route_drop; - // table ipv4_da_lpm owns this DirectCounter instance - pna_direct_meter = meter1; - } - - apply { - if (hdr.ipv4.isValid()) { - color_out = meter1.execute(color_in, 32w1024); - user_meta.port_out1 = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0); - ipv4_da_1.apply(); - ipv4_da_2.apply(); - } - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - ) main; -// END:Package_Instantiation_Example diff --git a/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err.p4 b/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err.p4 deleted file mode 100644 index 54084e467dc..00000000000 --- a/testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err.p4 +++ /dev/null @@ -1,131 +0,0 @@ -#include -#include - -typedef bit<48> EthernetAddress; -const bit<8> ETHERNET_HEADER_LEN = 14; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct empty_metadata_t { -} - - -struct main_metadata_t { - bit<32> data; -} - - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; -typedef bit<16> FlowIdx_t; -const bit<32> IPV4_HOST_TABLE_MAX_ENTRIES = 1024; - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { } -} - - -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - DirectCounter(PNA_CounterType_t.PACKETS_AND_BYTES) per_prefix_pkt_count; - ActionSelector(PNA_HashAlgorithm_t.TARGET_DEFAULT, 32w1024, 32w16) as; - action drop() { - drop_packet(); - } - - action send(PortId_t port) { - send_to_port(port); - per_prefix_pkt_count.count(1024); - } - - table ipv4_host { - key = { - hdr.ipv4.dstAddr : exact; - user_meta.data : selector; - } - - actions = { - drop; - send; - } - - const default_action = drop; - size = IPV4_HOST_TABLE_MAX_ENTRIES; - // Direct counter and implementation property cannot co-exist - pna_direct_counter = per_prefix_pkt_count; - pna_implementation = as; - } - - apply { - ipv4_host.apply(); - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in main_metadata_t user_meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -PNA_NIC(MainParserImpl(), PreControlImpl(), MainControlImpl(), MainDeparserImpl()) main; - diff --git a/testdata/p4_16_pna_errors/pna-example-addhit.p4 b/testdata/p4_16_pna_errors/pna-example-addhit.p4 deleted file mode 100644 index 683069960ed..00000000000 --- a/testdata/p4_16_pna_errors/pna-example-addhit.p4 +++ /dev/null @@ -1,221 +0,0 @@ -/* -Copyright 2022 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include "pna.p4" - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -header tcp_t { - bit<16> srcPort; - bit<16> dstPort; - bit<32> seqNo; - bit<32> ackNo; - bit<4> dataOffset; - bit<3> res; - bit<3> ecn; - bit<6> flags; - bit<16> window; - bit<16> checksum; - bit<16> urgentPtr; -} - - -struct empty_metadata_t { -} - -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; - -const bit<32> NUM_PORTS = 4; - - -////////////////////////////////////////////////////////////////////// -// Struct types for holding user-defined collections of headers and -// metadata in the P4 developer's program. -// -// Note: The names of these struct types are completely up to the P4 -// developer, as are their member fields, with the only restriction -// being that the structs intended to contain headers should only -// contain members whose types are header, header stack, or -// header_union. -////////////////////////////////////////////////////////////////////// - -struct main_metadata_t { - bit<1> rng_result1; - bit<1> val1; - bit<1> val2; - ExpireTimeProfileId_t timeout; -} - -// User-defined struct containing all of those headers parsed in the -// main parser. -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; - tcp_t tcp; -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -bit<1> dummy_func(inout headers_t hdr, bit<16> min1, - bit<16> max1,inout main_metadata_t user_meta){ - return (bit<1>) ((min1 <= hdr.tcp.srcPort) && (hdr.tcp.srcPort <= max1)); -} - -action do_range_checks_0 (inout headers_t hdr,inout main_metadata_t user_meta, - bit<16> min1, - bit<16> max1) { - user_meta.rng_result1 = dummy_func(hdr,min1, max1, user_meta ); -} - -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action next_hop(PortId_t vport) { - bit<32> tmp = 0; - add_entry(action_name="next_hop", action_params = tmp, expire_time_profile_id = user_meta.timeout); - send_to_port(vport); - } - action add_on_miss_action() { - bit<32> tmp = 0; - add_entry(action_name="next_hop", action_params = tmp, expire_time_profile_id = user_meta.timeout); - } - - action do_range_checks_1 ( - bit<16> min1, - bit<16> max1) - { - user_meta.rng_result1 = ((min1 <= hdr.tcp.srcPort) && (hdr.tcp.srcPort <= max1)) ? ((16w50 <= hdr.tcp.srcPort) && (hdr.tcp.srcPort <= 16w100)) ? user_meta.val1 : user_meta.val2 : user_meta.val1; - } - - table ipv4_da { - key = { - hdr.ipv4.dstAddr: exact; - - } - actions = { - @tableonly next_hop; - @defaultonly add_on_miss_action; - } - add_on_miss = true; - const default_action = add_on_miss_action; - } - action next_hop2(PortId_t vport, bit<32> newAddr) { - send_to_port(vport); - hdr.ipv4.srcAddr = newAddr; - } - action add_on_miss_action2() { - add_entry(action_name="next_hop", action_params = {32w0, 32w1234}, expire_time_profile_id = user_meta.timeout); - } - table ipv4_da2 { - key = { - hdr.ipv4.dstAddr: exact; - } - actions = { - @tableonly next_hop2; - @defaultonly add_on_miss_action2; - do_range_checks_1; - do_range_checks_0(hdr,user_meta); - } - add_on_miss = true; - const default_action = add_on_miss_action2; - } - apply { - user_meta.rng_result1 = (bit<1>) ((100 <= hdr.tcp.srcPort) && (hdr.tcp.srcPort <= 200)); - if (hdr.ipv4.isValid()) { - ipv4_da.apply(); - ipv4_da2.apply(); - } - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - // Hoping to make this optional parameter later, but not supported - // by p4c yet. - //, PreParserImpl() - ) main; -// END:Package_Instantiation_Example 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 deleted file mode 100644 index 47bd0dbf03e..00000000000 --- a/testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error.p4 +++ /dev/null @@ -1,125 +0,0 @@ -#include -#include "pna.p4" - -const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; - -const MirrorSessionId_t MIRROR_SESSION1 = (MirrorSessionId_t) 58; -const MirrorSessionId_t MIRROR_SESSION2 = (MirrorSessionId_t) 62; - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -struct main_metadata_t { -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION2); - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition select (hdr.ipv4.protocol) { - default: accept; - } - } -} - -control MainControlImpl( - inout headers_t hdr, - inout main_metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action send_with_mirror (PortId_t vport) { - send_to_port(vport); - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION1); - } - - action drop_with_mirror() { - drop_packet(); - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION2); - } - - table flowTable { - key = { - hdr.ipv4.srcAddr : exact; - hdr.ipv4.dstAddr : exact; - hdr.ipv4.protocol : exact; - } - actions = { - send_with_mirror; - drop_with_mirror; - NoAction; - } - const default_action = NoAction(); - } - - apply { - flowTable.apply(); - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in main_metadata_t user_meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - ) main; - 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 deleted file mode 100644 index bae55b628d4..00000000000 --- a/testdata/p4_16_pna_errors/pna-example-mirror-packet-ctxt-error1.p4 +++ /dev/null @@ -1,126 +0,0 @@ -#include -#include "pna.p4" - -const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; - -const MirrorSessionId_t MIRROR_SESSION1 = (MirrorSessionId_t) 58; -const MirrorSessionId_t MIRROR_SESSION2 = (MirrorSessionId_t) 62; - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -struct main_metadata_t { -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition select (hdr.ipv4.protocol) { - default: accept; - } - } -} - -control MainControlImpl( - inout headers_t hdr, - inout main_metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action send_with_mirror (PortId_t vport) { - send_to_port(vport); - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION1); - } - - action drop_with_mirror() { - drop_packet(); - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION2); - } - - table flowTable { - key = { - hdr.ipv4.srcAddr : exact; - hdr.ipv4.dstAddr : exact; - hdr.ipv4.protocol : exact; - } - actions = { - send_with_mirror; - drop_with_mirror; - NoAction; - } - const default_action = NoAction(); - } - - apply { - flowTable.apply(); - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in main_metadata_t user_meta, - in pna_main_output_metadata_t ostd) -{ - apply { - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION2); - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - ) main; - 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 deleted file mode 100644 index 8af7f2aff2c..00000000000 --- a/testdata/p4_16_pna_errors/pna-example-mirror-packet-error1.p4 +++ /dev/null @@ -1,125 +0,0 @@ -#include -#include "pna.p4" - -const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; - -const MirrorSessionId_t MIRROR_SESSION1 = (MirrorSessionId_t) 0; -const MirrorSessionId_t MIRROR_SESSION2 = (MirrorSessionId_t) 62; - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -struct main_metadata_t { -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition select (hdr.ipv4.protocol) { - default: accept; - } - } -} - -control MainControlImpl( - inout headers_t hdr, - inout main_metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action send_with_mirror (PortId_t vport) { - send_to_port(vport); - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION1); - } - - action drop_with_mirror() { - drop_packet(); - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION2); - } - - table flowTable { - key = { - hdr.ipv4.srcAddr : exact; - hdr.ipv4.dstAddr : exact; - hdr.ipv4.protocol : exact; - } - actions = { - send_with_mirror; - drop_with_mirror; - NoAction; - } - const default_action = NoAction(); - } - - apply { - flowTable.apply(); - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in main_metadata_t user_meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - ) main; - 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 deleted file mode 100644 index 163ed19b963..00000000000 --- a/testdata/p4_16_pna_errors/pna-example-mirror-packet-error2.p4 +++ /dev/null @@ -1,133 +0,0 @@ -#include -#include "pna.p4" - -const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; - -const MirrorSessionId_t MIRROR_SESSION1 = (MirrorSessionId_t) 58; -const MirrorSessionId_t MIRROR_SESSION2 = (MirrorSessionId_t) 62; -const MirrorSessionId_t MIRROR_SESSION3 = (MirrorSessionId_t) 6; - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -struct main_metadata_t { -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition select (hdr.ipv4.protocol) { - default: accept; - } - } -} - -control MainControlImpl( - inout headers_t hdr, - inout main_metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - MirrorSessionId_t mirror_session; - MirrorSlotId_t mirror_slot; - action send_with_mirror (PortId_t vport) { - send_to_port(vport); - mirror_packet(mirror_slot, mirror_session); - } - - action drop_with_mirror() { - drop_packet(); - mirror_packet(mirror_slot, mirror_session); - } - - table flowTable { - key = { - hdr.ipv4.srcAddr : exact; - hdr.ipv4.dstAddr : exact; - hdr.ipv4.protocol : exact; - } - actions = { - send_with_mirror; - drop_with_mirror; - NoAction; - } - const default_action = NoAction(); - } - - apply { - mirror_slot = MIRROR_SLOT_ID; - switch (flowTable.apply().action_run){ - send_with_mirror: { mirror_session = MIRROR_SESSION1;} - drop_with_mirror: { mirror_session = MIRROR_SESSION2;} - default: {mirror_session = MIRROR_SESSION3;} - } - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in main_metadata_t user_meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - ) main; - 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 deleted file mode 100644 index 602bbde1647..00000000000 --- a/testdata/p4_16_pna_errors/pna-example-mirror-packet-error3.p4 +++ /dev/null @@ -1,124 +0,0 @@ -#include -#include "pna.p4" - -const MirrorSlotId_t MIRROR_SLOT_ID = (MirrorSlotId_t) 3; - -const MirrorSessionId_t MIRROR_SESSION1 = (MirrorSessionId_t) 58; - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; -} - -struct main_metadata_t { -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition select (hdr.ipv4.protocol) { - default: accept; - } - } -} - -control MainControlImpl( - inout headers_t hdr, - inout main_metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action send_with_mirror (PortId_t vport) { - send_to_port(vport); - mirror_packet(MIRROR_SLOT_ID); - } - - action drop_with_mirror() { - drop_packet(); - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION1); - } - - table flowTable { - key = { - hdr.ipv4.srcAddr : exact; - hdr.ipv4.dstAddr : exact; - hdr.ipv4.protocol : exact; - } - actions = { - send_with_mirror; - drop_with_mirror; - NoAction; - } - const default_action = NoAction(); - } - - apply { - flowTable.apply(); - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in main_metadata_t user_meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - ) main; - diff --git a/testdata/p4_16_pna_errors/pna-example-miss.p4 b/testdata/p4_16_pna_errors/pna-example-miss.p4 deleted file mode 100644 index f1ddb822a82..00000000000 --- a/testdata/p4_16_pna_errors/pna-example-miss.p4 +++ /dev/null @@ -1,220 +0,0 @@ -/* -Copyright 2022 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include "pna.p4" - - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLen; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - bit<32> srcAddr; - bit<32> dstAddr; -} - -header tcp_t { - bit<16> srcPort; - bit<16> dstPort; - bit<32> seqNo; - bit<32> ackNo; - bit<4> dataOffset; - bit<3> res; - bit<3> ecn; - bit<6> flags; - bit<16> window; - bit<16> checksum; - bit<16> urgentPtr; -} - - -struct empty_metadata_t { -} - -typedef bit<48> ByteCounter_t; -typedef bit<32> PacketCounter_t; -typedef bit<80> PacketByteCounter_t; - -const bit<32> NUM_PORTS = 4; - - -////////////////////////////////////////////////////////////////////// -// Struct types for holding user-defined collections of headers and -// metadata in the P4 developer's program. -// -// Note: The names of these struct types are completely up to the P4 -// developer, as are their member fields, with the only restriction -// being that the structs intended to contain headers should only -// contain members whose types are header, header stack, or -// header_union. -////////////////////////////////////////////////////////////////////// - -struct main_metadata_t { - bit<1> rng_result1; - bit<1> val1; - bit<1> val2; - ExpireTimeProfileId_t timeout; -} - -// User-defined struct containing all of those headers parsed in the -// main parser. -struct headers_t { - ethernet_t ethernet; - ipv4_t ipv4; - tcp_t tcp; -} - -control PreControlImpl( - in headers_t hdr, - inout main_metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - } -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout main_metadata_t main_meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.ethernet); - transition select(hdr.ethernet.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition accept; - } -} - -bit<1> dummy_func(inout headers_t hdr, bit<16> min1, - bit<16> max1,inout main_metadata_t user_meta){ - return (bit<1>) ((min1 <= hdr.tcp.srcPort) && (hdr.tcp.srcPort <= max1)); -} - -action do_range_checks_0 (inout headers_t hdr,inout main_metadata_t user_meta, - bit<16> min1, - bit<16> max1) { - user_meta.rng_result1 = dummy_func(hdr,min1, max1, user_meta ); -} - -control MainControlImpl( - inout headers_t hdr, // from main parser - inout main_metadata_t user_meta, // from main parser, to "next block" - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action next_hop(PortId_t vport) { - send_to_port(vport); - } - action add_on_miss_action() { - bit<32> tmp = 0; - bool res; - res = add_entry(action_name="add_on_miss_action", action_params = tmp, expire_time_profile_id = user_meta.timeout); - } - - action do_range_checks_1 ( - bit<16> min1, - bit<16> max1) - { - user_meta.rng_result1 = ((min1 <= hdr.tcp.srcPort) && (hdr.tcp.srcPort <= max1)) ? ((16w50 <= hdr.tcp.srcPort) && (hdr.tcp.srcPort <= 16w100)) ? user_meta.val1 : user_meta.val2 : user_meta.val1; - } - - table ipv4_da { - key = { - hdr.ipv4.dstAddr: exact; - - } - actions = { - @tableonly next_hop; - @defaultonly add_on_miss_action; - } - add_on_miss = true; - const default_action = add_on_miss_action; - } - action next_hop2(PortId_t vport, bit<32> newAddr) { - send_to_port(vport); - hdr.ipv4.srcAddr = newAddr; - } - action add_on_miss_action2() { - add_entry(action_name="next_hop", action_params = {32w0, 32w1234}, expire_time_profile_id = user_meta.timeout); - } - table ipv4_da2 { - key = { - hdr.ipv4.dstAddr: exact; - } - actions = { - @tableonly next_hop2; - @defaultonly add_on_miss_action2; - do_range_checks_1; - do_range_checks_0(hdr,user_meta); - } - add_on_miss = true; - const default_action = add_on_miss_action2; - } - apply { - user_meta.rng_result1 = (bit<1>) ((100 <= hdr.tcp.srcPort) && (hdr.tcp.srcPort <= 200)); - if (hdr.ipv4.isValid()) { - ipv4_da.apply(); - ipv4_da2.apply(); - } - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, // from main control - in main_metadata_t user_meta, // from main control - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.ethernet); - pkt.emit(hdr.ipv4); - } -} - -// BEGIN:Package_Instantiation_Example -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - // Hoping to make this optional parameter later, but not supported - // by p4c yet. - //, PreParserImpl() - ) main; -// END:Package_Instantiation_Example 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 deleted file mode 100644 index becb5bb6d7a..00000000000 --- a/testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err-1.p4 +++ /dev/null @@ -1,341 +0,0 @@ -/* -Copyright 2021-2022 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include "pna.p4" - - -// Very simple PNA program intended to demonstrate one use of an -// add-on-miss table to do a simple form of TCP connection tracking, -// where the per-entry expiration times can be modified in the data -// plane, without the control plane changing them. - - -typedef bit<48> EthernetAddress; -typedef bit<32> IPv4Address; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLength; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - IPv4Address srcAddr; - IPv4Address dstAddr; -} - -header tcp_t { - bit<16> srcPort; - bit<16> dstPort; - bit<32> seqNo; - bit<32> ackNo; - bit<4> dataOffset; - bit<4> res; - bit<8> flags; - bit<16> window; - bit<16> checksum; - bit<16> urgentPtr; -} - -// Masks of the bit positions of some bit flags within the TCP flags -// field. -const bit<8> TCP_URG_MASK = 0x20; -const bit<8> TCP_ACK_MASK = 0x10; -const bit<8> TCP_PSH_MASK = 0x08; -const bit<8> TCP_RST_MASK = 0x04; -const bit<8> TCP_SYN_MASK = 0x02; -const bit<8> TCP_FIN_MASK = 0x01; - -// Define names for different expire time profile id values. - -const ExpireTimeProfileId_t EXPIRE_TIME_PROFILE_TCP_NOW = (ExpireTimeProfileId_t) 0; -const ExpireTimeProfileId_t EXPIRE_TIME_PROFILE_TCP_NEW = (ExpireTimeProfileId_t) 1; -const ExpireTimeProfileId_t EXPIRE_TIME_PROFILE_TCP_ESTABLISHED = (ExpireTimeProfileId_t) 2; -const ExpireTimeProfileId_t EXPIRE_TIME_PROFILE_TCP_NEVER = (ExpireTimeProfileId_t) 3; - -////////////////////////////////////////////////////////////////////// -// Struct types for holding user-defined collections of headers and -// metadata in the P4 developer's program. -////////////////////////////////////////////////////////////////////// - -struct metadata_t { -} - -struct headers_t { - ethernet_t eth; - ipv4_t ipv4; - tcp_t tcp; -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout metadata_t meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.eth); - transition select (hdr.eth.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition select (hdr.ipv4.protocol) { - 6: parse_tcp; - default: accept; - } - } - state parse_tcp { - pkt.extract(hdr.tcp); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - // No IPsec decryption for this example program, so pre - // control does nothing. - } -} - -struct ct_tcp_table_hit_params_t { -} - -control MainControlImpl( - inout headers_t hdr, - inout metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action drop () { - drop_packet(); - } - - // Inputs from previous tables (or actions, or in general other P4 - // code) that can modify the behavior of actions of ct_tcp_table. - bool do_add_on_miss; - bool update_aging_info; - bool update_expire_time; - ExpireTimeProfileId_t new_expire_time_profile_id; - - // Outputs from actions of ct_tcp_table - bool add_succeeded; - - action tcp_syn_packet () { - do_add_on_miss = true; - update_aging_info = true; - update_expire_time = true; - new_expire_time_profile_id = EXPIRE_TIME_PROFILE_TCP_NEW; - } - action tcp_fin_or_rst_packet () { - update_aging_info = true; - update_expire_time = true; - new_expire_time_profile_id = EXPIRE_TIME_PROFILE_TCP_NOW; - } - action tcp_other_packets () { - update_aging_info = true; - update_expire_time = true; - new_expire_time_profile_id = EXPIRE_TIME_PROFILE_TCP_ESTABLISHED; - } - - table set_ct_options { - key = { - hdr.tcp.flags: ternary; - } - actions = { - tcp_syn_packet; - tcp_fin_or_rst_packet; - tcp_other_packets; - } - const entries = { - TCP_SYN_MASK &&& TCP_SYN_MASK: tcp_syn_packet; - TCP_FIN_MASK &&& TCP_FIN_MASK: tcp_fin_or_rst_packet; - TCP_RST_MASK &&& TCP_RST_MASK: tcp_fin_or_rst_packet; - } - const default_action = tcp_other_packets; - } - - action ct_tcp_table_hit () { -#ifdef AVOID_IF_INSIDE_ACTION - // This extern function update_expire_info has exactly the - // same behavior as the code in the #else part of this #ifdef. - // It is proposed as an extern function included in the - // standard pna.p4 include file specifically as a workaround - // for P4 compilers that do not have full support for if - // statements, such as the BMv2 back end as of 2022-Apr. - - // Another reason to have such an extern function is as a - // convenience to P4 developers. Even if their compiler - // supports if statements inside of actions, if they want the - // behavior of update_expire_info, this is less code to write - // and read. - update_expire_info(update_aging_info, update_expire_time, - new_expire_time_profile_id); -#else - if (update_aging_info) { - if (update_expire_time) { - set_entry_expire_time(new_expire_time_profile_id); - // This is implicit and automatic part of the behavior - // of set_entry_expire_time() call: - //restart_expire_timer(); - } else { - restart_expire_timer(); - } - // a target might also support additional statements here - } else { - // Do nothing here. In particular, DO NOT - // restart_expire_time(). Whatever state the target - // device uses per-entry to represent the last time this - // entry was matched is left UNCHANGED. This can be - // useful in some connection tracking scenarios, - // e.g. where one wishes to "star the timer" when a FIN - // packet arrives, but it should KEEP RUNNING as later - // packets arrive, without being restarted. - - // a target might also support additional statements here - } -#endif // AVOID_IF_INSIDE_ACTION - } - - action ct_tcp_table_miss() { - if (do_add_on_miss) { - // This example does not need to use allocate_flow_id(), - // because no later part of the P4 program uses its return - // value for anything. - add_succeeded = - add_entry(action_name = "ct_tcp_table_hit", // name of action - action_params = (ct_tcp_table_hit_params_t) - {}, - expire_time_profile_id = new_expire_time_profile_id); - } else { - drop_packet(); - } - // a target might also support additional statements here, e.g. - // mirror the packet - // update a counter - // set receive queue - } - - table ct_tcp_table { - /* add_on_miss table is restricted to have all exact match fields */ - key = { - // other key fields also possible, e.g. VRF - SelectByDirection(istd.direction, hdr.ipv4.srcAddr, hdr.ipv4.dstAddr): - exact @name("ipv4_addr_0"); - SelectByDirection(istd.direction, hdr.ipv4.dstAddr, hdr.ipv4.srcAddr): - exact @name("ipv4_addr_1"); - hdr.ipv4.protocol : exact; - SelectByDirection(istd.direction, hdr.tcp.srcPort, hdr.tcp.dstPort): - exact @name("tcp_port_0"); - SelectByDirection(istd.direction, hdr.tcp.dstPort, hdr.tcp.srcPort): - exact @name("tcp_port_1"); - } - actions = { - @tableonly ct_tcp_table_hit; - @defaultonly ct_tcp_table_miss; - } - - // New PNA table property 'add_on_miss = true' indicates that - // this table can use extern function add_entry() in its - // default (i.e. miss) action to add a new entry to the table - // from the data plane. - add_on_miss = true; - - default_idle_timeout_for_data_plane_added_entries = 1; - - // New PNA table property 'idle_timeout_with_auto_delete' is - // similar to 'idle_timeout' in other architectures, except - // that entries that have not been matched for their expire - // time interval will be deleted, without the control plane - // having to delete the entry. - const default_action = ct_tcp_table_miss; - } - - apply { - // The following code is here to give an _example_ similar to - // the desired behavior, but is likely to be implemented in a - // variety of ways, e.g. one or more P4 table lookups. It is - // also likely NOT to be identical to what someone experienced - // at writing TCP connection tracking code actually wants. - - // The important point is that all of these variables: - - // + do_add_on_miss - // + update_expire_time - // + new_expire_time_profile_id - - // are assigned the values we want them to have _before_ - // calling ct_tcp_table.apply() below. The conditions under - // which they are assigned different values depends upon the - // contents of the packet header fields and the direction of - // the packet, and perhaps some earlier P4 table entries - // populated by control plane software, but _not_ upon the - // current entries installed in the ct_tcp_table. - - do_add_on_miss = false; - update_expire_time = false; - if ((istd.direction == PNA_Direction_t.HOST_TO_NET) && - hdr.ipv4.isValid() && hdr.tcp.isValid()) - { - set_ct_options.apply(); - } - - // ct_tcp_table is a bidirectional table - if (hdr.ipv4.isValid() && hdr.tcp.isValid()) { - ct_tcp_table.apply(); - } - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in metadata_t meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.eth); - } -} - -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - // Hoping to make this optional parameter later, but not supported - // by p4c yet. - //, PreParserImpl() - ) main; - 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 deleted file mode 100644 index bd7dc8252a7..00000000000 --- a/testdata/p4_16_pna_errors/pna-example-tcp-connection-tracking-err.p4 +++ /dev/null @@ -1,342 +0,0 @@ -/* -Copyright 2021-2022 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -#include -#include "pna.p4" - - -// Very simple PNA program intended to demonstrate one use of an -// add-on-miss table to do a simple form of TCP connection tracking, -// where the per-entry expiration times can be modified in the data -// plane, without the control plane changing them. - - -typedef bit<48> EthernetAddress; -typedef bit<32> IPv4Address; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -header ipv4_t { - bit<4> version; - bit<4> ihl; - bit<8> diffserv; - bit<16> totalLength; - bit<16> identification; - bit<3> flags; - bit<13> fragOffset; - bit<8> ttl; - bit<8> protocol; - bit<16> hdrChecksum; - IPv4Address srcAddr; - IPv4Address dstAddr; -} - -header tcp_t { - bit<16> srcPort; - bit<16> dstPort; - bit<32> seqNo; - bit<32> ackNo; - bit<4> dataOffset; - bit<4> res; - bit<8> flags; - bit<16> window; - bit<16> checksum; - bit<16> urgentPtr; -} - -// Masks of the bit positions of some bit flags within the TCP flags -// field. -const bit<8> TCP_URG_MASK = 0x20; -const bit<8> TCP_ACK_MASK = 0x10; -const bit<8> TCP_PSH_MASK = 0x08; -const bit<8> TCP_RST_MASK = 0x04; -const bit<8> TCP_SYN_MASK = 0x02; -const bit<8> TCP_FIN_MASK = 0x01; - -// Define names for different expire time profile id values. - -const ExpireTimeProfileId_t EXPIRE_TIME_PROFILE_TCP_NOW = (ExpireTimeProfileId_t) 0; -const ExpireTimeProfileId_t EXPIRE_TIME_PROFILE_TCP_NEW = (ExpireTimeProfileId_t) 1; -const ExpireTimeProfileId_t EXPIRE_TIME_PROFILE_TCP_ESTABLISHED = (ExpireTimeProfileId_t) 2; -const ExpireTimeProfileId_t EXPIRE_TIME_PROFILE_TCP_NEVER = (ExpireTimeProfileId_t) 3; - -////////////////////////////////////////////////////////////////////// -// Struct types for holding user-defined collections of headers and -// metadata in the P4 developer's program. -////////////////////////////////////////////////////////////////////// - -struct metadata_t { -} - -struct headers_t { - ethernet_t eth; - ipv4_t ipv4; - tcp_t tcp; -} - -parser MainParserImpl( - packet_in pkt, - out headers_t hdr, - inout metadata_t meta, - in pna_main_parser_input_metadata_t istd) -{ - state start { - pkt.extract(hdr.eth); - transition select (hdr.eth.etherType) { - 0x0800: parse_ipv4; - default: accept; - } - } - state parse_ipv4 { - pkt.extract(hdr.ipv4); - transition select (hdr.ipv4.protocol) { - 6: parse_tcp; - default: accept; - } - } - state parse_tcp { - pkt.extract(hdr.tcp); - transition accept; - } -} - -control PreControlImpl( - in headers_t hdr, - inout metadata_t meta, - in pna_pre_input_metadata_t istd, - inout pna_pre_output_metadata_t ostd) -{ - apply { - // No IPsec decryption for this example program, so pre - // control does nothing. - } -} - -struct ct_tcp_table_hit_params_t { -} - -control MainControlImpl( - inout headers_t hdr, - inout metadata_t meta, - in pna_main_input_metadata_t istd, - inout pna_main_output_metadata_t ostd) -{ - action drop () { - drop_packet(); - } - - // Inputs from previous tables (or actions, or in general other P4 - // code) that can modify the behavior of actions of ct_tcp_table. - bool do_add_on_miss; - bool update_aging_info; - bool update_expire_time; - ExpireTimeProfileId_t new_expire_time_profile_id; - - // Outputs from actions of ct_tcp_table - bool add_succeeded; - - action tcp_syn_packet () { - do_add_on_miss = true; - update_aging_info = true; - update_expire_time = true; - new_expire_time_profile_id = EXPIRE_TIME_PROFILE_TCP_NEW; - } - action tcp_fin_or_rst_packet () { - update_aging_info = true; - update_expire_time = true; - new_expire_time_profile_id = EXPIRE_TIME_PROFILE_TCP_NOW; - } - action tcp_other_packets () { - update_aging_info = true; - update_expire_time = true; - new_expire_time_profile_id = EXPIRE_TIME_PROFILE_TCP_ESTABLISHED; - } - - table set_ct_options { - key = { - hdr.tcp.flags: ternary; - } - actions = { - tcp_syn_packet; - tcp_fin_or_rst_packet; - tcp_other_packets; - } - const entries = { - TCP_SYN_MASK &&& TCP_SYN_MASK: tcp_syn_packet; - TCP_FIN_MASK &&& TCP_FIN_MASK: tcp_fin_or_rst_packet; - TCP_RST_MASK &&& TCP_RST_MASK: tcp_fin_or_rst_packet; - } - const default_action = tcp_other_packets; - } - - action ct_tcp_table_hit () { -#ifdef AVOID_IF_INSIDE_ACTION - // This extern function update_expire_info has exactly the - // same behavior as the code in the #else part of this #ifdef. - // It is proposed as an extern function included in the - // standard pna.p4 include file specifically as a workaround - // for P4 compilers that do not have full support for if - // statements, such as the BMv2 back end as of 2022-Apr. - - // Another reason to have such an extern function is as a - // convenience to P4 developers. Even if their compiler - // supports if statements inside of actions, if they want the - // behavior of update_expire_info, this is less code to write - // and read. - update_expire_info(update_aging_info, update_expire_time, - new_expire_time_profile_id); -#else - if (update_aging_info) { - if (update_expire_time) { - set_entry_expire_time(new_expire_time_profile_id); - // This is implicit and automatic part of the behavior - // of set_entry_expire_time() call: - //restart_expire_timer(); - } else { - restart_expire_timer(); - } - // a target might also support additional statements here - } else { - // Do nothing here. In particular, DO NOT - // restart_expire_time(). Whatever state the target - // device uses per-entry to represent the last time this - // entry was matched is left UNCHANGED. This can be - // useful in some connection tracking scenarios, - // e.g. where one wishes to "star the timer" when a FIN - // packet arrives, but it should KEEP RUNNING as later - // packets arrive, without being restarted. - - // a target might also support additional statements here - } -#endif // AVOID_IF_INSIDE_ACTION - } - - action ct_tcp_table_miss() { - if (do_add_on_miss) { - // This example does not need to use allocate_flow_id(), - // because no later part of the P4 program uses its return - // value for anything. - add_succeeded = - add_entry(action_name = "ct_tcp_table_hit", // name of action - action_params = (ct_tcp_table_hit_params_t) - {}, - expire_time_profile_id = new_expire_time_profile_id); - } else { - drop_packet(); - } - // a target might also support additional statements here, e.g. - // mirror the packet - // update a counter - // set receive queue - } - - table ct_tcp_table { - /* add_on_miss table is restricted to have all exact match fields */ - key = { - // other key fields also possible, e.g. VRF - SelectByDirection(istd.direction, hdr.ipv4.srcAddr, hdr.ipv4.dstAddr): - exact @name("ipv4_addr_0"); - SelectByDirection(istd.direction, hdr.ipv4.dstAddr, hdr.ipv4.srcAddr): - exact @name("ipv4_addr_1"); - hdr.ipv4.protocol : exact; - SelectByDirection(istd.direction, hdr.tcp.srcPort, hdr.tcp.dstPort): - exact @name("tcp_port_0"); - SelectByDirection(istd.direction, hdr.tcp.dstPort, hdr.tcp.srcPort): - exact @name("tcp_port_1"); - } - actions = { - @tableonly ct_tcp_table_hit; - @defaultonly ct_tcp_table_miss; - } - - // New PNA table property 'add_on_miss = true' indicates that - // this table can use extern function add_entry() in its - // default (i.e. miss) action to add a new entry to the table - // from the data plane. - add_on_miss = true; - - default_idle_timeout_for_data_plane_added_entries = 1; - - // New PNA table property 'idle_timeout_with_auto_delete' is - // similar to 'idle_timeout' in other architectures, except - // that entries that have not been matched for their expire - // time interval will be deleted, without the control plane - // having to delete the entry. - idle_timeout_with_auto_delete = false; - const default_action = ct_tcp_table_miss; - } - - apply { - // The following code is here to give an _example_ similar to - // the desired behavior, but is likely to be implemented in a - // variety of ways, e.g. one or more P4 table lookups. It is - // also likely NOT to be identical to what someone experienced - // at writing TCP connection tracking code actually wants. - - // The important point is that all of these variables: - - // + do_add_on_miss - // + update_expire_time - // + new_expire_time_profile_id - - // are assigned the values we want them to have _before_ - // calling ct_tcp_table.apply() below. The conditions under - // which they are assigned different values depends upon the - // contents of the packet header fields and the direction of - // the packet, and perhaps some earlier P4 table entries - // populated by control plane software, but _not_ upon the - // current entries installed in the ct_tcp_table. - - do_add_on_miss = false; - update_expire_time = false; - if ((istd.direction == PNA_Direction_t.HOST_TO_NET) && - hdr.ipv4.isValid() && hdr.tcp.isValid()) - { - set_ct_options.apply(); - } - - // ct_tcp_table is a bidirectional table - if (hdr.ipv4.isValid() && hdr.tcp.isValid()) { - ct_tcp_table.apply(); - } - } -} - -control MainDeparserImpl( - packet_out pkt, - in headers_t hdr, - in metadata_t meta, - in pna_main_output_metadata_t ostd) -{ - apply { - pkt.emit(hdr.eth); - } -} - -PNA_NIC( - MainParserImpl(), - PreControlImpl(), - MainControlImpl(), - MainDeparserImpl() - // Hoping to make this optional parameter later, but not supported - // by p4c yet. - //, PreParserImpl() - ) main; - diff --git a/testdata/p4_16_pna_errors/psa-example-dpdk-directmeter-1.p4 b/testdata/p4_16_pna_errors/psa-example-dpdk-directmeter-1.p4 deleted file mode 100644 index 73183145c50..00000000000 --- a/testdata/p4_16_pna_errors/psa-example-dpdk-directmeter-1.p4 +++ /dev/null @@ -1,118 +0,0 @@ -#include -#include - -struct EMPTY { }; - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -struct headers_t { - ethernet_t ethernet; -} - -struct metadata_t { - bit<32> port_in; - bit<32> port_out; - bit<32> data; -} - - -parser MyIP( - packet_in buffer, - out headers_t hdr, - inout metadata_t b, - in psa_ingress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e) { - - state start { - buffer.extract(hdr.ethernet); - transition accept; - } -} - -parser MyEP( - packet_in buffer, - out EMPTY a, - inout metadata_t b, - in psa_egress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e, - in EMPTY f) { - state start { - transition accept; - } -} - -control MyIC( - inout headers_t hdr, - inout metadata_t b, - in psa_ingress_input_metadata_t c, - inout psa_ingress_output_metadata_t d) { - ActionSelector(PSA_HashAlgorithm_t.CRC32, 32w1024, 32w16) as; - PSA_MeterColor_t color_out; - PSA_MeterColor_t color_in = PSA_MeterColor_t.RED; - - DirectMeter(PSA_MeterType_t.BYTES) meter0; - action execute_meter () { - color_out = meter0.dpdk_execute(color_in, 32w1024); - b.port_out = (color_out == PSA_MeterColor_t.GREEN ? 32w1 : 32w0); - } - table tbl { - key = { - hdr.ethernet.srcAddr : exact; - b.data : selector; - } - actions = { NoAction; execute_meter;} - psa_direct_meter = meter0; - psa_implementation = as; - } - - apply { - tbl.apply(); - } -} - -control MyEC( - inout EMPTY a, - inout metadata_t b, - in psa_egress_input_metadata_t c, - inout psa_egress_output_metadata_t d) { - apply { } -} - -control MyID( - packet_out buffer, - out EMPTY a, - out EMPTY b, - out EMPTY c, - inout headers_t hdr, - in metadata_t e, - in psa_ingress_output_metadata_t f) { - apply { } -} - -control MyED( - packet_out buffer, - out EMPTY a, - out EMPTY b, - inout EMPTY c, - in metadata_t d, - in psa_egress_output_metadata_t e, - in psa_egress_deparser_input_metadata_t f) { - apply { } -} - -IngressPipeline(MyIP(), MyIC(), MyID()) ip; -EgressPipeline(MyEP(), MyEC(), MyED()) ep; - -PSA_Switch( - ip, - PacketReplicationEngine(), - ep, - BufferingQueueingEngine()) main; diff --git a/testdata/p4_16_pna_errors_outputs/pna-add-on-miss-err.p4-error b/testdata/p4_16_pna_errors_outputs/pna-add-on-miss-err.p4-error deleted file mode 100644 index c08cbd03443..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-add-on-miss-err.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -pna-add-on-miss-err.p4(138): [--Werror=unexpected] error: add_entry must only be called from within an action with ' add_on_miss_action' property equal to true - add_entry(action_name="next_hop", action_params = tmp, expire_time_profile_id = user_meta.timeout); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-add-on-miss-err.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-add-on-miss-err.p4.bfrt.json deleted file mode 100644 index d24bbe53be3..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-add-on-miss-err.p4.bfrt.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_da", - "id" : 38237845, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 18241179, - "name" : "MainControlImpl.add_on_miss_action", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_da2", - "id" : 36615223, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26610824, - "name" : "MainControlImpl.next_hop2", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "newAddr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 25338952, - "name" : "MainControlImpl.add_on_miss_action2", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-1.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-1.p4-error deleted file mode 100644 index 0bae5b8f416..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-1.p4-error +++ /dev/null @@ -1,6 +0,0 @@ -pna-dpdk-direct-counter-err-1.p4(92): [--Werror=expected] error: Expected default action default_route_drop to have 'count' method call for DirectCounter extern instance MainControlImpl.per_prefix_pkt_byte_count1 - action default_route_drop() { - ^^^^^^^^^^^^^^^^^^ -pna-dpdk-direct-counter-err-1.p4(105): [--Werror=target-error] error: Direct counters and direct meters are unsupported for wildcard match table ipv4_tbl - table ipv4_tbl { - ^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-1.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-1.p4.bfrt.json deleted file mode 100644 index 6d6f9615955..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-1.p4.bfrt.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_tbl1", - "id" : 43466024, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 19071441, - "name" : "MainControlImpl.default_route_drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65553, - "name" : "$COUNTER_SPEC_BYTES", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65554, - "name" : "$COUNTER_SPEC_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_tbl", - "id" : 35471879, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "oport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 19071441, - "name" : "MainControlImpl.default_route_drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65553, - "name" : "$COUNTER_SPEC_BYTES", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65554, - "name" : "$COUNTER_SPEC_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-2.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-2.p4-error deleted file mode 100644 index 627d4278a27..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-2.p4-error +++ /dev/null @@ -1 +0,0 @@ -[--Werror=unexpected] error: count method of per_prefix_pkt_bytes_count extern must only be called from within an action diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-2.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-2.p4.bfrt.json deleted file mode 100644 index ef9c95608ce..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-2.p4.bfrt.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_host_pkt_byte_count", - "id" : 40464130, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 27074912, - "name" : "MainControlImpl.send_pktbytecount", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65553, - "name" : "$COUNTER_SPEC_BYTES", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65554, - "name" : "$COUNTER_SPEC_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-3.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-3.p4-error deleted file mode 100644 index af7ef256747..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-3.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -pna.p4(401): [--Werror=unexpected] error: count method of per_prefix_pkt_bytes_count extern can only be invoked from within action of ownertable - void count(in bit<32> pkt_len); - ^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-3.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-3.p4.bfrt.json deleted file mode 100644 index 4fdfe809cee..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-3.p4.bfrt.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_host_byte_count", - "id" : 45522242, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 19872628, - "name" : "MainControlImpl.send_bytecount", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "port", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65553, - "name" : "$COUNTER_SPEC_BYTES", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_host_pkt_byte_count", - "id" : 40464130, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 27074912, - "name" : "MainControlImpl.send_pktbytecount", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "port", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65553, - "name" : "$COUNTER_SPEC_BYTES", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65554, - "name" : "$COUNTER_SPEC_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-4.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-4.p4-error deleted file mode 100644 index ce7344a527a..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-4.p4-error +++ /dev/null @@ -1,2 +0,0 @@ -[--Werror=unexpected] error: count method for different DirectCounter instances (per_prefix_pkt_byte_count_0 and per_prefix_pkt_byte_count1_0) called within same action -[--Werror=unexpected] error: count method for different DirectCounter instances (per_prefix_pkt_byte_count_0 and per_prefix_pkt_byte_count1_0) called within same action diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-4.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-4.p4.bfrt.json deleted file mode 100644 index 68df1eb8347..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err-4.p4.bfrt.json +++ /dev/null @@ -1,185 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_tbl1", - "id" : 43466024, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "oport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 19071441, - "name" : "MainControlImpl.default_route_drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65553, - "name" : "$COUNTER_SPEC_BYTES", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65554, - "name" : "$COUNTER_SPEC_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_tbl", - "id" : 35471879, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "oport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 19071441, - "name" : "MainControlImpl.default_route_drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65553, - "name" : "$COUNTER_SPEC_BYTES", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65554, - "name" : "$COUNTER_SPEC_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err.p4-error deleted file mode 100644 index fe4d4b4418e..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -pna-dpdk-direct-counter-err.p4(95): [--Werror=unexpected] error: implementation property cannot co-exist with direct counter and direct meter property for table ipv4_host - table ipv4_host { - ^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err.p4.bfrt.json deleted file mode 100644 index d50aed6c8db..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-counter-err.p4.bfrt.json +++ /dev/null @@ -1,252 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_host", - "id" : 47903772, - "size" : 1024, - "annotations" : [], - "depends_on" : [295331297, 2171056181], - "table_type" : "MatchAction_Indirect_Selector", - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "data" : [ - { - "mandatory" : true, - "read_only" : false, - "oneof" : [ - { - "id" : 65539, - "name" : "$ACTION_MEMBER_ID", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint32" - } - }, - { - "id" : 65540, - "name" : "$SELECTOR_GROUP_ID", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint32" - } - } - ] - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65553, - "name" : "$COUNTER_SPEC_BYTES", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65554, - "name" : "$COUNTER_SPEC_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.as", - "id" : 295331297, - "table_type" : "Action", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "key" : [ - { - "id" : 65539, - "name" : "$ACTION_MEMBER_ID", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "action_specs" : [ - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 22742608, - "name" : "MainControlImpl.send", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "port", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : [] - }, - { - "name" : "pipe.MainControlImpl.as_sel", - "id" : 2171056181, - "table_type" : "Selector", - "size" : 1024, - "annotations" : [], - "depends_on" : [295331297], - "key" : [ - { - "id" : 65560, - "name" : "$SELECTOR_GROUP_ID", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65559, - "name" : "$ACTION_MEMBER_ID", - "repeated" : true, - "annotations" : [], - "type" : { - "type" : "uint32" - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65561, - "name" : "$ACTION_MEMBER_STATUS", - "repeated" : true, - "annotations" : [], - "type" : { - "type" : "bool" - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65562, - "name" : "$MAX_GROUP_SIZE", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint32", - "default_value" : 120 - } - } - } - ], - "supported_operations" : [], - "attributes" : [] - }, - { - "name" : "pipe.MainControlImpl.as_sel_get_member", - "id" : 2187833397, - "table_type" : "SelectorGetMember", - "size" : 1, - "annotations" : [], - "depends_on" : [2171056181], - "key" : [ - { - "id" : 65560, - "name" : "$SELECTOR_GROUP_ID", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint64" - } - }, - { - "id" : 65563, - "name" : "hash_value", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint64" - } - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65559, - "name" : "$ACTION_MEMBER_ID", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64" - } - } - } - ], - "supported_operations" : [], - "attributes" : [] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-2.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-2.p4-error deleted file mode 100644 index 9778bae4a5c..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-2.p4-error +++ /dev/null @@ -1,4 +0,0 @@ -pna-dpdk-direct-meter-err-2.p4(81): [--Wwarn=unsupported] warning: MainControlImpl.meter0: Packet metering is not supported. Falling back to byte metering. - DirectMeter(PNA_MeterType_t.PACKETS) meter0; - ^^^^^^ -[--Werror=unexpected] error: dpdk_execute method of meter0 extern must only be called from within an action diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-2.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-2.p4.bfrt.json deleted file mode 100644 index 26d1f4b4e14..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-2.p4.bfrt.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_host", - "id" : 47903772, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 22742608, - "name" : "MainControlImpl.send", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65549, - "name" : "$METER_SPEC_CIR_PPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65550, - "name" : "$METER_SPEC_PIR_PPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65551, - "name" : "$METER_SPEC_CBS_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65552, - "name" : "$METER_SPEC_PBS_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust", "EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-3.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-3.p4-error deleted file mode 100644 index 7d69ea0ff39..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-3.p4-error +++ /dev/null @@ -1,2 +0,0 @@ -[--Werror=unexpected] error: dpdk_execute method for different DirectMeter instances (meter0_0 and meter1_0) called within same action -[--Werror=unexpected] error: dpdk_execute method for different DirectMeter instances (meter0_0 and meter1_0) called within same action diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-3.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-3.p4.bfrt.json deleted file mode 100644 index a48f538533e..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-3.p4.bfrt.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_da1", - "id" : 47683977, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "oport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 19071441, - "name" : "MainControlImpl.default_route_drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65545, - "name" : "$METER_SPEC_CIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65546, - "name" : "$METER_SPEC_PIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65547, - "name" : "$METER_SPEC_CBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65548, - "name" : "$METER_SPEC_PBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust", "EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_da", - "id" : 38237845, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "oport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 27951421, - "name" : "MainControlImpl.default_route_drop1", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65545, - "name" : "$METER_SPEC_CIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65546, - "name" : "$METER_SPEC_PIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65547, - "name" : "$METER_SPEC_CBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65548, - "name" : "$METER_SPEC_PBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust", "EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-4.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-4.p4-error deleted file mode 100644 index e5fb1b51d36..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-4.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -pna-dpdk-direct-meter-err-4.p4(118): [--Werror=expected] error: Expected default action default_route_drop to have 'dpdk_execute' method call for DirectMeter extern instance MainControlImpl.meter0 - action default_route_drop() { - ^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-4.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-4.p4.bfrt.json deleted file mode 100644 index 2378150048b..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err-4.p4.bfrt.json +++ /dev/null @@ -1,230 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_da_1", - "id" : 40343708, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "oport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 19071441, - "name" : "MainControlImpl.default_route_drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65545, - "name" : "$METER_SPEC_CIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65546, - "name" : "$METER_SPEC_PIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65547, - "name" : "$METER_SPEC_CBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65548, - "name" : "$METER_SPEC_PBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust", "EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_da_2", - "id" : 45927725, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "oport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 19071441, - "name" : "MainControlImpl.default_route_drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65545, - "name" : "$METER_SPEC_CIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65546, - "name" : "$METER_SPEC_PIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65547, - "name" : "$METER_SPEC_CBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65548, - "name" : "$METER_SPEC_PBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust", "EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err.p4-error b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err.p4-error deleted file mode 100644 index 408e7142020..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -pna-dpdk-direct-meter-err.p4(95): [--Werror=unexpected] error: implementation property cannot co-exist with direct counter and direct meter property for table ipv4_host - table ipv4_host { - ^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err.p4.bfrt.json deleted file mode 100644 index d50aed6c8db..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-dpdk-direct-meter-err.p4.bfrt.json +++ /dev/null @@ -1,252 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_host", - "id" : 47903772, - "size" : 1024, - "annotations" : [], - "depends_on" : [295331297, 2171056181], - "table_type" : "MatchAction_Indirect_Selector", - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "data" : [ - { - "mandatory" : true, - "read_only" : false, - "oneof" : [ - { - "id" : 65539, - "name" : "$ACTION_MEMBER_ID", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint32" - } - }, - { - "id" : 65540, - "name" : "$SELECTOR_GROUP_ID", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint32" - } - } - ] - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65553, - "name" : "$COUNTER_SPEC_BYTES", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65554, - "name" : "$COUNTER_SPEC_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.as", - "id" : 295331297, - "table_type" : "Action", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "key" : [ - { - "id" : 65539, - "name" : "$ACTION_MEMBER_ID", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "action_specs" : [ - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 22742608, - "name" : "MainControlImpl.send", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "port", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : [] - }, - { - "name" : "pipe.MainControlImpl.as_sel", - "id" : 2171056181, - "table_type" : "Selector", - "size" : 1024, - "annotations" : [], - "depends_on" : [295331297], - "key" : [ - { - "id" : 65560, - "name" : "$SELECTOR_GROUP_ID", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65559, - "name" : "$ACTION_MEMBER_ID", - "repeated" : true, - "annotations" : [], - "type" : { - "type" : "uint32" - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65561, - "name" : "$ACTION_MEMBER_STATUS", - "repeated" : true, - "annotations" : [], - "type" : { - "type" : "bool" - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65562, - "name" : "$MAX_GROUP_SIZE", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint32", - "default_value" : 120 - } - } - } - ], - "supported_operations" : [], - "attributes" : [] - }, - { - "name" : "pipe.MainControlImpl.as_sel_get_member", - "id" : 2187833397, - "table_type" : "SelectorGetMember", - "size" : 1, - "annotations" : [], - "depends_on" : [2171056181], - "key" : [ - { - "id" : 65560, - "name" : "$SELECTOR_GROUP_ID", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint64" - } - }, - { - "id" : 65563, - "name" : "hash_value", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint64" - } - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65559, - "name" : "$ACTION_MEMBER_ID", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64" - } - } - } - ], - "supported_operations" : [], - "attributes" : [] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-addhit.p4-error b/testdata/p4_16_pna_errors_outputs/pna-example-addhit.p4-error deleted file mode 100644 index c7167a35d55..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-addhit.p4-error +++ /dev/null @@ -1,6 +0,0 @@ -pna-example-addhit.p4(143): [--Werror=unexpected] error: add_entry is not called from a default action: next_hop - add_entry(action_name="next_hop", action_params = tmp, expire_time_profile_id = user_meta.timeout); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -pna-example-addhit.p4(175): [--Werror=unexpected] error: add_entry first arg action name next_hop is not any action in table ipv4_da2_0 - add_entry(action_name="next_hop", action_params = {32w0, 32w1234}, expire_time_profile_id = user_meta.timeout); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-addhit.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-example-addhit.p4.bfrt.json deleted file mode 100644 index 2b8941f3a09..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-addhit.p4.bfrt.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_da", - "id" : 38237845, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 18241179, - "name" : "MainControlImpl.add_on_miss_action", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_da2", - "id" : 36615223, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26610824, - "name" : "MainControlImpl.next_hop2", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "newAddr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 25338952, - "name" : "MainControlImpl.add_on_miss_action2", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - }, - { - "id" : 28272441, - "name" : "MainControlImpl.do_range_checks_1", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "min1", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 2, - "name" : "max1", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - } - ] - }, - { - "id" : 26929328, - "name" : "do_range_checks_0", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "min1", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 2, - "name" : "max1", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - } - ] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error.p4-error b/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error.p4-error deleted file mode 100644 index ef3248d52ff..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error.p4-error +++ /dev/null @@ -1,4 +0,0 @@ -[--Wwarn=mismatch] warning: Mismatched header/metadata struct for key elements in table flowTable. Copying all match fields to metadata -pna-example-mirror-packet-ctxt-error.p4(47): [--Werror=unsupported] error: mirror_packet cannot be used in the PreControlImpl pre control - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION2); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error.p4.bfrt.json deleted file mode 100644 index 37c74b89272..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error.p4.bfrt.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.flowTable", - "id" : 50149889, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdr.ipv4.protocol", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 8 - } - } - ], - "action_specs" : [ - { - "id" : 23308017, - "name" : "MainControlImpl.send_with_mirror", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 20972178, - "name" : "MainControlImpl.drop_with_mirror", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error1.p4-error b/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error1.p4-error deleted file mode 100644 index 20c49a16d8c..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error1.p4-error +++ /dev/null @@ -1,4 +0,0 @@ -[--Wwarn=mismatch] warning: Mismatched header/metadata struct for key elements in table flowTable. Copying all match fields to metadata -pna-example-mirror-packet-ctxt-error1.p4(114): [--Werror=unsupported] error: mirror_packet cannot be used in the MainDeparserImpl main deparser - mirror_packet(MIRROR_SLOT_ID, MIRROR_SESSION2); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error1.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error1.p4.bfrt.json deleted file mode 100644 index 37c74b89272..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-ctxt-error1.p4.bfrt.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.flowTable", - "id" : 50149889, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdr.ipv4.protocol", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 8 - } - } - ], - "action_specs" : [ - { - "id" : 23308017, - "name" : "MainControlImpl.send_with_mirror", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 20972178, - "name" : "MainControlImpl.drop_with_mirror", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error1.p4-error b/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error1.p4-error deleted file mode 100644 index 50751bd97b2..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error1.p4-error +++ /dev/null @@ -1,2 +0,0 @@ -[--Wwarn=mismatch] warning: Mismatched header/metadata struct for key elements in table flowTable. Copying all match fields to metadata -[--Werror=invalid] error: Mirror session ID 0 is reserved for use by Architecture diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error1.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error1.p4.bfrt.json deleted file mode 100644 index 37c74b89272..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error1.p4.bfrt.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.flowTable", - "id" : 50149889, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdr.ipv4.protocol", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 8 - } - } - ], - "action_specs" : [ - { - "id" : 23308017, - "name" : "MainControlImpl.send_with_mirror", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 20972178, - "name" : "MainControlImpl.drop_with_mirror", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error2.p4-error b/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error2.p4-error deleted file mode 100644 index 384d1ca4474..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error2.p4-error +++ /dev/null @@ -1,34 +0,0 @@ -pna-example-mirror-packet-error2.p4(83): [--Werror=type-error] error: mirror_packet - mirror_packet(mirror_slot, mirror_session); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ---- Actual error: -pna-example-mirror-packet-error2.p4(83): mirror_slot: argument used for directionless parameter 'mirror_slot_id' must be a compile-time constant - mirror_packet(mirror_slot, mirror_session); - ^^^^^^^^^^^ -pna.p4(582) - extern void mirror_packet(MirrorSlotId_t mirror_slot_id, - ^^^^^^^^^^^^^^ - ---- Originating from: -pna.p4(582): Function type 'mirror_packet' does not match invocation type '' - extern void mirror_packet(MirrorSlotId_t mirror_slot_id, - ^^^^^^^^^^^^^ -pna-example-mirror-packet-error2.p4(83) - mirror_packet(mirror_slot, mirror_session); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -pna-example-mirror-packet-error2.p4(88): [--Werror=type-error] error: mirror_packet - mirror_packet(mirror_slot, mirror_session); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ---- Actual error: -pna-example-mirror-packet-error2.p4(88): mirror_slot: argument used for directionless parameter 'mirror_slot_id' must be a compile-time constant - mirror_packet(mirror_slot, mirror_session); - ^^^^^^^^^^^ -pna.p4(582) - extern void mirror_packet(MirrorSlotId_t mirror_slot_id, - ^^^^^^^^^^^^^^ - ---- Originating from: -pna.p4(582): Function type 'mirror_packet' does not match invocation type '' - extern void mirror_packet(MirrorSlotId_t mirror_slot_id, - ^^^^^^^^^^^^^ -pna-example-mirror-packet-error2.p4(88) - mirror_packet(mirror_slot, mirror_session); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error3.p4-error b/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error3.p4-error deleted file mode 100644 index bb670eb6275..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-mirror-packet-error3.p4-error +++ /dev/null @@ -1,14 +0,0 @@ -pna-example-mirror-packet-error3.p4(79): [--Werror=type-error] error: mirror_packet - mirror_packet(MIRROR_SLOT_ID); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - ---- Actual error: -pna.p4(583): mirror_session_id: No argument supplied for parameter - MirrorSessionId_t mirror_session_id); - ^^^^^^^^^^^^^^^^^ - ---- Originating from: -pna.p4(582): Function type 'mirror_packet' does not match invocation type '' - extern void mirror_packet(MirrorSlotId_t mirror_slot_id, - ^^^^^^^^^^^^^ -pna-example-mirror-packet-error3.p4(79) - mirror_packet(MIRROR_SLOT_ID); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-miss.p4-error b/testdata/p4_16_pna_errors_outputs/pna-example-miss.p4-error deleted file mode 100644 index afd899e316d..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-miss.p4-error +++ /dev/null @@ -1,6 +0,0 @@ -pna-example-miss.p4(147): [--Werror=unexpected] error: add_entry action cannot be default action: add_on_miss_action: - res = add_entry(action_name="add_on_miss_action", action_params = tmp, expire_time_profile_id = user_meta.timeout); - ^ -pna-example-miss.p4(174): [--Werror=unexpected] error: add_entry first arg action name next_hop is not any action in table ipv4_da2_0 - add_entry(action_name="next_hop", action_params = {32w0, 32w1234}, expire_time_profile_id = user_meta.timeout); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-miss.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-example-miss.p4.bfrt.json deleted file mode 100644 index 2b8941f3a09..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-miss.p4.bfrt.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.ipv4_da", - "id" : 38237845, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 25584005, - "name" : "MainControlImpl.next_hop", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 18241179, - "name" : "MainControlImpl.add_on_miss_action", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ipv4_da2", - "id" : 36615223, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26610824, - "name" : "MainControlImpl.next_hop2", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [ - { - "id" : 1, - "name" : "vport", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "newAddr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 25338952, - "name" : "MainControlImpl.add_on_miss_action2", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - }, - { - "id" : 28272441, - "name" : "MainControlImpl.do_range_checks_1", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "min1", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 2, - "name" : "max1", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - } - ] - }, - { - "id" : 26929328, - "name" : "do_range_checks_0", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "min1", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 2, - "name" : "max1", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - } - ] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err-1.p4-error b/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err-1.p4-error deleted file mode 100644 index 206c6381e97..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err-1.p4-error +++ /dev/null @@ -1,15 +0,0 @@ -pna-example-tcp-connection-tracking-err-1.p4(206): [--Wwarn=uninitialized_use] warning: update_aging_info may be uninitialized - if (update_aging_info) { - ^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err-1.p4(208): [--Wwarn=uninitialized_use] warning: new_expire_time_profile_id may not be completely initialized - set_entry_expire_time(new_expire_time_profile_id); - ^^^^^^^^^^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err-1.p4(240): [--Wwarn=uninitialized_use] warning: new_expire_time_profile_id may not be completely initialized - expire_time_profile_id = new_expire_time_profile_id); - ^^^^^^^^^^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err-1.p4(208): [--Werror=unexpected] error: set_entry_expire_time must only be called from within an action with ' ct_tcp_table_hit' property equal to true - set_entry_expire_time(new_expire_time_profile_id); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err-1.p4(213): [--Werror=unexpected] error: restart_expire_timer must only be called from within an action with ' ct_tcp_table_hit' property equal to true - restart_expire_timer(); - ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err-1.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err-1.p4.bfrt.json deleted file mode 100644 index 4fc2d7d914d..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err-1.p4.bfrt.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.set_ct_options", - "id" : 48249440, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.tcp.flags", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Ternary", - "type" : { - "type" : "bytes", - "width" : 8 - } - }, - { - "id" : 65537, - "name" : "$MATCH_PRIORITY", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "action_specs" : [ - { - "id" : 23677896, - "name" : "MainControlImpl.tcp_syn_packet", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 27056431, - "name" : "MainControlImpl.tcp_fin_or_rst_packet", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 23970644, - "name" : "MainControlImpl.tcp_other_packets", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ct_tcp_table", - "id" : 35731637, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "ipv4_addr_0", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "ipv4_addr_1", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdr.ipv4.protocol", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 8 - } - }, - { - "id" : 4, - "name" : "tcp_port_0", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 5, - "name" : "tcp_port_1", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 16 - } - } - ], - "action_specs" : [ - { - "id" : 17749373, - "name" : "MainControlImpl.ct_tcp_table_hit", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [] - }, - { - "id" : 22853387, - "name" : "MainControlImpl.ct_tcp_table_miss", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err.p4-error b/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err.p4-error deleted file mode 100644 index 3210108d256..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err.p4-error +++ /dev/null @@ -1,15 +0,0 @@ -pna-example-tcp-connection-tracking-err.p4(206): [--Wwarn=uninitialized_use] warning: update_aging_info may be uninitialized - if (update_aging_info) { - ^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err.p4(208): [--Wwarn=uninitialized_use] warning: new_expire_time_profile_id may not be completely initialized - set_entry_expire_time(new_expire_time_profile_id); - ^^^^^^^^^^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err.p4(240): [--Wwarn=uninitialized_use] warning: new_expire_time_profile_id may not be completely initialized - expire_time_profile_id = new_expire_time_profile_id); - ^^^^^^^^^^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err.p4(208): [--Werror=unexpected] error: set_entry_expire_time must only be called from within an action with 'idle_timeout_with_auto_delete ct_tcp_table_hit' property equal to true - set_entry_expire_time(new_expire_time_profile_id); - ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err.p4(213): [--Werror=unexpected] error: restart_expire_timer must only be called from within an action with 'idle_timeout_with_auto_delete ct_tcp_table_hit' property equal to true - restart_expire_timer(); - ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err.p4.bfrt.json deleted file mode 100644 index 4fc2d7d914d..00000000000 --- a/testdata/p4_16_pna_errors_outputs/pna-example-tcp-connection-tracking-err.p4.bfrt.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.set_ct_options", - "id" : 48249440, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.tcp.flags", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Ternary", - "type" : { - "type" : "bytes", - "width" : 8 - } - }, - { - "id" : 65537, - "name" : "$MATCH_PRIORITY", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "action_specs" : [ - { - "id" : 23677896, - "name" : "MainControlImpl.tcp_syn_packet", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 27056431, - "name" : "MainControlImpl.tcp_fin_or_rst_packet", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 23970644, - "name" : "MainControlImpl.tcp_other_packets", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.ct_tcp_table", - "id" : 35731637, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "ipv4_addr_0", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "ipv4_addr_1", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdr.ipv4.protocol", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 8 - } - }, - { - "id" : 4, - "name" : "tcp_port_0", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 5, - "name" : "tcp_port_1", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 16 - } - } - ], - "action_specs" : [ - { - "id" : 17749373, - "name" : "MainControlImpl.ct_tcp_table_hit", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [] - }, - { - "id" : 22853387, - "name" : "MainControlImpl.ct_tcp_table_miss", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_pna_errors_outputs/psa-example-dpdk-directmeter-1.p4-error b/testdata/p4_16_pna_errors_outputs/psa-example-dpdk-directmeter-1.p4-error deleted file mode 100644 index f2757fb2467..00000000000 --- a/testdata/p4_16_pna_errors_outputs/psa-example-dpdk-directmeter-1.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -psa-example-dpdk-directmeter-1.p4(66): [--Werror=unexpected] error: implementation property cannot co-exist with direct counter and direct meter property for table tbl - table tbl { - ^^^ diff --git a/testdata/p4_16_pna_errors_outputs/psa-example-dpdk-directmeter-1.p4.bfrt.json b/testdata/p4_16_pna_errors_outputs/psa-example-dpdk-directmeter-1.p4.bfrt.json deleted file mode 100644 index 6b0cdad0d0b..00000000000 --- a/testdata/p4_16_pna_errors_outputs/psa-example-dpdk-directmeter-1.p4.bfrt.json +++ /dev/null @@ -1,267 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.MyIC.tbl", - "id" : 39967501, - "size" : 1024, - "annotations" : [], - "depends_on" : [294316857, 2164374905], - "table_type" : "MatchAction_Indirect_Selector", - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ], - "data" : [ - { - "mandatory" : true, - "read_only" : false, - "oneof" : [ - { - "id" : 65539, - "name" : "$ACTION_MEMBER_ID", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint32" - } - }, - { - "id" : 65540, - "name" : "$SELECTOR_GROUP_ID", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint32" - } - } - ] - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65545, - "name" : "$METER_SPEC_CIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65546, - "name" : "$METER_SPEC_PIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65547, - "name" : "$METER_SPEC_CBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65548, - "name" : "$METER_SPEC_PBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust", "EntryScope"] - }, - { - "name" : "ip.MyIC.as", - "id" : 294316857, - "table_type" : "Action", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "key" : [ - { - "id" : 65539, - "name" : "$ACTION_MEMBER_ID", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 18579058, - "name" : "MyIC.execute_meter", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : [] - }, - { - "name" : "ip.MyIC.as_sel", - "id" : 2164374905, - "table_type" : "Selector", - "size" : 1024, - "annotations" : [], - "depends_on" : [294316857], - "key" : [ - { - "id" : 65560, - "name" : "$SELECTOR_GROUP_ID", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65559, - "name" : "$ACTION_MEMBER_ID", - "repeated" : true, - "annotations" : [], - "type" : { - "type" : "uint32" - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65561, - "name" : "$ACTION_MEMBER_STATUS", - "repeated" : true, - "annotations" : [], - "type" : { - "type" : "bool" - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65562, - "name" : "$MAX_GROUP_SIZE", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint32", - "default_value" : 120 - } - } - } - ], - "supported_operations" : [], - "attributes" : [] - }, - { - "name" : "ip.MyIC.as_sel_get_member", - "id" : 2181152121, - "table_type" : "SelectorGetMember", - "size" : 1, - "annotations" : [], - "depends_on" : [2164374905], - "key" : [ - { - "id" : 65560, - "name" : "$SELECTOR_GROUP_ID", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint64" - } - }, - { - "id" : 65563, - "name" : "hash_value", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint64" - } - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65559, - "name" : "$ACTION_MEMBER_ID", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64" - } - } - } - ], - "supported_operations" : [], - "attributes" : [] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_psa_errors/psa-action-profile2.p4 b/testdata/p4_16_psa_errors/psa-action-profile2.p4 deleted file mode 100644 index ac04e4fcf32..00000000000 --- a/testdata/p4_16_psa_errors/psa-action-profile2.p4 +++ /dev/null @@ -1,105 +0,0 @@ -#include -#include - -struct EMPTY { }; - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -struct headers_t { - ethernet_t ethernet; -} - -parser MyIP( - packet_in buffer, - out headers_t hdr, - inout EMPTY b, - in psa_ingress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e) { - - state start { - buffer.extract(hdr.ethernet); - transition accept; - } -} - -parser MyEP( - packet_in buffer, - out EMPTY a, - inout EMPTY b, - in psa_egress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e, - in EMPTY f) { - state start { - transition accept; - } -} - -control MyIC( - inout headers_t hdr, - inout EMPTY b, - in psa_ingress_input_metadata_t c, - inout psa_ingress_output_metadata_t d) { - ActionProfile(1024) ap; - ActionProfile(1024) ap1; - action a1(bit<48> param) { hdr.ethernet.dstAddr = param; } - action a2(bit<16> param) { hdr.ethernet.etherType = param; } - table tbl { - key = { - hdr.ethernet.srcAddr : exact; - } - actions = { NoAction; a1; a2; } - psa_implementation = { ap, ap1 }; - } - apply { - tbl.apply(); - } -} - -control MyEC( - inout EMPTY a, - inout EMPTY b, - in psa_egress_input_metadata_t c, - inout psa_egress_output_metadata_t d) { - apply { } -} - -control MyID( - packet_out buffer, - out EMPTY a, - out EMPTY b, - out EMPTY c, - inout headers_t hdr, - in EMPTY e, - in psa_ingress_output_metadata_t f) { - apply { - buffer.emit(hdr.ethernet); - } -} - -control MyED( - packet_out buffer, - out EMPTY a, - out EMPTY b, - inout EMPTY c, - in EMPTY d, - in psa_egress_output_metadata_t e, - in psa_egress_deparser_input_metadata_t f) { - apply { } -} - -IngressPipeline(MyIP(), MyIC(), MyID()) ip; -EgressPipeline(MyEP(), MyEC(), MyED()) ep; - -PSA_Switch( - ip, - PacketReplicationEngine(), - ep, - BufferingQueueingEngine()) main; diff --git a/testdata/p4_16_psa_errors/psa-counter6.p4 b/testdata/p4_16_psa_errors/psa-counter6.p4 deleted file mode 100644 index eed795da04f..00000000000 --- a/testdata/p4_16_psa_errors/psa-counter6.p4 +++ /dev/null @@ -1,113 +0,0 @@ -#include -#include - -struct EMPTY { }; - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -struct headers_t { - ethernet_t ethernet; -} - -parser MyIP( - packet_in buffer, - out headers_t hdr, - inout EMPTY b, - in psa_ingress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e) { - - state start { - buffer.extract(hdr.ethernet); - transition accept; - } -} - -parser MyEP( - packet_in buffer, - out EMPTY a, - inout EMPTY b, - in psa_egress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e, - in EMPTY f) { - state start { - transition accept; - } -} - -control MyIC( - inout headers_t hdr, - inout EMPTY b, - in psa_ingress_input_metadata_t c, - inout psa_ingress_output_metadata_t d) { - - DirectCounter>(PSA_CounterType_t.PACKETS) counter0; - action execute() { - counter0.count(); - } - table tbl { - key = { - hdr.ethernet.srcAddr : exact; - } - actions = { NoAction; execute; } - psa_direct_counter = counter0; - } - table tbl2 { - key = { - hdr.ethernet.srcAddr : exact; - } - actions = { NoAction; execute; } - psa_direct_counter = counter0; - } - - apply { - tbl.apply(); - tbl2.apply(); - } -} - -control MyEC( - inout EMPTY a, - inout EMPTY b, - in psa_egress_input_metadata_t c, - inout psa_egress_output_metadata_t d) { - apply { } -} - -control MyID( - packet_out buffer, - out EMPTY a, - out EMPTY b, - out EMPTY c, - inout headers_t hdr, - in EMPTY e, - in psa_ingress_output_metadata_t f) { - apply { } -} - -control MyED( - packet_out buffer, - out EMPTY a, - out EMPTY b, - inout EMPTY c, - in EMPTY d, - in psa_egress_output_metadata_t e, - in psa_egress_deparser_input_metadata_t f) { - apply { } -} - -IngressPipeline(MyIP(), MyIC(), MyID()) ip; -EgressPipeline(MyEP(), MyEC(), MyED()) ep; - -PSA_Switch( - ip, - PacketReplicationEngine(), - ep, - BufferingQueueingEngine()) main; diff --git a/testdata/p4_16_psa_errors/psa-example-dpdk-directmeter-err.p4 b/testdata/p4_16_psa_errors/psa-example-dpdk-directmeter-err.p4 deleted file mode 100644 index 6f3cd89bfa1..00000000000 --- a/testdata/p4_16_psa_errors/psa-example-dpdk-directmeter-err.p4 +++ /dev/null @@ -1,112 +0,0 @@ -#include -#include - -struct EMPTY { }; - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -struct headers_t { - ethernet_t ethernet; -} - -parser MyIP( - packet_in buffer, - out headers_t hdr, - inout EMPTY b, - in psa_ingress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e) { - - state start { - buffer.extract(hdr.ethernet); - transition accept; - } -} - -parser MyEP( - packet_in buffer, - out EMPTY a, - inout EMPTY b, - in psa_egress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e, - in EMPTY f) { - state start { - transition accept; - } -} - -control MyIC( - inout headers_t hdr, - inout EMPTY b, - in psa_ingress_input_metadata_t c, - inout psa_ingress_output_metadata_t d) { - - DirectMeter(PSA_MeterType_t.BYTES) meter0; - action execute_meter () { - meter0.dpdk_execute(32w0); - } - table tbl { - key = { - hdr.ethernet.srcAddr : exact; - } - actions = { NoAction; } - psa_direct_meter = meter0; - } - table tbl2 { - key = { - hdr.ethernet.srcAddr : exact; - } - actions = { NoAction; execute_meter; } - } - - apply { - tbl.apply(); - tbl2.apply(); - } -} - -control MyEC( - inout EMPTY a, - inout EMPTY b, - in psa_egress_input_metadata_t c, - inout psa_egress_output_metadata_t d) { - apply { } -} - -control MyID( - packet_out buffer, - out EMPTY a, - out EMPTY b, - out EMPTY c, - inout headers_t hdr, - in EMPTY e, - in psa_ingress_output_metadata_t f) { - apply { } -} - -control MyED( - packet_out buffer, - out EMPTY a, - out EMPTY b, - inout EMPTY c, - in EMPTY d, - in psa_egress_output_metadata_t e, - in psa_egress_deparser_input_metadata_t f) { - apply { } -} - -IngressPipeline(MyIP(), MyIC(), MyID()) ip; -EgressPipeline(MyEP(), MyEC(), MyED()) ep; - -PSA_Switch( - ip, - PacketReplicationEngine(), - ep, - BufferingQueueingEngine()) main; diff --git a/testdata/p4_16_psa_errors/psa-meter6.p4 b/testdata/p4_16_psa_errors/psa-meter6.p4 deleted file mode 100644 index 7a2e171bffd..00000000000 --- a/testdata/p4_16_psa_errors/psa-meter6.p4 +++ /dev/null @@ -1,112 +0,0 @@ -#include -#include - -struct EMPTY { }; - -typedef bit<48> EthernetAddress; - -header ethernet_t { - EthernetAddress dstAddr; - EthernetAddress srcAddr; - bit<16> etherType; -} - -struct headers_t { - ethernet_t ethernet; -} - -parser MyIP( - packet_in buffer, - out headers_t hdr, - inout EMPTY b, - in psa_ingress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e) { - - state start { - buffer.extract(hdr.ethernet); - transition accept; - } -} - -parser MyEP( - packet_in buffer, - out EMPTY a, - inout EMPTY b, - in psa_egress_parser_input_metadata_t c, - in EMPTY d, - in EMPTY e, - in EMPTY f) { - state start { - transition accept; - } -} - -control MyIC( - inout headers_t hdr, - inout EMPTY b, - in psa_ingress_input_metadata_t c, - inout psa_ingress_output_metadata_t d) { - - DirectMeter(PSA_MeterType_t.PACKETS) meter0; - action execute_meter () { - meter0.execute(); - } - table tbl { - key = { - hdr.ethernet.srcAddr : exact; - } - actions = { NoAction; } - psa_direct_meter = meter0; - } - table tbl2 { - key = { - hdr.ethernet.srcAddr : exact; - } - actions = { NoAction; execute_meter; } - } - - apply { - tbl.apply(); - tbl2.apply(); - } -} - -control MyEC( - inout EMPTY a, - inout EMPTY b, - in psa_egress_input_metadata_t c, - inout psa_egress_output_metadata_t d) { - apply { } -} - -control MyID( - packet_out buffer, - out EMPTY a, - out EMPTY b, - out EMPTY c, - inout headers_t hdr, - in EMPTY e, - in psa_ingress_output_metadata_t f) { - apply { } -} - -control MyED( - packet_out buffer, - out EMPTY a, - out EMPTY b, - inout EMPTY c, - in EMPTY d, - in psa_egress_output_metadata_t e, - in psa_egress_deparser_input_metadata_t f) { - apply { } -} - -IngressPipeline(MyIP(), MyIC(), MyID()) ip; -EgressPipeline(MyEP(), MyEC(), MyED()) ep; - -PSA_Switch( - ip, - PacketReplicationEngine(), - ep, - BufferingQueueingEngine()) main; diff --git a/testdata/p4_16_psa_errors_outputs/psa-action-profile2.p4-error b/testdata/p4_16_psa_errors_outputs/psa-action-profile2.p4-error deleted file mode 100644 index 031fd2faf49..00000000000 --- a/testdata/p4_16_psa_errors_outputs/psa-action-profile2.p4-error +++ /dev/null @@ -1,6 +0,0 @@ -psa-action-profile2.p4(59): [--Werror=invalid] error: Expected psa_implementation property value for table MyIC.tbl to resolve to an extern instance: psa_implementation - psa_implementation = { ap, ap1 }; - ^^^^^^^^^^^^^^^^^^ -psa-action-profile2.p4(59): [--Werror=invalid] error: Expected psa_implementation property value for table MyIC.tbl to resolve to an extern instance: psa_implementation - psa_implementation = { ap, ap1 }; - ^^^^^^^^^^^^^^^^^^ diff --git a/testdata/p4_16_psa_errors_outputs/psa-action-profile2.p4.bfrt.json b/testdata/p4_16_psa_errors_outputs/psa-action-profile2.p4.bfrt.json deleted file mode 100644 index 85bdc66e50b..00000000000 --- a/testdata/p4_16_psa_errors_outputs/psa-action-profile2.p4.bfrt.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.MyIC.tbl", - "id" : 39967501, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 21832421, - "name" : "MyIC.a1", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "param", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ] - }, - { - "id" : 23466264, - "name" : "MyIC.a2", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "param", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - } - ] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_psa_errors_outputs/psa-counter6.p4-error b/testdata/p4_16_psa_errors_outputs/psa-counter6.p4-error deleted file mode 100644 index c46de5be3f2..00000000000 --- a/testdata/p4_16_psa_errors_outputs/psa-counter6.p4-error +++ /dev/null @@ -1,2 +0,0 @@ -[--Werror=duplicate] error: Name 'MyIC.counter0' is used for multiple direct counter objects in the P4Info message -[--Werror=duplicate] error: Found 1 duplicate name(s) in the P4Info diff --git a/testdata/p4_16_psa_errors_outputs/psa-counter6.p4.bfrt.json b/testdata/p4_16_psa_errors_outputs/psa-counter6.p4.bfrt.json deleted file mode 100644 index 7c5331edce1..00000000000 --- a/testdata/p4_16_psa_errors_outputs/psa-counter6.p4.bfrt.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.MyIC.tbl", - "id" : 39967501, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 22078320, - "name" : "MyIC.execute", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65554, - "name" : "$COUNTER_SPEC_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - }, - { - "name" : "ip.MyIC.tbl2", - "id" : 47318070, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 22078320, - "name" : "MyIC.execute", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65554, - "name" : "$COUNTER_SPEC_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 0 - } - } - } - ], - "supported_operations" : ["SyncCounters"], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_psa_errors_outputs/psa-example-dpdk-directmeter-err.p4-error b/testdata/p4_16_psa_errors_outputs/psa-example-dpdk-directmeter-err.p4-error deleted file mode 100644 index 845acc057ea..00000000000 --- a/testdata/p4_16_psa_errors_outputs/psa-example-dpdk-directmeter-err.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -psa.p4(670): [--Werror=unexpected] error: dpdk_execute method of meter0 extern can only be invoked from within action of ownertable - PSA_MeterColor_t dpdk_execute(in bit<32> pkt_len); - ^^^^^^^^^^^^ diff --git a/testdata/p4_16_psa_errors_outputs/psa-example-dpdk-directmeter-err.p4.bfrt.json b/testdata/p4_16_psa_errors_outputs/psa-example-dpdk-directmeter-err.p4.bfrt.json deleted file mode 100644 index 4c131216b0c..00000000000 --- a/testdata/p4_16_psa_errors_outputs/psa-example-dpdk-directmeter-err.p4.bfrt.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.MyIC.tbl", - "id" : 39967501, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65545, - "name" : "$METER_SPEC_CIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65546, - "name" : "$METER_SPEC_PIR_KBPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65547, - "name" : "$METER_SPEC_CBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65548, - "name" : "$METER_SPEC_PBS_KBITS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust", "EntryScope"] - }, - { - "name" : "ip.MyIC.tbl2", - "id" : 47318070, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 18579058, - "name" : "MyIC.execute_meter", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_psa_errors_outputs/psa-meter6.p4-error b/testdata/p4_16_psa_errors_outputs/psa-meter6.p4-error deleted file mode 100644 index 5fbfe5d38e6..00000000000 --- a/testdata/p4_16_psa_errors_outputs/psa-meter6.p4-error +++ /dev/null @@ -1,4 +0,0 @@ -psa-meter6.p4(51): [--Wwarn=unsupported] warning: MyIC.meter0: Packet metering is not supported. Falling back to byte metering. - DirectMeter(PSA_MeterType_t.PACKETS) meter0; - ^^^^^^ -[--Werror=unexpected] error: execute method not supported for DirectMeter extern diff --git a/testdata/p4_16_psa_errors_outputs/psa-meter6.p4.bfrt.json b/testdata/p4_16_psa_errors_outputs/psa-meter6.p4.bfrt.json deleted file mode 100644 index 8feb572bea0..00000000000 --- a/testdata/p4_16_psa_errors_outputs/psa-meter6.p4.bfrt.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.MyIC.tbl", - "id" : 39967501, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65549, - "name" : "$METER_SPEC_CIR_PPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65550, - "name" : "$METER_SPEC_PIR_PPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65551, - "name" : "$METER_SPEC_CBS_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65552, - "name" : "$METER_SPEC_PBS_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust", "EntryScope"] - }, - { - "name" : "ip.MyIC.tbl2", - "id" : 47318070, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 18579058, - "name" : "MyIC.execute_meter", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_samples_outputs/action-synth.p4.entries.txt b/testdata/p4_16_samples_outputs/action-synth.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/action-synth.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/action-synth.p4.entries.txtpb b/testdata/p4_16_samples_outputs/action-synth.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/action-synth.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/action-synth.p4.p4info.txt b/testdata/p4_16_samples_outputs/action-synth.p4.p4info.txt deleted file mode 100644 index 76d427d33ff..00000000000 --- a/testdata/p4_16_samples_outputs/action-synth.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 27422362 - name: "IngressI.aux.a" - alias: "a" - } -} diff --git a/testdata/p4_16_samples_outputs/action-synth.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action-synth.p4.p4info.txtpb new file mode 100644 index 00000000000..0ed68b92cb9 --- /dev/null +++ b/testdata/p4_16_samples_outputs/action-synth.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 27422362 + name: "IngressI.aux.a" + alias: "a" + } +} diff --git a/testdata/p4_16_samples_outputs/action-two-params.p4.entries.txt b/testdata/p4_16_samples_outputs/action-two-params.p4.entries.txt deleted file mode 100644 index 5bae3f9253d..00000000000 --- a/testdata/p4_16_samples_outputs/action-two-params.p4.entries.txt +++ /dev/null @@ -1,30 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 46478332 - match { - field_id: 1 - exact { - value: " \002\004 " - } - } - action { - action { - action_id: 23137650 - params { - param_id: 1 - value: "\000\000*" - } - params { - param_id: 2 - value: " \002B\000" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/action-two-params.p4.entries.txtpb b/testdata/p4_16_samples_outputs/action-two-params.p4.entries.txtpb new file mode 100644 index 00000000000..1dde0f3dbfc --- /dev/null +++ b/testdata/p4_16_samples_outputs/action-two-params.p4.entries.txtpb @@ -0,0 +1,31 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 46478332 + match { + field_id: 1 + exact { + value: " \002\004 " + } + } + action { + action { + action_id: 23137650 + params { + param_id: 1 + value: "\000\000*" + } + params { + param_id: 2 + value: " \002B\000" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txt b/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txt deleted file mode 100644 index df6aa81cf79..00000000000 --- a/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46478332 - name: "MyIngress.ingress_tbl" - alias: "ingress_tbl" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 23137650 - } - action_refs { - id: 25652968 - } - const_default_action_id: 25652968 - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 25652968 - name: "MyIngress.drop" - alias: "drop" - } -} -actions { - preamble { - id: 23137650 - name: "MyIngress.actTbl" - alias: "actTbl" - } - params { - id: 1 - name: "id" - bitwidth: 24 - } - params { - id: 2 - name: "ip" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb new file mode 100644 index 00000000000..908f12a1cba --- /dev/null +++ b/testdata/p4_16_samples_outputs/action-two-params.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46478332 + name: "MyIngress.ingress_tbl" + alias: "ingress_tbl" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 23137650 + } + action_refs { + id: 25652968 + } + const_default_action_id: 25652968 + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 25652968 + name: "MyIngress.drop" + alias: "drop" + } +} +actions { + preamble { + id: 23137650 + name: "MyIngress.actTbl" + alias: "actTbl" + } + params { + id: 1 + name: "id" + bitwidth: 24 + } + params { + id: 2 + name: "ip" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/action_call_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/action_call_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/action_call_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/action_call_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/action_call_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_call_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txt deleted file mode 100644 index 706a2298530..00000000000 --- a/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txt +++ /dev/null @@ -1,50 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -tables { - preamble { - id: 49639434 - name: "pipe.tbl_a" - alias: "tbl_a" - } - action_refs { - id: 16865584 - } - action_refs { - id: 32630357 - } - action_refs { - id: 26966999 - } - size: 1024 -} -actions { - preamble { - id: 16865584 - name: "pipe.RejectConditional" - alias: "RejectConditional" - } - params { - id: 1 - name: "condition" - bitwidth: 1 - } -} -actions { - preamble { - id: 32630357 - name: "pipe.act_return" - alias: "act_return" - } -} -actions { - preamble { - id: 26966999 - name: "pipe.act_exit" - alias: "act_exit" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..747112451c2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_call_ubpf.p4.p4info.txtpb @@ -0,0 +1,51 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +tables { + preamble { + id: 49639434 + name: "pipe.tbl_a" + alias: "tbl_a" + } + action_refs { + id: 16865584 + } + action_refs { + id: 32630357 + } + action_refs { + id: 26966999 + } + size: 1024 +} +actions { + preamble { + id: 16865584 + name: "pipe.RejectConditional" + alias: "RejectConditional" + } + params { + id: 1 + name: "condition" + bitwidth: 1 + } +} +actions { + preamble { + id: 32630357 + name: "pipe.act_return" + alias: "act_return" + } +} +actions { + preamble { + id: 26966999 + name: "pipe.act_exit" + alias: "act_exit" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.p4info.txt deleted file mode 100644 index bc49a28559e..00000000000 --- a/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} diff --git a/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..3eb7a5ed325 --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_fwd_ubpf.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} diff --git a/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txt deleted file mode 100644 index 9616156e898..00000000000 --- a/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txt +++ /dev/null @@ -1,73 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46872340 - name: "IngressI.indirect" - alias: "indirect" - } - action_refs { - id: 23455883 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - implementation_id: 294074782 - size: 1024 -} -tables { - preamble { - id: 38116258 - name: "IngressI.indirect_ws" - alias: "indirect_ws" - } - action_refs { - id: 23455883 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - implementation_id: 300324846 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 23455883 - name: "IngressI.drop" - alias: "drop" - } -} -action_profiles { - preamble { - id: 294074782 - name: "ap" - alias: "ap" - } - table_ids: 46872340 - size: 128 -} -action_profiles { - preamble { - id: 300324846 - name: "ap_ws" - alias: "ap_ws" - } - table_ids: 38116258 - with_selector: true - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..83a6b066d04 --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_profile-bmv2.p4.p4info.txtpb @@ -0,0 +1,74 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46872340 + name: "IngressI.indirect" + alias: "indirect" + } + action_refs { + id: 23455883 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + implementation_id: 294074782 + size: 1024 +} +tables { + preamble { + id: 38116258 + name: "IngressI.indirect_ws" + alias: "indirect_ws" + } + action_refs { + id: 23455883 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + implementation_id: 300324846 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23455883 + name: "IngressI.drop" + alias: "drop" + } +} +action_profiles { + preamble { + id: 294074782 + name: "ap" + alias: "ap" + } + table_ids: 46872340 + size: 128 +} +action_profiles { + preamble { + id: 300324846 + name: "ap_ws" + alias: "ap_ws" + } + table_ids: 38116258 + with_selector: true + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.entries.txt b/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.entries.txtpb b/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txt b/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txt deleted file mode 100644 index c35c4be3988..00000000000 --- a/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txt +++ /dev/null @@ -1,74 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46872340 - name: "IngressI.indirect" - alias: "indirect" - } - action_refs { - id: 23455883 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - implementation_id: 294074782 - size: 1024 -} -tables { - preamble { - id: 38116258 - name: "IngressI.indirect_ws" - alias: "indirect_ws" - } - action_refs { - id: 23455883 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - implementation_id: 300324846 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 23455883 - name: "IngressI.drop" - alias: "drop" - } -} -action_profiles { - preamble { - id: 294074782 - name: "ap" - alias: "ap" - } - table_ids: 46872340 - size: 128 -} -action_profiles { - preamble { - id: 300324846 - name: "ap_ws" - alias: "ap_ws" - } - table_ids: 38116258 - with_selector: true - size: 1024 - max_group_size: 200 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb new file mode 100644 index 00000000000..6f25cf8db7a --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_profile_max_group_size_annotation.p4.p4info.txtpb @@ -0,0 +1,75 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46872340 + name: "IngressI.indirect" + alias: "indirect" + } + action_refs { + id: 23455883 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + implementation_id: 294074782 + size: 1024 +} +tables { + preamble { + id: 38116258 + name: "IngressI.indirect_ws" + alias: "indirect_ws" + } + action_refs { + id: 23455883 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + implementation_id: 300324846 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23455883 + name: "IngressI.drop" + alias: "drop" + } +} +action_profiles { + preamble { + id: 294074782 + name: "ap" + alias: "ap" + } + table_ids: 46872340 + size: 128 +} +action_profiles { + preamble { + id: 300324846 + name: "ap_ws" + alias: "ap_ws" + } + table_ids: 38116258 + with_selector: true + size: 1024 + max_group_size: 200 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txt deleted file mode 100644 index 1f2ec4082d7..00000000000 --- a/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txt +++ /dev/null @@ -1,65 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 38116258 - name: "IngressI.indirect_ws" - alias: "indirect_ws" - } - action_refs { - id: 23455883 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - implementation_id: 291652621 - size: 1024 -} -tables { - preamble { - id: 33951097 - name: "IngressI.indirect_ws_1" - alias: "indirect_ws_1" - } - action_refs { - id: 23455883 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - implementation_id: 291652621 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 23455883 - name: "IngressI.drop" - alias: "drop" - } -} -action_profiles { - preamble { - id: 291652621 - name: "IngressI.as" - alias: "as" - } - table_ids: 38116258 - table_ids: 33951097 - with_selector: true - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..097e2ec7760 --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_selector_shared-bmv2.p4.p4info.txtpb @@ -0,0 +1,66 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 38116258 + name: "IngressI.indirect_ws" + alias: "indirect_ws" + } + action_refs { + id: 23455883 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + implementation_id: 291652621 + size: 1024 +} +tables { + preamble { + id: 33951097 + name: "IngressI.indirect_ws_1" + alias: "indirect_ws_1" + } + action_refs { + id: 23455883 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + implementation_id: 291652621 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23455883 + name: "IngressI.drop" + alias: "drop" + } +} +action_profiles { + preamble { + id: 291652621 + name: "IngressI.as" + alias: "as" + } + table_ids: 38116258 + table_ids: 33951097 + with_selector: true + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.p4info.txt deleted file mode 100644 index d417ff32d7b..00000000000 --- a/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.p4info.txt +++ /dev/null @@ -1,16 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -action_profiles { - preamble { - id: 291652621 - name: "IngressI.as" - alias: "as" - } - with_selector: true - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..6117520fcc0 --- /dev/null +++ b/testdata/p4_16_samples_outputs/action_selector_unused-bmv2.p4.p4info.txtpb @@ -0,0 +1,17 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +action_profiles { + preamble { + id: 291652621 + name: "IngressI.as" + alias: "as" + } + with_selector: true + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/advance_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/advance_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/advance_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/advance_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/advance_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/advance_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/advance_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/advance_ubpf.p4.p4info.txt deleted file mode 100644 index bc49a28559e..00000000000 --- a/testdata/p4_16_samples_outputs/advance_ubpf.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} diff --git a/testdata/p4_16_samples_outputs/advance_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/advance_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..3eb7a5ed325 --- /dev/null +++ b/testdata/p4_16_samples_outputs/advance_ubpf.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} diff --git a/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.entries.txt b/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.entries.txtpb b/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txt b/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txt deleted file mode 100644 index 5f0d536bf32..00000000000 --- a/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 40790357 - name: "MyIngress.inner.inner_table" - alias: "inner_table" - annotations: "@my_anno_4" - } - action_refs { - id: 28504505 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28504505 - name: "MyIngress.inner.set_hdr" - alias: "set_hdr" - } - params { - id: 1 - name: "val" - bitwidth: 16 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb new file mode 100644 index 00000000000..e07c4fb0fe3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/annotation-inline-propagate.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40790357 + name: "MyIngress.inner.inner_table" + alias: "inner_table" + annotations: "@my_anno_4" + } + action_refs { + id: 28504505 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28504505 + name: "MyIngress.inner.set_hdr" + alias: "set_hdr" + } + params { + id: 1 + name: "val" + bitwidth: 16 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/arith-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/arith-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/arith-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/arith-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/arith-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txt deleted file mode 100644 index a7924cab80f..00000000000 --- a/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 20728178 - } - const_default_action_id: 20728178 - size: 1024 -} -actions { - preamble { - id: 20728178 - name: "ingress.add" - alias: "add" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..29a3be03d2d --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 20728178 + } + const_default_action_id: 20728178 + size: 1024 +} +actions { + preamble { + id: 20728178 + name: "ingress.add" + alias: "add" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txt deleted file mode 100644 index b8d3b8e824a..00000000000 --- a/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43577110 - name: "ingress.c.t" - alias: "t" - } - action_refs { - id: 29022044 - } - const_default_action_id: 29022044 - size: 1024 -} -actions { - preamble { - id: 29022044 - name: "ingress.c.add" - alias: "add" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ddadf42bc63 --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith-inline-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43577110 + name: "ingress.c.t" + alias: "t" + } + action_refs { + id: 29022044 + } + const_default_action_id: 29022044 + size: 1024 +} +actions { + preamble { + id: 29022044 + name: "ingress.c.add" + alias: "add" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/arith1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/arith1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/arith1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/arith1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/arith1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txt deleted file mode 100644 index fd3201401b2..00000000000 --- a/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 25073243 - } - const_default_action_id: 25073243 - size: 1024 -} -actions { - preamble { - id: 25073243 - name: "ingress.compare" - alias: "compare" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..e9a7c87335a --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith1-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 25073243 + } + const_default_action_id: 25073243 + size: 1024 +} +actions { + preamble { + id: 25073243 + name: "ingress.compare" + alias: "compare" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/arith2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/arith2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/arith2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/arith2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/arith2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txt deleted file mode 100644 index fd3201401b2..00000000000 --- a/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 25073243 - } - const_default_action_id: 25073243 - size: 1024 -} -actions { - preamble { - id: 25073243 - name: "ingress.compare" - alias: "compare" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..e9a7c87335a --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith2-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 25073243 + } + const_default_action_id: 25073243 + size: 1024 +} +actions { + preamble { + id: 25073243 + name: "ingress.compare" + alias: "compare" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith2-inline-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/arith3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/arith3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/arith3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/arith3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/arith3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txt deleted file mode 100644 index 18cd572c1bd..00000000000 --- a/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 32554999 - } - const_default_action_id: 32554999 - size: 1024 -} -actions { - preamble { - id: 32554999 - name: "ingress.shift" - alias: "shift" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..62774f2d1e8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith3-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 32554999 + } + const_default_action_id: 32554999 + size: 1024 +} +actions { + preamble { + id: 32554999 + name: "ingress.shift" + alias: "shift" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/arith4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/arith4-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/arith4-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/arith4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/arith4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith4-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txt deleted file mode 100644 index 18cd572c1bd..00000000000 --- a/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 32554999 - } - const_default_action_id: 32554999 - size: 1024 -} -actions { - preamble { - id: 32554999 - name: "ingress.shift" - alias: "shift" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..62774f2d1e8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith4-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 32554999 + } + const_default_action_id: 32554999 + size: 1024 +} +actions { + preamble { + id: 32554999 + name: "ingress.shift" + alias: "shift" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/arith5-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/arith5-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/arith5-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/arith5-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/arith5-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith5-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txt deleted file mode 100644 index 18cd572c1bd..00000000000 --- a/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 32554999 - } - const_default_action_id: 32554999 - size: 1024 -} -actions { - preamble { - id: 32554999 - name: "ingress.shift" - alias: "shift" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..62774f2d1e8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/arith5-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 32554999 + } + const_default_action_id: 32554999 + size: 1024 +} +actions { + preamble { + id: 32554999 + name: "ingress.shift" + alias: "shift" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/array-copy-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/basic2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/basic2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/basic2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/basic2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/basic2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/basic2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txt deleted file mode 100644 index 710875e05cc..00000000000 --- a/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,59 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 37375156 - name: "MyIngress.ipv4_lpm" - alias: "ipv4_lpm" - annotations: "@__debug" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: TERNARY - } - match_fields { - id: 2 - name: "hdr.ipv4.srcAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 28792405 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25652968 - name: "MyIngress.drop" - alias: "drop" - } -} -actions { - preamble { - id: 28792405 - name: "MyIngress.ipv4_forward" - alias: "ipv4_forward" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..e8156b06312 --- /dev/null +++ b/testdata/p4_16_samples_outputs/basic2-bmv2.p4.p4info.txtpb @@ -0,0 +1,60 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 37375156 + name: "MyIngress.ipv4_lpm" + alias: "ipv4_lpm" + annotations: "@__debug" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 2 + name: "hdr.ipv4.srcAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 28792405 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25652968 + name: "MyIngress.drop" + alias: "drop" + } +} +actions { + preamble { + id: 28792405 + name: "MyIngress.ipv4_forward" + alias: "ipv4_forward" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txt deleted file mode 100644 index 70950b5994e..00000000000 --- a/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txt +++ /dev/null @@ -1,250 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48392551 - name: "ingress.bd" - alias: "bd" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.bd" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 33505590 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 65536 -} -tables { - preamble { - id: 41084491 - name: "ingress.ipv4_fib" - alias: "ipv4_fib" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.vrf" - bitwidth: 12 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 22594144 - } - action_refs { - id: 26104220 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 131072 -} -tables { - preamble { - id: 42875950 - name: "ingress.ipv4_fib_lpm" - alias: "ipv4_fib_lpm" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.vrf" - bitwidth: 12 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 22594144 - } - action_refs { - id: 26104220 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 16384 -} -tables { - preamble { - id: 43581057 - name: "ingress.nexthop" - alias: "nexthop" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.nexthop_index" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 22594144 - } - action_refs { - id: 19738113 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 32768 -} -tables { - preamble { - id: 39645634 - name: "ingress.port_mapping" - alias: "port_mapping" - } - match_fields { - id: 1 - name: "standard_metadata.ingress_port" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 27500220 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 32768 -} -tables { - preamble { - id: 40309161 - name: "egress.rewrite_mac" - alias: "rewrite_mac" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.nexthop_index" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 28864280 - } - action_refs { - id: 28966416 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 32768 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 33505590 - name: "ingress.set_vrf" - alias: "set_vrf" - } - params { - id: 1 - name: "vrf" - bitwidth: 12 - } -} -actions { - preamble { - id: 22594144 - name: "ingress.on_miss" - alias: "ingress.on_miss" - } -} -actions { - preamble { - id: 26104220 - name: "ingress.fib_hit_nexthop" - alias: "fib_hit_nexthop" - } - params { - id: 1 - name: "nexthop_index" - bitwidth: 16 - } -} -actions { - preamble { - id: 19738113 - name: "ingress.set_egress_details" - alias: "set_egress_details" - } - params { - id: 1 - name: "egress_spec" - bitwidth: 9 - } -} -actions { - preamble { - id: 27500220 - name: "ingress.set_bd" - alias: "set_bd" - } - params { - id: 1 - name: "bd" - bitwidth: 16 - } -} -actions { - preamble { - id: 28864280 - name: "egress.on_miss" - alias: "egress.on_miss" - } -} -actions { - preamble { - id: 28966416 - name: "egress.rewrite_src_dst_mac" - alias: "rewrite_src_dst_mac" - } - params { - id: 1 - name: "smac" - bitwidth: 48 - } - params { - id: 2 - name: "dmac" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..7033385f7e1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/basic_routing-bmv2.p4.p4info.txtpb @@ -0,0 +1,251 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48392551 + name: "ingress.bd" + alias: "bd" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.bd" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 33505590 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 65536 +} +tables { + preamble { + id: 41084491 + name: "ingress.ipv4_fib" + alias: "ipv4_fib" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.vrf" + bitwidth: 12 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 22594144 + } + action_refs { + id: 26104220 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 131072 +} +tables { + preamble { + id: 42875950 + name: "ingress.ipv4_fib_lpm" + alias: "ipv4_fib_lpm" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.vrf" + bitwidth: 12 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 22594144 + } + action_refs { + id: 26104220 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 16384 +} +tables { + preamble { + id: 43581057 + name: "ingress.nexthop" + alias: "nexthop" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.nexthop_index" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 22594144 + } + action_refs { + id: 19738113 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 32768 +} +tables { + preamble { + id: 39645634 + name: "ingress.port_mapping" + alias: "port_mapping" + } + match_fields { + id: 1 + name: "standard_metadata.ingress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 27500220 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 32768 +} +tables { + preamble { + id: 40309161 + name: "egress.rewrite_mac" + alias: "rewrite_mac" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.nexthop_index" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 28864280 + } + action_refs { + id: 28966416 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 32768 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 33505590 + name: "ingress.set_vrf" + alias: "set_vrf" + } + params { + id: 1 + name: "vrf" + bitwidth: 12 + } +} +actions { + preamble { + id: 22594144 + name: "ingress.on_miss" + alias: "ingress.on_miss" + } +} +actions { + preamble { + id: 26104220 + name: "ingress.fib_hit_nexthop" + alias: "fib_hit_nexthop" + } + params { + id: 1 + name: "nexthop_index" + bitwidth: 16 + } +} +actions { + preamble { + id: 19738113 + name: "ingress.set_egress_details" + alias: "set_egress_details" + } + params { + id: 1 + name: "egress_spec" + bitwidth: 9 + } +} +actions { + preamble { + id: 27500220 + name: "ingress.set_bd" + alias: "set_bd" + } + params { + id: 1 + name: "bd" + bitwidth: 16 + } +} +actions { + preamble { + id: 28864280 + name: "egress.on_miss" + alias: "egress.on_miss" + } +} +actions { + preamble { + id: 28966416 + name: "egress.rewrite_src_dst_mac" + alias: "rewrite_src_dst_mac" + } + params { + id: 1 + name: "smac" + bitwidth: 48 + } + params { + id: 2 + name: "dmac" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/bitwise-and.p4.entries.txt b/testdata/p4_16_samples_outputs/bitwise-and.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/bitwise-and.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/bitwise-and.p4.entries.txtpb b/testdata/p4_16_samples_outputs/bitwise-and.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/bitwise-and.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/bitwise-and.p4.p4info.txt b/testdata/p4_16_samples_outputs/bitwise-and.p4.p4info.txt deleted file mode 100644 index c7afbcdce7e..00000000000 --- a/testdata/p4_16_samples_outputs/bitwise-and.p4.p4info.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info diff --git a/testdata/p4_16_samples_outputs/bitwise-and.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/bitwise-and.p4.p4info.txtpb new file mode 100644 index 00000000000..707a7400ea3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/bitwise-and.p4.p4info.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + diff --git a/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.entries.txt b/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.entries.txtpb b/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.p4info.txt b/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/bool_to_bit_cast.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.entries.txt deleted file mode 100644 index 2fcaa29e47d..00000000000 --- a/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.entries.txt +++ /dev/null @@ -1,50 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 40116169 - match { - field_id: 1 - exact { - value: "\001" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\001" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 40116169 - match { - field_id: 1 - exact { - value: "\002" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\002" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..8f373c34c71 --- /dev/null +++ b/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.entries.txtpb @@ -0,0 +1,51 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 40116169 + match { + field_id: 1 + exact { + value: "\001" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\001" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 40116169 + match { + field_id: 1 + exact { + value: "\002" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\002" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txt deleted file mode 100644 index 0233f51cd74..00000000000 --- a/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 40116169 - name: "ingress.t_exact" - alias: "t_exact" - } - match_fields { - id: 1 - name: "h.h.row.e" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4ed10559c15 --- /dev/null +++ b/testdata/p4_16_samples_outputs/bvec-hdr-bmv2.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40116169 + name: "ingress.t_exact" + alias: "t_exact" + } + match_fields { + id: 1 + name: "h.h.row.e" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/bvec_union-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.entries.txt deleted file mode 100644 index f591719399d..00000000000 --- a/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.entries.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 48165785 - match { - field_id: 1 - exact { - value: "\000P" - } - } - action { - action { - action_id: 25440736 - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 43043839 - match { - field_id: 1 - exact { - value: "\000P" - } - } - action { - action { - action_id: 18556685 - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..8bdfce057f7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.entries.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 48165785 + match { + field_id: 1 + exact { + value: "\000P" + } + } + action { + action { + action_id: 25440736 + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 43043839 + match { + field_id: 1 + exact { + value: "\000P" + } + } + action { + action { + action_id: 18556685 + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txt deleted file mode 100644 index 076566453d2..00000000000 --- a/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,75 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48165785 - name: "cIngress.guh" - alias: "guh" - } - match_fields { - id: 1 - name: "hdr.tcp.dstPort" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 25440736 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 - is_const_table: true - has_initial_entries: true -} -tables { - preamble { - id: 43043839 - name: "cIngress.huh" - alias: "huh" - } - match_fields { - id: 1 - name: "hdr.udp.dstPort" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 18556685 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25440736 - name: "cIngress.foot" - alias: "foot" - } -} -actions { - preamble { - id: 18556685 - name: "cIngress.foou" - alias: "foou" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..eaa0bc5ef6a --- /dev/null +++ b/testdata/p4_16_samples_outputs/checksum-l4-bmv2.p4.p4info.txtpb @@ -0,0 +1,76 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48165785 + name: "cIngress.guh" + alias: "guh" + } + match_fields { + id: 1 + name: "hdr.tcp.dstPort" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 25440736 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 + is_const_table: true + has_initial_entries: true +} +tables { + preamble { + id: 43043839 + name: "cIngress.huh" + alias: "huh" + } + match_fields { + id: 1 + name: "hdr.udp.dstPort" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 18556685 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25440736 + name: "cIngress.foot" + alias: "foot" + } +} +actions { + preamble { + id: 18556685 + name: "cIngress.foou" + alias: "foou" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txt deleted file mode 100644 index c0be9eb8302..00000000000 --- a/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,31 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48165785 - name: "cIngress.guh" - alias: "guh" - } - match_fields { - id: 1 - name: "hdr.tcp.dstPort" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 25131402 - } - size: 1024 -} -actions { - preamble { - id: 25131402 - name: "cIngress.foo" - alias: "foo" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ce33ebd07b1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/checksum1-bmv2.p4.p4info.txtpb @@ -0,0 +1,32 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48165785 + name: "cIngress.guh" + alias: "guh" + } + match_fields { + id: 1 + name: "hdr.tcp.dstPort" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 25131402 + } + size: 1024 +} +actions { + preamble { + id: 25131402 + name: "cIngress.foo" + alias: "foo" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/checksum2-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/checksum3-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/concat-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/concat-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/concat-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/concat-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/concat-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/concat-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txt deleted file mode 100644 index 00ecc910171..00000000000 --- a/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 30378945 - } - const_default_action_id: 30378945 - size: 1024 -} -actions { - preamble { - id: 30378945 - name: "ingress.concat" - alias: "concat" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..77cf8912f75 --- /dev/null +++ b/testdata/p4_16_samples_outputs/concat-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 30378945 + } + const_default_action_id: 30378945 + size: 1024 +} +actions { + preamble { + id: 30378945 + name: "ingress.concat" + alias: "concat" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/constant-in-calculation-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.entries.txt b/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.p4info.txt b/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test1.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.entries.txt b/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.p4info.txt b/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.entries.txt b/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.p4info.txt b/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test3.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.entries.txt b/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.p4info.txt b/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test4.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.entries.txt b/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.entries.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.p4info.txt b/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.p4info.txt deleted file mode 100644 index 40d81bd20b1..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.p4info.txt +++ /dev/null @@ -1,25 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 20728178 - name: "ingress.add" - alias: "add" - } -} -counters { - preamble { - id: 304134966 - name: "ingress.stats" - alias: "stats" - } - spec { - unit: PACKETS - } - size: 65536 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.p4info.txtpb new file mode 100644 index 00000000000..b71e4b72737 --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test5.p4.p4info.txtpb @@ -0,0 +1,26 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 20728178 + name: "ingress.add" + alias: "add" + } +} +counters { + preamble { + id: 304134966 + name: "ingress.stats" + alias: "stats" + } + spec { + unit: PACKETS + } + size: 65536 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.entries.txt b/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.entries.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txt b/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txt deleted file mode 100644 index 422593ce946..00000000000 --- a/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - match_fields { - id: 1 - name: "h.h[h.i.index].a" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 31682970 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 31682970 - name: "ingress.set_data" - alias: "set_data" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb new file mode 100644 index 00000000000..4cfc1acc62a --- /dev/null +++ b/testdata/p4_16_samples_outputs/control-hs-index-test6.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + match_fields { + id: 1 + name: "h.h[h.i.index].a" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 31682970 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 31682970 + name: "ingress.set_data" + alias: "set_data" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/copyprop1.p4.entries.txt b/testdata/p4_16_samples_outputs/copyprop1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/copyprop1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/copyprop1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/copyprop1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/copyprop1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txt b/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txt deleted file mode 100644 index f500cee76e8..00000000000 --- a/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44659798 - name: "MyIngress.t1" - alias: "t1" - } - match_fields { - id: 1 - name: "hdr.payload.x" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 23754841 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 23754841 - name: "MyIngress.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb new file mode 100644 index 00000000000..8adb84a3404 --- /dev/null +++ b/testdata/p4_16_samples_outputs/copyprop1.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44659798 + name: "MyIngress.t1" + alias: "t1" + } + match_fields { + id: 1 + name: "hdr.payload.x" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 23754841 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23754841 + name: "MyIngress.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/crc32-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/crc32-bmv2.p4.entries.txt deleted file mode 100644 index 69d9ac40281..00000000000 --- a/testdata/p4_16_samples_outputs/crc32-bmv2.p4.entries.txt +++ /dev/null @@ -1,122 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 35792087 - match { - field_id: 1 - exact { - value: "+" - } - } - action { - action { - action_id: 24785092 - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35792087 - match { - field_id: 1 - exact { - value: "-" - } - } - action { - action { - action_id: 22867470 - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35792087 - match { - field_id: 1 - exact { - value: "&" - } - } - action { - action { - action_id: 32601303 - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35792087 - match { - field_id: 1 - exact { - value: "|" - } - } - action { - action { - action_id: 17405675 - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35792087 - match { - field_id: 1 - exact { - value: "^" - } - } - action { - action { - action_id: 31935968 - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35792087 - match { - field_id: 1 - exact { - value: ">" - } - } - action { - action { - action_id: 24997060 - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/crc32-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/crc32-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..f139550345e --- /dev/null +++ b/testdata/p4_16_samples_outputs/crc32-bmv2.p4.entries.txtpb @@ -0,0 +1,123 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 35792087 + match { + field_id: 1 + exact { + value: "+" + } + } + action { + action { + action_id: 24785092 + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35792087 + match { + field_id: 1 + exact { + value: "-" + } + } + action { + action { + action_id: 22867470 + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35792087 + match { + field_id: 1 + exact { + value: "&" + } + } + action { + action { + action_id: 32601303 + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35792087 + match { + field_id: 1 + exact { + value: "|" + } + } + action { + action { + action_id: 17405675 + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35792087 + match { + field_id: 1 + exact { + value: "^" + } + } + action { + action { + action_id: 31935968 + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35792087 + match { + field_id: 1 + exact { + value: ">" + } + } + action { + action { + action_id: 24997060 + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txt deleted file mode 100644 index 9b8f79c6ddb..00000000000 --- a/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txt +++ /dev/null @@ -1,94 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 35792087 - name: "MyIngress.calculate" - alias: "calculate" - } - match_fields { - id: 1 - name: "hdr.p4calc.op" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 24785092 - } - action_refs { - id: 22867470 - } - action_refs { - id: 32601303 - } - action_refs { - id: 17405675 - } - action_refs { - id: 31935968 - } - action_refs { - id: 24997060 - } - action_refs { - id: 32121835 - } - const_default_action_id: 32121835 - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 24785092 - name: "MyIngress.operation_add" - alias: "operation_add" - } -} -actions { - preamble { - id: 22867470 - name: "MyIngress.operation_sub" - alias: "operation_sub" - } -} -actions { - preamble { - id: 32601303 - name: "MyIngress.operation_and" - alias: "operation_and" - } -} -actions { - preamble { - id: 17405675 - name: "MyIngress.operation_or" - alias: "operation_or" - } -} -actions { - preamble { - id: 31935968 - name: "MyIngress.operation_xor" - alias: "operation_xor" - } -} -actions { - preamble { - id: 24997060 - name: "MyIngress.operation_crc" - alias: "operation_crc" - } -} -actions { - preamble { - id: 32121835 - name: "MyIngress.operation_drop" - alias: "operation_drop" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..3af394a4c07 --- /dev/null +++ b/testdata/p4_16_samples_outputs/crc32-bmv2.p4.p4info.txtpb @@ -0,0 +1,95 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 35792087 + name: "MyIngress.calculate" + alias: "calculate" + } + match_fields { + id: 1 + name: "hdr.p4calc.op" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 24785092 + } + action_refs { + id: 22867470 + } + action_refs { + id: 32601303 + } + action_refs { + id: 17405675 + } + action_refs { + id: 31935968 + } + action_refs { + id: 24997060 + } + action_refs { + id: 32121835 + } + const_default_action_id: 32121835 + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 24785092 + name: "MyIngress.operation_add" + alias: "operation_add" + } +} +actions { + preamble { + id: 22867470 + name: "MyIngress.operation_sub" + alias: "operation_sub" + } +} +actions { + preamble { + id: 32601303 + name: "MyIngress.operation_and" + alias: "operation_and" + } +} +actions { + preamble { + id: 17405675 + name: "MyIngress.operation_or" + alias: "operation_or" + } +} +actions { + preamble { + id: 31935968 + name: "MyIngress.operation_xor" + alias: "operation_xor" + } +} +actions { + preamble { + id: 24997060 + name: "MyIngress.operation_crc" + alias: "operation_crc" + } +} +actions { + preamble { + id: 32121835 + name: "MyIngress.operation_drop" + alias: "operation_drop" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/csum_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/csum_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/csum_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/csum_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/csum_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/csum_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/csum_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/csum_ubpf.p4.p4info.txt deleted file mode 100644 index bc49a28559e..00000000000 --- a/testdata/p4_16_samples_outputs/csum_ubpf.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} diff --git a/testdata/p4_16_samples_outputs/csum_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/csum_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..3eb7a5ed325 --- /dev/null +++ b/testdata/p4_16_samples_outputs/csum_ubpf.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} diff --git a/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.entries.txt b/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.entries.txtpb b/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txt b/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txt deleted file mode 100644 index 2bda115cf84..00000000000 --- a/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txt +++ /dev/null @@ -1,117 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 49173205 - name: "ingressImpl.t1" - alias: "t1" - } - match_fields { - id: 1 - name: "hdr.andycustom.srcAddr" - bitwidth: 32 - match_type: EXACT - type_name { - name: "CustomAddr_t" - } - } - action_refs { - id: 23315944 - } - action_refs { - id: 32254556 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 32254556 - name: "ingressImpl.my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 23315944 - name: "ingressImpl.set_addr" - alias: "set_addr" - } - params { - id: 1 - name: "new_dstAddr" - bitwidth: 32 - type_name { - name: "IPv4Addr_t" - } - } -} -controller_packet_metadata { - preamble { - id: 75327753 - name: "packet_out" - alias: "packet_out" - annotations: "@controller_header(\"packet_out\")" - } - metadata { - id: 1 - name: "egress_port" - bitwidth: 9 - } - metadata { - id: 2 - name: "queue_id" - bitwidth: 8 - } - metadata { - id: 3 - name: "not_actually_useful" - bitwidth: 32 - type_name { - name: "EthernetAddr_t" - } - } -} -type_info { - new_types { - key: "CustomAddr_t" - value { - translated_type { - uri: "com.fingerhutpress/andysp4arch/v1/CustomAddr_t" - sdn_bitwidth: 32 - } - } - } - new_types { - key: "EthernetAddr_t" - value { - translated_type { - uri: "com.fingerhutpress/andysp4arch/v1/EthernetAddr_t" - sdn_bitwidth: 32 - } - } - } - new_types { - key: "IPv4Addr_t" - value { - translated_type { - uri: "com.fingerhutpress/andysp4arch/v1/IPv4Addr_t" - sdn_bitwidth: 32 - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb new file mode 100644 index 00000000000..5e45df90b2f --- /dev/null +++ b/testdata/p4_16_samples_outputs/custom-type-restricted-fields.p4.p4info.txtpb @@ -0,0 +1,118 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 49173205 + name: "ingressImpl.t1" + alias: "t1" + } + match_fields { + id: 1 + name: "hdr.andycustom.srcAddr" + bitwidth: 32 + match_type: EXACT + type_name { + name: "CustomAddr_t" + } + } + action_refs { + id: 23315944 + } + action_refs { + id: 32254556 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 32254556 + name: "ingressImpl.my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 23315944 + name: "ingressImpl.set_addr" + alias: "set_addr" + } + params { + id: 1 + name: "new_dstAddr" + bitwidth: 32 + type_name { + name: "IPv4Addr_t" + } + } +} +controller_packet_metadata { + preamble { + id: 75327753 + name: "packet_out" + alias: "packet_out" + annotations: "@controller_header(\"packet_out\")" + } + metadata { + id: 1 + name: "egress_port" + bitwidth: 9 + } + metadata { + id: 2 + name: "queue_id" + bitwidth: 8 + } + metadata { + id: 3 + name: "not_actually_useful" + bitwidth: 32 + type_name { + name: "EthernetAddr_t" + } + } +} +type_info { + new_types { + key: "CustomAddr_t" + value { + translated_type { + uri: "com.fingerhutpress/andysp4arch/v1/CustomAddr_t" + sdn_bitwidth: 32 + } + } + } + new_types { + key: "EthernetAddr_t" + value { + translated_type { + uri: "com.fingerhutpress/andysp4arch/v1/EthernetAddr_t" + sdn_bitwidth: 32 + } + } + } + new_types { + key: "IPv4Addr_t" + value { + translated_type { + uri: "com.fingerhutpress/andysp4arch/v1/IPv4Addr_t" + sdn_bitwidth: 32 + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..f7243e58807 --- /dev/null +++ b/testdata/p4_16_samples_outputs/dash/dash-pipeline-v1model-bmv2.p4.p4info.txtpb @@ -0,0 +1,1942 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 38937816 + name: "dash_ingress.vip|dash_vip" + alias: "vip|dash_vip" + } + match_fields { + id: 1 + name: "hdr.ipv4.dst_addr:VIP" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 26041632 + } + action_refs { + id: 23563653 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 23563653 + size: 1024 +} +tables { + preamble { + id: 38960243 + name: "dash_ingress.direction_lookup|dash_direction_lookup" + alias: "direction_lookup|dash_direction_lookup" + } + match_fields { + id: 1 + name: "hdr.vxlan.vni:VNI" + bitwidth: 24 + match_type: EXACT + } + action_refs { + id: 21912829 + } + action_refs { + id: 20977739 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 20977739 + size: 1024 +} +tables { + preamble { + id: 42701762 + name: "dash_ingress.appliance" + alias: "appliance" + } + match_fields { + id: 1 + name: "meta.appliance_id:appliance_id" + bitwidth: 8 + match_type: TERNARY + } + action_refs { + id: 21793905 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 47336097 + name: "dash_ingress.eni|dash_eni" + alias: "eni|dash_eni" + } + match_fields { + id: 1 + name: "meta.eni_id:eni_id" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 27167550 + } + action_refs { + id: 23563653 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 23563653 + size: 1024 +} +tables { + preamble { + id: 40418231 + name: "dash_ingress.eni_meter" + alias: "eni_meter" + } + match_fields { + id: 1 + name: "meta.eni_id:eni_id" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "meta.direction:direction" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 3 + name: "meta.dropped:dropped" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + direct_resource_ids: 322696367 + size: 1024 +} +tables { + preamble { + id: 48948181 + name: "dash_ingress.pa_validation|dash_pa_validation" + alias: "pa_validation|dash_pa_validation" + } + match_fields { + id: 1 + name: "meta.vnet_id:vnet_id" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ipv4.src_addr:sip" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 32591400 + } + action_refs { + id: 23563653 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 23563653 + size: 1024 +} +tables { + preamble { + id: 42758350 + name: "dash_ingress.inbound_routing|dash_inbound_routing" + alias: "inbound_routing|dash_inbound_routing" + } + match_fields { + id: 1 + name: "meta.eni_id:eni_id" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.vxlan.vni:VNI" + bitwidth: 24 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ipv4.src_addr:sip" + bitwidth: 32 + match_type: TERNARY + } + action_refs { + id: 28528336 + } + action_refs { + id: 22711915 + } + action_refs { + id: 23563653 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 23563653 + size: 1024 +} +tables { + preamble { + id: 48776568 + name: "dash_ingress.meter_policy|dash_meter" + alias: "meter_policy|dash_meter" + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "isobject" + value { + string_value: "true" + } + } + } + } + } + match_fields { + id: 1 + name: "meta.meter_policy_id:meter_policy_id" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 31945207 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 47787652 + name: "dash_ingress.meter_rule|dash_meter" + alias: "meter_rule|dash_meter" + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "isobject" + value { + string_value: "true" + } + } + } + } + } + match_fields { + id: 1 + name: "meta.meter_policy_id:meter_policy_id" + bitwidth: 16 + match_type: EXACT + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_object_id_t" + } + } + kv_pairs { + key: "isresourcetype" + value { + string_value: "true" + } + } + kv_pairs { + key: "objects" + value { + string_value: "METER_POLICY" + } + } + } + } + } + match_fields { + id: 2 + name: "hdr.ipv4.dst_addr:dip" + bitwidth: 32 + match_type: TERNARY + } + action_refs { + id: 24426589 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +tables { + preamble { + id: 49926129 + name: "dash_ingress.meter_bucket|dash_meter" + alias: "meter_bucket|dash_meter" + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "isobject" + value { + string_value: "true" + } + } + } + } + } + match_fields { + id: 1 + name: "meta.eni_id:eni_id" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "meta.meter_class:meter_class" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 23500411 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +tables { + preamble { + id: 38612462 + name: "dash_ingress.eni_ether_address_map|dash_eni" + alias: "eni_ether_address_map|dash_eni" + } + match_fields { + id: 1 + name: "meta.eni_addr:address" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 18228884 + } + action_refs { + id: 23563653 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 23563653 + size: 1024 +} +tables { + preamble { + id: 45323240 + name: "dash_ingress.dash_acl_group|dash_acl" + alias: "dash_acl_group|dash_acl" + } + match_fields { + id: 1 + name: "meta.stage1_dash_acl_group_id:dash_acl_group_id" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 25655048 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 47829983 + name: "dash_ingress.src_tag|dash_tag" + alias: "src_tag|dash_tag" + } + match_fields { + id: 1 + name: "meta.src_ip_addr:sip" + bitwidth: 128 + match_type: LPM + } + action_refs { + id: 27783729 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 34314002 + name: "dash_ingress.dst_tag|dash_tag" + alias: "dst_tag|dash_tag" + } + match_fields { + id: 1 + name: "meta.dst_ip_addr:dip" + bitwidth: 128 + match_type: LPM + } + action_refs { + id: 23256694 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 42788937 + name: "dash_ingress.outbound.outbound_routing|dash_outbound_routing" + alias: "outbound_routing|dash_outbound_routing" + } + match_fields { + id: 1 + name: "meta.eni_id:eni_id" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "meta.is_overlay_ip_v6:is_destination_v4_or_v6" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "meta.dst_ip_addr:destination" + bitwidth: 128 + match_type: LPM + } + action_refs { + id: 25364446 + } + action_refs { + id: 31116088 + } + action_refs { + id: 22900588 + } + action_refs { + id: 26447487 + } + action_refs { + id: 33407636 + } + const_default_action_id: 33407636 + direct_resource_ids: 329571213 + size: 1024 +} +tables { + preamble { + id: 48860231 + name: "dash_ingress.outbound.outbound_ca_to_pa|dash_outbound_ca_to_pa" + alias: "outbound_ca_to_pa|dash_outbound_ca_to_pa" + } + match_fields { + id: 1 + name: "meta.dst_vnet_id:dst_vnet_id" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "meta.is_lkup_dst_ip_v6:is_dip_v4_or_v6" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "meta.lkup_dst_ip_addr:dip" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 25450412 + } + action_refs { + id: 33407636 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 33407636 + direct_resource_ids: 321828795 + size: 1024 +} +tables { + preamble { + id: 34579306 + name: "dash_ingress.outbound.vnet|dash_vnet" + alias: "vnet|dash_vnet" + } + match_fields { + id: 1 + name: "meta.vnet_id:vnet_id" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 17187022 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 33810473 + name: "dash_ingress.outbound.acl.stage1:dash_acl_rule|dash_acl" + alias: "outbound.acl.stage1:dash_acl_rule|dash_acl" + } + match_fields { + id: 1 + name: "meta.dash_acl_group_id:dash_acl_group_id" + bitwidth: 16 + match_type: EXACT + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_object_id_t" + } + } + kv_pairs { + key: "isresourcetype" + value { + string_value: "true" + } + } + kv_pairs { + key: "objects" + value { + string_value: "SAI_OBJECT_TYPE_DASH_ACL_GROUP" + } + } + } + } + } + match_fields { + id: 2 + name: "meta.dst_tag_map:dst_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 3 + name: "meta.src_tag_map:src_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 4 + name: "meta.dst_ip_addr:dip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 5 + name: "meta.src_ip_addr:sip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 6 + name: "meta.ip_protocol:protocol" + bitwidth: 8 + match_type: OPTIONAL + } + match_fields { + id: 7 + name: "meta.src_l4_port:src_port" + bitwidth: 16 + match_type: OPTIONAL + } + match_fields { + id: 8 + name: "meta.dst_l4_port:dst_port" + bitwidth: 16 + match_type: OPTIONAL + } + action_refs { + id: 18858683 + } + action_refs { + id: 24263137 + } + action_refs { + id: 29962337 + } + action_refs { + id: 26077229 + } + direct_resource_ids: 324963620 + size: 1024 +} +tables { + preamble { + id: 49812549 + name: "dash_ingress.outbound.acl.stage2:dash_acl_rule|dash_acl" + alias: "outbound.acl.stage2:dash_acl_rule|dash_acl" + } + match_fields { + id: 1 + name: "meta.dash_acl_group_id:dash_acl_group_id" + bitwidth: 16 + match_type: EXACT + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_object_id_t" + } + } + kv_pairs { + key: "isresourcetype" + value { + string_value: "true" + } + } + kv_pairs { + key: "objects" + value { + string_value: "SAI_OBJECT_TYPE_DASH_ACL_GROUP" + } + } + } + } + } + match_fields { + id: 2 + name: "meta.dst_tag_map:dst_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 3 + name: "meta.src_tag_map:src_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 4 + name: "meta.dst_ip_addr:dip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 5 + name: "meta.src_ip_addr:sip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 6 + name: "meta.ip_protocol:protocol" + bitwidth: 8 + match_type: OPTIONAL + } + match_fields { + id: 7 + name: "meta.src_l4_port:src_port" + bitwidth: 16 + match_type: OPTIONAL + } + match_fields { + id: 8 + name: "meta.dst_l4_port:dst_port" + bitwidth: 16 + match_type: OPTIONAL + } + action_refs { + id: 18858683 + } + action_refs { + id: 24263137 + } + action_refs { + id: 29962337 + } + action_refs { + id: 26077229 + } + direct_resource_ids: 334749261 + size: 1024 +} +tables { + preamble { + id: 40782112 + name: "dash_ingress.outbound.acl.stage3:dash_acl_rule|dash_acl" + alias: "outbound.acl.stage3:dash_acl_rule|dash_acl" + } + match_fields { + id: 1 + name: "meta.dash_acl_group_id:dash_acl_group_id" + bitwidth: 16 + match_type: EXACT + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_object_id_t" + } + } + kv_pairs { + key: "isresourcetype" + value { + string_value: "true" + } + } + kv_pairs { + key: "objects" + value { + string_value: "SAI_OBJECT_TYPE_DASH_ACL_GROUP" + } + } + } + } + } + match_fields { + id: 2 + name: "meta.dst_tag_map:dst_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 3 + name: "meta.src_tag_map:src_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 4 + name: "meta.dst_ip_addr:dip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 5 + name: "meta.src_ip_addr:sip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 6 + name: "meta.ip_protocol:protocol" + bitwidth: 8 + match_type: OPTIONAL + } + match_fields { + id: 7 + name: "meta.src_l4_port:src_port" + bitwidth: 16 + match_type: OPTIONAL + } + match_fields { + id: 8 + name: "meta.dst_l4_port:dst_port" + bitwidth: 16 + match_type: OPTIONAL + } + action_refs { + id: 18858683 + } + action_refs { + id: 24263137 + } + action_refs { + id: 29962337 + } + action_refs { + id: 26077229 + } + direct_resource_ids: 320450761 + size: 1024 +} +tables { + preamble { + id: 33901322 + name: "dash_ingress.inbound.acl.stage1:dash_acl_rule|dash_acl" + alias: "inbound.acl.stage1:dash_acl_rule|dash_acl" + } + match_fields { + id: 1 + name: "meta.dash_acl_group_id:dash_acl_group_id" + bitwidth: 16 + match_type: EXACT + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_object_id_t" + } + } + kv_pairs { + key: "isresourcetype" + value { + string_value: "true" + } + } + kv_pairs { + key: "objects" + value { + string_value: "SAI_OBJECT_TYPE_DASH_ACL_GROUP" + } + } + } + } + } + match_fields { + id: 2 + name: "meta.dst_tag_map:dst_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 3 + name: "meta.src_tag_map:src_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 4 + name: "meta.dst_ip_addr:dip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 5 + name: "meta.src_ip_addr:sip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 6 + name: "meta.ip_protocol:protocol" + bitwidth: 8 + match_type: OPTIONAL + } + match_fields { + id: 7 + name: "meta.src_l4_port:src_port" + bitwidth: 16 + match_type: OPTIONAL + } + match_fields { + id: 8 + name: "meta.dst_l4_port:dst_port" + bitwidth: 16 + match_type: OPTIONAL + } + action_refs { + id: 32161567 + } + action_refs { + id: 20706700 + } + action_refs { + id: 28146588 + } + action_refs { + id: 31424218 + } + direct_resource_ids: 320981527 + size: 1024 +} +tables { + preamble { + id: 44184066 + name: "dash_ingress.inbound.acl.stage2:dash_acl_rule|dash_acl" + alias: "inbound.acl.stage2:dash_acl_rule|dash_acl" + } + match_fields { + id: 1 + name: "meta.dash_acl_group_id:dash_acl_group_id" + bitwidth: 16 + match_type: EXACT + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_object_id_t" + } + } + kv_pairs { + key: "isresourcetype" + value { + string_value: "true" + } + } + kv_pairs { + key: "objects" + value { + string_value: "SAI_OBJECT_TYPE_DASH_ACL_GROUP" + } + } + } + } + } + match_fields { + id: 2 + name: "meta.dst_tag_map:dst_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 3 + name: "meta.src_tag_map:src_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 4 + name: "meta.dst_ip_addr:dip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 5 + name: "meta.src_ip_addr:sip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 6 + name: "meta.ip_protocol:protocol" + bitwidth: 8 + match_type: OPTIONAL + } + match_fields { + id: 7 + name: "meta.src_l4_port:src_port" + bitwidth: 16 + match_type: OPTIONAL + } + match_fields { + id: 8 + name: "meta.dst_l4_port:dst_port" + bitwidth: 16 + match_type: OPTIONAL + } + action_refs { + id: 32161567 + } + action_refs { + id: 20706700 + } + action_refs { + id: 28146588 + } + action_refs { + id: 31424218 + } + direct_resource_ids: 322865948 + size: 1024 +} +tables { + preamble { + id: 46150034 + name: "dash_ingress.inbound.acl.stage3:dash_acl_rule|dash_acl" + alias: "inbound.acl.stage3:dash_acl_rule|dash_acl" + } + match_fields { + id: 1 + name: "meta.dash_acl_group_id:dash_acl_group_id" + bitwidth: 16 + match_type: EXACT + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_object_id_t" + } + } + kv_pairs { + key: "isresourcetype" + value { + string_value: "true" + } + } + kv_pairs { + key: "objects" + value { + string_value: "SAI_OBJECT_TYPE_DASH_ACL_GROUP" + } + } + } + } + } + match_fields { + id: 2 + name: "meta.dst_tag_map:dst_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 3 + name: "meta.src_tag_map:src_tag" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 4 + name: "meta.dst_ip_addr:dip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 5 + name: "meta.src_ip_addr:sip" + bitwidth: 128 + match_type: OPTIONAL + } + match_fields { + id: 6 + name: "meta.ip_protocol:protocol" + bitwidth: 8 + match_type: OPTIONAL + } + match_fields { + id: 7 + name: "meta.src_l4_port:src_port" + bitwidth: 16 + match_type: OPTIONAL + } + match_fields { + id: 8 + name: "meta.dst_l4_port:dst_port" + bitwidth: 16 + match_type: OPTIONAL + } + action_refs { + id: 32161567 + } + action_refs { + id: 20706700 + } + action_refs { + id: 28146588 + } + action_refs { + id: 31424218 + } + direct_resource_ids: 328370481 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28528336 + name: "vxlan_decap" + alias: "vxlan_decap" + } +} +actions { + preamble { + id: 29669127 + name: "vxlan_encap" + alias: "vxlan_encap" + } +} +actions { + preamble { + id: 30611573 + name: "nvgre_encap" + alias: "nvgre_encap" + } +} +actions { + preamble { + id: 17483495 + name: "dash_ingress.drop_action" + alias: "drop_action" + } +} +actions { + preamble { + id: 23563653 + name: "dash_ingress.deny" + alias: "dash_ingress.deny" + } +} +actions { + preamble { + id: 26041632 + name: "dash_ingress.accept" + alias: "accept" + } +} +actions { + preamble { + id: 21912829 + name: "dash_ingress.set_outbound_direction" + alias: "set_outbound_direction" + } +} +actions { + preamble { + id: 20977739 + name: "dash_ingress.set_inbound_direction" + alias: "set_inbound_direction" + } +} +actions { + preamble { + id: 21793905 + name: "dash_ingress.set_appliance" + alias: "set_appliance" + } + params { + id: 1 + name: "neighbor_mac" + bitwidth: 48 + } + params { + id: 2 + name: "mac" + bitwidth: 48 + } +} +actions { + preamble { + id: 27167550 + name: "dash_ingress.set_eni_attrs" + alias: "set_eni_attrs" + } + params { + id: 1 + name: "cps" + bitwidth: 32 + } + params { + id: 2 + name: "pps" + bitwidth: 32 + } + params { + id: 3 + name: "flows" + bitwidth: 32 + } + params { + id: 4 + name: "admin_state" + bitwidth: 1 + } + params { + id: 5 + name: "vm_underlay_dip" + bitwidth: 32 + } + params { + id: 6 + name: "vm_vni" + bitwidth: 24 + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_uint32_t" + } + } + } + } + } + params { + id: 7 + name: "vnet_id" + bitwidth: 16 + } + params { + id: 8 + name: "v4_meter_policy_id" + bitwidth: 16 + } + params { + id: 9 + name: "v6_meter_policy_id" + bitwidth: 16 + } + params { + id: 10 + name: "inbound_v4_stage1_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 11 + name: "inbound_v4_stage2_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 12 + name: "inbound_v4_stage3_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 13 + name: "inbound_v4_stage4_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 14 + name: "inbound_v4_stage5_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 15 + name: "inbound_v6_stage1_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 16 + name: "inbound_v6_stage2_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 17 + name: "inbound_v6_stage3_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 18 + name: "inbound_v6_stage4_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 19 + name: "inbound_v6_stage5_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 20 + name: "outbound_v4_stage1_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 21 + name: "outbound_v4_stage2_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 22 + name: "outbound_v4_stage3_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 23 + name: "outbound_v4_stage4_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 24 + name: "outbound_v4_stage5_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 25 + name: "outbound_v6_stage1_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 26 + name: "outbound_v6_stage2_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 27 + name: "outbound_v6_stage3_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 28 + name: "outbound_v6_stage4_dash_acl_group_id" + bitwidth: 16 + } + params { + id: 29 + name: "outbound_v6_stage5_dash_acl_group_id" + bitwidth: 16 + } +} +actions { + preamble { + id: 32591400 + name: "dash_ingress.permit" + alias: "dash_ingress.permit" + } +} +actions { + preamble { + id: 22711915 + name: "dash_ingress.vxlan_decap_pa_validate" + alias: "vxlan_decap_pa_validate" + } + params { + id: 1 + name: "src_vnet_id" + bitwidth: 16 + } +} +actions { + preamble { + id: 31945207 + name: "dash_ingress.check_ip_addr_family" + alias: "check_ip_addr_family" + } + params { + id: 1 + name: "ip_addr_family" + bitwidth: 32 + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_ip_addr_family_t" + } + } + kv_pairs { + key: "isresourcetype" + value { + string_value: "true" + } + } + } + } + } +} +actions { + preamble { + id: 24426589 + name: "dash_ingress.set_policy_meter_class" + alias: "set_policy_meter_class" + } + params { + id: 1 + name: "meter_class" + bitwidth: 16 + } +} +actions { + preamble { + id: 23500411 + name: "dash_ingress.meter_bucket_action" + alias: "meter_bucket_action" + } + params { + id: 1 + name: "outbound_bytes_counter" + bitwidth: 64 + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_uint64_t" + } + } + kv_pairs { + key: "isreadonly" + value { + string_value: "true" + } + } + } + } + } + params { + id: 2 + name: "inbound_bytes_counter" + bitwidth: 64 + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_uint64_t" + } + } + kv_pairs { + key: "isreadonly" + value { + string_value: "true" + } + } + } + } + } + params { + id: 3 + name: "meter_bucket_index" + bitwidth: 32 + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_uint32_t" + } + } + kv_pairs { + key: "skipattr" + value { + string_value: "true" + } + } + } + } + } +} +actions { + preamble { + id: 18228884 + name: "dash_ingress.set_eni" + alias: "set_eni" + } + params { + id: 1 + name: "eni_id" + bitwidth: 16 + } +} +actions { + preamble { + id: 25655048 + name: "dash_ingress.set_acl_group_attrs" + alias: "set_acl_group_attrs" + } + params { + id: 1 + name: "ip_addr_family" + bitwidth: 32 + structured_annotations { + name: "Sai" + kv_pair_list { + kv_pairs { + key: "type" + value { + string_value: "sai_ip_addr_family_t" + } + } + kv_pairs { + key: "isresourcetype" + value { + string_value: "true" + } + } + } + } + } +} +actions { + preamble { + id: 27783729 + name: "dash_ingress.set_src_tag" + alias: "set_src_tag" + } + params { + id: 1 + name: "tag_map" + bitwidth: 32 + } +} +actions { + preamble { + id: 23256694 + name: "dash_ingress.set_dst_tag" + alias: "set_dst_tag" + } + params { + id: 1 + name: "tag_map" + bitwidth: 32 + } +} +actions { + preamble { + id: 25364446 + name: "dash_ingress.outbound.route_vnet" + alias: "route_vnet" + } + params { + id: 1 + name: "dst_vnet_id" + bitwidth: 16 + } + params { + id: 2 + name: "meter_policy_en" + bitwidth: 1 + } + params { + id: 3 + name: "meter_class" + bitwidth: 16 + } +} +actions { + preamble { + id: 31116088 + name: "dash_ingress.outbound.route_vnet_direct" + alias: "route_vnet_direct" + } + params { + id: 1 + name: "dst_vnet_id" + bitwidth: 16 + } + params { + id: 2 + name: "is_overlay_ip_v4_or_v6" + bitwidth: 1 + } + params { + id: 3 + name: "overlay_ip" + bitwidth: 128 + } + params { + id: 4 + name: "meter_policy_en" + bitwidth: 1 + } + params { + id: 5 + name: "meter_class" + bitwidth: 16 + } +} +actions { + preamble { + id: 22900588 + name: "dash_ingress.outbound.route_direct" + alias: "route_direct" + } + params { + id: 1 + name: "meter_policy_en" + bitwidth: 1 + } + params { + id: 2 + name: "meter_class" + bitwidth: 16 + } +} +actions { + preamble { + id: 33407636 + name: "dash_ingress.outbound.drop" + alias: "drop" + } +} +actions { + preamble { + id: 26447487 + name: "dash_ingress.outbound.route_service_tunnel" + alias: "route_service_tunnel" + } + params { + id: 1 + name: "is_overlay_dip_v4_or_v6" + bitwidth: 1 + } + params { + id: 2 + name: "overlay_dip" + bitwidth: 128 + } + params { + id: 3 + name: "is_overlay_dip_mask_v4_or_v6" + bitwidth: 1 + } + params { + id: 4 + name: "overlay_dip_mask" + bitwidth: 128 + } + params { + id: 5 + name: "is_overlay_sip_v4_or_v6" + bitwidth: 1 + } + params { + id: 6 + name: "overlay_sip" + bitwidth: 128 + } + params { + id: 7 + name: "is_overlay_sip_mask_v4_or_v6" + bitwidth: 1 + } + params { + id: 8 + name: "overlay_sip_mask" + bitwidth: 128 + } + params { + id: 9 + name: "is_underlay_dip_v4_or_v6" + bitwidth: 1 + } + params { + id: 10 + name: "underlay_dip" + bitwidth: 128 + } + params { + id: 11 + name: "is_underlay_sip_v4_or_v6" + bitwidth: 1 + } + params { + id: 12 + name: "underlay_sip" + bitwidth: 128 + } + params { + id: 13 + name: "dash_encapsulation" + bitwidth: 16 + } + params { + id: 14 + name: "tunnel_key" + bitwidth: 24 + } + params { + id: 15 + name: "meter_policy_en" + bitwidth: 1 + } + params { + id: 16 + name: "meter_class" + bitwidth: 16 + } +} +actions { + preamble { + id: 25450412 + name: "dash_ingress.outbound.set_tunnel_mapping" + alias: "set_tunnel_mapping" + } + params { + id: 1 + name: "underlay_dip" + bitwidth: 32 + } + params { + id: 2 + name: "overlay_dmac" + bitwidth: 48 + } + params { + id: 3 + name: "use_dst_vnet_vni" + bitwidth: 1 + } + params { + id: 4 + name: "meter_class" + bitwidth: 16 + } + params { + id: 5 + name: "meter_class_override" + bitwidth: 1 + } +} +actions { + preamble { + id: 17187022 + name: "dash_ingress.outbound.set_vnet_attrs" + alias: "set_vnet_attrs" + } + params { + id: 1 + name: "vni" + bitwidth: 24 + } +} +actions { + preamble { + id: 18858683 + name: "dash_ingress.outbound.acl.permit" + alias: "outbound.acl.permit" + } +} +actions { + preamble { + id: 24263137 + name: "dash_ingress.outbound.acl.permit_and_continue" + alias: "outbound.acl.permit_and_continue" + } +} +actions { + preamble { + id: 29962337 + name: "dash_ingress.outbound.acl.deny" + alias: "outbound.acl.deny" + } +} +actions { + preamble { + id: 26077229 + name: "dash_ingress.outbound.acl.deny_and_continue" + alias: "outbound.acl.deny_and_continue" + } +} +actions { + preamble { + id: 32161567 + name: "dash_ingress.inbound.acl.permit" + alias: "inbound.acl.permit" + } +} +actions { + preamble { + id: 20706700 + name: "dash_ingress.inbound.acl.permit_and_continue" + alias: "inbound.acl.permit_and_continue" + } +} +actions { + preamble { + id: 28146588 + name: "dash_ingress.inbound.acl.deny" + alias: "inbound.acl.deny" + } +} +actions { + preamble { + id: 31424218 + name: "dash_ingress.inbound.acl.deny_and_continue" + alias: "inbound.acl.deny_and_continue" + } +} +counters { + preamble { + id: 318423147 + name: "dash_ingress.meter_bucket_inbound" + alias: "meter_bucket_inbound" + } + spec { + unit: BYTES + } + size: 262144 +} +counters { + preamble { + id: 317610666 + name: "dash_ingress.meter_bucket_outbound" + alias: "meter_bucket_outbound" + } + spec { + unit: BYTES + } + size: 262144 +} +direct_counters { + preamble { + id: 322696367 + name: "dash_ingress.eni_counter" + alias: "eni_counter" + } + spec { + unit: BOTH + } + direct_table_id: 40418231 +} +direct_counters { + preamble { + id: 329571213 + name: "dash_ingress.outbound.routing_counter" + alias: "routing_counter" + } + spec { + unit: BOTH + } + direct_table_id: 42788937 +} +direct_counters { + preamble { + id: 321828795 + name: "dash_ingress.outbound.ca_to_pa_counter" + alias: "ca_to_pa_counter" + } + spec { + unit: BOTH + } + direct_table_id: 48860231 +} +direct_counters { + preamble { + id: 324963620 + name: "dash_ingress.outbound.acl.stage1_counter" + alias: "outbound.acl.stage1_counter" + } + spec { + unit: BOTH + } + direct_table_id: 33810473 +} +direct_counters { + preamble { + id: 334749261 + name: "dash_ingress.outbound.acl.stage2_counter" + alias: "outbound.acl.stage2_counter" + } + spec { + unit: BOTH + } + direct_table_id: 49812549 +} +direct_counters { + preamble { + id: 320450761 + name: "dash_ingress.outbound.acl.stage3_counter" + alias: "outbound.acl.stage3_counter" + } + spec { + unit: BOTH + } + direct_table_id: 40782112 +} +direct_counters { + preamble { + id: 320981527 + name: "dash_ingress.inbound.acl.stage1_counter" + alias: "inbound.acl.stage1_counter" + } + spec { + unit: BOTH + } + direct_table_id: 33901322 +} +direct_counters { + preamble { + id: 322865948 + name: "dash_ingress.inbound.acl.stage2_counter" + alias: "inbound.acl.stage2_counter" + } + spec { + unit: BOTH + } + direct_table_id: 44184066 +} +direct_counters { + preamble { + id: 328370481 + name: "dash_ingress.inbound.acl.stage3_counter" + alias: "inbound.acl.stage3_counter" + } + spec { + unit: BOTH + } + direct_table_id: 46150034 +} +type_info { + serializable_enums { + key: "dash_direction_t" + value { + underlying_type { + bitwidth: 16 + } + members { + name: "INVALID" + value: "\000\000" + } + members { + name: "OUTBOUND" + value: "\000\001" + } + members { + name: "INBOUND" + value: "\000\002" + } + } + } + serializable_enums { + key: "dash_encapsulation_t" + value { + underlying_type { + bitwidth: 16 + } + members { + name: "INVALID" + value: "\000\000" + } + members { + name: "VXLAN" + value: "\000\001" + } + members { + name: "NVGRE" + value: "\000\002" + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/def-use.p4.entries.txt b/testdata/p4_16_samples_outputs/def-use.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/def-use.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/def-use.p4.entries.txtpb b/testdata/p4_16_samples_outputs/def-use.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/def-use.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/def-use.p4.p4info.txt b/testdata/p4_16_samples_outputs/def-use.p4.p4info.txt deleted file mode 100644 index 55027b254eb..00000000000 --- a/testdata/p4_16_samples_outputs/def-use.p4.p4info.txt +++ /dev/null @@ -1,25 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 45349674 - name: "EgressI.t" - alias: "t" - } - action_refs { - id: 21913698 - } - size: 1024 -} -actions { - preamble { - id: 21913698 - name: "EgressI.a" - alias: "a" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb new file mode 100644 index 00000000000..616d9801aaa --- /dev/null +++ b/testdata/p4_16_samples_outputs/def-use.p4.p4info.txtpb @@ -0,0 +1,26 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 45349674 + name: "EgressI.t" + alias: "t" + } + action_refs { + id: 21913698 + } + size: 1024 +} +actions { + preamble { + id: 21913698 + name: "EgressI.a" + alias: "a" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/default_action-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/default_action-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/default_action-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/default_action-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/default_action-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/default_action-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txt deleted file mode 100644 index 75ebabb85b4..00000000000 --- a/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txt +++ /dev/null @@ -1,31 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43577110 - name: "ingress.c.t" - alias: "t" - } - action_refs { - id: 29022044 - } - const_default_action_id: 29022044 - size: 1024 -} -actions { - preamble { - id: 29022044 - name: "ingress.c.add" - alias: "add" - } - params { - id: 1 - name: "data" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..1dce9d362fb --- /dev/null +++ b/testdata/p4_16_samples_outputs/default_action-bmv2.p4.p4info.txtpb @@ -0,0 +1,32 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43577110 + name: "ingress.c.t" + alias: "t" + } + action_refs { + id: 29022044 + } + const_default_action_id: 29022044 + size: 1024 +} +actions { + preamble { + id: 29022044 + name: "ingress.c.add" + alias: "add" + } + params { + id: 1 + name: "data" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/default_action_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/default_action_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/default_action_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/default_action_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/default_action_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/default_action_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txt deleted file mode 100644 index 2706d59c512..00000000000 --- a/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txt +++ /dev/null @@ -1,30 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -tables { - preamble { - id: 49639434 - name: "pipe.tbl_a" - alias: "tbl_a" - } - action_refs { - id: 23144899 - } - size: 1024 -} -actions { - preamble { - id: 23144899 - name: "pipe.add" - alias: "add" - } - params { - id: 1 - name: "data" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..45005334560 --- /dev/null +++ b/testdata/p4_16_samples_outputs/default_action_ubpf.p4.p4info.txtpb @@ -0,0 +1,31 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +tables { + preamble { + id: 49639434 + name: "pipe.tbl_a" + alias: "tbl_a" + } + action_refs { + id: 23144899 + } + size: 1024 +} +actions { + preamble { + id: 23144899 + name: "pipe.add" + alias: "add" + } + params { + id: 1 + name: "data" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/drop-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/drop-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/drop-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/drop-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/drop-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/drop-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txt deleted file mode 100644 index 039e1931fcb..00000000000 --- a/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 47103791 - name: "IngressI.forward" - alias: "forward" - } - action_refs { - id: 18759588 - } - const_default_action_id: 18759588 - size: 1024 -} -actions { - preamble { - id: 18759588 - name: "drop" - alias: "drop" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ead32dc500d --- /dev/null +++ b/testdata/p4_16_samples_outputs/drop-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 47103791 + name: "IngressI.forward" + alias: "forward" + } + action_refs { + id: 18759588 + } + const_default_action_id: 18759588 + size: 1024 +} +actions { + preamble { + id: 18759588 + name: "drop" + alias: "drop" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/empty-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/empty-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/empty-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/empty-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/empty-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/empty-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/empty-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/empty-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/empty-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/empty-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/empty-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/empty-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/enum-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/enum-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/enum-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/enum-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/enum-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/enum-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/enum-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/enum-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/enum-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/enum-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/enum-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/enum-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/equality-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/equality-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/equality-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/equality-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/equality-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/equality-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/equality-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/equality-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/equality-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/equality-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/equality-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/equality-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/equality-varbit-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/extern-funcs-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/extract_for_header_union.p4.entries.txt b/testdata/p4_16_samples_outputs/extract_for_header_union.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/extract_for_header_union.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/extract_for_header_union.p4.entries.txtpb b/testdata/p4_16_samples_outputs/extract_for_header_union.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/extract_for_header_union.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/extract_for_header_union.p4.p4info.txt b/testdata/p4_16_samples_outputs/extract_for_header_union.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/extract_for_header_union.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/extract_for_header_union.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/extract_for_header_union.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/extract_for_header_union.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.entries.txtpb b/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb new file mode 100644 index 00000000000..b06fa2c5d91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.p4info.txtpb @@ -0,0 +1,905 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43310977 + name: "FabricIngress.filtering.ingress_port_vlan" + alias: "ingress_port_vlan" + } + match_fields { + id: 1 + name: "ig_port" + bitwidth: 9 + match_type: EXACT + } + match_fields { + id: 2 + name: "vlan_is_valid" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "vlan_id" + bitwidth: 12 + match_type: TERNARY + } + action_refs { + id: 17164167 + } + action_refs { + id: 24158268 + } + action_refs { + id: 24266015 + } + const_default_action_id: 17164167 + direct_resource_ids: 326221069 + size: 1024 +} +tables { + preamble { + id: 49718154 + name: "FabricIngress.filtering.fwd_classifier" + alias: "fwd_classifier" + } + match_fields { + id: 1 + name: "ig_port" + bitwidth: 9 + match_type: EXACT + } + match_fields { + id: 2 + name: "eth_dst" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 3 + name: "eth_type" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 25032921 + } + const_default_action_id: 25032921 + direct_resource_ids: 335473470 + size: 1024 +} +tables { + preamble { + id: 43623757 + name: "FabricIngress.forwarding.bridging" + alias: "bridging" + } + match_fields { + id: 1 + name: "vlan_id" + bitwidth: 12 + match_type: EXACT + } + match_fields { + id: 2 + name: "eth_dst" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21791748 + } + action_refs { + id: 28485346 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28485346 + direct_resource_ids: 330959985 + size: 1024 +} +tables { + preamble { + id: 37768578 + name: "FabricIngress.forwarding.mpls" + alias: "mpls" + } + match_fields { + id: 1 + name: "mpls_label" + bitwidth: 20 + match_type: EXACT + } + action_refs { + id: 30066030 + } + action_refs { + id: 28485346 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28485346 + direct_resource_ids: 318961579 + size: 1024 +} +tables { + preamble { + id: 41754650 + name: "FabricIngress.forwarding.routing_v4" + alias: "routing_v4" + } + match_fields { + id: 1 + name: "ipv4_dst" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 19792090 + } + action_refs { + id: 29124955 + } + action_refs { + id: 28485346 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28485346 + direct_resource_ids: 333425635 + size: 1024 +} +tables { + preamble { + id: 44104738 + name: "FabricIngress.acl.acl" + alias: "acl" + } + match_fields { + id: 1 + name: "ig_port" + bitwidth: 9 + match_type: TERNARY + } + match_fields { + id: 2 + name: "ip_proto" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 3 + name: "l4_sport" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 4 + name: "l4_dport" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 5 + name: "eth_src" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 6 + name: "eth_dst" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 7 + name: "vlan_id" + bitwidth: 12 + match_type: TERNARY + } + match_fields { + id: 8 + name: "eth_type" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 9 + name: "ipv4_src" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 10 + name: "ipv4_dst" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 11 + name: "icmp_type" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 12 + name: "icmp_code" + bitwidth: 8 + match_type: TERNARY + } + action_refs { + id: 23623126 + } + action_refs { + id: 23579892 + } + action_refs { + id: 29898175 + } + action_refs { + id: 23570973 + } + action_refs { + id: 29607214 + } + const_default_action_id: 29607214 + direct_resource_ids: 319194241 + size: 1024 +} +tables { + preamble { + id: 35696861 + name: "FabricIngress.next.next_vlan" + alias: "next_vlan" + } + match_fields { + id: 1 + name: "next_id" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 22099101 + } + action_refs { + id: 28485346 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28485346 + direct_resource_ids: 326370320 + size: 1024 +} +tables { + preamble { + id: 48735793 + name: "FabricIngress.next.xconnect" + alias: "xconnect" + } + match_fields { + id: 1 + name: "ig_port" + bitwidth: 9 + match_type: EXACT + } + match_fields { + id: 2 + name: "next_id" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 24640974 + } + action_refs { + id: 30599612 + } + action_refs { + id: 28485346 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28485346 + direct_resource_ids: 321989420 + size: 1024 +} +tables { + preamble { + id: 47960972 + name: "FabricIngress.next.hashed" + alias: "hashed" + } + match_fields { + id: 1 + name: "next_id" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 27301117 + } + action_refs { + id: 20985706 + } + action_refs { + id: 27920375 + } + action_refs { + id: 28485346 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28485346 + implementation_id: 291115404 + direct_resource_ids: 322798228 + size: 1024 +} +tables { + preamble { + id: 40619180 + name: "FabricIngress.next.multicast" + alias: "multicast" + } + match_fields { + id: 1 + name: "next_id" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 21629581 + } + action_refs { + id: 28485346 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28485346 + direct_resource_ids: 319194968 + size: 1024 +} +tables { + preamble { + id: 49442443 + name: "FabricIngress.spgw_ingress.dl_sess_lookup" + alias: "dl_sess_lookup" + } + match_fields { + id: 1 + name: "ipv4_dst" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 31156449 + } + action_refs { + id: 28485346 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28485346 + direct_resource_ids: 334575698 + size: 1024 +} +tables { + preamble { + id: 40038434 + name: "FabricIngress.spgw_ingress.s1u_filter_table" + alias: "s1u_filter_table" + } + match_fields { + id: 1 + name: "gtp_ipv4_dst" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 28485346 + } + const_default_action_id: 28485346 + size: 1024 +} +tables { + preamble { + id: 49262446 + name: "FabricEgress.egress_next.egress_vlan" + alias: "egress_vlan" + } + match_fields { + id: 1 + name: "vlan_id" + bitwidth: 12 + match_type: EXACT + } + match_fields { + id: 2 + name: "eg_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 17183246 + } + action_refs { + id: 28485346 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28485346 + direct_resource_ids: 318892680 + size: 1024 +} +actions { + preamble { + id: 28485346 + name: "nop" + alias: "nop" + } +} +actions { + preamble { + id: 17164167 + name: "FabricIngress.filtering.deny" + alias: "deny" + } +} +actions { + preamble { + id: 24158268 + name: "FabricIngress.filtering.permit" + alias: "permit" + } +} +actions { + preamble { + id: 24266015 + name: "FabricIngress.filtering.permit_with_internal_vlan" + alias: "permit_with_internal_vlan" + } + params { + id: 1 + name: "vlan_id" + bitwidth: 12 + } +} +actions { + preamble { + id: 25032921 + name: "FabricIngress.filtering.set_forwarding_type" + alias: "set_forwarding_type" + } + params { + id: 1 + name: "fwd_type" + bitwidth: 3 + } +} +actions { + preamble { + id: 21791748 + name: "FabricIngress.forwarding.set_next_id_bridging" + alias: "set_next_id_bridging" + } + params { + id: 1 + name: "next_id" + bitwidth: 32 + } +} +actions { + preamble { + id: 30066030 + name: "FabricIngress.forwarding.pop_mpls_and_next" + alias: "pop_mpls_and_next" + } + params { + id: 1 + name: "next_id" + bitwidth: 32 + } +} +actions { + preamble { + id: 19792090 + name: "FabricIngress.forwarding.set_next_id_routing_v4" + alias: "set_next_id_routing_v4" + } + params { + id: 1 + name: "next_id" + bitwidth: 32 + } +} +actions { + preamble { + id: 29124955 + name: "FabricIngress.forwarding.nop_routing_v4" + alias: "nop_routing_v4" + } +} +actions { + preamble { + id: 23623126 + name: "FabricIngress.acl.set_next_id_acl" + alias: "set_next_id_acl" + } + params { + id: 1 + name: "next_id" + bitwidth: 32 + } +} +actions { + preamble { + id: 23579892 + name: "FabricIngress.acl.punt_to_cpu" + alias: "punt_to_cpu" + } +} +actions { + preamble { + id: 29898175 + name: "FabricIngress.acl.clone_to_cpu" + alias: "clone_to_cpu" + } +} +actions { + preamble { + id: 23570973 + name: "FabricIngress.acl.drop" + alias: "drop" + } +} +actions { + preamble { + id: 29607214 + name: "FabricIngress.acl.nop_acl" + alias: "nop_acl" + } +} +actions { + preamble { + id: 22099101 + name: "FabricIngress.next.set_vlan" + alias: "set_vlan" + } + params { + id: 1 + name: "vlan_id" + bitwidth: 12 + } +} +actions { + preamble { + id: 24640974 + name: "FabricIngress.next.output_xconnect" + alias: "output_xconnect" + } + params { + id: 1 + name: "port_num" + bitwidth: 9 + } +} +actions { + preamble { + id: 30599612 + name: "FabricIngress.next.set_next_id_xconnect" + alias: "set_next_id_xconnect" + } + params { + id: 1 + name: "next_id" + bitwidth: 32 + } +} +actions { + preamble { + id: 27301117 + name: "FabricIngress.next.output_hashed" + alias: "output_hashed" + } + params { + id: 1 + name: "port_num" + bitwidth: 9 + } +} +actions { + preamble { + id: 20985706 + name: "FabricIngress.next.routing_hashed" + alias: "routing_hashed" + } + params { + id: 1 + name: "port_num" + bitwidth: 9 + } + params { + id: 2 + name: "smac" + bitwidth: 48 + } + params { + id: 3 + name: "dmac" + bitwidth: 48 + } +} +actions { + preamble { + id: 27920375 + name: "FabricIngress.next.mpls_routing_hashed" + alias: "mpls_routing_hashed" + } + params { + id: 1 + name: "port_num" + bitwidth: 9 + } + params { + id: 2 + name: "smac" + bitwidth: 48 + } + params { + id: 3 + name: "dmac" + bitwidth: 48 + } + params { + id: 4 + name: "label" + bitwidth: 20 + } +} +actions { + preamble { + id: 21629581 + name: "FabricIngress.next.set_mcast_group_id" + alias: "set_mcast_group_id" + } + params { + id: 1 + name: "group_id" + bitwidth: 16 + } +} +actions { + preamble { + id: 31156449 + name: "FabricIngress.spgw_ingress.set_dl_sess_info" + alias: "set_dl_sess_info" + } + params { + id: 1 + name: "teid" + bitwidth: 32 + } + params { + id: 2 + name: "s1u_enb_addr" + bitwidth: 32 + } + params { + id: 3 + name: "s1u_sgw_addr" + bitwidth: 32 + } +} +actions { + preamble { + id: 17183246 + name: "FabricEgress.egress_next.pop_vlan" + alias: "pop_vlan" + } +} +action_profiles { + preamble { + id: 291115404 + name: "FabricIngress.next.hashed_selector" + alias: "hashed_selector" + } + table_ids: 47960972 + with_selector: true + size: 1024 + max_group_size: 16 +} +counters { + preamble { + id: 314528581 + name: "FabricIngress.port_counters_control.egress_port_counter" + alias: "egress_port_counter" + } + spec { + unit: BOTH + } + size: 511 +} +counters { + preamble { + id: 312947283 + name: "FabricIngress.port_counters_control.ingress_port_counter" + alias: "ingress_port_counter" + } + spec { + unit: BOTH + } + size: 511 +} +direct_counters { + preamble { + id: 326221069 + name: "FabricIngress.filtering.ingress_port_vlan_counter" + alias: "ingress_port_vlan_counter" + } + spec { + unit: BOTH + } + direct_table_id: 43310977 +} +direct_counters { + preamble { + id: 335473470 + name: "FabricIngress.filtering.fwd_classifier_counter" + alias: "fwd_classifier_counter" + } + spec { + unit: BOTH + } + direct_table_id: 49718154 +} +direct_counters { + preamble { + id: 330959985 + name: "FabricIngress.forwarding.bridging_counter" + alias: "bridging_counter" + } + spec { + unit: BOTH + } + direct_table_id: 43623757 +} +direct_counters { + preamble { + id: 318961579 + name: "FabricIngress.forwarding.mpls_counter" + alias: "mpls_counter" + } + spec { + unit: BOTH + } + direct_table_id: 37768578 +} +direct_counters { + preamble { + id: 333425635 + name: "FabricIngress.forwarding.routing_v4_counter" + alias: "routing_v4_counter" + } + spec { + unit: BOTH + } + direct_table_id: 41754650 +} +direct_counters { + preamble { + id: 319194241 + name: "FabricIngress.acl.acl_counter" + alias: "acl_counter" + } + spec { + unit: BOTH + } + direct_table_id: 44104738 +} +direct_counters { + preamble { + id: 326370320 + name: "FabricIngress.next.next_vlan_counter" + alias: "next_vlan_counter" + } + spec { + unit: BOTH + } + direct_table_id: 35696861 +} +direct_counters { + preamble { + id: 321989420 + name: "FabricIngress.next.xconnect_counter" + alias: "xconnect_counter" + } + spec { + unit: BOTH + } + direct_table_id: 48735793 +} +direct_counters { + preamble { + id: 322798228 + name: "FabricIngress.next.hashed_counter" + alias: "hashed_counter" + } + spec { + unit: BOTH + } + direct_table_id: 47960972 +} +direct_counters { + preamble { + id: 319194968 + name: "FabricIngress.next.multicast_counter" + alias: "multicast_counter" + } + spec { + unit: BOTH + } + direct_table_id: 40619180 +} +direct_counters { + preamble { + id: 334575698 + name: "FabricIngress.spgw_ingress.ue_counter" + alias: "ue_counter" + } + spec { + unit: BOTH + } + direct_table_id: 49442443 +} +direct_counters { + preamble { + id: 318892680 + name: "FabricEgress.egress_next.egress_vlan_counter" + alias: "egress_vlan_counter" + } + spec { + unit: BOTH + } + direct_table_id: 49262446 +} +controller_packet_metadata { + preamble { + id: 81826293 + name: "packet_in" + alias: "packet_in" + annotations: "@controller_header(\"packet_in\")" + } + metadata { + id: 1 + name: "ingress_port" + bitwidth: 9 + } + metadata { + id: 2 + name: "_pad" + bitwidth: 7 + } +} +controller_packet_metadata { + preamble { + id: 76689799 + name: "packet_out" + alias: "packet_out" + annotations: "@controller_header(\"packet_out\")" + } + metadata { + id: 1 + name: "egress_port" + bitwidth: 9 + } + metadata { + id: 2 + name: "_pad" + bitwidth: 7 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txt deleted file mode 100644 index 6b981d16fa1..00000000000 --- a/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txt +++ /dev/null @@ -1,62 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43030458 - name: "ingress.ipv4_lpm" - alias: "ipv4_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 21257015 - } - action_refs { - id: 30548487 - } - action_refs { - id: 33281717 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 33281717 - name: "ingress.drop" - alias: "drop" - } -} -actions { - preamble { - id: 30548487 - name: "ingress.ipv4_forward" - alias: "ipv4_forward" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 48 - } - params { - id: 2 - name: "port" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..7ec1dd5f264 --- /dev/null +++ b/testdata/p4_16_samples_outputs/flag_lost-bmv2.p4.p4info.txtpb @@ -0,0 +1,63 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43030458 + name: "ingress.ipv4_lpm" + alias: "ipv4_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 21257015 + } + action_refs { + id: 30548487 + } + action_refs { + id: 33281717 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 33281717 + name: "ingress.drop" + alias: "drop" + } +} +actions { + preamble { + id: 30548487 + name: "ingress.ipv4_forward" + alias: "ipv4_forward" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 48 + } + params { + id: 2 + name: "port" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txt deleted file mode 100644 index 08578b9da5f..00000000000 --- a/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txt +++ /dev/null @@ -1,251 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 38446407 - name: "ingress.ecmp_group" - alias: "ecmp_group" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 19344232 - } - action_refs { - id: 20375000 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 41627831 - name: "ingress.ecmp_nhop" - alias: "ecmp_nhop" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.ecmp_offset" - bitwidth: 14 - match_type: EXACT - } - action_refs { - id: 19344232 - } - action_refs { - id: 29239084 - } - action_refs { - id: 21257015 - } - size: 16384 -} -tables { - preamble { - id: 42150575 - name: "ingress.flowlet" - alias: "flowlet" - } - action_refs { - id: 27889477 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 43289378 - name: "ingress.forward" - alias: "forward" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.nhop_ipv4" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 30489383 - } - action_refs { - id: 19344232 - } - action_refs { - id: 21257015 - } - size: 512 -} -tables { - preamble { - id: 43789109 - name: "ingress.new_flowlet" - alias: "new_flowlet" - } - action_refs { - id: 17397136 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 49367184 - name: "egress.send_frame" - alias: "send_frame" - } - match_fields { - id: 1 - name: "standard_metadata.egress_port" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 23531945 - } - action_refs { - id: 25850727 - } - action_refs { - id: 21257015 - } - size: 256 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 19344232 - name: "ingress._drop" - alias: "ingress._drop" - } -} -actions { - preamble { - id: 20375000 - name: "ingress.set_ecmp_select" - alias: "set_ecmp_select" - } - params { - id: 1 - name: "ecmp_base" - bitwidth: 8 - } - params { - id: 2 - name: "ecmp_count" - bitwidth: 8 - } -} -actions { - preamble { - id: 29239084 - name: "ingress.set_nhop" - alias: "set_nhop" - } - params { - id: 1 - name: "nhop_ipv4" - bitwidth: 32 - } - params { - id: 2 - name: "port" - bitwidth: 9 - } -} -actions { - preamble { - id: 27889477 - name: "ingress.lookup_flowlet_map" - alias: "lookup_flowlet_map" - } -} -actions { - preamble { - id: 30489383 - name: "ingress.set_dmac" - alias: "set_dmac" - } - params { - id: 1 - name: "dmac" - bitwidth: 48 - } -} -actions { - preamble { - id: 17397136 - name: "ingress.update_flowlet_id" - alias: "update_flowlet_id" - } -} -actions { - preamble { - id: 23531945 - name: "egress.rewrite_mac" - alias: "rewrite_mac" - } - params { - id: 1 - name: "smac" - bitwidth: 48 - } -} -actions { - preamble { - id: 25850727 - name: "egress._drop" - alias: "egress._drop" - } -} -registers { - preamble { - id: 384519412 - name: "ingress.flowlet_id" - alias: "flowlet_id" - } - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - size: 8192 -} -registers { - preamble { - id: 375147533 - name: "ingress.flowlet_lasttime" - alias: "flowlet_lasttime" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 8192 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..f6f0ac9972e --- /dev/null +++ b/testdata/p4_16_samples_outputs/flowlet_switching-bmv2.p4.p4info.txtpb @@ -0,0 +1,252 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 38446407 + name: "ingress.ecmp_group" + alias: "ecmp_group" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 19344232 + } + action_refs { + id: 20375000 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 41627831 + name: "ingress.ecmp_nhop" + alias: "ecmp_nhop" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.ecmp_offset" + bitwidth: 14 + match_type: EXACT + } + action_refs { + id: 19344232 + } + action_refs { + id: 29239084 + } + action_refs { + id: 21257015 + } + size: 16384 +} +tables { + preamble { + id: 42150575 + name: "ingress.flowlet" + alias: "flowlet" + } + action_refs { + id: 27889477 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 43289378 + name: "ingress.forward" + alias: "forward" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.nhop_ipv4" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 30489383 + } + action_refs { + id: 19344232 + } + action_refs { + id: 21257015 + } + size: 512 +} +tables { + preamble { + id: 43789109 + name: "ingress.new_flowlet" + alias: "new_flowlet" + } + action_refs { + id: 17397136 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 49367184 + name: "egress.send_frame" + alias: "send_frame" + } + match_fields { + id: 1 + name: "standard_metadata.egress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 23531945 + } + action_refs { + id: 25850727 + } + action_refs { + id: 21257015 + } + size: 256 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 19344232 + name: "ingress._drop" + alias: "ingress._drop" + } +} +actions { + preamble { + id: 20375000 + name: "ingress.set_ecmp_select" + alias: "set_ecmp_select" + } + params { + id: 1 + name: "ecmp_base" + bitwidth: 8 + } + params { + id: 2 + name: "ecmp_count" + bitwidth: 8 + } +} +actions { + preamble { + id: 29239084 + name: "ingress.set_nhop" + alias: "set_nhop" + } + params { + id: 1 + name: "nhop_ipv4" + bitwidth: 32 + } + params { + id: 2 + name: "port" + bitwidth: 9 + } +} +actions { + preamble { + id: 27889477 + name: "ingress.lookup_flowlet_map" + alias: "lookup_flowlet_map" + } +} +actions { + preamble { + id: 30489383 + name: "ingress.set_dmac" + alias: "set_dmac" + } + params { + id: 1 + name: "dmac" + bitwidth: 48 + } +} +actions { + preamble { + id: 17397136 + name: "ingress.update_flowlet_id" + alias: "update_flowlet_id" + } +} +actions { + preamble { + id: 23531945 + name: "egress.rewrite_mac" + alias: "rewrite_mac" + } + params { + id: 1 + name: "smac" + bitwidth: 48 + } +} +actions { + preamble { + id: 25850727 + name: "egress._drop" + alias: "egress._drop" + } +} +registers { + preamble { + id: 384519412 + name: "ingress.flowlet_id" + alias: "flowlet_id" + } + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + size: 8192 +} +registers { + preamble { + id: 375147533 + name: "ingress.flowlet_lasttime" + alias: "flowlet_lasttime" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 8192 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/free-form-annotation.p4.entries.txt b/testdata/p4_16_samples_outputs/free-form-annotation.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/free-form-annotation.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/free-form-annotation.p4.entries.txtpb b/testdata/p4_16_samples_outputs/free-form-annotation.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/free-form-annotation.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/free-form-annotation.p4.p4info.txt b/testdata/p4_16_samples_outputs/free-form-annotation.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/free-form-annotation.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/free-form-annotation.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/free-form-annotation.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/free-form-annotation.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.entries.txt b/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.entries.txtpb b/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.p4info.txt b/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.p4info.txt deleted file mode 100644 index ed28782f7ef..00000000000 --- a/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} diff --git a/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.p4info.txtpb new file mode 100644 index 00000000000..cfbdc3d692a --- /dev/null +++ b/testdata/p4_16_samples_outputs/fwd-bmv2-psa.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.p4info.txt deleted file mode 100644 index fb44c4fdf4e..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 26431821 - name: "ingress.do_thing" - alias: "do_thing" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ea8fc97a7c2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_action_mux-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 26431821 + name: "ingress.do_thing" + alias: "do_thing" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txt deleted file mode 100644 index b36ed9c0bdf..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "bKiScA" - bitwidth: 128 - match_type: EXACT - } - action_refs { - id: 21566949 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..09213a032d1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_action_return-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "bKiScA" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 21566949 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_arithref_cast-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_complex_initialization-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.p4info.txt deleted file mode 100644 index fb44c4fdf4e..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 26431821 - name: "ingress.do_thing" - alias: "do_thing" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ea8fc97a7c2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_copy_out-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 26431821 + name: "ingress.do_thing" + alias: "do_thing" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.p4info.txt deleted file mode 100644 index fb44c4fdf4e..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 26431821 - name: "ingress.do_thing" - alias: "do_thing" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ea8fc97a7c2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_enum_assign-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 26431821 + name: "ingress.do_thing" + alias: "do_thing" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_after_valid-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txt deleted file mode 100644 index e2583438ee3..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,49 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "akSTMF" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 18214157 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 18214157 - name: "ingress.dummy" - alias: "dummy" - } -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..9a4f8a1b232 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_1-bmv2.p4.p4info.txtpb @@ -0,0 +1,50 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "akSTMF" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 18214157 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 18214157 + name: "ingress.dummy" + alias: "dummy" + } +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txt deleted file mode 100644 index f11c2433321..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "key" - bitwidth: 64 - match_type: EXACT - } - action_refs { - id: 28337798 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28337798 - name: "ingress.exit_action" - alias: "exit_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4edd46d542c --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_10-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "key" + bitwidth: 64 + match_type: EXACT + } + action_refs { + id: 28337798 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28337798 + name: "ingress.exit_action" + alias: "exit_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txt deleted file mode 100644 index 0ae7680e272..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "key" - bitwidth: 64 - match_type: EXACT - } - action_refs { - id: 25524983 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..b46cd7b7a7b --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_11-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "key" + bitwidth: 64 + match_type: EXACT + } + action_refs { + id: 25524983 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txt deleted file mode 100644 index 17a965cf11a..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "bblsPX" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 25524983 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fd308934fa3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_13-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "bblsPX" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 25524983 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txt deleted file mode 100644 index 9be0228d9be..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "key" - bitwidth: 128 - match_type: EXACT - } - action_refs { - id: 28337798 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28337798 - name: "ingress.exit_action" - alias: "exit_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..c6991d20a2b --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_14-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "key" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 28337798 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28337798 + name: "ingress.exit_action" + alias: "exit_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txt deleted file mode 100644 index 11d29c6d148..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "Vmhbwk" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 25524983 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..672dd7c0270 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_15-bmv2.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "Vmhbwk" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 25524983 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txt deleted file mode 100644 index b71e0c89bb9..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "QIqvRY" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 27880877 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 27880877 - name: "ingress.dummy_action" - alias: "dummy_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..dc34c0f3e5b --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_16-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "QIqvRY" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 27880877 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 27880877 + name: "ingress.dummy_action" + alias: "dummy_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txt deleted file mode 100644 index 2a782063940..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txt +++ /dev/null @@ -1,66 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 36787877 - name: "ingress.simple_table_1" - alias: "simple_table_1" - } - match_fields { - id: 1 - name: "key" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 27880877 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -tables { - preamble { - id: 48738834 - name: "ingress.simple_table_2" - alias: "simple_table_2" - } - match_fields { - id: 1 - name: "key" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 27880877 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 27880877 - name: "ingress.dummy_action" - alias: "dummy_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..14fe5675e29 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_17-bmv2.p4.p4info.txtpb @@ -0,0 +1,67 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 36787877 + name: "ingress.simple_table_1" + alias: "simple_table_1" + } + match_fields { + id: 1 + name: "key" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 27880877 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 48738834 + name: "ingress.simple_table_2" + alias: "simple_table_2" + } + match_fields { + id: 1 + name: "key" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 27880877 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 27880877 + name: "ingress.dummy_action" + alias: "dummy_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_18-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txt deleted file mode 100644 index 95bd3a55ff0..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48738834 - name: "ingress.simple_table_2" - alias: "simple_table_2" - } - match_fields { - id: 1 - name: "key" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 33403406 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 33403406 - name: "exit_action" - alias: "exit_action" - } -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..da58ddfecb6 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_19-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48738834 + name: "ingress.simple_table_2" + alias: "simple_table_2" + } + match_fields { + id: 1 + name: "key" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 33403406 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 33403406 + name: "exit_action" + alias: "exit_action" + } +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txt deleted file mode 100644 index 2cec9684b09..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "key" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 18214157 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 18214157 - name: "ingress.dummy" - alias: "dummy" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..0387a5ea8fc --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_2-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "key" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 18214157 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 18214157 + name: "ingress.dummy" + alias: "dummy" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_20-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_21-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txt deleted file mode 100644 index 93db3b2624b..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "fbgPij" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 28337798 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28337798 - name: "ingress.exit_action" - alias: "exit_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..439fdd83ac4 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_22-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "fbgPij" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 28337798 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28337798 + name: "ingress.exit_action" + alias: "exit_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txt deleted file mode 100644 index 1c762cf7465..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "key" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 25524983 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..167055d8651 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_23-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "key" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 25524983 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txt deleted file mode 100644 index e1ec221ab19..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "key" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21566949 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..954f9302351 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_3-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "key" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21566949 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txt deleted file mode 100644 index b8bacda386d..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "key" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 28337798 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28337798 - name: "ingress.exit_action" - alias: "exit_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..6335e986db3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_4-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "key" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 28337798 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28337798 + name: "ingress.exit_action" + alias: "exit_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_5-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_6-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_7-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_8-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txt deleted file mode 100644 index 3a384b877f5..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "Vmhbwk" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 25524983 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..d15d7f39246 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_exit_combination_9-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "Vmhbwk" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 25524983 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_function_if_hdr_return-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.p4info.txt deleted file mode 100644 index b24ee12131e..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 20289359 - name: "ingress.action_thing" - alias: "action_thing" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..5b174a5585f --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_function_return-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 20289359 + name: "ingress.action_thing" + alias: "action_thing" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_function_return_cast-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_1-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_assign_2-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_function_cast-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_in_value-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_init-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_int_initializer-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.p4info.txt deleted file mode 100644 index 6426bddd418..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4b0ff88b01a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_out_in_action-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_hdr_set_valid-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_1-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txt deleted file mode 100644 index 630887c107c..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "IymcAg" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 25524983 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..6dbbb04c2e4 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_2-bmv2.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "IymcAg" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 25524983 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.p4info.txt deleted file mode 100644 index 538e30d36ae..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 30461719 - name: "ingress.do_something" - alias: "do_something" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..2247f7b69de --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_4-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 30461719 + name: "ingress.do_something" + alias: "do_something" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_5-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_6-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_7-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_8-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_index_9-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.p4info.txt deleted file mode 100644 index 6426bddd418..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4b0ff88b01a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_1-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_indirect_hdr_assign_2-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txt deleted file mode 100644 index 9e18ff56777..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txt +++ /dev/null @@ -1,39 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "dummy" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..3916da78de4 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_inout_slice_table_key-bmv2.p4.p4info.txtpb @@ -0,0 +1,40 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "dummy" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txt deleted file mode 100644 index db7081642e8..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44442671 - name: "ingress.BfyXpa" - alias: "BfyXpa" - } - match_fields { - id: 1 - name: "eJPEfW" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21566949 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..eac31d11dc1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_instance_overwrite-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44442671 + name: "ingress.BfyXpa" + alias: "BfyXpa" + } + match_fields { + id: 1 + name: "eJPEfW" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21566949 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_int_casting-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_int_slice-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_assign-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_invalid_hdr_short_circuit-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.p4info.txt deleted file mode 100644 index 6426bddd418..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4b0ff88b01a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_list_as_in_argument-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-first.p4 b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-first.p4 deleted file mode 100644 index 442f9a945cd..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-first.p4 +++ /dev/null @@ -1,34 +0,0 @@ -#include - -header ethernet_t { - bit<48> dst_addr; - bit<48> src_addr; - bit<16> eth_type; -} - -struct Headers { - ethernet_t eth_hdr; -} - -parser p(packet_in pkt, out Headers hdr) { - state start { - transition select((pkt.lookahead()).eth_type) { - 16w0xdead: parse_hdrs; - default: accept; - } - } - state parse_hdrs { - pkt.extract(hdr.eth_hdr); - transition accept; - } -} - -control ingress(inout Headers h) { - apply { - } -} - -parser Parser(packet_in b, out Headers hdr); -control Ingress(inout Headers hdr); -package top(Parser p, Ingress ig); -top(p(), ingress()) main; diff --git a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-frontend.p4 b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-frontend.p4 deleted file mode 100644 index 19d5deb1523..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-frontend.p4 +++ /dev/null @@ -1,38 +0,0 @@ -#include - -header ethernet_t { - bit<48> dst_addr; - bit<48> src_addr; - bit<16> eth_type; -} - -struct Headers { - ethernet_t eth_hdr; -} - -parser p(packet_in pkt, out Headers hdr) { - @name("p.tmp") bit<16> tmp; - @name("p.tmp_0") ethernet_t tmp_0; - state start { - tmp_0 = pkt.lookahead(); - tmp = tmp_0.eth_type; - transition select(tmp) { - 16w0xdead: parse_hdrs; - default: accept; - } - } - state parse_hdrs { - pkt.extract(hdr.eth_hdr); - transition accept; - } -} - -control ingress(inout Headers h) { - apply { - } -} - -parser Parser(packet_in b, out Headers hdr); -control Ingress(inout Headers hdr); -package top(Parser p, Ingress ig); -top(p(), ingress()) main; diff --git a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-midend.p4 b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-midend.p4 deleted file mode 100644 index fcf99f18217..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion-midend.p4 +++ /dev/null @@ -1,41 +0,0 @@ -#include - -header ethernet_t { - bit<48> dst_addr; - bit<48> src_addr; - bit<16> eth_type; -} - -struct Headers { - ethernet_t eth_hdr; -} - -parser p(packet_in pkt, out Headers hdr) { - @name("p.tmp_0") ethernet_t tmp_0; - bit<112> tmp_1; - state start { - tmp_1 = pkt.lookahead>(); - tmp_0.setValid(); - tmp_0.dst_addr = tmp_1[111:64]; - tmp_0.src_addr = tmp_1[63:16]; - tmp_0.eth_type = tmp_1[15:0]; - transition select(tmp_1[15:0]) { - 16w0xdead: parse_hdrs; - default: accept; - } - } - state parse_hdrs { - pkt.extract(hdr.eth_hdr); - transition accept; - } -} - -control ingress(inout Headers h) { - apply { - } -} - -parser Parser(packet_in b, out Headers hdr); -control Ingress(inout Headers hdr); -package top(Parser p, Ingress ig); -top(p(), ingress()) main; diff --git a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion.p4 b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion.p4 deleted file mode 100644 index 918bf926347..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion.p4 +++ /dev/null @@ -1,34 +0,0 @@ -#include - -header ethernet_t { - bit<48> dst_addr; - bit<48> src_addr; - bit<16> eth_type; -} - -struct Headers { - ethernet_t eth_hdr; -} - -parser p(packet_in pkt, out Headers hdr) { - state start { - transition select((pkt.lookahead()).eth_type) { - 0xdead: parse_hdrs; - default: accept; - } - } - state parse_hdrs { - pkt.extract(hdr.eth_hdr); - transition accept; - } -} - -control ingress(inout Headers h) { - apply { - } -} - -parser Parser(packet_in b, out Headers hdr); -control Ingress(inout Headers hdr); -package top(Parser p, Ingress ig); -top(p(), ingress()) main; diff --git a/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion.p4-stderr b/testdata/p4_16_samples_outputs/gauntlet_lookahead_expansion.p4-stderr deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_mux_eval-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txt deleted file mode 100644 index a51758d0311..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "key" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 25524983 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..098a163ce5d --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_mux_hdr-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "key" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 25524983 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_mux_typecasting-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.p4info.txt deleted file mode 100644 index 5bdaaec9b6d..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 18214157 - name: "ingress.dummy" - alias: "dummy" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..1d5234f1755 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_mux_validity-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 18214157 + name: "ingress.dummy" + alias: "dummy" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_nested_ifs_in_function-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_nested_slice-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txt deleted file mode 100644 index 398141a8eaa..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txt +++ /dev/null @@ -1,35 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 32407014 - name: "ingress.call_action" - alias: "call_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fe58351d5ae --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_nested_switch-bmv2.p4.p4info.txtpb @@ -0,0 +1,36 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 32407014 + name: "ingress.call_action" + alias: "call_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txt deleted file mode 100644 index 7a3d747b61d..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 35327705 - name: "ingress.exit_table" - alias: "exit_table" - } - match_fields { - id: 1 - name: "key" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 28337798 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28337798 - name: "ingress.exit_action" - alias: "exit_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..c03ae60e4f1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_nested_table_calls-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 35327705 + name: "ingress.exit_table" + alias: "exit_table" + } + match_fields { + id: 1 + name: "key" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 28337798 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28337798 + name: "ingress.exit_action" + alias: "exit_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.p4info.txt deleted file mode 100644 index 7628021a64f..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 28905910 - name: "ingress.iuJze" - alias: "iuJze" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..5986c6ed143 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_return_truncate-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 28905910 + name: "ingress.iuJze" + alias: "iuJze" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_set_invalid-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_set_valid_in_function-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_short_circuit-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.p4info.txt deleted file mode 100644 index 9aeee57df5d..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 33493644 - name: "ingress.do_action_2" - alias: "do_action_2" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4315aa4ea15 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_1-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 33493644 + name: "ingress.do_action_2" + alias: "do_action_2" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.p4info.txt deleted file mode 100644 index fb44c4fdf4e..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 26431821 - name: "ingress.do_thing" - alias: "do_thing" - } -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ea8fc97a7c2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_2-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 26431821 + name: "ingress.do_thing" + alias: "do_thing" + } +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_3-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_4-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effect_order_5-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_side_effects_in_mux-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txt deleted file mode 100644 index 9b69fcc70a1..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "h.eth_hdr.src_addr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 33190437 - } - action_refs { - id: 27123567 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 33190437 - name: "ingress.action_0" - alias: "action_0" - } -} -actions { - preamble { - id: 27123567 - name: "ingress.action_1" - alias: "action_1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..dc15762b635 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_switch_exclusivity-bmv2.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "h.eth_hdr.src_addr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 33190437 + } + action_refs { + id: 27123567 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 33190437 + name: "ingress.action_0" + alias: "action_0" + } +} +actions { + preamble { + id: 27123567 + name: "ingress.action_1" + alias: "action_1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txt deleted file mode 100644 index d81d6614c3e..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txt +++ /dev/null @@ -1,61 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 36787877 - name: "ingress.simple_table_1" - alias: "simple_table_1" - } - match_fields { - id: 1 - name: "JGOUaj" - bitwidth: 128 - match_type: EXACT - } - action_refs { - id: 21614167 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -tables { - preamble { - id: 48738834 - name: "ingress.simple_table_2" - alias: "simple_table_2" - } - match_fields { - id: 1 - name: "qkgOtm" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21614167 - name: "ingress.set_valid_action" - alias: "set_valid_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..42972d745ec --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_switch_nested_table_apply-bmv2.p4.p4info.txtpb @@ -0,0 +1,62 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 36787877 + name: "ingress.simple_table_1" + alias: "simple_table_1" + } + match_fields { + id: 1 + name: "JGOUaj" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 21614167 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 48738834 + name: "ingress.simple_table_2" + alias: "simple_table_2" + } + match_fields { + id: 1 + name: "qkgOtm" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21614167 + name: "ingress.set_valid_action" + alias: "set_valid_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txt deleted file mode 100644 index 63afc62f851..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "aiiIgQ" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 27123567 - } - action_refs { - id: 23379194 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 27123567 - name: "ingress.action_1" - alias: "action_1" - } -} -actions { - preamble { - id: 23379194 - name: "ingress.action_2" - alias: "action_2" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..1b7a0ad10b0 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_switch_shadowing-bmv2.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "aiiIgQ" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 27123567 + } + action_refs { + id: 23379194 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 27123567 + name: "ingress.action_1" + alias: "action_1" + } +} +actions { + preamble { + id: 23379194 + name: "ingress.action_2" + alias: "action_2" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txt deleted file mode 100644 index 5f60234c072..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "dummy_name" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 25524983 - } - action_refs { - id: 28337798 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -actions { - preamble { - id: 28337798 - name: "ingress.exit_action" - alias: "exit_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..f2fe672ed8c --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_table_call_in_expression-bmv2.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "dummy_name" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 25524983 + } + action_refs { + id: 28337798 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +actions { + preamble { + id: 28337798 + name: "ingress.exit_action" + alias: "exit_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_typedef_cast-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txt deleted file mode 100644 index b4ee0186aa7..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "MsRuxx" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 27880877 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 27880877 - name: "ingress.dummy_action" - alias: "dummy_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..92557c02569 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_uninitialized_bool_struct-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "MsRuxx" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 27880877 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 27880877 + name: "ingress.dummy_action" + alias: "dummy_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txt deleted file mode 100644 index be655465bf1..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43577110 - name: "ingress.c.t" - alias: "t" - } - match_fields { - id: 1 - name: "e" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 27847715 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 27847715 - name: "ingress.c.a" - alias: "a" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..b4f4b802538 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_variable_shadowing-bmv2.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43577110 + name: "ingress.c.t" + alias: "t" + } + match_fields { + id: 1 + name: "e" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 27847715 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 27847715 + name: "ingress.c.a" + alias: "a" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/gauntlet_various_ops-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/global_action_after_exit.p4.entries.txt b/testdata/p4_16_samples_outputs/global_action_after_exit.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/global_action_after_exit.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/global_action_after_exit.p4.entries.txtpb b/testdata/p4_16_samples_outputs/global_action_after_exit.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/global_action_after_exit.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/global_action_after_exit.p4.p4info.txt b/testdata/p4_16_samples_outputs/global_action_after_exit.p4.p4info.txt deleted file mode 100644 index 191e6d846d9..00000000000 --- a/testdata/p4_16_samples_outputs/global_action_after_exit.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 17641357 - name: "do_action" - alias: "do_action" - } -} diff --git a/testdata/p4_16_samples_outputs/global_action_after_exit.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/global_action_after_exit.p4.p4info.txtpb new file mode 100644 index 00000000000..a98606bbf81 --- /dev/null +++ b/testdata/p4_16_samples_outputs/global_action_after_exit.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 17641357 + name: "do_action" + alias: "do_action" + } +} diff --git a/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.entries.txt b/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.entries.txtpb b/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txt b/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txt deleted file mode 100644 index ec0704e110d..00000000000 --- a/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txt +++ /dev/null @@ -1,33 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - match_fields { - id: 1 - name: "h.h.a" - annotations: "@hidden" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 16785644 - } - const_default_action_id: 16785644 - size: 1024 -} -actions { - preamble { - id: 16785644 - name: "ingress.foo" - alias: "foo" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb new file mode 100644 index 00000000000..dac37ed60b6 --- /dev/null +++ b/testdata/p4_16_samples_outputs/graph-annotationless-key.p4.p4info.txtpb @@ -0,0 +1,34 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + match_fields { + id: 1 + name: "h.h.a" + annotations: "@hidden" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 16785644 + } + const_default_action_id: 16785644 + size: 1024 +} +actions { + preamble { + id: 16785644 + name: "ingress.foo" + alias: "foo" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/hash-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/hash-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/hash-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/hash-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/hash-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/hash-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/hash-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/hash-bmv2.p4.p4info.txt deleted file mode 100644 index fa03c4fab7d..00000000000 --- a/testdata/p4_16_samples_outputs/hash-bmv2.p4.p4info.txt +++ /dev/null @@ -1,14 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 20366104 - name: "IngressI.a" - alias: "a" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/hash-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/hash-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..0a174eb4bf2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/hash-bmv2.p4.p4info.txtpb @@ -0,0 +1,15 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 20366104 + name: "IngressI.a" + alias: "a" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.p4info.txt deleted file mode 100644 index f50f68e7ac5..00000000000 --- a/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.p4info.txt +++ /dev/null @@ -1,15 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..0a58e0ba6f8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/hash-extern-bmv2.p4.p4info.txtpb @@ -0,0 +1,16 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/hash_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/hash_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/hash_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/hash_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/hash_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/hash_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/hash_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/hash_ubpf.p4.p4info.txt deleted file mode 100644 index ac019efcb00..00000000000 --- a/testdata/p4_16_samples_outputs/hash_ubpf.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -actions { - preamble { - id: 17733895 - name: "pipe.a" - alias: "a" - } -} -actions { - preamble { - id: 26233366 - name: "pipe.b" - alias: "b" - } -} -actions { - preamble { - id: 22982579 - name: "pipe.c" - alias: "c" - } -} diff --git a/testdata/p4_16_samples_outputs/hash_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/hash_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..0dce2ab409b --- /dev/null +++ b/testdata/p4_16_samples_outputs/hash_ubpf.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +actions { + preamble { + id: 17733895 + name: "pipe.a" + alias: "a" + } +} +actions { + preamble { + id: 26233366 + name: "pipe.b" + alias: "b" + } +} +actions { + preamble { + id: 22982579 + name: "pipe.c" + alias: "c" + } +} diff --git a/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/hashing-non-tuple-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.entries.txt b/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.entries.txtpb b/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.p4info.txt b/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/hdr_stacks2345.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/header-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/header-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/header-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/header-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/header-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/header-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/header-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/header-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/header-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/header-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/header-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/header-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/header-bool-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/header-stack-ops-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txt deleted file mode 100644 index 57508245b3f..00000000000 --- a/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 36244739 - name: "IngressI.t" - alias: "t" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..a4f1a040523 --- /dev/null +++ b/testdata/p4_16_samples_outputs/hit-expr-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 36244739 + name: "IngressI.t" + alias: "t" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.entries.txt deleted file mode 100644 index dd491a0e67e..00000000000 --- a/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.entries.txt +++ /dev/null @@ -1,1629 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 49173205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\001" - } - } - } - priority: 10 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 49173205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\002" - } - } - } - priority: 20 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 49173205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\003" - } - } - } - priority: 30 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 49173205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\002\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\004" - } - } - } - priority: 40 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 49173205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\000\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\005" - } - } - } - priority: 40 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 49173205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\006" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\006" - } - } - } - priority: 50 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 40845583 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\001" - } - } - } - priority: 10 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 40845583 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\002" - } - } - } - priority: 20 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 40845583 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\003" - } - } - } - priority: 30 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 40845583 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\002\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\004" - } - } - } - priority: 40 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 40845583 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\000\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\005" - } - } - } - priority: 40 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 40845583 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\006" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\006" - } - } - } - priority: 50 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35926338 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\001" - } - } - } - priority: 11 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35926338 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\002" - } - } - } - priority: 21 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35926338 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\003" - } - } - } - priority: 31 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35926338 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\002\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\004" - } - } - } - priority: 41 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35926338 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\000\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\005" - } - } - } - priority: 40 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 35926338 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\006" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\006" - } - } - } - priority: 50 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 37653272 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\001" - } - } - } - priority: 11 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 37653272 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\002" - } - } - } - priority: 21 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 37653272 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\003" - } - } - } - priority: 31 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 37653272 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\002\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\004" - } - } - } - priority: 41 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 37653272 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\000\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\005" - } - } - } - priority: 40 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 37653272 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\006" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\006" - } - } - } - priority: 50 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 38935454 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\001" - } - } - } - priority: 11 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 38935454 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\002" - } - } - } - priority: 12 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 38935454 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\003" - } - } - } - priority: 13 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 38935454 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\002\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\004" - } - } - } - priority: 14 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 38935454 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\000\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\005" - } - } - } - priority: 13 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 38935454 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\006" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\006" - } - } - } - priority: 14 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 46791685 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\001" - } - } - } - priority: 11 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 46791685 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\002" - } - } - } - priority: 12 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 46791685 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\003" - } - } - } - priority: 13 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 46791685 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\002\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\004" - } - } - } - priority: 14 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 46791685 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\000\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\005" - } - } - } - priority: 13 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 46791685 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\006" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\006" - } - } - } - priority: 14 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 43122205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\001" - } - } - } - priority: 2001 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 43122205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\002" - } - } - } - priority: 2001 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 43122205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\003" - } - } - } - priority: 2001 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 43122205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\002\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\004" - } - } - } - priority: 2001 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 43122205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\000\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\005" - } - } - } - priority: 2001 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 43122205 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\006" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\006" - } - } - } - priority: 2001 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47394566 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\001" - } - } - } - priority: 2001 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47394566 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\002" - } - } - } - priority: 2001 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47394566 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\003" - } - } - } - priority: 2001 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47394566 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\002\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\004" - } - } - } - priority: 2001 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47394566 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\000\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\005" - } - } - } - priority: 2001 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47394566 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\006" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\006" - } - } - } - priority: 2001 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47497379 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\001" - } - } - } - priority: 1000 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47497379 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\002" - } - } - } - priority: 900 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47497379 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\003" - } - } - } - priority: 800 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47497379 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\002\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\004" - } - } - } - priority: 700 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47497379 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\004" - } - } - match { - field_id: 2 - ternary { - value: "\000\020" - mask: "\002\360" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\005" - } - } - } - priority: 901 - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 47497379 - match { - field_id: 1 - exact { - value: "\000\000\000\000\000\006" - } - } - action { - action { - action_id: 26776898 - params { - param_id: 1 - value: "\000\000\000\006" - } - } - } - priority: 801 - } - } -} diff --git a/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5e03e186f69 --- /dev/null +++ b/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.entries.txtpb @@ -0,0 +1,1630 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 49173205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\001" + } + } + } + priority: 10 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 49173205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\002" + } + } + } + priority: 20 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 49173205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\003" + } + } + } + priority: 30 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 49173205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\002\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\004" + } + } + } + priority: 40 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 49173205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\000\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\005" + } + } + } + priority: 40 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 49173205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\006" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\006" + } + } + } + priority: 50 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 40845583 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\001" + } + } + } + priority: 10 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 40845583 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\002" + } + } + } + priority: 20 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 40845583 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\003" + } + } + } + priority: 30 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 40845583 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\002\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\004" + } + } + } + priority: 40 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 40845583 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\000\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\005" + } + } + } + priority: 40 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 40845583 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\006" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\006" + } + } + } + priority: 50 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35926338 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\001" + } + } + } + priority: 11 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35926338 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\002" + } + } + } + priority: 21 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35926338 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\003" + } + } + } + priority: 31 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35926338 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\002\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\004" + } + } + } + priority: 41 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35926338 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\000\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\005" + } + } + } + priority: 40 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 35926338 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\006" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\006" + } + } + } + priority: 50 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 37653272 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\001" + } + } + } + priority: 11 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 37653272 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\002" + } + } + } + priority: 21 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 37653272 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\003" + } + } + } + priority: 31 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 37653272 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\002\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\004" + } + } + } + priority: 41 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 37653272 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\000\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\005" + } + } + } + priority: 40 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 37653272 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\006" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\006" + } + } + } + priority: 50 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38935454 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\001" + } + } + } + priority: 11 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38935454 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\002" + } + } + } + priority: 12 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38935454 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\003" + } + } + } + priority: 13 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38935454 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\002\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\004" + } + } + } + priority: 14 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38935454 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\000\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\005" + } + } + } + priority: 13 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38935454 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\006" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\006" + } + } + } + priority: 14 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 46791685 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\001" + } + } + } + priority: 11 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 46791685 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\002" + } + } + } + priority: 12 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 46791685 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\003" + } + } + } + priority: 13 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 46791685 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\002\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\004" + } + } + } + priority: 14 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 46791685 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\000\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\005" + } + } + } + priority: 13 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 46791685 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\006" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\006" + } + } + } + priority: 14 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 43122205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\001" + } + } + } + priority: 2001 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 43122205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\002" + } + } + } + priority: 2001 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 43122205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\003" + } + } + } + priority: 2001 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 43122205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\002\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\004" + } + } + } + priority: 2001 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 43122205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\000\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\005" + } + } + } + priority: 2001 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 43122205 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\006" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\006" + } + } + } + priority: 2001 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47394566 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\001" + } + } + } + priority: 2001 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47394566 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\002" + } + } + } + priority: 2001 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47394566 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\003" + } + } + } + priority: 2001 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47394566 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\002\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\004" + } + } + } + priority: 2001 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47394566 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\000\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\005" + } + } + } + priority: 2001 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47394566 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\006" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\006" + } + } + } + priority: 2001 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47497379 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\001" + } + } + } + priority: 1000 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47497379 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\002" + } + } + } + priority: 900 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47497379 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\003" + } + } + } + priority: 800 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47497379 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\002\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\004" + } + } + } + priority: 700 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47497379 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\004" + } + } + match { + field_id: 2 + ternary { + value: "\000\020" + mask: "\002\360" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\005" + } + } + } + priority: 901 + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 47497379 + match { + field_id: 1 + exact { + value: "\000\000\000\000\000\006" + } + } + action { + action { + action_id: 26776898 + params { + param_id: 1 + value: "\000\000\000\006" + } + } + } + priority: 801 + } + } +} diff --git a/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txt deleted file mode 100644 index de670aed4d5..00000000000 --- a/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txt +++ /dev/null @@ -1,269 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 49173205 - name: "ingressImpl.t1" - alias: "t1" - } - match_fields { - id: 1 - name: "hdr.ethernet.src_addr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.ether_type" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 25218163 - } - action_refs { - id: 26776898 - } - size: 1024 - has_initial_entries: true -} -tables { - preamble { - id: 40845583 - name: "ingressImpl.t1b" - alias: "t1b" - } - match_fields { - id: 1 - name: "hdr.ethernet.src_addr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.ether_type" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 25218163 - } - action_refs { - id: 26776898 - } - size: 1024 - has_initial_entries: true -} -tables { - preamble { - id: 35926338 - name: "ingressImpl.t2" - alias: "t2" - } - match_fields { - id: 1 - name: "hdr.ethernet.src_addr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.ether_type" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 25218163 - } - action_refs { - id: 26776898 - } - size: 1024 - has_initial_entries: true -} -tables { - preamble { - id: 37653272 - name: "ingressImpl.t2b" - alias: "t2b" - } - match_fields { - id: 1 - name: "hdr.ethernet.src_addr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.ether_type" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 25218163 - } - action_refs { - id: 26776898 - } - size: 1024 - has_initial_entries: true -} -tables { - preamble { - id: 38935454 - name: "ingressImpl.t3" - alias: "t3" - } - match_fields { - id: 1 - name: "hdr.ethernet.src_addr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.ether_type" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 25218163 - } - action_refs { - id: 26776898 - } - size: 1024 - has_initial_entries: true -} -tables { - preamble { - id: 46791685 - name: "ingressImpl.t3b" - alias: "t3b" - } - match_fields { - id: 1 - name: "hdr.ethernet.src_addr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.ether_type" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 25218163 - } - action_refs { - id: 26776898 - } - size: 1024 - has_initial_entries: true -} -tables { - preamble { - id: 43122205 - name: "ingressImpl.t4" - alias: "t4" - } - match_fields { - id: 1 - name: "hdr.ethernet.src_addr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.ether_type" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 25218163 - } - action_refs { - id: 26776898 - } - size: 1024 - has_initial_entries: true -} -tables { - preamble { - id: 47394566 - name: "ingressImpl.t4b" - alias: "t4b" - } - match_fields { - id: 1 - name: "hdr.ethernet.src_addr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.ether_type" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 25218163 - } - action_refs { - id: 26776898 - } - size: 1024 - has_initial_entries: true -} -tables { - preamble { - id: 47497379 - name: "ingressImpl.t5" - alias: "t5" - } - match_fields { - id: 1 - name: "hdr.ethernet.src_addr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.ether_type" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 25218163 - } - action_refs { - id: 26776898 - } - size: 1024 - has_initial_entries: true -} -actions { - preamble { - id: 25218163 - name: "ingressImpl.a" - alias: "a" - } -} -actions { - preamble { - id: 26776898 - name: "ingressImpl.a_params" - alias: "a_params" - } - params { - id: 1 - name: "param" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..96fcc8aa477 --- /dev/null +++ b/testdata/p4_16_samples_outputs/init-entries-bmv2.p4.p4info.txtpb @@ -0,0 +1,270 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 49173205 + name: "ingressImpl.t1" + alias: "t1" + } + match_fields { + id: 1 + name: "hdr.ethernet.src_addr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.ether_type" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 25218163 + } + action_refs { + id: 26776898 + } + size: 1024 + has_initial_entries: true +} +tables { + preamble { + id: 40845583 + name: "ingressImpl.t1b" + alias: "t1b" + } + match_fields { + id: 1 + name: "hdr.ethernet.src_addr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.ether_type" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 25218163 + } + action_refs { + id: 26776898 + } + size: 1024 + has_initial_entries: true +} +tables { + preamble { + id: 35926338 + name: "ingressImpl.t2" + alias: "t2" + } + match_fields { + id: 1 + name: "hdr.ethernet.src_addr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.ether_type" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 25218163 + } + action_refs { + id: 26776898 + } + size: 1024 + has_initial_entries: true +} +tables { + preamble { + id: 37653272 + name: "ingressImpl.t2b" + alias: "t2b" + } + match_fields { + id: 1 + name: "hdr.ethernet.src_addr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.ether_type" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 25218163 + } + action_refs { + id: 26776898 + } + size: 1024 + has_initial_entries: true +} +tables { + preamble { + id: 38935454 + name: "ingressImpl.t3" + alias: "t3" + } + match_fields { + id: 1 + name: "hdr.ethernet.src_addr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.ether_type" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 25218163 + } + action_refs { + id: 26776898 + } + size: 1024 + has_initial_entries: true +} +tables { + preamble { + id: 46791685 + name: "ingressImpl.t3b" + alias: "t3b" + } + match_fields { + id: 1 + name: "hdr.ethernet.src_addr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.ether_type" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 25218163 + } + action_refs { + id: 26776898 + } + size: 1024 + has_initial_entries: true +} +tables { + preamble { + id: 43122205 + name: "ingressImpl.t4" + alias: "t4" + } + match_fields { + id: 1 + name: "hdr.ethernet.src_addr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.ether_type" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 25218163 + } + action_refs { + id: 26776898 + } + size: 1024 + has_initial_entries: true +} +tables { + preamble { + id: 47394566 + name: "ingressImpl.t4b" + alias: "t4b" + } + match_fields { + id: 1 + name: "hdr.ethernet.src_addr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.ether_type" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 25218163 + } + action_refs { + id: 26776898 + } + size: 1024 + has_initial_entries: true +} +tables { + preamble { + id: 47497379 + name: "ingressImpl.t5" + alias: "t5" + } + match_fields { + id: 1 + name: "hdr.ethernet.src_addr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.ether_type" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 25218163 + } + action_refs { + id: 26776898 + } + size: 1024 + has_initial_entries: true +} +actions { + preamble { + id: 25218163 + name: "ingressImpl.a" + alias: "a" + } +} +actions { + preamble { + id: 26776898 + name: "ingressImpl.a_params" + alias: "a_params" + } + params { + id: 1 + name: "param" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/inline-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/inline-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/inline-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/inline-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/inline-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/inline-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txt deleted file mode 100644 index 8b64c375a93..00000000000 --- a/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txt +++ /dev/null @@ -1,32 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 40552494 - name: "IngressI.do_aux.adjust_lkp_fields" - alias: "adjust_lkp_fields" - } - match_fields { - id: 1 - name: "hdr.ipv4.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..c38b7239725 --- /dev/null +++ b/testdata/p4_16_samples_outputs/inline-bmv2.p4.p4info.txtpb @@ -0,0 +1,33 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40552494 + name: "IngressI.do_aux.adjust_lkp_fields" + alias: "adjust_lkp_fields" + } + match_fields { + id: 1 + name: "hdr.ipv4.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/inline-stack-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/inline1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/inline1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/inline1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/inline1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/inline1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/inline1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txt deleted file mode 100644 index 8b64c375a93..00000000000 --- a/testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,32 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 40552494 - name: "IngressI.do_aux.adjust_lkp_fields" - alias: "adjust_lkp_fields" - } - match_fields { - id: 1 - name: "hdr.ipv4.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..c38b7239725 --- /dev/null +++ b/testdata/p4_16_samples_outputs/inline1-bmv2.p4.p4info.txtpb @@ -0,0 +1,33 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40552494 + name: "IngressI.do_aux.adjust_lkp_fields" + alias: "adjust_lkp_fields" + } + match_fields { + id: 1 + name: "hdr.ipv4.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.p4info.txt deleted file mode 100644 index f50f68e7ac5..00000000000 --- a/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,15 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..0a58e0ba6f8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/internet_checksum1-bmv2.p4.p4info.txtpb @@ -0,0 +1,16 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/intrinsic-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.entries.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.p4info.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings1.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.entries.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.p4info.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.p4info.txt deleted file mode 100644 index c0198714969..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 32920635 - name: "IngressI.invalid_H" - alias: "invalid_H" - } -} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.p4info.txtpb new file mode 100644 index 00000000000..75e7ef2ea9c --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 32920635 + name: "IngressI.invalid_H" + alias: "invalid_H" + } +} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings3-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.entries.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.p4info.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.p4info.txt deleted file mode 100644 index 79c74cb55b4..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 22733763 - name: "IngressI.validateHeader" - alias: "validateHeader" - } -} -actions { - preamble { - id: 19774285 - name: "IngressI.invalidateHeader" - alias: "invalidateHeader" - } -} -actions { - preamble { - id: 26792443 - name: "IngressI.invalidateStack" - alias: "invalidateStack" - } -} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.p4info.txtpb new file mode 100644 index 00000000000..21e2d68daf2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings4.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 22733763 + name: "IngressI.validateHeader" + alias: "validateHeader" + } +} +actions { + preamble { + id: 19774285 + name: "IngressI.invalidateHeader" + alias: "invalidateHeader" + } +} +actions { + preamble { + id: 26792443 + name: "IngressI.invalidateStack" + alias: "invalidateStack" + } +} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.entries.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.entries.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.p4info.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings5.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.entries.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.entries.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.p4info.txt b/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/invalid-hdr-warnings6.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txt deleted file mode 100644 index a0e32c8e54b..00000000000 --- a/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txt +++ /dev/null @@ -1,292 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -tables { - preamble { - id: 34660133 - name: "pipe.filter_tbl" - alias: "filter_tbl" - } - match_fields { - id: 1 - name: "headers.ipv4.srcAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 22459262 - } - action_refs { - id: 25901177 - } - action_refs { - id: 28593466 - } - action_refs { - id: 23020487 - } - action_refs { - id: 22607454 - } - action_refs { - id: 22035671 - } - action_refs { - id: 29816553 - } - action_refs { - id: 17848524 - } - action_refs { - id: 17633771 - } - action_refs { - id: 27703701 - } - action_refs { - id: 24523917 - } - action_refs { - id: 23198765 - } - action_refs { - id: 19626680 - } - action_refs { - id: 30994171 - } - action_refs { - id: 26908305 - } - action_refs { - id: 18876683 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 18876683 - name: "pipe.Reject" - alias: "Reject" - } -} -actions { - preamble { - id: 22459262 - name: "pipe.set_ipv4_version" - alias: "set_ipv4_version" - } - params { - id: 1 - name: "version" - bitwidth: 4 - } -} -actions { - preamble { - id: 25901177 - name: "pipe.set_ihl" - alias: "set_ihl" - } - params { - id: 1 - name: "ihl" - bitwidth: 4 - } -} -actions { - preamble { - id: 28593466 - name: "pipe.set_diffserv" - alias: "set_diffserv" - } - params { - id: 1 - name: "diffserv" - bitwidth: 8 - } -} -actions { - preamble { - id: 23020487 - name: "pipe.set_identification" - alias: "set_identification" - } - params { - id: 1 - name: "identification" - bitwidth: 16 - } -} -actions { - preamble { - id: 22607454 - name: "pipe.set_flags" - alias: "set_flags" - } - params { - id: 1 - name: "flags" - bitwidth: 3 - } -} -actions { - preamble { - id: 22035671 - name: "pipe.set_fragOffset" - alias: "set_fragOffset" - } - params { - id: 1 - name: "fragOffset" - bitwidth: 13 - } -} -actions { - preamble { - id: 29816553 - name: "pipe.set_ttl" - alias: "set_ttl" - } - params { - id: 1 - name: "ttl" - bitwidth: 8 - } -} -actions { - preamble { - id: 17848524 - name: "pipe.set_protocol" - alias: "set_protocol" - } - params { - id: 1 - name: "protocol" - bitwidth: 8 - } -} -actions { - preamble { - id: 17633771 - name: "pipe.set_srcAddr" - alias: "set_srcAddr" - } - params { - id: 1 - name: "srcAddr" - bitwidth: 32 - } -} -actions { - preamble { - id: 27703701 - name: "pipe.set_dstAddr" - alias: "set_dstAddr" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 32 - } -} -actions { - preamble { - id: 24523917 - name: "pipe.set_srcAddr_dstAddr" - alias: "set_srcAddr_dstAddr" - } - params { - id: 1 - name: "srcAddr" - bitwidth: 32 - } - params { - id: 2 - name: "dstAddr" - bitwidth: 32 - } -} -actions { - preamble { - id: 23198765 - name: "pipe.set_ihl_diffserv" - alias: "set_ihl_diffserv" - } - params { - id: 1 - name: "ihl" - bitwidth: 4 - } - params { - id: 2 - name: "diffserv" - bitwidth: 8 - } -} -actions { - preamble { - id: 19626680 - name: "pipe.set_fragOffset_flags" - alias: "set_fragOffset_flags" - } - params { - id: 1 - name: "fragOffset" - bitwidth: 13 - } - params { - id: 2 - name: "flags" - bitwidth: 3 - } -} -actions { - preamble { - id: 30994171 - name: "pipe.set_flags_ttl" - alias: "set_flags_ttl" - } - params { - id: 1 - name: "flags" - bitwidth: 3 - } - params { - id: 2 - name: "ttl" - bitwidth: 8 - } -} -actions { - preamble { - id: 26908305 - name: "pipe.set_fragOffset_srcAddr" - alias: "set_fragOffset_srcAddr" - } - params { - id: 1 - name: "fragOffset" - bitwidth: 13 - } - params { - id: 2 - name: "srcAddr" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..b3a73ec34f9 --- /dev/null +++ b/testdata/p4_16_samples_outputs/ipv4-actions_ubpf.p4.p4info.txtpb @@ -0,0 +1,293 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +tables { + preamble { + id: 34660133 + name: "pipe.filter_tbl" + alias: "filter_tbl" + } + match_fields { + id: 1 + name: "headers.ipv4.srcAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 22459262 + } + action_refs { + id: 25901177 + } + action_refs { + id: 28593466 + } + action_refs { + id: 23020487 + } + action_refs { + id: 22607454 + } + action_refs { + id: 22035671 + } + action_refs { + id: 29816553 + } + action_refs { + id: 17848524 + } + action_refs { + id: 17633771 + } + action_refs { + id: 27703701 + } + action_refs { + id: 24523917 + } + action_refs { + id: 23198765 + } + action_refs { + id: 19626680 + } + action_refs { + id: 30994171 + } + action_refs { + id: 26908305 + } + action_refs { + id: 18876683 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 18876683 + name: "pipe.Reject" + alias: "Reject" + } +} +actions { + preamble { + id: 22459262 + name: "pipe.set_ipv4_version" + alias: "set_ipv4_version" + } + params { + id: 1 + name: "version" + bitwidth: 4 + } +} +actions { + preamble { + id: 25901177 + name: "pipe.set_ihl" + alias: "set_ihl" + } + params { + id: 1 + name: "ihl" + bitwidth: 4 + } +} +actions { + preamble { + id: 28593466 + name: "pipe.set_diffserv" + alias: "set_diffserv" + } + params { + id: 1 + name: "diffserv" + bitwidth: 8 + } +} +actions { + preamble { + id: 23020487 + name: "pipe.set_identification" + alias: "set_identification" + } + params { + id: 1 + name: "identification" + bitwidth: 16 + } +} +actions { + preamble { + id: 22607454 + name: "pipe.set_flags" + alias: "set_flags" + } + params { + id: 1 + name: "flags" + bitwidth: 3 + } +} +actions { + preamble { + id: 22035671 + name: "pipe.set_fragOffset" + alias: "set_fragOffset" + } + params { + id: 1 + name: "fragOffset" + bitwidth: 13 + } +} +actions { + preamble { + id: 29816553 + name: "pipe.set_ttl" + alias: "set_ttl" + } + params { + id: 1 + name: "ttl" + bitwidth: 8 + } +} +actions { + preamble { + id: 17848524 + name: "pipe.set_protocol" + alias: "set_protocol" + } + params { + id: 1 + name: "protocol" + bitwidth: 8 + } +} +actions { + preamble { + id: 17633771 + name: "pipe.set_srcAddr" + alias: "set_srcAddr" + } + params { + id: 1 + name: "srcAddr" + bitwidth: 32 + } +} +actions { + preamble { + id: 27703701 + name: "pipe.set_dstAddr" + alias: "set_dstAddr" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 32 + } +} +actions { + preamble { + id: 24523917 + name: "pipe.set_srcAddr_dstAddr" + alias: "set_srcAddr_dstAddr" + } + params { + id: 1 + name: "srcAddr" + bitwidth: 32 + } + params { + id: 2 + name: "dstAddr" + bitwidth: 32 + } +} +actions { + preamble { + id: 23198765 + name: "pipe.set_ihl_diffserv" + alias: "set_ihl_diffserv" + } + params { + id: 1 + name: "ihl" + bitwidth: 4 + } + params { + id: 2 + name: "diffserv" + bitwidth: 8 + } +} +actions { + preamble { + id: 19626680 + name: "pipe.set_fragOffset_flags" + alias: "set_fragOffset_flags" + } + params { + id: 1 + name: "fragOffset" + bitwidth: 13 + } + params { + id: 2 + name: "flags" + bitwidth: 3 + } +} +actions { + preamble { + id: 30994171 + name: "pipe.set_flags_ttl" + alias: "set_flags_ttl" + } + params { + id: 1 + name: "flags" + bitwidth: 3 + } + params { + id: 2 + name: "ttl" + bitwidth: 8 + } +} +actions { + preamble { + id: 26908305 + name: "pipe.set_fragOffset_srcAddr" + alias: "set_fragOffset_srcAddr" + } + params { + id: 1 + name: "fragOffset" + bitwidth: 13 + } + params { + id: 2 + name: "srcAddr" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txt deleted file mode 100644 index 0b5153e0b42..00000000000 --- a/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txt +++ /dev/null @@ -1,147 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -tables { - preamble { - id: 34660133 - name: "pipe.filter_tbl" - alias: "filter_tbl" - } - match_fields { - id: 1 - name: "headers.ipv6.srcAddr" - bitwidth: 128 - match_type: EXACT - } - action_refs { - id: 24270128 - } - action_refs { - id: 20492649 - } - action_refs { - id: 20189377 - } - action_refs { - id: 20780797 - } - action_refs { - id: 33293880 - } - action_refs { - id: 27915362 - } - action_refs { - id: 25251608 - } - action_refs { - id: 18876683 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 18876683 - name: "pipe.Reject" - alias: "Reject" - } -} -actions { - preamble { - id: 24270128 - name: "pipe.ipv6_modify_dstAddr" - alias: "ipv6_modify_dstAddr" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 128 - } -} -actions { - preamble { - id: 20492649 - name: "pipe.ipv6_swap_addr" - alias: "ipv6_swap_addr" - } -} -actions { - preamble { - id: 20189377 - name: "pipe.set_flowlabel" - alias: "set_flowlabel" - } - params { - id: 1 - name: "label" - bitwidth: 20 - } -} -actions { - preamble { - id: 20780797 - name: "pipe.set_traffic_class_flow_label" - alias: "set_traffic_class_flow_label" - } - params { - id: 1 - name: "trafficClass" - bitwidth: 8 - } - params { - id: 2 - name: "label" - bitwidth: 20 - } -} -actions { - preamble { - id: 33293880 - name: "pipe.set_ipv6_version" - alias: "set_ipv6_version" - } - params { - id: 1 - name: "version" - bitwidth: 4 - } -} -actions { - preamble { - id: 27915362 - name: "pipe.set_next_hdr" - alias: "set_next_hdr" - } - params { - id: 1 - name: "nextHdr" - bitwidth: 8 - } -} -actions { - preamble { - id: 25251608 - name: "pipe.set_hop_limit" - alias: "set_hop_limit" - } - params { - id: 1 - name: "hopLimit" - bitwidth: 8 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..071cf165897 --- /dev/null +++ b/testdata/p4_16_samples_outputs/ipv6-actions_ubpf.p4.p4info.txtpb @@ -0,0 +1,148 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +tables { + preamble { + id: 34660133 + name: "pipe.filter_tbl" + alias: "filter_tbl" + } + match_fields { + id: 1 + name: "headers.ipv6.srcAddr" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 24270128 + } + action_refs { + id: 20492649 + } + action_refs { + id: 20189377 + } + action_refs { + id: 20780797 + } + action_refs { + id: 33293880 + } + action_refs { + id: 27915362 + } + action_refs { + id: 25251608 + } + action_refs { + id: 18876683 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 18876683 + name: "pipe.Reject" + alias: "Reject" + } +} +actions { + preamble { + id: 24270128 + name: "pipe.ipv6_modify_dstAddr" + alias: "ipv6_modify_dstAddr" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 128 + } +} +actions { + preamble { + id: 20492649 + name: "pipe.ipv6_swap_addr" + alias: "ipv6_swap_addr" + } +} +actions { + preamble { + id: 20189377 + name: "pipe.set_flowlabel" + alias: "set_flowlabel" + } + params { + id: 1 + name: "label" + bitwidth: 20 + } +} +actions { + preamble { + id: 20780797 + name: "pipe.set_traffic_class_flow_label" + alias: "set_traffic_class_flow_label" + } + params { + id: 1 + name: "trafficClass" + bitwidth: 8 + } + params { + id: 2 + name: "label" + bitwidth: 20 + } +} +actions { + preamble { + id: 33293880 + name: "pipe.set_ipv6_version" + alias: "set_ipv6_version" + } + params { + id: 1 + name: "version" + bitwidth: 4 + } +} +actions { + preamble { + id: 27915362 + name: "pipe.set_next_hdr" + alias: "set_next_hdr" + } + params { + id: 1 + name: "nextHdr" + bitwidth: 8 + } +} +actions { + preamble { + id: 25251608 + name: "pipe.set_hop_limit" + alias: "set_hop_limit" + } + params { + id: 1 + name: "hopLimit" + bitwidth: 8 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txt deleted file mode 100644 index 2b7b1bca122..00000000000 --- a/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txt +++ /dev/null @@ -1,133 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 45337246 - name: "ingress.ipv6_tbl" - alias: "ipv6_tbl" - } - match_fields { - id: 1 - name: "mcast_key" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21164525 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -tables { - preamble { - id: 34324521 - name: "egress.get_multicast_copy_out_bd" - alias: "get_multicast_copy_out_bd" - } - match_fields { - id: 1 - name: "standard_metadata.mcast_grp" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 2 - name: "standard_metadata.egress_rid" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 22004009 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -tables { - preamble { - id: 49367184 - name: "egress.send_frame" - alias: "send_frame" - } - match_fields { - id: 1 - name: "meta.fwd.out_bd" - bitwidth: 24 - match_type: EXACT - } - action_refs { - id: 23531945 - } - action_refs { - id: 20119496 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21164525 - name: "ingress.set_mcast_grp" - alias: "set_mcast_grp" - } - params { - id: 1 - name: "mcast_grp" - bitwidth: 16 - } - params { - id: 2 - name: "port" - bitwidth: 9 - } -} -actions { - preamble { - id: 22004009 - name: "egress.set_out_bd" - alias: "set_out_bd" - } - params { - id: 1 - name: "bd" - bitwidth: 24 - } -} -actions { - preamble { - id: 20119496 - name: "egress.drop" - alias: "drop" - } -} -actions { - preamble { - id: 23531945 - name: "egress.rewrite_mac" - alias: "rewrite_mac" - } - params { - id: 1 - name: "smac" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..024e3a868a1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/ipv6-switch-ml-bmv2.p4.p4info.txtpb @@ -0,0 +1,134 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 45337246 + name: "ingress.ipv6_tbl" + alias: "ipv6_tbl" + } + match_fields { + id: 1 + name: "mcast_key" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21164525 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 34324521 + name: "egress.get_multicast_copy_out_bd" + alias: "get_multicast_copy_out_bd" + } + match_fields { + id: 1 + name: "standard_metadata.mcast_grp" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "standard_metadata.egress_rid" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 22004009 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 49367184 + name: "egress.send_frame" + alias: "send_frame" + } + match_fields { + id: 1 + name: "meta.fwd.out_bd" + bitwidth: 24 + match_type: EXACT + } + action_refs { + id: 23531945 + } + action_refs { + id: 20119496 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21164525 + name: "ingress.set_mcast_grp" + alias: "set_mcast_grp" + } + params { + id: 1 + name: "mcast_grp" + bitwidth: 16 + } + params { + id: 2 + name: "port" + bitwidth: 9 + } +} +actions { + preamble { + id: 22004009 + name: "egress.set_out_bd" + alias: "set_out_bd" + } + params { + id: 1 + name: "bd" + bitwidth: 24 + } +} +actions { + preamble { + id: 20119496 + name: "egress.drop" + alias: "drop" + } +} +actions { + preamble { + id: 23531945 + name: "egress.rewrite_mac" + alias: "rewrite_mac" + } + params { + id: 1 + name: "smac" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue-2123-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue-2123-3-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue-2123.p4.entries.txt b/testdata/p4_16_samples_outputs/issue-2123.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue-2123.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue-2123.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue-2123.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue-2123.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txt deleted file mode 100644 index 70950b5994e..00000000000 --- a/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txt +++ /dev/null @@ -1,250 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48392551 - name: "ingress.bd" - alias: "bd" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.bd" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 33505590 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 65536 -} -tables { - preamble { - id: 41084491 - name: "ingress.ipv4_fib" - alias: "ipv4_fib" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.vrf" - bitwidth: 12 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 22594144 - } - action_refs { - id: 26104220 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 131072 -} -tables { - preamble { - id: 42875950 - name: "ingress.ipv4_fib_lpm" - alias: "ipv4_fib_lpm" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.vrf" - bitwidth: 12 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 22594144 - } - action_refs { - id: 26104220 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 16384 -} -tables { - preamble { - id: 43581057 - name: "ingress.nexthop" - alias: "nexthop" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.nexthop_index" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 22594144 - } - action_refs { - id: 19738113 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 32768 -} -tables { - preamble { - id: 39645634 - name: "ingress.port_mapping" - alias: "port_mapping" - } - match_fields { - id: 1 - name: "standard_metadata.ingress_port" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 27500220 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 32768 -} -tables { - preamble { - id: 40309161 - name: "egress.rewrite_mac" - alias: "rewrite_mac" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.nexthop_index" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 28864280 - } - action_refs { - id: 28966416 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 32768 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 33505590 - name: "ingress.set_vrf" - alias: "set_vrf" - } - params { - id: 1 - name: "vrf" - bitwidth: 12 - } -} -actions { - preamble { - id: 22594144 - name: "ingress.on_miss" - alias: "ingress.on_miss" - } -} -actions { - preamble { - id: 26104220 - name: "ingress.fib_hit_nexthop" - alias: "fib_hit_nexthop" - } - params { - id: 1 - name: "nexthop_index" - bitwidth: 16 - } -} -actions { - preamble { - id: 19738113 - name: "ingress.set_egress_details" - alias: "set_egress_details" - } - params { - id: 1 - name: "egress_spec" - bitwidth: 9 - } -} -actions { - preamble { - id: 27500220 - name: "ingress.set_bd" - alias: "set_bd" - } - params { - id: 1 - name: "bd" - bitwidth: 16 - } -} -actions { - preamble { - id: 28864280 - name: "egress.on_miss" - alias: "egress.on_miss" - } -} -actions { - preamble { - id: 28966416 - name: "egress.rewrite_src_dst_mac" - alias: "rewrite_src_dst_mac" - } - params { - id: 1 - name: "smac" - bitwidth: 48 - } - params { - id: 2 - name: "dmac" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb new file mode 100644 index 00000000000..7033385f7e1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue-2123.p4.p4info.txtpb @@ -0,0 +1,251 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48392551 + name: "ingress.bd" + alias: "bd" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.bd" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 33505590 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 65536 +} +tables { + preamble { + id: 41084491 + name: "ingress.ipv4_fib" + alias: "ipv4_fib" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.vrf" + bitwidth: 12 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 22594144 + } + action_refs { + id: 26104220 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 131072 +} +tables { + preamble { + id: 42875950 + name: "ingress.ipv4_fib_lpm" + alias: "ipv4_fib_lpm" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.vrf" + bitwidth: 12 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 22594144 + } + action_refs { + id: 26104220 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 16384 +} +tables { + preamble { + id: 43581057 + name: "ingress.nexthop" + alias: "nexthop" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.nexthop_index" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 22594144 + } + action_refs { + id: 19738113 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 32768 +} +tables { + preamble { + id: 39645634 + name: "ingress.port_mapping" + alias: "port_mapping" + } + match_fields { + id: 1 + name: "standard_metadata.ingress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 27500220 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 32768 +} +tables { + preamble { + id: 40309161 + name: "egress.rewrite_mac" + alias: "rewrite_mac" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.nexthop_index" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 28864280 + } + action_refs { + id: 28966416 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 32768 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 33505590 + name: "ingress.set_vrf" + alias: "set_vrf" + } + params { + id: 1 + name: "vrf" + bitwidth: 12 + } +} +actions { + preamble { + id: 22594144 + name: "ingress.on_miss" + alias: "ingress.on_miss" + } +} +actions { + preamble { + id: 26104220 + name: "ingress.fib_hit_nexthop" + alias: "fib_hit_nexthop" + } + params { + id: 1 + name: "nexthop_index" + bitwidth: 16 + } +} +actions { + preamble { + id: 19738113 + name: "ingress.set_egress_details" + alias: "set_egress_details" + } + params { + id: 1 + name: "egress_spec" + bitwidth: 9 + } +} +actions { + preamble { + id: 27500220 + name: "ingress.set_bd" + alias: "set_bd" + } + params { + id: 1 + name: "bd" + bitwidth: 16 + } +} +actions { + preamble { + id: 28864280 + name: "egress.on_miss" + alias: "egress.on_miss" + } +} +actions { + preamble { + id: 28966416 + name: "egress.rewrite_src_dst_mac" + alias: "rewrite_src_dst_mac" + } + params { + id: 1 + name: "smac" + bitwidth: 48 + } + params { + id: 2 + name: "dmac" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txt deleted file mode 100644 index 58e4c03f861..00000000000 --- a/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txt +++ /dev/null @@ -1,60 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 20728178 - } - action_refs { - id: 26265154 - } - const_default_action_id: 20728178 - size: 1024 -} -tables { - preamble { - id: 39755323 - name: "ingress.t1" - alias: "t1" - } - action_refs { - id: 26265154 - } - const_default_action_id: 26265154 - size: 1024 -} -tables { - preamble { - id: 42400396 - name: "ingress.t2" - alias: "t2" - } - action_refs { - id: 20728178 - } - const_default_action_id: 20728178 - size: 1024 -} -actions { - preamble { - id: 20728178 - name: "ingress.add" - alias: "add" - } -} -actions { - preamble { - id: 26265154 - name: "ingress.sub" - alias: "sub" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ebeb2be7504 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue-3312-graph-bmv2.p4.p4info.txtpb @@ -0,0 +1,61 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 20728178 + } + action_refs { + id: 26265154 + } + const_default_action_id: 20728178 + size: 1024 +} +tables { + preamble { + id: 39755323 + name: "ingress.t1" + alias: "t1" + } + action_refs { + id: 26265154 + } + const_default_action_id: 26265154 + size: 1024 +} +tables { + preamble { + id: 42400396 + name: "ingress.t2" + alias: "t2" + } + action_refs { + id: 20728178 + } + const_default_action_id: 20728178 + size: 1024 +} +actions { + preamble { + id: 20728178 + name: "ingress.add" + alias: "add" + } +} +actions { + preamble { + id: 26265154 + name: "ingress.sub" + alias: "sub" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1000-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1001-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1001-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1025-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1043-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txt deleted file mode 100644 index 55a13d38fe3..00000000000 --- a/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txt +++ /dev/null @@ -1,62 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48165785 - name: "cIngress.guh" - alias: "guh" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 28550627 - } - size: 1024 -} -tables { - preamble { - id: 43025017 - name: "cIngress.debug_table" - alias: "debug_table" - } - match_fields { - id: 1 - name: "meta.mystruct1.hash1" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 2 - name: "meta.mystruct1.hash_drop" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28550627 - name: "cIngress.hash_drop_decision" - alias: "hash_drop_decision" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fbf612b2228 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1049-bmv2.p4.p4info.txtpb @@ -0,0 +1,63 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48165785 + name: "cIngress.guh" + alias: "guh" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 28550627 + } + size: 1024 +} +tables { + preamble { + id: 43025017 + name: "cIngress.debug_table" + alias: "debug_table" + } + match_fields { + id: 1 + name: "meta.mystruct1.hash1" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "meta.mystruct1.hash_drop" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28550627 + name: "cIngress.hash_drop_decision" + alias: "hash_drop_decision" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1062-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1062-1-bmv2.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/issue1062-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1062-1-bmv2.p4.p4info.txt deleted file mode 100644 index 4fae61920ed..00000000000 --- a/testdata/p4_16_samples_outputs/issue1062-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,31 +0,0 @@ -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 33562569 - name: "ingress.t_exact" - alias: "t_exact" - } - match_fields { - id: 1 - name: "m.my_err" - match_type: EXACT - } - action_refs { - id: 16798640 - } - size: 1024 -} -actions { - preamble { - id: 16798640 - name: "ingress.set_error_idx" - alias: "set_error_idx" - } - params { - id: 1 - name: "idx" - bitwidth: 8 - } -} diff --git a/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1079-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.p4info.txt deleted file mode 100644 index 27279a18e0c..00000000000 --- a/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,22 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -registers { - preamble { - id: 369183714 - name: "r" - alias: "r" - } - type_spec { - bitstring { - bit { - bitwidth: 8 - } - } - } - size: 256 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdd16970417 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1097-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,23 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +registers { + preamble { + id: 369183714 + name: "r" + alias: "r" + } + type_spec { + bitstring { + bit { + bitwidth: 8 + } + } + } + size: 256 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.p4info.txt deleted file mode 100644 index 97c10372efb..00000000000 --- a/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.p4info.txt +++ /dev/null @@ -1,22 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -registers { - preamble { - id: 369183714 - name: "r" - alias: "r" - } - type_spec { - bitstring { - bit { - bitwidth: 8 - } - } - } - size: 2 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..d9c9ee7e905 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1097-bmv2.p4.p4info.txtpb @@ -0,0 +1,23 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +registers { + preamble { + id: 369183714 + name: "r" + alias: "r" + } + type_spec { + bitstring { + bit { + bitwidth: 8 + } + } + } + size: 2 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1107.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1107.p4.entries.txt deleted file mode 100644 index e1833c1690f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1107.p4.entries.txt +++ /dev/null @@ -1,62 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 48415709 - match { - field_id: 1 - exact { - value: "\000\000\000\001" - } - } - match { - field_id: 2 - exact { - value: "\377\377\377\377" - } - } - action { - action { - action_id: 16988524 - params { - param_id: 1 - value: "\000\001" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 48415709 - match { - field_id: 1 - exact { - value: "\000\000\000\002" - } - } - match { - field_id: 2 - exact { - value: "\377\377\377\377" - } - } - action { - action { - action_id: 16988524 - params { - param_id: 1 - value: "\000\002" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/issue1107.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1107.p4.entries.txtpb new file mode 100644 index 00000000000..840862a53e5 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1107.p4.entries.txtpb @@ -0,0 +1,63 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 48415709 + match { + field_id: 1 + exact { + value: "\000\000\000\001" + } + } + match { + field_id: 2 + exact { + value: "\377\377\377\377" + } + } + action { + action { + action_id: 16988524 + params { + param_id: 1 + value: "\000\001" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 48415709 + match { + field_id: 1 + exact { + value: "\000\000\000\002" + } + } + match { + field_id: 2 + exact { + value: "\377\377\377\377" + } + } + action { + action { + action_id: 16988524 + params { + param_id: 1 + value: "\000\002" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txt deleted file mode 100644 index 9873288f0fa..00000000000 --- a/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txt +++ /dev/null @@ -1,57 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48415709 - name: "IngressI.myc.myt" - alias: "myt" - } - match_fields { - id: 1 - name: "meta.f1" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 2 - name: "meta.f2" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 16988524 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 16988524 - name: "IngressI.myc.set_eg" - alias: "set_eg" - } - params { - id: 1 - name: "eg" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb new file mode 100644 index 00000000000..f0dd0f1d5b1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1107.p4.p4info.txtpb @@ -0,0 +1,58 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48415709 + name: "IngressI.myc.myt" + alias: "myt" + } + match_fields { + id: 1 + name: "meta.f1" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 2 + name: "meta.f2" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 16988524 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 16988524 + name: "IngressI.myc.set_eg" + alias: "set_eg" + } + params { + id: 1 + name: "eg" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1127-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txt deleted file mode 100644 index 49c9a6206dd..00000000000 --- a/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txt +++ /dev/null @@ -1,38 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44621953 - name: "MyIngress.t" - alias: "t" - } - action_refs { - id: 17271521 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 17271521 - name: "MyIngress.a" - alias: "a" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..47aadf9cc67 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1193-bmv2.p4.p4info.txtpb @@ -0,0 +1,39 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44621953 + name: "MyIngress.t" + alias: "t" + } + action_refs { + id: 17271521 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 17271521 + name: "MyIngress.a" + alias: "a" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1208-1.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1208-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1208-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1208-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1208-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1208-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1208-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1208-1.p4.p4info.txt deleted file mode 100644 index ed28782f7ef..00000000000 --- a/testdata/p4_16_samples_outputs/issue1208-1.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} diff --git a/testdata/p4_16_samples_outputs/issue1208-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1208-1.p4.p4info.txtpb new file mode 100644 index 00000000000..cfbdc3d692a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1208-1.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} diff --git a/testdata/p4_16_samples_outputs/issue1210.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1210.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1210.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1210.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1210.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1210.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1210.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1210.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1210.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1210.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1210.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1210.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1291-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1304.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1304.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/issue1304.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1304.p4.p4info.txt deleted file mode 100644 index 6e53a807bb4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1304.p4.p4info.txt +++ /dev/null @@ -1,38 +0,0 @@ -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 33611905 - name: "MyIngress.t" - alias: "t" - } - match_fields { - id: 1 - name: "meta.err" - match_type: EXACT - } - action_refs { - id: 16777606 - } - action_refs { - id: 16800567 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 16800567 - name: "NoAction" - alias: "NoAction" - } -} -actions { - preamble { - id: 16777606 - name: "MyIngress.set_data" - alias: "set_data" - } -} diff --git a/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1325-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue134-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue134-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue134-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue134-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue134-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue134-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue134-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue134-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue134-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue134-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue134-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue134-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txt deleted file mode 100644 index 8b25aa2849c..00000000000 --- a/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txt +++ /dev/null @@ -1,163 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46460945 - name: "MyIngress.forward" - alias: "forward" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 33025127 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 37375156 - name: "MyIngress.ipv4_lpm" - alias: "ipv4_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 24952588 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 49202009 - name: "MyEgress.send_frame" - alias: "send_frame" - } - match_fields { - id: 1 - name: "standard_metadata.egress_port" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 22398708 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25652968 - name: "MyIngress.drop" - alias: "drop" - } -} -actions { - preamble { - id: 33025127 - name: "MyIngress.set_dmac" - alias: "set_dmac" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 48 - } -} -actions { - preamble { - id: 24952588 - name: "MyIngress.set_nhop" - alias: "set_nhop" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 32 - } - params { - id: 2 - name: "port" - bitwidth: 9 - } -} -actions { - preamble { - id: 23592486 - name: "MyIngress.send_digest" - alias: "send_digest" - } -} -actions { - preamble { - id: 22398708 - name: "MyEgress.rewrite_mac" - alias: "rewrite_mac" - } - params { - id: 1 - name: "srcAddr" - bitwidth: 48 - } -} -digests { - preamble { - id: 387015589 - name: "test_digest_t" - alias: "test_digest_t" - } - type_spec { - struct { - name: "test_digest_t" - } - } -} -type_info { - structs { - key: "test_digest_t" - value { - members { - name: "in_mac_srcAddr" - type_spec { - bitstring { - bit { - bitwidth: 48 - } - } - } - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ab1dfb29a54 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1352-bmv2.p4.p4info.txtpb @@ -0,0 +1,164 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46460945 + name: "MyIngress.forward" + alias: "forward" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 33025127 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 37375156 + name: "MyIngress.ipv4_lpm" + alias: "ipv4_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 24952588 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 49202009 + name: "MyEgress.send_frame" + alias: "send_frame" + } + match_fields { + id: 1 + name: "standard_metadata.egress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 22398708 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25652968 + name: "MyIngress.drop" + alias: "drop" + } +} +actions { + preamble { + id: 33025127 + name: "MyIngress.set_dmac" + alias: "set_dmac" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 48 + } +} +actions { + preamble { + id: 24952588 + name: "MyIngress.set_nhop" + alias: "set_nhop" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 32 + } + params { + id: 2 + name: "port" + bitwidth: 9 + } +} +actions { + preamble { + id: 23592486 + name: "MyIngress.send_digest" + alias: "send_digest" + } +} +actions { + preamble { + id: 22398708 + name: "MyEgress.rewrite_mac" + alias: "rewrite_mac" + } + params { + id: 1 + name: "srcAddr" + bitwidth: 48 + } +} +digests { + preamble { + id: 387015589 + name: "test_digest_t" + alias: "test_digest_t" + } + type_spec { + struct { + name: "test_digest_t" + } + } +} +type_info { + structs { + key: "test_digest_t" + value { + members { + name: "in_mac_srcAddr" + type_spec { + bitstring { + bit { + bitwidth: 48 + } + } + } + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/issue1386.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1386.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1386.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1386.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1386.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1386.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1386.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1386.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1386.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1386.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1386.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1386.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1406.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1406.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1406.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1406.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1406.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1406.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1406.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1406.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1406.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1406.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1406.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1406.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1409-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txt deleted file mode 100644 index 194fcd7fdf3..00000000000 --- a/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 49261221 - name: "EgressImpl.change_cond" - alias: "change_cond" - } - match_fields { - id: 1 - name: "ostd.egress_spec" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 28272974 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28272974 - name: "EgressImpl.set_true" - alias: "set_true" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..3e9d6e3d9de --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1412-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 49261221 + name: "EgressImpl.change_cond" + alias: "change_cond" + } + match_fields { + id: 1 + name: "ostd.egress_spec" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 28272974 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28272974 + name: "EgressImpl.set_true" + alias: "set_true" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1470-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.entries.txt deleted file mode 100644 index ad44726998b..00000000000 --- a/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.entries.txt +++ /dev/null @@ -1,22 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 42400396 - match { - field_id: 1 - exact { - value: "\000\000" - } - } - action { - action { - action_id: 21257015 - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..bf0949d5d80 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.entries.txtpb @@ -0,0 +1,23 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 42400396 + match { + field_id: 1 + exact { + value: "\000\000" + } + } + action { + action { + action_id: 21257015 + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txt deleted file mode 100644 index c73f222c7fc..00000000000 --- a/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txt +++ /dev/null @@ -1,46 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39755323 - name: "ingress.t1" - alias: "t1" - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 3 -} -tables { - preamble { - id: 42400396 - name: "ingress.t2" - alias: "t2" - } - match_fields { - id: 1 - name: "sm.ingress_port" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 10 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..025e575aa86 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1478-bmv2.p4.p4info.txtpb @@ -0,0 +1,47 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39755323 + name: "ingress.t1" + alias: "t1" + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 3 +} +tables { + preamble { + id: 42400396 + name: "ingress.t2" + alias: "t2" + } + match_fields { + id: 1 + name: "sm.ingress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 10 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1517-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.p4info.txt deleted file mode 100644 index 6c743023cd6..00000000000 --- a/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.p4info.txt +++ /dev/null @@ -1,37 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -registers { - preamble { - id: 385061251 - name: "MyIngress.h.c1.r" - alias: "c1.r" - } - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - size: 8 -} -registers { - preamble { - id: 369403856 - name: "MyIngress.h.c2.r" - alias: "c2.r" - } - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - size: 8 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..82be300fd25 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1520-bmv2.p4.p4info.txtpb @@ -0,0 +1,38 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +registers { + preamble { + id: 385061251 + name: "MyIngress.h.c1.r" + alias: "c1.r" + } + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + size: 8 +} +registers { + preamble { + id: 369403856 + name: "MyIngress.h.c2.r" + alias: "c2.r" + } + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + size: 8 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1524.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1524.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1524.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1524.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1524.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1524.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1524.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1524.p4.p4info.txt deleted file mode 100644 index c7afbcdce7e..00000000000 --- a/testdata/p4_16_samples_outputs/issue1524.p4.p4info.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info diff --git a/testdata/p4_16_samples_outputs/issue1524.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1524.p4.p4info.txtpb new file mode 100644 index 00000000000..707a7400ea3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1524.p4.p4info.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + diff --git a/testdata/p4_16_samples_outputs/issue1535.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1535.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1535.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1535.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1535.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1535.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1535.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1535.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1535.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1535.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1535.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1535.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1538.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1538.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1538.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1538.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1538.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1538.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txt deleted file mode 100644 index d47ad3510d2..00000000000 --- a/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txt +++ /dev/null @@ -1,46 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43424410 - name: "ingress.mac_da" - alias: "mac_da" - } - match_fields { - id: 1 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 29666769 - } - action_refs { - id: 32609675 - } - size: 1024 -} -actions { - preamble { - id: 32609675 - name: "my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 29666769 - name: "ingress.set_port" - alias: "set_port" - } - params { - id: 1 - name: "output_port" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb new file mode 100644 index 00000000000..e16e05a8794 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1538.p4.p4info.txtpb @@ -0,0 +1,47 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43424410 + name: "ingress.mac_da" + alias: "mac_da" + } + match_fields { + id: 1 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 29666769 + } + action_refs { + id: 32609675 + } + size: 1024 +} +actions { + preamble { + id: 32609675 + name: "my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 29666769 + name: "ingress.set_port" + alias: "set_port" + } + params { + id: 1 + name: "output_port" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1541.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1541.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1541.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1541.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1541.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1541.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1541.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1541.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1541.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1541.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1541.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1541.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txt deleted file mode 100644 index d47ad3510d2..00000000000 --- a/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,46 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43424410 - name: "ingress.mac_da" - alias: "mac_da" - } - match_fields { - id: 1 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 29666769 - } - action_refs { - id: 32609675 - } - size: 1024 -} -actions { - preamble { - id: 32609675 - name: "my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 29666769 - name: "ingress.set_port" - alias: "set_port" - } - params { - id: 1 - name: "output_port" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..e16e05a8794 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1544-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,47 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43424410 + name: "ingress.mac_da" + alias: "mac_da" + } + match_fields { + id: 1 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 29666769 + } + action_refs { + id: 32609675 + } + size: 1024 +} +actions { + preamble { + id: 32609675 + name: "my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 29666769 + name: "ingress.set_port" + alias: "set_port" + } + params { + id: 1 + name: "output_port" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txt deleted file mode 100644 index d47ad3510d2..00000000000 --- a/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,46 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43424410 - name: "ingress.mac_da" - alias: "mac_da" - } - match_fields { - id: 1 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 29666769 - } - action_refs { - id: 32609675 - } - size: 1024 -} -actions { - preamble { - id: 32609675 - name: "my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 29666769 - name: "ingress.set_port" - alias: "set_port" - } - params { - id: 1 - name: "output_port" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..e16e05a8794 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1544-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,47 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43424410 + name: "ingress.mac_da" + alias: "mac_da" + } + match_fields { + id: 1 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 29666769 + } + action_refs { + id: 32609675 + } + size: 1024 +} +actions { + preamble { + id: 32609675 + name: "my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 29666769 + name: "ingress.set_port" + alias: "set_port" + } + params { + id: 1 + name: "output_port" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txt deleted file mode 100644 index d47ad3510d2..00000000000 --- a/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txt +++ /dev/null @@ -1,46 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43424410 - name: "ingress.mac_da" - alias: "mac_da" - } - match_fields { - id: 1 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 29666769 - } - action_refs { - id: 32609675 - } - size: 1024 -} -actions { - preamble { - id: 32609675 - name: "my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 29666769 - name: "ingress.set_port" - alias: "set_port" - } - params { - id: 1 - name: "output_port" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..e16e05a8794 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1544-bmv2.p4.p4info.txtpb @@ -0,0 +1,47 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43424410 + name: "ingress.mac_da" + alias: "mac_da" + } + match_fields { + id: 1 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 29666769 + } + action_refs { + id: 32609675 + } + size: 1024 +} +actions { + preamble { + id: 32609675 + name: "my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 29666769 + name: "ingress.set_port" + alias: "set_port" + } + params { + id: 1 + name: "output_port" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txt deleted file mode 100644 index fc3f646fa76..00000000000 --- a/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txt +++ /dev/null @@ -1,114 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34391244 - name: "cIngress.t0" - alias: "t0" - } - match_fields { - id: 1 - name: "hdr.tcp.dstPort" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 32211572 - } - action_refs { - id: 18753241 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 8 -} -tables { - preamble { - id: 39254368 - name: "cIngress.t1" - alias: "t1" - } - match_fields { - id: 1 - name: "hdr.tcp.dstPort" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 32211572 - } - action_refs { - id: 18753241 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 8 -} -tables { - preamble { - id: 47468127 - name: "cIngress.t2" - alias: "t2" - } - match_fields { - id: 1 - name: "hdr.tcp.srcPort" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 32211572 - } - action_refs { - id: 18753241 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 16 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 32211572 - name: "cIngress.foo1" - alias: "foo1" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 32 - } -} -actions { - preamble { - id: 18753241 - name: "cIngress.foo2" - alias: "foo2" - } - params { - id: 1 - name: "srcAddr" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..24f6e3908e5 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1560-bmv2.p4.p4info.txtpb @@ -0,0 +1,115 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34391244 + name: "cIngress.t0" + alias: "t0" + } + match_fields { + id: 1 + name: "hdr.tcp.dstPort" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 32211572 + } + action_refs { + id: 18753241 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 8 +} +tables { + preamble { + id: 39254368 + name: "cIngress.t1" + alias: "t1" + } + match_fields { + id: 1 + name: "hdr.tcp.dstPort" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 32211572 + } + action_refs { + id: 18753241 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 8 +} +tables { + preamble { + id: 47468127 + name: "cIngress.t2" + alias: "t2" + } + match_fields { + id: 1 + name: "hdr.tcp.srcPort" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 32211572 + } + action_refs { + id: 18753241 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 16 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 32211572 + name: "cIngress.foo1" + alias: "foo1" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 32 + } +} +actions { + preamble { + id: 18753241 + name: "cIngress.foo2" + alias: "foo2" + } + params { + id: 1 + name: "srcAddr" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.p4info.txt deleted file mode 100644 index 009e68bbd88..00000000000 --- a/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.p4info.txt +++ /dev/null @@ -1,18 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -counters { - preamble { - id: 314274935 - name: "cIngress.E.c1.stats" - alias: "stats" - } - spec { - unit: PACKETS - } - size: 65536 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..9395dfa51e2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1566-bmv2.p4.p4info.txtpb @@ -0,0 +1,19 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +counters { + preamble { + id: 314274935 + name: "cIngress.E.c1.stats" + alias: "stats" + } + spec { + unit: PACKETS + } + size: 65536 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1566.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1566.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1566.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1566.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1566.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1566.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1566.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1566.p4.p4info.txt deleted file mode 100644 index 009e68bbd88..00000000000 --- a/testdata/p4_16_samples_outputs/issue1566.p4.p4info.txt +++ /dev/null @@ -1,18 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -counters { - preamble { - id: 314274935 - name: "cIngress.E.c1.stats" - alias: "stats" - } - spec { - unit: PACKETS - } - size: 65536 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1566.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1566.p4.p4info.txtpb new file mode 100644 index 00000000000..9395dfa51e2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1566.p4.p4info.txtpb @@ -0,0 +1,19 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +counters { + preamble { + id: 314274935 + name: "cIngress.E.c1.stats" + alias: "stats" + } + spec { + unit: PACKETS + } + size: 65536 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1595.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1595.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1595.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1595.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1595.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1595.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txt deleted file mode 100644 index b140d789306..00000000000 --- a/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txt +++ /dev/null @@ -1,72 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39254368 - name: "cIngress.t1" - alias: "t1" - } - match_fields { - id: 1 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21211318 - } - action_refs { - id: 17087019 - } - action_refs { - id: 20586134 - } - action_refs { - id: 26367828 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21211318 - name: "cIngress.a1" - alias: "a1" - } -} -actions { - preamble { - id: 17087019 - name: "cIngress.a2" - alias: "a2" - } -} -actions { - preamble { - id: 20586134 - name: "cIngress.a3" - alias: "a3" - } -} -actions { - preamble { - id: 26367828 - name: "cIngress.a4" - alias: "a4" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb new file mode 100644 index 00000000000..66c34ab5c58 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1595.p4.p4info.txtpb @@ -0,0 +1,73 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39254368 + name: "cIngress.t1" + alias: "t1" + } + match_fields { + id: 1 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21211318 + } + action_refs { + id: 17087019 + } + action_refs { + id: 20586134 + } + action_refs { + id: 26367828 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21211318 + name: "cIngress.a1" + alias: "a1" + } +} +actions { + preamble { + id: 17087019 + name: "cIngress.a2" + alias: "a2" + } +} +actions { + preamble { + id: 20586134 + name: "cIngress.a3" + alias: "a3" + } +} +actions { + preamble { + id: 26367828 + name: "cIngress.a4" + alias: "a4" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1607-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txt deleted file mode 100644 index 2c31c13f937..00000000000 --- a/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txt +++ /dev/null @@ -1,62 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 37375156 - name: "MyIngress.ipv4_lpm" - alias: "ipv4_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 28792405 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25652968 - name: "MyIngress.drop" - alias: "drop" - } -} -actions { - preamble { - id: 28792405 - name: "MyIngress.ipv4_forward" - alias: "ipv4_forward" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 48 - } - params { - id: 2 - name: "port" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..89e1868e4d8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1630-bmv2.p4.p4info.txtpb @@ -0,0 +1,63 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 37375156 + name: "MyIngress.ipv4_lpm" + alias: "ipv4_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 28792405 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25652968 + name: "MyIngress.drop" + alias: "drop" + } +} +actions { + preamble { + id: 28792405 + name: "MyIngress.ipv4_forward" + alias: "ipv4_forward" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 48 + } + params { + id: 2 + name: "port" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1642-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1653-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txt deleted file mode 100644 index 3d7aaf3b1b9..00000000000 --- a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txt +++ /dev/null @@ -1,50 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46138463 - name: "ingress.tns" - alias: "tns" - } - match_fields { - id: 1 - name: "h.bvh1.row.alt1.valid" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "local_metadata.row0.alt0.valid" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 22708368 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 22708368 - name: "ingress.do_act" - alias: "do_act" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..149090280c1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4.p4info.txtpb @@ -0,0 +1,51 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46138463 + name: "ingress.tns" + alias: "tns" + } + match_fields { + id: 1 + name: "h.bvh1.row.alt1.valid" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "local_metadata.row0.alt0.valid" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 22708368 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 22708368 + name: "ingress.do_act" + alias: "do_act" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1660-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1670-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txt deleted file mode 100644 index 14ffc60bda9..00000000000 --- a/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txt +++ /dev/null @@ -1,56 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 25451019 - } - action_refs { - id: 22181799 - } - action_refs { - id: 23335884 - } - action_refs { - id: 27086398 - } - const_default_action_id: 25451019 - size: 1024 -} -actions { - preamble { - id: 25451019 - name: "ingress.case0" - alias: "case0" - } -} -actions { - preamble { - id: 22181799 - name: "ingress.case1" - alias: "case1" - } -} -actions { - preamble { - id: 23335884 - name: "ingress.case2" - alias: "case2" - } -} -actions { - preamble { - id: 27086398 - name: "ingress.case3" - alias: "case3" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..3c7887c18bf --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1713-bmv2.p4.p4info.txtpb @@ -0,0 +1,57 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 25451019 + } + action_refs { + id: 22181799 + } + action_refs { + id: 23335884 + } + action_refs { + id: 27086398 + } + const_default_action_id: 25451019 + size: 1024 +} +actions { + preamble { + id: 25451019 + name: "ingress.case0" + alias: "case0" + } +} +actions { + preamble { + id: 22181799 + name: "ingress.case1" + alias: "case1" + } +} +actions { + preamble { + id: 23335884 + name: "ingress.case2" + alias: "case2" + } +} +actions { + preamble { + id: 27086398 + name: "ingress.case3" + alias: "case3" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txt deleted file mode 100644 index 46abcdddea1..00000000000 --- a/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txt +++ /dev/null @@ -1,105 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 35996228 - name: "ingress.ipv4_da_lpm" - alias: "ipv4_da_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - type_name { - name: "IPv4Address_t" - } - } - action_refs { - id: 28429210 - } - action_refs { - id: 32609675 - } - size: 1024 -} -tables { - preamble { - id: 45595328 - name: "ingress.ipv4_sa_filter" - alias: "ipv4_sa_filter" - } - match_fields { - id: 1 - name: "hdr.ipv4.srcAddr" - bitwidth: 32 - match_type: TERNARY - type_name { - name: "IPv4Address2_t" - } - } - action_refs { - id: 32609675 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 32609675 - name: "my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28429210 - name: "ingress.set_output" - alias: "set_output" - } - params { - id: 1 - name: "out_port" - bitwidth: 9 - } -} -type_info { - new_types { - key: "IPv4Address2_t" - value { - original_type { - bitstring { - bit { - bitwidth: 32 - } - } - } - } - } - new_types { - key: "IPv4Address_t" - value { - original_type { - bitstring { - bit { - bitwidth: 32 - } - } - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..b77a01f32e9 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1739-bmv2.p4.p4info.txtpb @@ -0,0 +1,106 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 35996228 + name: "ingress.ipv4_da_lpm" + alias: "ipv4_da_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + type_name { + name: "IPv4Address_t" + } + } + action_refs { + id: 28429210 + } + action_refs { + id: 32609675 + } + size: 1024 +} +tables { + preamble { + id: 45595328 + name: "ingress.ipv4_sa_filter" + alias: "ipv4_sa_filter" + } + match_fields { + id: 1 + name: "hdr.ipv4.srcAddr" + bitwidth: 32 + match_type: TERNARY + type_name { + name: "IPv4Address2_t" + } + } + action_refs { + id: 32609675 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 32609675 + name: "my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28429210 + name: "ingress.set_output" + alias: "set_output" + } + params { + id: 1 + name: "out_port" + bitwidth: 9 + } +} +type_info { + new_types { + key: "IPv4Address2_t" + value { + original_type { + bitstring { + bit { + bitwidth: 32 + } + } + } + } + } + new_types { + key: "IPv4Address_t" + value { + original_type { + bitstring { + bit { + bitwidth: 32 + } + } + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1755-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1755-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txt deleted file mode 100644 index a79e56a0e7c..00000000000 --- a/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,125 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 33947648 - name: "MyIngress.v6_addresses" - alias: "v6_addresses" - } - match_fields { - id: 1 - name: "hdr.ipv6.dst_addr" - bitwidth: 128 - match_type: EXACT - } - action_refs { - id: 23604876 - } - action_refs { - id: 32142762 - } - action_refs { - id: 24332213 - } - action_refs { - id: 21257015 - } - size: 64 -} -tables { - preamble { - id: 38089137 - name: "MyIngress.v6_networks" - alias: "v6_networks" - } - match_fields { - id: 1 - name: "hdr.ipv6.dst_addr" - bitwidth: 128 - match_type: LPM - } - action_refs { - id: 27787745 - } - action_refs { - id: 23604876 - } - action_refs { - id: 32142762 - } - action_refs { - id: 21257015 - } - size: 64 -} -tables { - preamble { - id: 37875907 - name: "MyIngress.v4_networks" - alias: "v4_networks" - } - match_fields { - id: 1 - name: "hdr.ipv4.dst_addr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 27787745 - } - action_refs { - id: 21257015 - } - size: 64 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 27787745 - name: "MyIngress.set_egress_port" - alias: "set_egress_port" - } - params { - id: 1 - name: "out_port" - bitwidth: 9 - } -} -actions { - preamble { - id: 23604876 - name: "MyIngress.controller_debug" - alias: "controller_debug" - } -} -actions { - preamble { - id: 32142762 - name: "MyIngress.controller_reply" - alias: "controller_reply" - } - params { - id: 1 - name: "task" - bitwidth: 16 - } -} -actions { - preamble { - id: 24332213 - name: "MyIngress.icmp6_echo_reply" - alias: "icmp6_echo_reply" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..07fc30ea424 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1765-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,126 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 33947648 + name: "MyIngress.v6_addresses" + alias: "v6_addresses" + } + match_fields { + id: 1 + name: "hdr.ipv6.dst_addr" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 23604876 + } + action_refs { + id: 32142762 + } + action_refs { + id: 24332213 + } + action_refs { + id: 21257015 + } + size: 64 +} +tables { + preamble { + id: 38089137 + name: "MyIngress.v6_networks" + alias: "v6_networks" + } + match_fields { + id: 1 + name: "hdr.ipv6.dst_addr" + bitwidth: 128 + match_type: LPM + } + action_refs { + id: 27787745 + } + action_refs { + id: 23604876 + } + action_refs { + id: 32142762 + } + action_refs { + id: 21257015 + } + size: 64 +} +tables { + preamble { + id: 37875907 + name: "MyIngress.v4_networks" + alias: "v4_networks" + } + match_fields { + id: 1 + name: "hdr.ipv4.dst_addr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 27787745 + } + action_refs { + id: 21257015 + } + size: 64 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 27787745 + name: "MyIngress.set_egress_port" + alias: "set_egress_port" + } + params { + id: 1 + name: "out_port" + bitwidth: 9 + } +} +actions { + preamble { + id: 23604876 + name: "MyIngress.controller_debug" + alias: "controller_debug" + } +} +actions { + preamble { + id: 32142762 + name: "MyIngress.controller_reply" + alias: "controller_reply" + } + params { + id: 1 + name: "task" + bitwidth: 16 + } +} +actions { + preamble { + id: 24332213 + name: "MyIngress.icmp6_echo_reply" + alias: "icmp6_echo_reply" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txt deleted file mode 100644 index c0be9eb8302..00000000000 --- a/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txt +++ /dev/null @@ -1,31 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48165785 - name: "cIngress.guh" - alias: "guh" - } - match_fields { - id: 1 - name: "hdr.tcp.dstPort" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 25131402 - } - size: 1024 -} -actions { - preamble { - id: 25131402 - name: "cIngress.foo" - alias: "foo" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ce33ebd07b1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1765-bmv2.p4.p4info.txtpb @@ -0,0 +1,32 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48165785 + name: "cIngress.guh" + alias: "guh" + } + match_fields { + id: 1 + name: "hdr.tcp.dstPort" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 25131402 + } + size: 1024 +} +actions { + preamble { + id: 25131402 + name: "cIngress.foo" + alias: "foo" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1768-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.p4info.txt deleted file mode 100644 index 402a012fb04..00000000000 --- a/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25324817 - name: "IngressImpl.update_value" - alias: "update_value" - } -} diff --git a/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..b9ae043ba7d --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1781-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25324817 + name: "IngressImpl.update_value" + alias: "update_value" + } +} diff --git a/testdata/p4_16_samples_outputs/issue1806.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1806.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/issue1806.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1806.p4.p4info.txt deleted file mode 100644 index 08d1c65e008..00000000000 --- a/testdata/p4_16_samples_outputs/issue1806.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48497513 - name: "c.tns" - alias: "tns" - } - match_fields { - id: 1 - name: "h.eth.tst[13:4]" - bitwidth: 10 - match_type: EXACT - } - action_refs { - id: 22922986 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 22922986 - name: "c.do_act" - alias: "do_act" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txt deleted file mode 100644 index 608b7716c7d..00000000000 --- a/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,69 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44942503 - name: "IngressImpl.debug_table" - alias: "debug_table" - } - match_fields { - id: 1 - name: "meta.test" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 17676690 - } - action_refs { - id: 33244565 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 17676690 - name: "IngressImpl.drop" - alias: "drop" - } -} -actions { - preamble { - id: 33244565 - name: "IngressImpl.forward" - alias: "forward" - } -} -registers { - preamble { - id: 377042504 - name: "IngressImpl.testRegister" - alias: "testRegister" - } - type_spec { - bitstring { - bit { - bitwidth: 1 - } - } - } - size: 1 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..405b5ac2936 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1814-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,70 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44942503 + name: "IngressImpl.debug_table" + alias: "debug_table" + } + match_fields { + id: 1 + name: "meta.test" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 17676690 + } + action_refs { + id: 33244565 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 17676690 + name: "IngressImpl.drop" + alias: "drop" + } +} +actions { + preamble { + id: 33244565 + name: "IngressImpl.forward" + alias: "forward" + } +} +registers { + preamble { + id: 377042504 + name: "IngressImpl.testRegister" + alias: "testRegister" + } + type_spec { + bitstring { + bit { + bitwidth: 1 + } + } + } + size: 1 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txt deleted file mode 100644 index 509f0368e9d..00000000000 --- a/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txt +++ /dev/null @@ -1,47 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44942503 - name: "IngressImpl.debug_table" - alias: "debug_table" - } - match_fields { - id: 1 - name: "meta.test" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -registers { - preamble { - id: 377042504 - name: "IngressImpl.testRegister" - alias: "testRegister" - } - type_spec { - bitstring { - bit { - bitwidth: 1 - } - } - } - size: 1 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..086bb9baf1a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1814-bmv2.p4.p4info.txtpb @@ -0,0 +1,48 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44942503 + name: "IngressImpl.debug_table" + alias: "debug_table" + } + match_fields { + id: 1 + name: "meta.test" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +registers { + preamble { + id: 377042504 + name: "IngressImpl.testRegister" + alias: "testRegister" + } + type_spec { + bitstring { + bit { + bitwidth: 1 + } + } + } + size: 1 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1824-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txt deleted file mode 100644 index 50907c68994..00000000000 --- a/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,32 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43802445 - name: "ingressImpl.mac_da" - alias: "mac_da" - } - match_fields { - id: 1 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 23080345 - } - const_default_action_id: 23080345 - size: 1024 -} -actions { - preamble { - id: 23080345 - name: "ingressImpl.do_meter" - alias: "do_meter" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..045f5ad9615 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1829-4-bmv2.p4.p4info.txtpb @@ -0,0 +1,33 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43802445 + name: "ingressImpl.mac_da" + alias: "mac_da" + } + match_fields { + id: 1 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 23080345 + } + const_default_action_id: 23080345 + size: 1024 +} +actions { + preamble { + id: 23080345 + name: "ingressImpl.do_meter" + alias: "do_meter" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.entries.txt deleted file mode 100644 index 4d92fd966bc..00000000000 --- a/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.entries.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 39967805 - match { - field_id: 1 - exact { - value: "\001" - } - } - action { - action { - action_id: 30009676 - params { - param_id: 1 - value: "\001" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..2d4ee861bf7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.entries.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 39967805 + match { + field_id: 1 + exact { + value: "\001" + } + } + action { + action { + action_id: 30009676 + params { + param_id: 1 + value: "\001" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txt deleted file mode 100644 index c16c117653d..00000000000 --- a/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txt +++ /dev/null @@ -1,51 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39967805 - name: "IngressImpl.test_table" - alias: "test_table" - } - match_fields { - id: 1 - name: "meta.test" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 30009676 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 30009676 - name: "IngressImpl.act" - alias: "act" - } - params { - id: 1 - name: "a" - bitwidth: 8 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..bc9fdb13c70 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1834-bmv2.p4.p4info.txtpb @@ -0,0 +1,52 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39967805 + name: "IngressImpl.test_table" + alias: "test_table" + } + match_fields { + id: 1 + name: "meta.test" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 30009676 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 30009676 + name: "IngressImpl.act" + alias: "act" + } + params { + id: 1 + name: "a" + bitwidth: 8 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1876.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1876.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1876.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1876.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1876.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1876.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1876.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1876.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1876.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1876.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1876.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1876.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1879-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1882-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1882-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1897-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.p4info.txt deleted file mode 100644 index a8afbf20ee7..00000000000 --- a/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25589981 - name: "foo" - alias: "foo" - } -} diff --git a/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..84e3658a228 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1937-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25589981 + name: "foo" + alias: "foo" + } +} diff --git a/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1937-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1937-3-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue1955.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1955.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1955.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1955.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1955.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1955.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1955.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1955.p4.p4info.txt deleted file mode 100644 index 97450211fe8..00000000000 --- a/testdata/p4_16_samples_outputs/issue1955.p4.p4info.txt +++ /dev/null @@ -1,31 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -value_sets { - preamble { - id: 59321522 - name: "parserImpl.p1.ipv4_ethertypes" - alias: "p1.ipv4_ethertypes" - } - match { - id: 1 - bitwidth: 16 - match_type: EXACT - } - size: 8 -} -value_sets { - preamble { - id: 55724863 - name: "parserImpl.p2.ipv4_ethertypes" - alias: "p2.ipv4_ethertypes" - } - match { - id: 1 - bitwidth: 16 - match_type: EXACT - } - size: 8 -} diff --git a/testdata/p4_16_samples_outputs/issue1955.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1955.p4.p4info.txtpb new file mode 100644 index 00000000000..5e429d46aba --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1955.p4.p4info.txtpb @@ -0,0 +1,32 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +value_sets { + preamble { + id: 59321522 + name: "parserImpl.p1.ipv4_ethertypes" + alias: "p1.ipv4_ethertypes" + } + match { + id: 1 + bitwidth: 16 + match_type: EXACT + } + size: 8 +} +value_sets { + preamble { + id: 55724863 + name: "parserImpl.p2.ipv4_ethertypes" + alias: "p2.ipv4_ethertypes" + } + match { + id: 1 + bitwidth: 16 + match_type: EXACT + } + size: 8 +} diff --git a/testdata/p4_16_samples_outputs/issue1958.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1958.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1958.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1958.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1958.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1958.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txt deleted file mode 100644 index 3eacd6bd07a..00000000000 --- a/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txt +++ /dev/null @@ -1,57 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34768437 - name: "ingressImpl.foo2_inst.foo2_table" - alias: "foo2_table" - } - match_fields { - id: 1 - name: "my_headers.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 31043630 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 31043630 - name: "ingressImpl.foo2_inst.foo2_action" - alias: "foo2_action" - } -} -registers { - preamble { - id: 370394577 - name: "ingressImpl.reg1" - alias: "reg1" - } - type_spec { - bitstring { - bit { - bitwidth: 8 - } - } - } - size: 256 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb new file mode 100644 index 00000000000..03c5a037a37 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1958.p4.p4info.txtpb @@ -0,0 +1,58 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34768437 + name: "ingressImpl.foo2_inst.foo2_table" + alias: "foo2_table" + } + match_fields { + id: 1 + name: "my_headers.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 31043630 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 31043630 + name: "ingressImpl.foo2_inst.foo2_action" + alias: "foo2_action" + } +} +registers { + preamble { + id: 370394577 + name: "ingressImpl.reg1" + alias: "reg1" + } + type_spec { + bitstring { + bit { + bitwidth: 8 + } + } + } + size: 256 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1985.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1985.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1985.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1985.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1985.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1985.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txt deleted file mode 100644 index 8d9f49b4d3d..00000000000 --- a/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txt +++ /dev/null @@ -1,38 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 41215887 - name: "c3.t" - alias: "t" - } - action_refs { - id: 28268551 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28268551 - name: "c3.a" - alias: "a" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb new file mode 100644 index 00000000000..7808e055bf0 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1985.p4.p4info.txtpb @@ -0,0 +1,39 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 41215887 + name: "c3.t" + alias: "t" + } + action_refs { + id: 28268551 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28268551 + name: "c3.a" + alias: "a" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txt deleted file mode 100644 index e881c330fab..00000000000 --- a/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46102874 - name: "ingress.acl_table" - alias: "acl_table" - } - match_fields { - id: 1 - name: "hdr.ethernet.etherType" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 24130103 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 24130103 - name: "ingress.assign_non_const_array_index" - alias: "assign_non_const_array_index" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4f0834a91c8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue1989-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46102874 + name: "ingress.acl_table" + alias: "acl_table" + } + match_fields { + id: 1 + name: "hdr.ethernet.etherType" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 24130103 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 24130103 + name: "ingress.assign_non_const_array_index" + alias: "assign_non_const_array_index" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txt deleted file mode 100644 index 09fa5b6a0a9..00000000000 --- a/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txt +++ /dev/null @@ -1,32 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - match_fields { - id: 1 - name: "h.h.b" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..d13d4bb0b2d --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2044-bmv2.p4.p4info.txtpb @@ -0,0 +1,33 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + match_fields { + id: 1 + name: "h.h.b" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2104-1.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2104-1.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/issue2104-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2104-1.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/issue2104-1.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2104.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2104.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/issue2104.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2104.p4.p4info.txt deleted file mode 100644 index 3a84e1d97b6..00000000000 --- a/testdata/p4_16_samples_outputs/issue2104.p4.p4info.txt +++ /dev/null @@ -1,10 +0,0 @@ -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 24946439 - name: "c.v" - alias: "v" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2105.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2105.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/issue2105.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2105.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/issue2105.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.p4info.txt deleted file mode 100644 index 6426bddd418..00000000000 --- a/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4b0ff88b01a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2147-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2148.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2148.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2148.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2148.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2148.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2148.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2148.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2148.p4.p4info.txt deleted file mode 100644 index 2625f786389..00000000000 --- a/testdata/p4_16_samples_outputs/issue2148.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25346740 - name: "ingress.do_thing_action" - alias: "do_thing_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2148.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2148.p4.p4info.txtpb new file mode 100644 index 00000000000..56484906940 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2148.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25346740 + name: "ingress.do_thing_action" + alias: "do_thing_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txt deleted file mode 100644 index 57ae8d41455..00000000000 --- a/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "hdr.h.b" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 30461719 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 30461719 - name: "ingress.do_something" - alias: "do_something" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..2f5bb2b992f --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2153-bmv2.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "hdr.h.b" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 30461719 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 30461719 + name: "ingress.do_something" + alias: "do_something" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txt deleted file mode 100644 index 57ae8d41455..00000000000 --- a/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "hdr.h.b" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 30461719 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 30461719 - name: "ingress.do_something" - alias: "do_something" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..2f5bb2b992f --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2170-bmv2.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "hdr.h.b" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 30461719 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 30461719 + name: "ingress.do_something" + alias: "do_something" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.p4info.txt deleted file mode 100644 index 9aeee57df5d..00000000000 --- a/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 33493644 - name: "ingress.do_action_2" - alias: "do_action_2" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4315aa4ea15 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2176-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 33493644 + name: "ingress.do_action_2" + alias: "do_action_2" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2190.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2190.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2190.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2190.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2190.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2190.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2190.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2190.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2190.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2190.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2190.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2190.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2201-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2205-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2205-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2208.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2208.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2208.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2208.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2208.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2208.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2208.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2208.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2208.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2208.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2208.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2208.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2213-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2221-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.p4info.txt deleted file mode 100644 index 6426bddd418..00000000000 --- a/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4b0ff88b01a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2225-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2248.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2248.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2248.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2248.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2248.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2248.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2248.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2248.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/issue2248.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2248.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2248.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2248.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txt deleted file mode 100644 index 595478a4ba0..00000000000 --- a/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txt +++ /dev/null @@ -1,34 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "dummy_name" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..2418089ad0d --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2258-bmv2.p4.p4info.txtpb @@ -0,0 +1,35 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "dummy_name" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2261.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2261.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2261.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2261.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2261.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2261.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2261.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2261.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2261.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2261.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2261.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2261.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2266.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2266.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2266.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2266.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2266.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2266.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txt deleted file mode 100644 index f3c399ac827..00000000000 --- a/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txt +++ /dev/null @@ -1,38 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - action_refs { - id: 25524983 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb new file mode 100644 index 00000000000..78f6118a1b3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2266.p4.p4info.txtpb @@ -0,0 +1,39 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + action_refs { + id: 25524983 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txt deleted file mode 100644 index e2d46418191..00000000000 --- a/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,80 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - match_fields { - id: 1 - name: "h.ports.port1" - bitwidth: 32 - match_type: EXACT - type_name { - name: "PortId1_t" - } - } - match_fields { - id: 2 - name: "h.ports.port2" - bitwidth: 32 - match_type: EXACT - type_name { - name: "PortId2_t" - } - } - match_fields { - id: 3 - name: "h.ports.port3" - match_type: EXACT - type_name { - name: "PortId3_t" - } - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { - new_types { - key: "PortId1_t" - value { - translated_type { - uri: "p4.org/psa/v1/PortId1_t" - sdn_bitwidth: 32 - } - } - } - new_types { - key: "PortId2_t" - value { - translated_type { - uri: "p4.org/psa/v1/PortId2_t" - sdn_bitwidth: 32 - } - } - } - new_types { - key: "PortId3_t" - value { - translated_type { - uri: "p4.org/psa/v1/PortId3_t" - sdn_string { - } - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..dd754263575 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2283_1-bmv2.p4.p4info.txtpb @@ -0,0 +1,81 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + match_fields { + id: 1 + name: "h.ports.port1" + bitwidth: 32 + match_type: EXACT + type_name { + name: "PortId1_t" + } + } + match_fields { + id: 2 + name: "h.ports.port2" + bitwidth: 32 + match_type: EXACT + type_name { + name: "PortId2_t" + } + } + match_fields { + id: 3 + name: "h.ports.port3" + match_type: EXACT + type_name { + name: "PortId3_t" + } + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { + new_types { + key: "PortId1_t" + value { + translated_type { + uri: "p4.org/psa/v1/PortId1_t" + sdn_bitwidth: 32 + } + } + } + new_types { + key: "PortId2_t" + value { + translated_type { + uri: "p4.org/psa/v1/PortId2_t" + sdn_bitwidth: 32 + } + } + } + new_types { + key: "PortId3_t" + value { + translated_type { + uri: "p4.org/psa/v1/PortId3_t" + sdn_string { + } + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2287-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2289.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2289.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2289.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2289.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2289.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2289.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2289.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2289.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/issue2289.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2289.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2289.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2289.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2291-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2303.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2303.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2303.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2303.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2303.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2303.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2303.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2303.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2303.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2303.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2303.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2303.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2314.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2314.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2314.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2314.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2314.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2314.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2314.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2314.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2314.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2314.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2314.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2314.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue232-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue232-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue232-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue232-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue232-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue232-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue232-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue232-bmv2.p4.p4info.txt deleted file mode 100644 index 87a6aed80af..00000000000 --- a/testdata/p4_16_samples_outputs/issue232-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 17055359 - name: "Eg.test" - alias: "test" - } -} diff --git a/testdata/p4_16_samples_outputs/issue232-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue232-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..448cb5db538 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue232-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 17055359 + name: "Eg.test" + alias: "test" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2321.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2321.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2321.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2321.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2321.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2321.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txt deleted file mode 100644 index c58be24d06d..00000000000 --- a/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txt +++ /dev/null @@ -1,63 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 49173205 - name: "ingressImpl.t1" - alias: "t1" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 18992955 - } - action_refs { - id: 31699133 - } - action_refs { - id: 32254556 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 32254556 - name: "ingressImpl.my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 18992955 - name: "ingressImpl.a1" - alias: "a1" - } -} -actions { - preamble { - id: 31699133 - name: "ingressImpl.a2" - alias: "a2" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb new file mode 100644 index 00000000000..ff39c1978ec --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2321.p4.p4info.txtpb @@ -0,0 +1,64 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 49173205 + name: "ingressImpl.t1" + alias: "t1" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 18992955 + } + action_refs { + id: 31699133 + } + action_refs { + id: 32254556 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 32254556 + name: "ingressImpl.my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 18992955 + name: "ingressImpl.a1" + alias: "a1" + } +} +actions { + preamble { + id: 31699133 + name: "ingressImpl.a2" + alias: "a2" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2330-1.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2330-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2330-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2330-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2330-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2330-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2330-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2330-1.p4.p4info.txt deleted file mode 100644 index 6426bddd418..00000000000 --- a/testdata/p4_16_samples_outputs/issue2330-1.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2330-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2330-1.p4.p4info.txtpb new file mode 100644 index 00000000000..4b0ff88b01a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2330-1.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2330.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2330.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2330.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2330.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2330.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2330.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2330.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2330.p4.p4info.txt deleted file mode 100644 index 6426bddd418..00000000000 --- a/testdata/p4_16_samples_outputs/issue2330.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2330.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2330.p4.p4info.txtpb new file mode 100644 index 00000000000..4b0ff88b01a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2330.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2343-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2344.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2344.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2344.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2344.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2344.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2344.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txt deleted file mode 100644 index e9a2f1eb2bd..00000000000 --- a/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "key" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 25524983 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb new file mode 100644 index 00000000000..9b93fad2579 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2344.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "key" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 25524983 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2345-1.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2345-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2345-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2345-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2345-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2345-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2345-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2345-1.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/issue2345-1.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2345-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2345-1.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2345-1.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2345-2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2345-2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2345-2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2345-2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2345-2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2345-2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2345-2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2345-2.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/issue2345-2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2345-2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2345-2.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2345-2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2345-multiple_dependencies.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2345-with_nested_if.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2345.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2345.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2345.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2345.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2345.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2345.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2345.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2345.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/issue2345.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2345.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2345.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2345.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2355.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2355.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2355.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2355.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2355.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2355.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2355.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2355.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2355.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2355.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2355.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2355.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2356.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2356.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2356.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2356.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2356.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2356.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2356.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2356.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2356.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2356.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2356.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2356.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2359.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2359.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2359.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2359.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2359.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2359.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2359.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2359.p4.p4info.txt deleted file mode 100644 index 6426bddd418..00000000000 --- a/testdata/p4_16_samples_outputs/issue2359.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2359.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2359.p4.p4info.txtpb new file mode 100644 index 00000000000..4b0ff88b01a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2359.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txt deleted file mode 100644 index 981941c7e3f..00000000000 --- a/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txt +++ /dev/null @@ -1,53 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 49616433 - name: "ingress.sub_table" - alias: "sub_table" - } - match_fields { - id: 1 - name: "dummy_name" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - match_fields { - id: 1 - name: "dummy_name" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..7dd4621a878 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2362-bmv2.p4.p4info.txtpb @@ -0,0 +1,54 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 49616433 + name: "ingress.sub_table" + alias: "sub_table" + } + match_fields { + id: 1 + name: "dummy_name" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + match_fields { + id: 1 + name: "dummy_name" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.p4info.txt deleted file mode 100644 index 6426bddd418..00000000000 --- a/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4b0ff88b01a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2375-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txt deleted file mode 100644 index 9eba5c63218..00000000000 --- a/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txt +++ /dev/null @@ -1,38 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39789425 - name: "ingress.simple_table" - alias: "simple_table" - } - action_refs { - id: 21566949 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21566949 - name: "ingress.do_action" - alias: "do_action" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..c82b49a7071 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2375-bmv2.p4.p4info.txtpb @@ -0,0 +1,39 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39789425 + name: "ingress.simple_table" + alias: "simple_table" + } + action_refs { + id: 21566949 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21566949 + name: "ingress.do_action" + alias: "do_action" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2383-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2392-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue242.p4.entries.txt b/testdata/p4_16_samples_outputs/issue242.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue242.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue242.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue242.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue242.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue242.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue242.p4.p4info.txt deleted file mode 100644 index d112100ae22..00000000000 --- a/testdata/p4_16_samples_outputs/issue242.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 17055359 - name: "Eg.test" - alias: "test" - } -} -registers { - preamble { - id: 373885401 - name: "Eg.debug" - alias: "debug" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 100 -} -registers { - preamble { - id: 383254970 - name: "Eg.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue242.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue242.p4.p4info.txtpb new file mode 100644 index 00000000000..2e552c99dbe --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue242.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 17055359 + name: "Eg.test" + alias: "test" + } +} +registers { + preamble { + id: 373885401 + name: "Eg.debug" + alias: "debug" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 100 +} +registers { + preamble { + id: 383254970 + name: "Eg.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2465-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2488-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue249.p4.entries.txt b/testdata/p4_16_samples_outputs/issue249.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue249.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue249.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue249.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue249.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue249.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue249.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue249.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue249.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue249.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue249.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txt deleted file mode 100644 index 175fa81d421..00000000000 --- a/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txt +++ /dev/null @@ -1,28 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46850820 - name: "ingress.dummy_table" - alias: "dummy_table" - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..e1f5aece048 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2495-bmv2.p4.p4info.txtpb @@ -0,0 +1,29 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46850820 + name: "ingress.dummy_table" + alias: "dummy_table" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.p4info.txt deleted file mode 100644 index c61f5b70453..00000000000 --- a/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 23482726 - name: "ingress.slice_action" - alias: "slice_action" - } -} diff --git a/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ffe6306e67e --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2498-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 23482726 + name: "ingress.slice_action" + alias: "slice_action" + } +} diff --git a/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2614-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2657-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2664-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue270-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue270-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue270-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue270-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue270-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue270-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue270-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue270-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue270-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue270-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue270-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue270-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue272-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue272-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2726-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2735-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2735.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2735.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2735.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2735.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2735.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2735.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2735.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2735.p4.p4info.txt deleted file mode 100644 index c7afbcdce7e..00000000000 --- a/testdata/p4_16_samples_outputs/issue2735.p4.p4info.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info diff --git a/testdata/p4_16_samples_outputs/issue2735.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2735.p4.p4info.txtpb new file mode 100644 index 00000000000..707a7400ea3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2735.p4.p4info.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + diff --git a/testdata/p4_16_samples_outputs/issue281.p4.entries.txt b/testdata/p4_16_samples_outputs/issue281.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue281.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue281.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue281.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue281.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue281.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue281.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue281.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue281.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue281.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue281.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue2844-enum.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2844-enum.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2844-enum.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2844-enum.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2844-enum.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2844-enum.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2844-enum.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2844-enum.p4.p4info.txt deleted file mode 100644 index 036b875f1ee..00000000000 --- a/testdata/p4_16_samples_outputs/issue2844-enum.p4.p4info.txt +++ /dev/null @@ -1,18 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -counters { - preamble { - id: 314274935 - name: "cIngress.E.c1.stats" - alias: "stats" - } - spec { - unit: PACKETS - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2844-enum.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2844-enum.p4.p4info.txtpb new file mode 100644 index 00000000000..f57de250604 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2844-enum.p4.p4info.txtpb @@ -0,0 +1,19 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +counters { + preamble { + id: 314274935 + name: "cIngress.E.c1.stats" + alias: "stats" + } + spec { + unit: PACKETS + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue2890.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2890.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/issue2890.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2890.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/issue2890.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue2904.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2904.p4.entries.txt deleted file mode 100644 index fca47a6c530..00000000000 --- a/testdata/p4_16_samples_outputs/issue2904.p4.entries.txt +++ /dev/null @@ -1,73 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 46966664 - match { - field_id: 1 - ternary { - value: "\000" - mask: "\017" - } - } - action { - action { - action_id: 28988252 - params { - param_id: 1 - value: "\000" - } - } - } - priority: 3 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 46966664 - match { - field_id: 1 - ternary { - value: "\001" - mask: "\017" - } - } - action { - action { - action_id: 28988252 - params { - param_id: 1 - value: "\001" - } - } - } - priority: 2 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 46966664 - action { - action { - action_id: 28988252 - params { - param_id: 1 - value: "\001" - } - } - } - priority: 1 - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/issue2904.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2904.p4.entries.txtpb new file mode 100644 index 00000000000..99a91153115 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2904.p4.entries.txtpb @@ -0,0 +1,74 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 46966664 + match { + field_id: 1 + ternary { + value: "\000" + mask: "\017" + } + } + action { + action { + action_id: 28988252 + params { + param_id: 1 + value: "\000" + } + } + } + priority: 3 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 46966664 + match { + field_id: 1 + ternary { + value: "\001" + mask: "\017" + } + } + action { + action { + action_id: 28988252 + params { + param_id: 1 + value: "\001" + } + } + } + priority: 2 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 46966664 + action { + action { + action_id: 28988252 + params { + param_id: 1 + value: "\001" + } + } + } + priority: 1 + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txt deleted file mode 100644 index 00248fbf1c3..00000000000 --- a/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txt +++ /dev/null @@ -1,67 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46966664 - name: "ingress.X" - alias: "X" - } - match_fields { - id: 1 - name: "y" - bitwidth: 4 - match_type: TERNARY - } - action_refs { - id: 28988252 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28988252 - name: "ingress.A" - alias: "A" - } - params { - id: 1 - name: "t" - bitwidth: 5 - } -} -type_info { - serializable_enums { - key: "TableType" - value { - underlying_type { - bitwidth: 5 - } - members { - name: "TT_ACL" - value: "\000" - } - members { - name: "TT_FWD" - value: "\001" - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb new file mode 100644 index 00000000000..9b46cec4465 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2904.p4.p4info.txtpb @@ -0,0 +1,68 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46966664 + name: "ingress.X" + alias: "X" + } + match_fields { + id: 1 + name: "y" + bitwidth: 4 + match_type: TERNARY + } + action_refs { + id: 28988252 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28988252 + name: "ingress.A" + alias: "A" + } + params { + id: 1 + name: "t" + bitwidth: 5 + } +} +type_info { + serializable_enums { + key: "TableType" + value { + underlying_type { + bitwidth: 5 + } + members { + name: "TT_ACL" + value: "\000" + } + members { + name: "TT_FWD" + value: "\001" + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txt deleted file mode 100644 index 1834189fd8b..00000000000 --- a/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txt +++ /dev/null @@ -1,47 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 40116169 - name: "ingress.t_exact" - alias: "t_exact" - } - match_fields { - id: 1 - name: "h.h.e" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..a1660a74f90 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue2905-bmv2.p4.p4info.txtpb @@ -0,0 +1,48 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40116169 + name: "ingress.t_exact" + alias: "t_exact" + } + match_fields { + id: 1 + name: "h.h.e" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue297-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue297-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue297-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue297-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue297-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue297-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txt deleted file mode 100644 index a20ecbddc7c..00000000000 --- a/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txt +++ /dev/null @@ -1,73 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46872340 - name: "IngressI.indirect" - alias: "indirect" - } - action_refs { - id: 23455883 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - implementation_id: 289199568 - size: 1024 -} -tables { - preamble { - id: 38116258 - name: "IngressI.indirect_ws" - alias: "indirect_ws" - } - action_refs { - id: 23455883 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - implementation_id: 300324846 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 23455883 - name: "IngressI.drop" - alias: "drop" - } -} -action_profiles { - preamble { - id: 289199568 - name: "IngressI.ap" - alias: "ap" - } - table_ids: 46872340 - size: 128 -} -action_profiles { - preamble { - id: 300324846 - name: "ap_ws" - alias: "ap_ws" - } - table_ids: 38116258 - with_selector: true - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..daa752d32bc --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue297-bmv2.p4.p4info.txtpb @@ -0,0 +1,74 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46872340 + name: "IngressI.indirect" + alias: "indirect" + } + action_refs { + id: 23455883 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + implementation_id: 289199568 + size: 1024 +} +tables { + preamble { + id: 38116258 + name: "IngressI.indirect_ws" + alias: "indirect_ws" + } + action_refs { + id: 23455883 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + implementation_id: 300324846 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23455883 + name: "IngressI.drop" + alias: "drop" + } +} +action_profiles { + preamble { + id: 289199568 + name: "IngressI.ap" + alias: "ap" + } + table_ids: 46872340 + size: 128 +} +action_profiles { + preamble { + id: 300324846 + name: "ap_ws" + alias: "ap_ws" + } + table_ids: 38116258 + with_selector: true + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue298-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue298-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue298-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue298-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue298-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue298-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txt deleted file mode 100644 index c0483354149..00000000000 --- a/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txt +++ /dev/null @@ -1,75 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44788207 - name: "ingress.round_tbl" - alias: "round_tbl" - } - action_refs { - id: 28773984 - } - size: 8 -} -tables { - preamble { - id: 39880927 - name: "egress.drop_tbl" - alias: "drop_tbl" - } - match_fields { - id: 1 - name: "meta.ingress_metadata.set_drop" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 25850727 - } - action_refs { - id: 21257015 - } - size: 2 -} -actions { - preamble { - id: 28773984 - name: "ingress.read_round" - alias: "read_round" - } -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25850727 - name: "egress._drop" - alias: "_drop" - } -} -registers { - preamble { - id: 373634406 - name: "ingress.registerRound" - alias: "registerRound" - } - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - size: 65536 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..bd032289690 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue298-bmv2.p4.p4info.txtpb @@ -0,0 +1,76 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44788207 + name: "ingress.round_tbl" + alias: "round_tbl" + } + action_refs { + id: 28773984 + } + size: 8 +} +tables { + preamble { + id: 39880927 + name: "egress.drop_tbl" + alias: "drop_tbl" + } + match_fields { + id: 1 + name: "meta.ingress_metadata.set_drop" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 25850727 + } + action_refs { + id: 21257015 + } + size: 2 +} +actions { + preamble { + id: 28773984 + name: "ingress.read_round" + alias: "read_round" + } +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25850727 + name: "egress._drop" + alias: "_drop" + } +} +registers { + preamble { + id: 373634406 + name: "ingress.registerRound" + alias: "registerRound" + } + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + size: 65536 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue3001-1.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3001-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3001-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3001-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3001-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3001-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3001-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3001-1.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue3001-1.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue3001-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3001-1.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3001-1.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue3057-2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3057-2.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/issue3057-2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3057-2.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/issue3057-2.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue3091.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3091.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3091.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3091.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3091.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3091.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3091.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3091.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue3091.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue3091.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3091.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3091.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3118-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue3225.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3225.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3225.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3225.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3225.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3225.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3225.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3225.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue3225.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue3225.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3225.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3225.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue323.p4.entries.txt b/testdata/p4_16_samples_outputs/issue323.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue323.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue323.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue323.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue323.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue323.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue323.p4.p4info.txt deleted file mode 100644 index a904aa51057..00000000000 --- a/testdata/p4_16_samples_outputs/issue323.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 19804277 - name: "ingress.my_a" - alias: "my_a" - } -} diff --git a/testdata/p4_16_samples_outputs/issue323.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue323.p4.p4info.txtpb new file mode 100644 index 00000000000..d4002b3cec2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue323.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 19804277 + name: "ingress.my_a" + alias: "my_a" + } +} diff --git a/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.p4info.txt deleted file mode 100644 index 654e58aec3a..00000000000 --- a/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.p4info.txt +++ /dev/null @@ -1,20 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -controller_packet_metadata { - preamble { - id: 76689799 - name: "packet_out" - alias: "packet_out" - annotations: "@controller_header(\"packet_out\")" - } - metadata { - id: 1 - name: "b.b" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..29e5d860a3b --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3329-bmv2.p4.p4info.txtpb @@ -0,0 +1,21 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +controller_packet_metadata { + preamble { + id: 76689799 + name: "packet_out" + alias: "packet_out" + annotations: "@controller_header(\"packet_out\")" + } + metadata { + id: 1 + name: "b.b" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue3374.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3374.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3374.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3374.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3374.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3374.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txt deleted file mode 100644 index bbc8f67a761..00000000000 --- a/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txt +++ /dev/null @@ -1,57 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 40816781 - name: "ingressImpl.stub" - alias: "stub" - } - match_fields { - id: 1 - name: "hdrs.vlan_tag[meta.depth].vid" - bitwidth: 12 - match_type: EXACT - } - action_refs { - id: 18712486 - } - const_default_action_id: 18712486 - size: 1000000 -} -tables { - preamble { - id: 45677008 - name: "ingressImpl.stub1" - alias: "stub1" - } - match_fields { - id: 1 - name: "hdrs.ethernet.etherType" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 32723879 - } - const_default_action_id: 32723879 - size: 1000000 -} -actions { - preamble { - id: 18712486 - name: "ingressImpl.execute" - alias: "execute" - } -} -actions { - preamble { - id: 32723879 - name: "ingressImpl.execute_1" - alias: "execute_1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb new file mode 100644 index 00000000000..92b3135ef87 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3374.p4.p4info.txtpb @@ -0,0 +1,58 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40816781 + name: "ingressImpl.stub" + alias: "stub" + } + match_fields { + id: 1 + name: "hdrs.vlan_tag[meta.depth].vid" + bitwidth: 12 + match_type: EXACT + } + action_refs { + id: 18712486 + } + const_default_action_id: 18712486 + size: 1000000 +} +tables { + preamble { + id: 45677008 + name: "ingressImpl.stub1" + alias: "stub1" + } + match_fields { + id: 1 + name: "hdrs.ethernet.etherType" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 32723879 + } + const_default_action_id: 32723879 + size: 1000000 +} +actions { + preamble { + id: 18712486 + name: "ingressImpl.execute" + alias: "execute" + } +} +actions { + preamble { + id: 32723879 + name: "ingressImpl.execute_1" + alias: "execute_1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue3394.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3394.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3394.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3394.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3394.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3394.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3394.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3394.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue3394.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue3394.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3394.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3394.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txt deleted file mode 100644 index f0b769e9634..00000000000 --- a/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txt +++ /dev/null @@ -1,47 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -tables { - preamble { - id: 43471039 - name: "pipe.Check_src_ip" - alias: "Check_src_ip" - } - match_fields { - id: 1 - name: "headers.ipv4.srcAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 18876683 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 18876683 - name: "pipe.Reject" - alias: "Reject" - } - params { - id: 1 - name: "add" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..52820be944a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3483_ubpf.p4.p4info.txtpb @@ -0,0 +1,48 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +tables { + preamble { + id: 43471039 + name: "pipe.Check_src_ip" + alias: "Check_src_ip" + } + match_fields { + id: 1 + name: "headers.ipv4.srcAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 18876683 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 18876683 + name: "pipe.Reject" + alias: "Reject" + } + params { + id: 1 + name: "add" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txt deleted file mode 100644 index 6c422caf5f0..00000000000 --- a/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,146 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43864660 - name: "test_ingress.pre_tbl1" - alias: "pre_tbl1" - } - match_fields { - id: 1 - name: "hdr.ipv4.dst_addr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 20002082 - } - action_refs { - id: 22581617 - } - action_refs { - id: 23788437 - } - action_refs { - id: 18870058 - annotations: "@defaut_only" - } - const_default_action_id: 18870058 - size: 1024 -} -tables { - preamble { - id: 40359168 - name: "test_ingress.in_tbl2" - alias: "in_tbl2" - } - match_fields { - id: 1 - name: "hdr.ipv4.protocol" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 28661802 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -tables { - preamble { - id: 35182163 - name: "test_ingress.post_tbl3" - alias: "post_tbl3" - } - match_fields { - id: 1 - name: "hdr.ipv4.src_addr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 17737436 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 23338443 - name: "test_ingress.drop_action" - alias: "drop_action" - } -} -actions { - preamble { - id: 23788437 - name: "test_ingress.action3" - alias: "action3" - } -} -actions { - preamble { - id: 22581617 - name: "test_ingress.action2" - alias: "action2" - } -} -actions { - preamble { - id: 20002082 - name: "test_ingress.action1" - alias: "action1" - } -} -actions { - preamble { - id: 18870058 - name: "test_ingress.send_to_port" - alias: "send_to_port" - } - params { - id: 1 - name: "p" - bitwidth: 9 - } -} -actions { - preamble { - id: 28661802 - name: "test_ingress.action4" - alias: "action4" - } -} -actions { - preamble { - id: 17737436 - name: "test_ingress.action5" - alias: "action5" - } - params { - id: 1 - name: "neighbor_mac" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..f9f65d27610 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3488-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,147 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43864660 + name: "test_ingress.pre_tbl1" + alias: "pre_tbl1" + } + match_fields { + id: 1 + name: "hdr.ipv4.dst_addr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 20002082 + } + action_refs { + id: 22581617 + } + action_refs { + id: 23788437 + } + action_refs { + id: 18870058 + annotations: "@defaut_only" + } + const_default_action_id: 18870058 + size: 1024 +} +tables { + preamble { + id: 40359168 + name: "test_ingress.in_tbl2" + alias: "in_tbl2" + } + match_fields { + id: 1 + name: "hdr.ipv4.protocol" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 28661802 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 35182163 + name: "test_ingress.post_tbl3" + alias: "post_tbl3" + } + match_fields { + id: 1 + name: "hdr.ipv4.src_addr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 17737436 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23338443 + name: "test_ingress.drop_action" + alias: "drop_action" + } +} +actions { + preamble { + id: 23788437 + name: "test_ingress.action3" + alias: "action3" + } +} +actions { + preamble { + id: 22581617 + name: "test_ingress.action2" + alias: "action2" + } +} +actions { + preamble { + id: 20002082 + name: "test_ingress.action1" + alias: "action1" + } +} +actions { + preamble { + id: 18870058 + name: "test_ingress.send_to_port" + alias: "send_to_port" + } + params { + id: 1 + name: "p" + bitwidth: 9 + } +} +actions { + preamble { + id: 28661802 + name: "test_ingress.action4" + alias: "action4" + } +} +actions { + preamble { + id: 17737436 + name: "test_ingress.action5" + alias: "action5" + } + params { + id: 1 + name: "neighbor_mac" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txt deleted file mode 100644 index b6af3a2c54a..00000000000 --- a/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txt +++ /dev/null @@ -1,134 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43864660 - name: "test_ingress.pre_tbl1" - alias: "pre_tbl1" - } - match_fields { - id: 1 - name: "hdr.ipv4.dst_addr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 20002082 - } - action_refs { - id: 22581617 - } - action_refs { - id: 23788437 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -tables { - preamble { - id: 40359168 - name: "test_ingress.in_tbl2" - alias: "in_tbl2" - } - match_fields { - id: 1 - name: "hdr.ipv4.protocol" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 28661802 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -tables { - preamble { - id: 35182163 - name: "test_ingress.post_tbl3" - alias: "post_tbl3" - } - match_fields { - id: 1 - name: "hdr.ipv4.src_addr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 17737436 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 23338443 - name: "test_ingress.drop_action" - alias: "drop_action" - } -} -actions { - preamble { - id: 23788437 - name: "test_ingress.action3" - alias: "action3" - } -} -actions { - preamble { - id: 22581617 - name: "test_ingress.action2" - alias: "action2" - } -} -actions { - preamble { - id: 20002082 - name: "test_ingress.action1" - alias: "action1" - } -} -actions { - preamble { - id: 28661802 - name: "test_ingress.action4" - alias: "action4" - } -} -actions { - preamble { - id: 17737436 - name: "test_ingress.action5" - alias: "action5" - } - params { - id: 1 - name: "neighbor_mac" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..864b97a3c87 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3488-bmv2.p4.p4info.txtpb @@ -0,0 +1,135 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43864660 + name: "test_ingress.pre_tbl1" + alias: "pre_tbl1" + } + match_fields { + id: 1 + name: "hdr.ipv4.dst_addr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 20002082 + } + action_refs { + id: 22581617 + } + action_refs { + id: 23788437 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 40359168 + name: "test_ingress.in_tbl2" + alias: "in_tbl2" + } + match_fields { + id: 1 + name: "hdr.ipv4.protocol" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 28661802 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 35182163 + name: "test_ingress.post_tbl3" + alias: "post_tbl3" + } + match_fields { + id: 1 + name: "hdr.ipv4.src_addr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 17737436 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23338443 + name: "test_ingress.drop_action" + alias: "drop_action" + } +} +actions { + preamble { + id: 23788437 + name: "test_ingress.action3" + alias: "action3" + } +} +actions { + preamble { + id: 22581617 + name: "test_ingress.action2" + alias: "action2" + } +} +actions { + preamble { + id: 20002082 + name: "test_ingress.action1" + alias: "action1" + } +} +actions { + preamble { + id: 28661802 + name: "test_ingress.action4" + alias: "action4" + } +} +actions { + preamble { + id: 17737436 + name: "test_ingress.action5" + alias: "action5" + } + params { + id: 1 + name: "neighbor_mac" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue3531.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3531.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3531.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3531.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3531.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3531.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3531.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3531.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue3531.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue3531.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3531.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3531.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue355-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue355-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue355-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue355-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue355-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue355-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue355-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue355-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue355-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue355-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue355-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue355-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue3550.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3550.p4.entries.txt deleted file mode 100644 index 689c7a593ec..00000000000 --- a/testdata/p4_16_samples_outputs/issue3550.p4.entries.txt +++ /dev/null @@ -1,320 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 44506256 - match { - field_id: 1 - exact { - value: "\001" - } - } - match { - field_id: 2 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 3 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 4 - exact { - value: "\001" - } - } - match { - field_id: 5 - ternary { - value: "\000\000\000\000\000\002" - mask: "\000\000\000\000\000\003" - } - } - match { - field_id: 6 - range { - low: "\000\000\000\000\000\002" - high: "\000\000\000\000\000\004" - } - } - match { - field_id: 7 - optional { - value: "\000\000\000\000\000\n" - } - } - action { - action { - action_id: 29480552 - params { - param_id: 1 - value: "\000\000\000\000\000\001" - } - } - } - priority: 3 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44506256 - match { - field_id: 1 - exact { - value: "\001" - } - } - match { - field_id: 2 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 3 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 4 - exact { - value: "\001" - } - } - match { - field_id: 5 - ternary { - value: "\000\000\000\000\000\002" - mask: "\000\000\000\000\000\003" - } - } - match { - field_id: 6 - range { - low: "\000\000\000\000\000\002" - high: "\000\000\000\000\000\005" - } - } - match { - field_id: 7 - optional { - value: "\000\000\000\000\000\n" - } - } - action { - action { - action_id: 29480552 - params { - param_id: 1 - value: "\000\000\000\000\000\001" - } - } - } - priority: 2 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44506256 - match { - field_id: 1 - exact { - value: "\001" - } - } - match { - field_id: 2 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 3 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 4 - exact { - value: "\001" - } - } - match { - field_id: 5 - ternary { - value: "\000\000\000\000\000\002" - mask: "\000\000\000\000\000\003" - } - } - match { - field_id: 6 - range { - low: "\000\000\000\000\000\002" - high: "\000\000\000\000\000\006" - } - } - match { - field_id: 7 - optional { - value: "\000\000\000\000\000\n" - } - } - action { - action { - action_id: 29480552 - params { - param_id: 1 - value: "\000\000\000\000\000\001" - } - } - } - priority: 1 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 33873526 - match { - field_id: 1 - exact { - value: "\001" - } - } - match { - field_id: 2 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 3 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 4 - lpm { - value: "\000\000\000\000\000\n" - prefix_len: 48 - } - } - action { - action { - action_id: 29480552 - params { - param_id: 1 - value: "\000\000\000\000\000\001" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 33873526 - match { - field_id: 1 - exact { - value: "\001" - } - } - match { - field_id: 2 - exact { - value: "\000\000\000\000\000\001" - } - } - match { - field_id: 3 - exact { - value: "\000\000\000\000\000\002" - } - } - match { - field_id: 4 - lpm { - value: "\000\000\000\000\000\013" - prefix_len: 48 - } - } - action { - action { - action_id: 29480552 - params { - param_id: 1 - value: "\000\000\000\000\000\001" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 33873526 - match { - field_id: 1 - exact { - value: "\001" - } - } - match { - field_id: 2 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 3 - exact { - value: "\000\000\000\000\000\003" - } - } - match { - field_id: 4 - lpm { - value: "\000\000\000\000\000\014" - prefix_len: 48 - } - } - action { - action { - action_id: 29480552 - params { - param_id: 1 - value: "\000\000\000\000\000\001" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/issue3550.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3550.p4.entries.txtpb new file mode 100644 index 00000000000..df2fc6d98db --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3550.p4.entries.txtpb @@ -0,0 +1,321 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 44506256 + match { + field_id: 1 + exact { + value: "\001" + } + } + match { + field_id: 2 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 3 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 4 + exact { + value: "\001" + } + } + match { + field_id: 5 + ternary { + value: "\000\000\000\000\000\002" + mask: "\000\000\000\000\000\003" + } + } + match { + field_id: 6 + range { + low: "\000\000\000\000\000\002" + high: "\000\000\000\000\000\004" + } + } + match { + field_id: 7 + optional { + value: "\000\000\000\000\000\n" + } + } + action { + action { + action_id: 29480552 + params { + param_id: 1 + value: "\000\000\000\000\000\001" + } + } + } + priority: 3 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44506256 + match { + field_id: 1 + exact { + value: "\001" + } + } + match { + field_id: 2 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 3 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 4 + exact { + value: "\001" + } + } + match { + field_id: 5 + ternary { + value: "\000\000\000\000\000\002" + mask: "\000\000\000\000\000\003" + } + } + match { + field_id: 6 + range { + low: "\000\000\000\000\000\002" + high: "\000\000\000\000\000\005" + } + } + match { + field_id: 7 + optional { + value: "\000\000\000\000\000\n" + } + } + action { + action { + action_id: 29480552 + params { + param_id: 1 + value: "\000\000\000\000\000\001" + } + } + } + priority: 2 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44506256 + match { + field_id: 1 + exact { + value: "\001" + } + } + match { + field_id: 2 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 3 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 4 + exact { + value: "\001" + } + } + match { + field_id: 5 + ternary { + value: "\000\000\000\000\000\002" + mask: "\000\000\000\000\000\003" + } + } + match { + field_id: 6 + range { + low: "\000\000\000\000\000\002" + high: "\000\000\000\000\000\006" + } + } + match { + field_id: 7 + optional { + value: "\000\000\000\000\000\n" + } + } + action { + action { + action_id: 29480552 + params { + param_id: 1 + value: "\000\000\000\000\000\001" + } + } + } + priority: 1 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 33873526 + match { + field_id: 1 + exact { + value: "\001" + } + } + match { + field_id: 2 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 3 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 4 + lpm { + value: "\000\000\000\000\000\n" + prefix_len: 48 + } + } + action { + action { + action_id: 29480552 + params { + param_id: 1 + value: "\000\000\000\000\000\001" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 33873526 + match { + field_id: 1 + exact { + value: "\001" + } + } + match { + field_id: 2 + exact { + value: "\000\000\000\000\000\001" + } + } + match { + field_id: 3 + exact { + value: "\000\000\000\000\000\002" + } + } + match { + field_id: 4 + lpm { + value: "\000\000\000\000\000\013" + prefix_len: 48 + } + } + action { + action { + action_id: 29480552 + params { + param_id: 1 + value: "\000\000\000\000\000\001" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 33873526 + match { + field_id: 1 + exact { + value: "\001" + } + } + match { + field_id: 2 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 3 + exact { + value: "\000\000\000\000\000\003" + } + } + match { + field_id: 4 + lpm { + value: "\000\000\000\000\000\014" + prefix_len: 48 + } + } + action { + action { + action_id: 29480552 + params { + param_id: 1 + value: "\000\000\000\000\000\001" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txt deleted file mode 100644 index 82342c5907b..00000000000 --- a/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txt +++ /dev/null @@ -1,125 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 4 - name: "hdr.ipv4.protocol" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 5 - name: "user_meta.key1" - bitwidth: 48 - match_type: TERNARY - } - match_fields { - id: 6 - name: "user_meta.key2" - bitwidth: 48 - match_type: RANGE - } - match_fields { - id: 7 - name: "user_meta.key4" - bitwidth: 48 - match_type: OPTIONAL - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -tables { - preamble { - id: 33873526 - name: "ingress.tbl1" - alias: "tbl1" - } - match_fields { - id: 1 - name: "hdr.ethernet.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 4 - name: "user_meta.key3" - bitwidth: 48 - match_type: LPM - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "x" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb new file mode 100644 index 00000000000..b3cf3e31341 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3550.p4.p4info.txtpb @@ -0,0 +1,126 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 4 + name: "hdr.ipv4.protocol" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 5 + name: "user_meta.key1" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 6 + name: "user_meta.key2" + bitwidth: 48 + match_type: RANGE + } + match_fields { + id: 7 + name: "user_meta.key4" + bitwidth: 48 + match_type: OPTIONAL + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +tables { + preamble { + id: 33873526 + name: "ingress.tbl1" + alias: "tbl1" + } + match_fields { + id: 1 + name: "hdr.ethernet.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 4 + name: "user_meta.key3" + bitwidth: 48 + match_type: LPM + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "x" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue356-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue356-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue356-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue356-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue356-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue356-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue356-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue356-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue356-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue356-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue356-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue356-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue361-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue361-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue361-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue361-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue361-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue361-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue361-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue361-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue361-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue361-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue361-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue361-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue364-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue364-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue364-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue364-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue364-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue364-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txt deleted file mode 100644 index 6ba595753f4..00000000000 --- a/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txt +++ /dev/null @@ -1,43 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 32530319 - } - const_default_action_id: 32530319 - direct_resource_ids: 330698586 - size: 1024 -} -actions { - preamble { - id: 32530319 - name: "ingress.my_action" - alias: "my_action" - } - params { - id: 1 - name: "a" - bitwidth: 9 - } -} -direct_counters { - preamble { - id: 330698586 - name: "ingress.c" - alias: "c" - } - spec { - unit: PACKETS - } - direct_table_id: 34728461 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..5b7beb2db3b --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue364-bmv2.p4.p4info.txtpb @@ -0,0 +1,44 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 32530319 + } + const_default_action_id: 32530319 + direct_resource_ids: 330698586 + size: 1024 +} +actions { + preamble { + id: 32530319 + name: "ingress.my_action" + alias: "my_action" + } + params { + id: 1 + name: "a" + bitwidth: 9 + } +} +direct_counters { + preamble { + id: 330698586 + name: "ingress.c" + alias: "c" + } + spec { + unit: PACKETS + } + direct_table_id: 34728461 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue3650.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3650.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3650.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3650.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3650.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3650.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3650.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3650.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue3650.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue3650.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3650.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3650.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue3702-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue383-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue383-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue383-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue383-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue383-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue383-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txt deleted file mode 100644 index c067be66aa1..00000000000 --- a/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txt +++ /dev/null @@ -1,50 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46138463 - name: "ingress.tns" - alias: "tns" - } - match_fields { - id: 1 - name: "h.bvh1.row.alt1.valid" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "local_metadata.col.bvh.row.alt0.valid" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 22708368 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 22708368 - name: "ingress.do_act" - alias: "do_act" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..f77a28f00ad --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue383-bmv2.p4.p4info.txtpb @@ -0,0 +1,51 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46138463 + name: "ingress.tns" + alias: "tns" + } + match_fields { + id: 1 + name: "h.bvh1.row.alt1.valid" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "local_metadata.col.bvh.row.alt0.valid" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 22708368 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 22708368 + name: "ingress.do_act" + alias: "do_act" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue4057.p4.entries.txt b/testdata/p4_16_samples_outputs/issue4057.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue4057.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue4057.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue4057.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue4057.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue4057.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue4057.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue4057.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue4057.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue4057.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue4057.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue407-2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue407-2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue407-2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue407-2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue407-2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue407-2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue407-2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue407-2.p4.p4info.txt deleted file mode 100644 index c7afbcdce7e..00000000000 --- a/testdata/p4_16_samples_outputs/issue407-2.p4.p4info.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info diff --git a/testdata/p4_16_samples_outputs/issue407-2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue407-2.p4.p4info.txtpb new file mode 100644 index 00000000000..707a7400ea3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue407-2.p4.p4info.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + diff --git a/testdata/p4_16_samples_outputs/issue407-3.p4.entries.txt b/testdata/p4_16_samples_outputs/issue407-3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue407-3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue407-3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue407-3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue407-3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue407-3.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue407-3.p4.p4info.txt deleted file mode 100644 index c7afbcdce7e..00000000000 --- a/testdata/p4_16_samples_outputs/issue407-3.p4.p4info.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info diff --git a/testdata/p4_16_samples_outputs/issue407-3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue407-3.p4.p4info.txtpb new file mode 100644 index 00000000000..707a7400ea3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue407-3.p4.p4info.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + diff --git a/testdata/p4_16_samples_outputs/issue414-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue414-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue414-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue414-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue414-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue414-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txt deleted file mode 100644 index 9ddf356a9ad..00000000000 --- a/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txt +++ /dev/null @@ -1,31 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48165785 - name: "cIngress.guh" - alias: "guh" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 25131402 - } - size: 1024 -} -actions { - preamble { - id: 25131402 - name: "cIngress.foo" - alias: "foo" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ae22de48280 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue414-bmv2.p4.p4info.txtpb @@ -0,0 +1,32 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48165785 + name: "cIngress.guh" + alias: "guh" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 25131402 + } + size: 1024 +} +actions { + preamble { + id: 25131402 + name: "cIngress.foo" + alias: "foo" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue420.p4.entries.txt b/testdata/p4_16_samples_outputs/issue420.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue420.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue420.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue420.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue420.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue420.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue420.p4.p4info.txt deleted file mode 100644 index 27b2de266d2..00000000000 --- a/testdata/p4_16_samples_outputs/issue420.p4.p4info.txt +++ /dev/null @@ -1,41 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46298898 - name: "cIngress.tbl1" - alias: "tbl1" - } - action_refs { - id: 25131402 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25131402 - name: "cIngress.foo" - alias: "foo" - } - params { - id: 1 - name: "bar" - bitwidth: 16 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb new file mode 100644 index 00000000000..4fd7500740f --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue420.p4.p4info.txtpb @@ -0,0 +1,42 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46298898 + name: "cIngress.tbl1" + alias: "tbl1" + } + action_refs { + id: 25131402 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25131402 + name: "cIngress.foo" + alias: "foo" + } + params { + id: 1 + name: "bar" + bitwidth: 16 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue422.p4.entries.txt b/testdata/p4_16_samples_outputs/issue422.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue422.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue422.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue422.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue422.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue422.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue422.p4.p4info.txt deleted file mode 100644 index 2fc71736edb..00000000000 --- a/testdata/p4_16_samples_outputs/issue422.p4.p4info.txt +++ /dev/null @@ -1,36 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46298898 - name: "cIngress.tbl1" - alias: "tbl1" - } - action_refs { - id: 25131402 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25131402 - name: "cIngress.foo" - alias: "foo" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb new file mode 100644 index 00000000000..cbfa0ac99fa --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue422.p4.p4info.txtpb @@ -0,0 +1,37 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46298898 + name: "cIngress.tbl1" + alias: "tbl1" + } + action_refs { + id: 25131402 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25131402 + name: "cIngress.foo" + alias: "foo" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.p4info.txt deleted file mode 100644 index 322fe4049b3..00000000000 --- a/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,25 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -digests { - preamble { - id: 401776493 - name: "digest_0" - alias: "digest_0" - } - type_spec { - tuple { - members { - bitstring { - bit { - bitwidth: 48 - } - } - } - } - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..59e0de85405 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue430-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,26 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +digests { + preamble { + id: 401776493 + name: "digest_0" + alias: "digest_0" + } + type_spec { + tuple { + members { + bitstring { + bit { + bitwidth: 48 + } + } + } + } + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue430-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue430-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue430-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue430-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue430-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue430-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue430-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue430-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue430-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue430-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue430-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue430-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-3-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-4-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-5-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue447-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue447-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue447-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue447-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue447-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue447-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue447-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue447-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue447-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue447-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue461-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue461-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue461-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue461-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue461-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue461-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txt deleted file mode 100644 index 2967dae4674..00000000000 --- a/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txt +++ /dev/null @@ -1,139 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 35996228 - name: "ingress.ipv4_da_lpm" - alias: "ipv4_da_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 26563711 - } - action_refs { - id: 20279829 - } - direct_resource_ids: 323801931 - size: 1024 -} -tables { - preamble { - id: 43424410 - name: "ingress.mac_da" - alias: "mac_da" - } - match_fields { - id: 1 - name: "meta.fwd_metadata.l2ptr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 28039253 - } - action_refs { - id: 32609675 - } - size: 1024 -} -tables { - preamble { - id: 49367184 - name: "egress.send_frame" - alias: "send_frame" - } - match_fields { - id: 1 - name: "meta.fwd_metadata.out_bd" - bitwidth: 24 - match_type: EXACT - } - action_refs { - id: 23531945 - } - action_refs { - id: 32609675 - } - size: 1024 -} -actions { - preamble { - id: 32609675 - name: "my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 26563711 - name: "ingress.set_l2ptr" - alias: "set_l2ptr" - } - params { - id: 1 - name: "l2ptr" - bitwidth: 32 - } -} -actions { - preamble { - id: 20279829 - name: "ingress.drop_with_count" - alias: "drop_with_count" - } -} -actions { - preamble { - id: 28039253 - name: "ingress.set_bd_dmac_intf" - alias: "set_bd_dmac_intf" - } - params { - id: 1 - name: "bd" - bitwidth: 24 - } - params { - id: 2 - name: "dmac" - bitwidth: 48 - } - params { - id: 3 - name: "intf" - bitwidth: 9 - } -} -actions { - preamble { - id: 23531945 - name: "egress.rewrite_mac" - alias: "rewrite_mac" - } - params { - id: 1 - name: "smac" - bitwidth: 48 - } -} -direct_counters { - preamble { - id: 323801931 - name: "ingress.ipv4_da_lpm_stats" - alias: "ipv4_da_lpm_stats" - } - spec { - unit: PACKETS - } - direct_table_id: 35996228 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..83ac102dd90 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue461-bmv2.p4.p4info.txtpb @@ -0,0 +1,140 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 35996228 + name: "ingress.ipv4_da_lpm" + alias: "ipv4_da_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 26563711 + } + action_refs { + id: 20279829 + } + direct_resource_ids: 323801931 + size: 1024 +} +tables { + preamble { + id: 43424410 + name: "ingress.mac_da" + alias: "mac_da" + } + match_fields { + id: 1 + name: "meta.fwd_metadata.l2ptr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 28039253 + } + action_refs { + id: 32609675 + } + size: 1024 +} +tables { + preamble { + id: 49367184 + name: "egress.send_frame" + alias: "send_frame" + } + match_fields { + id: 1 + name: "meta.fwd_metadata.out_bd" + bitwidth: 24 + match_type: EXACT + } + action_refs { + id: 23531945 + } + action_refs { + id: 32609675 + } + size: 1024 +} +actions { + preamble { + id: 32609675 + name: "my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 26563711 + name: "ingress.set_l2ptr" + alias: "set_l2ptr" + } + params { + id: 1 + name: "l2ptr" + bitwidth: 32 + } +} +actions { + preamble { + id: 20279829 + name: "ingress.drop_with_count" + alias: "drop_with_count" + } +} +actions { + preamble { + id: 28039253 + name: "ingress.set_bd_dmac_intf" + alias: "set_bd_dmac_intf" + } + params { + id: 1 + name: "bd" + bitwidth: 24 + } + params { + id: 2 + name: "dmac" + bitwidth: 48 + } + params { + id: 3 + name: "intf" + bitwidth: 9 + } +} +actions { + preamble { + id: 23531945 + name: "egress.rewrite_mac" + alias: "rewrite_mac" + } + params { + id: 1 + name: "smac" + bitwidth: 48 + } +} +direct_counters { + preamble { + id: 323801931 + name: "ingress.ipv4_da_lpm_stats" + alias: "ipv4_da_lpm_stats" + } + spec { + unit: PACKETS + } + direct_table_id: 35996228 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue486-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue486-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue486-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue486-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue486-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue486-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txt deleted file mode 100644 index ed29fe08568..00000000000 --- a/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txt +++ /dev/null @@ -1,49 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 42311841 - name: "cIngress.t" - alias: "t" - } - match_fields { - id: 1 - name: "hdr.x.add1" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 2 - name: "m.x.add2" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 3 - name: "m.z" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 4 - name: "z" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 25131402 - } - size: 1024 -} -actions { - preamble { - id: 25131402 - name: "cIngress.foo" - alias: "foo" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..50f6a8d4acf --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue486-bmv2.p4.p4info.txtpb @@ -0,0 +1,50 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 42311841 + name: "cIngress.t" + alias: "t" + } + match_fields { + id: 1 + name: "hdr.x.add1" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 2 + name: "m.x.add2" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 3 + name: "m.z" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 4 + name: "z" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 25131402 + } + size: 1024 +} +actions { + preamble { + id: 25131402 + name: "cIngress.foo" + alias: "foo" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue496.p4.entries.txt b/testdata/p4_16_samples_outputs/issue496.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue496.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue496.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue496.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue496.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue496.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue496.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue496.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue496.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue496.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue496.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue510-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue510-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue510-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue510-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue510-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue510-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue510-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue510-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue510-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue510-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue510-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue510-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue512.p4.entries.txt b/testdata/p4_16_samples_outputs/issue512.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue512.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue512.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue512.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue512.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue512.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue512.p4.p4info.txt deleted file mode 100644 index 9ddf356a9ad..00000000000 --- a/testdata/p4_16_samples_outputs/issue512.p4.p4info.txt +++ /dev/null @@ -1,31 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48165785 - name: "cIngress.guh" - alias: "guh" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 25131402 - } - size: 1024 -} -actions { - preamble { - id: 25131402 - name: "cIngress.foo" - alias: "foo" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb new file mode 100644 index 00000000000..ae22de48280 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue512.p4.p4info.txtpb @@ -0,0 +1,32 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48165785 + name: "cIngress.guh" + alias: "guh" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 25131402 + } + size: 1024 +} +actions { + preamble { + id: 25131402 + name: "cIngress.foo" + alias: "foo" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txt deleted file mode 100644 index 093d1ed75bf..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,45 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 47159577 - name: "ingress.debug_hdr" - alias: "debug_hdr" - } - match_fields { - id: 1 - name: "hdr.base.t" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.u.short.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.u.byte.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..8c8387495fb --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,46 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 47159577 + name: "ingress.debug_hdr" + alias: "debug_hdr" + } + match_fields { + id: 1 + name: "hdr.base.t" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.u.short.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.u.byte.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txt deleted file mode 100644 index 093d1ed75bf..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,45 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 47159577 - name: "ingress.debug_hdr" - alias: "debug_hdr" - } - match_fields { - id: 1 - name: "hdr.base.t" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.u.short.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.u.byte.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..8c8387495fb --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,46 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 47159577 + name: "ingress.debug_hdr" + alias: "debug_hdr" + } + match_fields { + id: 1 + name: "hdr.base.t" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.u.short.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.u.byte.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txt deleted file mode 100644 index 093d1ed75bf..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,45 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 47159577 - name: "ingress.debug_hdr" - alias: "debug_hdr" - } - match_fields { - id: 1 - name: "hdr.base.t" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.u.short.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.u.byte.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..8c8387495fb --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-3-bmv2.p4.p4info.txtpb @@ -0,0 +1,46 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 47159577 + name: "ingress.debug_hdr" + alias: "debug_hdr" + } + match_fields { + id: 1 + name: "hdr.base.t" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.u.short.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.u.byte.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txt deleted file mode 100644 index 8d40717497e..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,57 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 47159577 - name: "ingress.debug_hdr" - alias: "debug_hdr" - } - match_fields { - id: 1 - name: "hdr.base.t" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.u[0].byte.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.u[0].short.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 4 - name: "hdr.u[1].byte.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 5 - name: "hdr.u[1].short.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..a71d778d8b8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-4-bmv2.p4.p4info.txtpb @@ -0,0 +1,58 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 47159577 + name: "ingress.debug_hdr" + alias: "debug_hdr" + } + match_fields { + id: 1 + name: "hdr.base.t" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.u[0].byte.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.u[0].short.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 4 + name: "hdr.u[1].byte.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 5 + name: "hdr.u[1].short.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txt deleted file mode 100644 index 4e3099b09f0..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txt +++ /dev/null @@ -1,45 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 47159577 - name: "ingress.debug_hdr" - alias: "debug_hdr" - } - match_fields { - id: 1 - name: "hdr.base.t" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.u[0].short.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.u[0].byte.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..1a88daa3980 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-5-bmv2.p4.p4info.txtpb @@ -0,0 +1,46 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 47159577 + name: "ingress.debug_hdr" + alias: "debug_hdr" + } + match_fields { + id: 1 + name: "hdr.base.t" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.u[0].short.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.u[0].byte.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txt deleted file mode 100644 index 8d40717497e..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txt +++ /dev/null @@ -1,57 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 47159577 - name: "ingress.debug_hdr" - alias: "debug_hdr" - } - match_fields { - id: 1 - name: "hdr.base.t" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.u[0].byte.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.u[0].short.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 4 - name: "hdr.u[1].byte.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 5 - name: "hdr.u[1].short.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..a71d778d8b8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-6-bmv2.p4.p4info.txtpb @@ -0,0 +1,58 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 47159577 + name: "ingress.debug_hdr" + alias: "debug_hdr" + } + match_fields { + id: 1 + name: "hdr.base.t" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.u[0].byte.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.u[0].short.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 4 + name: "hdr.u[1].byte.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 5 + name: "hdr.u[1].short.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txt deleted file mode 100644 index 4e3099b09f0..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txt +++ /dev/null @@ -1,45 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 47159577 - name: "ingress.debug_hdr" - alias: "debug_hdr" - } - match_fields { - id: 1 - name: "hdr.base.t" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.u[0].short.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.u[0].byte.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..1a88daa3980 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-7-bmv2.p4.p4info.txtpb @@ -0,0 +1,46 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 47159577 + name: "ingress.debug_hdr" + alias: "debug_hdr" + } + match_fields { + id: 1 + name: "hdr.base.t" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.u[0].short.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.u[0].byte.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue561-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue561-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue561-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue561-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txt deleted file mode 100644 index 015e7b8362a..00000000000 --- a/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txt +++ /dev/null @@ -1,120 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 35996228 - name: "ingress.ipv4_da_lpm" - alias: "ipv4_da_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 26563711 - } - action_refs { - id: 32609675 - } - size: 1024 -} -tables { - preamble { - id: 43424410 - name: "ingress.mac_da" - alias: "mac_da" - } - match_fields { - id: 1 - name: "meta.fwd_metadata.l2ptr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 28039253 - } - action_refs { - id: 32609675 - } - size: 1024 -} -tables { - preamble { - id: 49367184 - name: "egress.send_frame" - alias: "send_frame" - } - match_fields { - id: 1 - name: "meta.fwd_metadata.out_bd" - bitwidth: 24 - match_type: EXACT - } - action_refs { - id: 23531945 - } - action_refs { - id: 32609675 - } - size: 1024 -} -actions { - preamble { - id: 32609675 - name: "my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 26563711 - name: "ingress.set_l2ptr" - alias: "set_l2ptr" - } - params { - id: 1 - name: "l2ptr" - bitwidth: 32 - } -} -actions { - preamble { - id: 28039253 - name: "ingress.set_bd_dmac_intf" - alias: "set_bd_dmac_intf" - } - params { - id: 1 - name: "bd" - bitwidth: 24 - } - params { - id: 2 - name: "dmac" - bitwidth: 48 - } - params { - id: 3 - name: "intf" - bitwidth: 9 - } -} -actions { - preamble { - id: 23531945 - name: "egress.rewrite_mac" - alias: "rewrite_mac" - } - params { - id: 1 - name: "smac" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..310a9d0dec0 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue561-bmv2.p4.p4info.txtpb @@ -0,0 +1,121 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 35996228 + name: "ingress.ipv4_da_lpm" + alias: "ipv4_da_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 26563711 + } + action_refs { + id: 32609675 + } + size: 1024 +} +tables { + preamble { + id: 43424410 + name: "ingress.mac_da" + alias: "mac_da" + } + match_fields { + id: 1 + name: "meta.fwd_metadata.l2ptr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 28039253 + } + action_refs { + id: 32609675 + } + size: 1024 +} +tables { + preamble { + id: 49367184 + name: "egress.send_frame" + alias: "send_frame" + } + match_fields { + id: 1 + name: "meta.fwd_metadata.out_bd" + bitwidth: 24 + match_type: EXACT + } + action_refs { + id: 23531945 + } + action_refs { + id: 32609675 + } + size: 1024 +} +actions { + preamble { + id: 32609675 + name: "my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 26563711 + name: "ingress.set_l2ptr" + alias: "set_l2ptr" + } + params { + id: 1 + name: "l2ptr" + bitwidth: 32 + } +} +actions { + preamble { + id: 28039253 + name: "ingress.set_bd_dmac_intf" + alias: "set_bd_dmac_intf" + } + params { + id: 1 + name: "bd" + bitwidth: 24 + } + params { + id: 2 + name: "dmac" + bitwidth: 48 + } + params { + id: 3 + name: "intf" + bitwidth: 9 + } +} +actions { + preamble { + id: 23531945 + name: "egress.rewrite_mac" + alias: "rewrite_mac" + } + params { + id: 1 + name: "smac" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue562-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue562-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue562-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue562-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue562-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue562-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue562-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue562-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue562-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue562-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue562-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue562-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue584-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue635-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue635-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue635-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue635-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue635-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue635-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue635-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue635-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue635-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue635-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue635-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue635-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue655-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue655-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue655-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue655-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue655-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue655-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue655-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue655-bmv2.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue655-bmv2.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue655-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue655-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue655-bmv2.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue655.p4.entries.txt b/testdata/p4_16_samples_outputs/issue655.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue655.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue655.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue655.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue655.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue655.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue655.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue655.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue655.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue655.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue655.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue677-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue677-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue677-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue677-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue677-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue677-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue677-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue677-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue677-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue677-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue677-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue677-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue692-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue692-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue692-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue692-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue692-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue692-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue692-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue692-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue692-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue692-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue692-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue692-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue696-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue696-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue696-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue696-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue696-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue696-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue696-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue696-bmv2.p4.p4info.txt deleted file mode 100644 index ca0f2e45474..00000000000 --- a/testdata/p4_16_samples_outputs/issue696-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 17055359 - name: "Eg.test" - alias: "test" - } -} -registers { - preamble { - id: 383637836 - name: "debug" - alias: "debug" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 100 -} -registers { - preamble { - id: 380140730 - name: "reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue696-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue696-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..51f2741b889 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue696-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 17055359 + name: "Eg.test" + alias: "test" + } +} +registers { + preamble { + id: 383637836 + name: "debug" + alias: "debug" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 100 +} +registers { + preamble { + id: 380140730 + name: "reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue737-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue737-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue737-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue737-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue737-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue737-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue737-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue737-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue737-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue737-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue737-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue737-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue774-4-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue841.p4.entries.txt b/testdata/p4_16_samples_outputs/issue841.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue841.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue841.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue841.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue841.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue841.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue841.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/issue841.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue841.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue841.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue841.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue887.p4.entries.txt b/testdata/p4_16_samples_outputs/issue887.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue887.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue887.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue887.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue887.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue887.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue887.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue887.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue887.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue887.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue887.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue891-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue891-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue891-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue891-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue891-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue891-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue891-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue891-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue891-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue891-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue891-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue891-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue907-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue907-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue907-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue907-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue907-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue907-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue907-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue907-bmv2.p4.p4info.txt deleted file mode 100644 index 37f314d84a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue907-bmv2.p4.p4info.txt +++ /dev/null @@ -1,35 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -registers { - preamble { - id: 372201615 - name: "Ing.r" - alias: "r" - } - type_spec { - struct { - name: "S" - } - } - size: 100 -} -type_info { - structs { - key: "S" - value { - members { - name: "f" - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/issue907-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue907-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..de36d670b09 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue907-bmv2.p4.p4info.txtpb @@ -0,0 +1,36 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +registers { + preamble { + id: 372201615 + name: "Ing.r" + alias: "r" + } + type_spec { + struct { + name: "S" + } + } + size: 100 +} +type_info { + structs { + key: "S" + value { + members { + name: "f" + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/issue914-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue914-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue914-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue914-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue914-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue914-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue914-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue914-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue914-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue914-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue914-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue914-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue949.p4.entries.txt b/testdata/p4_16_samples_outputs/issue949.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue949.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue949.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue949.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue949.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue949.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue949.p4.p4info.txt deleted file mode 100644 index 2cd552414a2..00000000000 --- a/testdata/p4_16_samples_outputs/issue949.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44851186 - name: "ingress.someTable" - alias: "someTable" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 29955570 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29955570 - name: "ingress.setDest" - alias: "setDest" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb new file mode 100644 index 00000000000..15fcacbb4e9 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue949.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44851186 + name: "ingress.someTable" + alias: "someTable" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 29955570 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29955570 + name: "ingress.setDest" + alias: "setDest" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue955.p4.entries.txt b/testdata/p4_16_samples_outputs/issue955.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue955.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue955.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue955.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue955.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue955.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue955.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue955.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue955.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue955.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue955.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/issue983-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue983-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue983-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue983-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue983-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue983-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txt deleted file mode 100644 index a2bc5b6c039..00000000000 --- a/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txt +++ /dev/null @@ -1,104 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48768774 - name: "ingress.debug_table_cksum1" - alias: "debug_table_cksum1" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ethernet.etherType" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 4 - name: "user_meta.fwd_meta.exp_etherType" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 5 - name: "user_meta.fwd_meta.tmp" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 6 - name: "user_meta.fwd_meta.exp_x1" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 7 - name: "user_meta.fwd_meta.x1" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 8 - name: "user_meta.fwd_meta.exp_x2" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 9 - name: "user_meta.fwd_meta.x2" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 10 - name: "user_meta.fwd_meta.exp_x3" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 11 - name: "user_meta.fwd_meta.x3" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 12 - name: "user_meta.fwd_meta.exp_x4" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 13 - name: "user_meta.fwd_meta.x4" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..bb9aa73dd5c --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue983-bmv2.p4.p4info.txtpb @@ -0,0 +1,105 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48768774 + name: "ingress.debug_table_cksum1" + alias: "debug_table_cksum1" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ethernet.etherType" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 4 + name: "user_meta.fwd_meta.exp_etherType" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 5 + name: "user_meta.fwd_meta.tmp" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 6 + name: "user_meta.fwd_meta.exp_x1" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 7 + name: "user_meta.fwd_meta.x1" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 8 + name: "user_meta.fwd_meta.exp_x2" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 9 + name: "user_meta.fwd_meta.x2" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 10 + name: "user_meta.fwd_meta.exp_x3" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 11 + name: "user_meta.fwd_meta.x3" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 12 + name: "user_meta.fwd_meta.exp_x4" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 13 + name: "user_meta.fwd_meta.x4" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txt deleted file mode 100644 index 317f4cfc65e..00000000000 --- a/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,37 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39755323 - name: "ingress.t1" - alias: "t1" - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 42400396 - name: "ingress.t2" - alias: "t2" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ce5f08ab7a6 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue986-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,38 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39755323 + name: "ingress.t1" + alias: "t1" + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 42400396 + name: "ingress.t2" + alias: "t2" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue986-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue986-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue986-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue986-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue986-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue986-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txt deleted file mode 100644 index 39b38d7c19c..00000000000 --- a/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 39755323 - name: "ingress.t1" - alias: "t1" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..8f364ae7217 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue986-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 39755323 + name: "ingress.t1" + alias: "t1" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/issue995-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/issue995-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/issue995-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/issue995-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/issue995-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue995-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/issue995-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/issue995-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/issue995-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/issue995-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/issue995-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/issue995-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txt deleted file mode 100644 index 57508245b3f..00000000000 --- a/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 36244739 - name: "IngressI.t" - alias: "t" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..a4f1a040523 --- /dev/null +++ b/testdata/p4_16_samples_outputs/junk-prop-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 36244739 + name: "IngressI.t" + alias: "t" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/key-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/key-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/key-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/key-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/key-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/key-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txt deleted file mode 100644 index be655465bf1..00000000000 --- a/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43577110 - name: "ingress.c.t" - alias: "t" - } - match_fields { - id: 1 - name: "e" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 27847715 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 27847715 - name: "ingress.c.a" - alias: "a" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..b4f4b802538 --- /dev/null +++ b/testdata/p4_16_samples_outputs/key-bmv2.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43577110 + name: "ingress.c.t" + alias: "t" + } + match_fields { + id: 1 + name: "e" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 27847715 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 27847715 + name: "ingress.c.a" + alias: "a" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/key1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/key1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/key1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/key1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/key1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/key1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txt deleted file mode 100644 index be655465bf1..00000000000 --- a/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 43577110 - name: "ingress.c.t" - alias: "t" - } - match_fields { - id: 1 - name: "e" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 27847715 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 27847715 - name: "ingress.c.a" - alias: "a" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..b4f4b802538 --- /dev/null +++ b/testdata/p4_16_samples_outputs/key1-bmv2.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 43577110 + name: "ingress.c.t" + alias: "t" + } + match_fields { + id: 1 + name: "e" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 27847715 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 27847715 + name: "ingress.c.a" + alias: "a" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/logging-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/logging-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/logging-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/logging-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/logging-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/logging-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txt deleted file mode 100644 index fdf334275bb..00000000000 --- a/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txt +++ /dev/null @@ -1,38 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 21186165 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4a19a73f522 --- /dev/null +++ b/testdata/p4_16_samples_outputs/logging-bmv2.p4.p4info.txtpb @@ -0,0 +1,39 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 21186165 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.p4info.txt deleted file mode 100644 index bc49a28559e..00000000000 --- a/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} diff --git a/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..3eb7a5ed325 --- /dev/null +++ b/testdata/p4_16_samples_outputs/lookahead_ubpf.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} diff --git a/testdata/p4_16_samples_outputs/lpm_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/lpm_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/lpm_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/lpm_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/lpm_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/lpm_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txt deleted file mode 100644 index 7f3b6c5b5c3..00000000000 --- a/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txt +++ /dev/null @@ -1,53 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -tables { - preamble { - id: 43471039 - name: "pipe.Check_src_ip" - alias: "Check_src_ip" - } - match_fields { - id: 1 - name: "headers.ipv4.srcAddr" - bitwidth: 32 - match_type: LPM - } - match_fields { - id: 2 - name: "headers.ipv4.protocol" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 18876683 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 18876683 - name: "pipe.Reject" - alias: "Reject" - } - params { - id: 1 - name: "add" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..2a43c9dbbd8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/lpm_ubpf.p4.p4info.txtpb @@ -0,0 +1,54 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +tables { + preamble { + id: 43471039 + name: "pipe.Check_src_ip" + alias: "Check_src_ip" + } + match_fields { + id: 1 + name: "headers.ipv4.srcAddr" + bitwidth: 32 + match_type: LPM + } + match_fields { + id: 2 + name: "headers.ipv4.protocol" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 18876683 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 18876683 + name: "pipe.Reject" + alias: "Reject" + } + params { + id: 1 + name: "add" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.entries.txt b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.entries.txtpb b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txt b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txt deleted file mode 100644 index 643637e78ef..00000000000 --- a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txt +++ /dev/null @@ -1,40 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 29027610 - } - size: 1000000 -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } - params { - id: 1 - name: "tmp2" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb new file mode 100644 index 00000000000..8846805c4eb --- /dev/null +++ b/testdata/p4_16_samples_outputs/m_psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb @@ -0,0 +1,41 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 29027610 + } + size: 1000000 +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } + params { + id: 1 + name: "tmp2" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txt deleted file mode 100644 index 7b3ce8029de..00000000000 --- a/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txt +++ /dev/null @@ -1,70 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 49173205 - name: "ingressImpl.t1" - alias: "t1" - } - match_fields { - id: 1 - name: "ethernet.srcAddr.slice" - bitwidth: 5 - match_type: EXACT - } - match_fields { - id: 2 - name: "dstAddr_lsbs" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "etherType_less_10" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 24416917 - } - action_refs { - id: 32254556 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 32254556 - name: "ingressImpl.my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 24416917 - name: "ingressImpl.foo" - alias: "foo" - } - params { - id: 1 - name: "out_port" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..7c191c13e2a --- /dev/null +++ b/testdata/p4_16_samples_outputs/match-on-exprs-bmv2.p4.p4info.txtpb @@ -0,0 +1,71 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 49173205 + name: "ingressImpl.t1" + alias: "t1" + } + match_fields { + id: 1 + name: "ethernet.srcAddr.slice" + bitwidth: 5 + match_type: EXACT + } + match_fields { + id: 2 + name: "dstAddr_lsbs" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "etherType_less_10" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 24416917 + } + action_refs { + id: 32254556 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 32254556 + name: "ingressImpl.my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 24416917 + name: "ingressImpl.foo" + alias: "foo" + } + params { + id: 1 + name: "out_port" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txt deleted file mode 100644 index 381197185d4..00000000000 --- a/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,70 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 49173205 - name: "ingressImpl.t1" - alias: "t1" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr[22:18]" - bitwidth: 5 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr & 0x10101010101" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "etherType_less_10" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 24416917 - } - action_refs { - id: 32254556 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 32254556 - name: "ingressImpl.my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 24416917 - name: "ingressImpl.foo" - alias: "foo" - } - params { - id: 1 - name: "out_port" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..541eb7cfc51 --- /dev/null +++ b/testdata/p4_16_samples_outputs/match-on-exprs2-bmv2.p4.p4info.txtpb @@ -0,0 +1,71 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 49173205 + name: "ingressImpl.t1" + alias: "t1" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr[22:18]" + bitwidth: 5 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr & 0x10101010101" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "etherType_less_10" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 24416917 + } + action_refs { + id: 32254556 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 32254556 + name: "ingressImpl.my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 24416917 + name: "ingressImpl.foo" + alias: "foo" + } + params { + id: 1 + name: "out_port" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/metadata_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/metadata_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/metadata_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/metadata_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/metadata_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/metadata_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txt deleted file mode 100644 index 58c36f5c7dd..00000000000 --- a/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txt +++ /dev/null @@ -1,69 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -tables { - preamble { - id: 38168442 - name: "pipe.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "headers.ethernet.etherType" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21382760 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 41201237 - name: "pipe.meta_based_tbl" - alias: "meta_based_tbl" - } - match_fields { - id: 1 - name: "meta.etherType" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 22219300 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21382760 - name: "pipe.fill_metadata" - alias: "fill_metadata" - } -} -actions { - preamble { - id: 22219300 - name: "pipe.change_etherType" - alias: "change_etherType" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..7774c0a1bd5 --- /dev/null +++ b/testdata/p4_16_samples_outputs/metadata_ubpf.p4.p4info.txtpb @@ -0,0 +1,70 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +tables { + preamble { + id: 38168442 + name: "pipe.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "headers.ethernet.etherType" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21382760 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 41201237 + name: "pipe.meta_based_tbl" + alias: "meta_based_tbl" + } + match_fields { + id: 1 + name: "meta.etherType" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 22219300 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21382760 + name: "pipe.fill_metadata" + alias: "fill_metadata" + } +} +actions { + preamble { + id: 22219300 + name: "pipe.change_etherType" + alias: "change_etherType" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/multicast-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/multicast-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/multicast-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/multicast-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/multicast-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/multicast-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txt deleted file mode 100644 index 424542abcbf..00000000000 --- a/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txt +++ /dev/null @@ -1,161 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 50277452 - name: "ingress.broadcast" - alias: "broadcast" - } - action_refs { - id: 18431090 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1 -} -tables { - preamble { - id: 43289378 - name: "ingress.forward" - alias: "forward" - } - match_fields { - id: 1 - name: "meta.routing_metadata.nhop_ipv4" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 25234447 - } - action_refs { - id: 19143480 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 512 -} -tables { - preamble { - id: 43030458 - name: "ingress.ipv4_lpm" - alias: "ipv4_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 23300268 - } - action_refs { - id: 19143480 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -tables { - preamble { - id: 49367184 - name: "egress.send_frame" - alias: "send_frame" - } - match_fields { - id: 1 - name: "standard_metadata.egress_port" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 31165400 - } - action_refs { - id: 19143480 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 256 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 18431090 - name: "bcast" - alias: "bcast" - } -} -actions { - preamble { - id: 25234447 - name: "set_dmac" - alias: "set_dmac" - } - params { - id: 1 - name: "dmac" - bitwidth: 48 - } -} -actions { - preamble { - id: 19143480 - name: "_drop" - alias: "_drop" - } -} -actions { - preamble { - id: 23300268 - name: "set_nhop" - alias: "set_nhop" - } - params { - id: 1 - name: "nhop_ipv4" - bitwidth: 32 - } - params { - id: 2 - name: "port" - bitwidth: 9 - } -} -actions { - preamble { - id: 31165400 - name: "rewrite_mac" - alias: "rewrite_mac" - } - params { - id: 1 - name: "smac" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..70cda0e2a85 --- /dev/null +++ b/testdata/p4_16_samples_outputs/multicast-bmv2.p4.p4info.txtpb @@ -0,0 +1,162 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 50277452 + name: "ingress.broadcast" + alias: "broadcast" + } + action_refs { + id: 18431090 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1 +} +tables { + preamble { + id: 43289378 + name: "ingress.forward" + alias: "forward" + } + match_fields { + id: 1 + name: "meta.routing_metadata.nhop_ipv4" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 25234447 + } + action_refs { + id: 19143480 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 512 +} +tables { + preamble { + id: 43030458 + name: "ingress.ipv4_lpm" + alias: "ipv4_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 23300268 + } + action_refs { + id: 19143480 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 49367184 + name: "egress.send_frame" + alias: "send_frame" + } + match_fields { + id: 1 + name: "standard_metadata.egress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 31165400 + } + action_refs { + id: 19143480 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 256 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 18431090 + name: "bcast" + alias: "bcast" + } +} +actions { + preamble { + id: 25234447 + name: "set_dmac" + alias: "set_dmac" + } + params { + id: 1 + name: "dmac" + bitwidth: 48 + } +} +actions { + preamble { + id: 19143480 + name: "_drop" + alias: "_drop" + } +} +actions { + preamble { + id: 23300268 + name: "set_nhop" + alias: "set_nhop" + } + params { + id: 1 + name: "nhop_ipv4" + bitwidth: 32 + } + params { + id: 2 + name: "port" + bitwidth: 9 + } +} +actions { + preamble { + id: 31165400 + name: "rewrite_mac" + alias: "rewrite_mac" + } + params { + id: 1 + name: "smac" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/mux-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/mux-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/mux-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/mux-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/mux-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/mux-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/mux-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/mux-bmv2.p4.p4info.txt deleted file mode 100644 index 5910067db37..00000000000 --- a/testdata/p4_16_samples_outputs/mux-bmv2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 32836297 - name: "Eg.update" - alias: "update" - } -} diff --git a/testdata/p4_16_samples_outputs/mux-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/mux-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..b787fbbfe2e --- /dev/null +++ b/testdata/p4_16_samples_outputs/mux-bmv2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 32836297 + name: "Eg.update" + alias: "update" + } +} diff --git a/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txt deleted file mode 100644 index c84f0a8e831..00000000000 --- a/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,99 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 40244407 - name: "ingress.m_filter" - alias: "m_filter" - } - match_fields { - id: 1 - name: "meta.meta.meter_tag" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 19344232 - } - action_refs { - id: 26939440 - } - action_refs { - id: 21257015 - } - size: 16 -} -tables { - preamble { - id: 43296733 - name: "ingress.m_table" - alias: "m_table" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 24512981 - } - action_refs { - id: 26939440 - } - action_refs { - id: 21257015 - } - direct_resource_ids: 368209065 - size: 16384 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 19344232 - name: "ingress._drop" - alias: "_drop" - } -} -actions { - preamble { - id: 26939440 - name: "ingress._nop" - alias: "_nop" - } -} -actions { - preamble { - id: 24512981 - name: "ingress.m_action" - alias: "m_action" - } - params { - id: 1 - name: "meter_idx" - bitwidth: 9 - } -} -direct_meters { - preamble { - id: 368209065 - name: "namedmeter" - alias: "namedmeter" - } - spec { - unit: PACKETS - } - direct_table_id: 43296733 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..885acc8c7c8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/named_meter_1-bmv2.p4.p4info.txtpb @@ -0,0 +1,100 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40244407 + name: "ingress.m_filter" + alias: "m_filter" + } + match_fields { + id: 1 + name: "meta.meta.meter_tag" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 19344232 + } + action_refs { + id: 26939440 + } + action_refs { + id: 21257015 + } + size: 16 +} +tables { + preamble { + id: 43296733 + name: "ingress.m_table" + alias: "m_table" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 24512981 + } + action_refs { + id: 26939440 + } + action_refs { + id: 21257015 + } + direct_resource_ids: 368209065 + size: 16384 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 19344232 + name: "ingress._drop" + alias: "_drop" + } +} +actions { + preamble { + id: 26939440 + name: "ingress._nop" + alias: "_nop" + } +} +actions { + preamble { + id: 24512981 + name: "ingress.m_action" + alias: "m_action" + } + params { + id: 1 + name: "meter_idx" + bitwidth: 9 + } +} +direct_meters { + preamble { + id: 368209065 + name: "namedmeter" + alias: "namedmeter" + } + spec { + unit: PACKETS + } + direct_table_id: 43296733 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txt deleted file mode 100644 index c03d72eaff2..00000000000 --- a/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txt +++ /dev/null @@ -1,99 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 40244407 - name: "ingress.m_filter" - alias: "m_filter" - } - match_fields { - id: 1 - name: "meta.meta.meter_tag" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 19344232 - } - action_refs { - id: 26939440 - } - action_refs { - id: 21257015 - } - size: 16 -} -tables { - preamble { - id: 43296733 - name: "ingress.m_table" - alias: "m_table" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 24512981 - } - action_refs { - id: 26939440 - } - action_refs { - id: 21257015 - } - direct_resource_ids: 354402025 - size: 16384 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 19344232 - name: "ingress._drop" - alias: "_drop" - } -} -actions { - preamble { - id: 26939440 - name: "ingress._nop" - alias: "_nop" - } -} -actions { - preamble { - id: 24512981 - name: "ingress.m_action" - alias: "m_action" - } - params { - id: 1 - name: "meter_idx" - bitwidth: 9 - } -} -direct_meters { - preamble { - id: 354402025 - name: "ingress.namedmeter" - alias: "namedmeter" - } - spec { - unit: PACKETS - } - direct_table_id: 43296733 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..3d63970c4a3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/named_meter_bmv2.p4.p4info.txtpb @@ -0,0 +1,100 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40244407 + name: "ingress.m_filter" + alias: "m_filter" + } + match_fields { + id: 1 + name: "meta.meta.meter_tag" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 19344232 + } + action_refs { + id: 26939440 + } + action_refs { + id: 21257015 + } + size: 16 +} +tables { + preamble { + id: 43296733 + name: "ingress.m_table" + alias: "m_table" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 24512981 + } + action_refs { + id: 26939440 + } + action_refs { + id: 21257015 + } + direct_resource_ids: 354402025 + size: 16384 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 19344232 + name: "ingress._drop" + alias: "_drop" + } +} +actions { + preamble { + id: 26939440 + name: "ingress._nop" + alias: "_nop" + } +} +actions { + preamble { + id: 24512981 + name: "ingress.m_action" + alias: "m_action" + } + params { + id: 1 + name: "meter_idx" + bitwidth: 9 + } +} +direct_meters { + preamble { + id: 354402025 + name: "ingress.namedmeter" + alias: "namedmeter" + } + spec { + unit: PACKETS + } + direct_table_id: 43296733 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/nested_if_else.p4.entries.txt b/testdata/p4_16_samples_outputs/nested_if_else.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/nested_if_else.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/nested_if_else.p4.entries.txtpb b/testdata/p4_16_samples_outputs/nested_if_else.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/nested_if_else.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txt b/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txt deleted file mode 100644 index 469fd2f8ba3..00000000000 --- a/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txt +++ /dev/null @@ -1,52 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 37375156 - name: "MyIngress.ipv4_lpm" - alias: "ipv4_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 28792405 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28792405 - name: "MyIngress.ipv4_forward" - alias: "ipv4_forward" - } -} -actions { - preamble { - id: 25652968 - name: "MyIngress.drop" - alias: "drop" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb new file mode 100644 index 00000000000..070d1468b0a --- /dev/null +++ b/testdata/p4_16_samples_outputs/nested_if_else.p4.p4info.txtpb @@ -0,0 +1,53 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 37375156 + name: "MyIngress.ipv4_lpm" + alias: "ipv4_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 28792405 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28792405 + name: "MyIngress.ipv4_forward" + alias: "ipv4_forward" + } +} +actions { + preamble { + id: 25652968 + name: "MyIngress.drop" + alias: "drop" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.entries.txt b/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.entries.txtpb b/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txt b/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txt deleted file mode 100644 index 469fd2f8ba3..00000000000 --- a/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txt +++ /dev/null @@ -1,52 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 37375156 - name: "MyIngress.ipv4_lpm" - alias: "ipv4_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 28792405 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28792405 - name: "MyIngress.ipv4_forward" - alias: "ipv4_forward" - } -} -actions { - preamble { - id: 25652968 - name: "MyIngress.drop" - alias: "drop" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb new file mode 100644 index 00000000000..070d1468b0a --- /dev/null +++ b/testdata/p4_16_samples_outputs/nested_if_lvalue_dependencies.p4.p4info.txtpb @@ -0,0 +1,53 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 37375156 + name: "MyIngress.ipv4_lpm" + alias: "ipv4_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 28792405 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28792405 + name: "MyIngress.ipv4_forward" + alias: "ipv4_forward" + } +} +actions { + preamble { + id: 25652968 + name: "MyIngress.drop" + alias: "drop" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/nested_if_statement.p4.entries.txt b/testdata/p4_16_samples_outputs/nested_if_statement.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/nested_if_statement.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/nested_if_statement.p4.entries.txtpb b/testdata/p4_16_samples_outputs/nested_if_statement.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/nested_if_statement.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txt b/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txt deleted file mode 100644 index 469fd2f8ba3..00000000000 --- a/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txt +++ /dev/null @@ -1,52 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 37375156 - name: "MyIngress.ipv4_lpm" - alias: "ipv4_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 28792405 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28792405 - name: "MyIngress.ipv4_forward" - alias: "ipv4_forward" - } -} -actions { - preamble { - id: 25652968 - name: "MyIngress.drop" - alias: "drop" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb new file mode 100644 index 00000000000..070d1468b0a --- /dev/null +++ b/testdata/p4_16_samples_outputs/nested_if_statement.p4.p4info.txtpb @@ -0,0 +1,53 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 37375156 + name: "MyIngress.ipv4_lpm" + alias: "ipv4_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 28792405 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28792405 + name: "MyIngress.ipv4_forward" + alias: "ipv4_forward" + } +} +actions { + preamble { + id: 25652968 + name: "MyIngress.drop" + alias: "drop" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/next-def-use.p4.entries.txt b/testdata/p4_16_samples_outputs/next-def-use.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/next-def-use.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/next-def-use.p4.entries.txtpb b/testdata/p4_16_samples_outputs/next-def-use.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/next-def-use.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/next-def-use.p4.p4info.txt b/testdata/p4_16_samples_outputs/next-def-use.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/next-def-use.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/next-def-use.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/next-def-use.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/next-def-use.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/noMatch.p4.entries.txt b/testdata/p4_16_samples_outputs/noMatch.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/noMatch.p4.p4info.txt b/testdata/p4_16_samples_outputs/noMatch.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/noMatch.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txt deleted file mode 100644 index 9d5f84531e1..00000000000 --- a/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txt +++ /dev/null @@ -1,122 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44010113 - name: "ingress.tables.prefix|simple_table_1" - alias: "prefix|simple_table_1" - } - match_fields { - id: 1 - name: "dummy_name" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 24698652 - } - size: 1024 -} -tables { - preamble { - id: 46184800 - name: "ingress.tables.@prefix@simple_table_2" - alias: "@prefix@simple_table_2" - } - match_fields { - id: 1 - name: "dummy_name" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 24698652 - } - size: 1024 -} -tables { - preamble { - id: 45435893 - name: "ingress.tables.<>]{]prefix/simple_table_3" - alias: "<>]{]prefix/simple_table_3" - } - match_fields { - id: 1 - name: "dummy_name" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 24698652 - } - size: 1024 -} -tables { - preamble { - id: 35450577 - name: "ingress.tables.!@#$%^&*()_+=-prefix^simple_table_1" - alias: "!@#$%^&*()_+=-prefix^simple_table_1" - } - match_fields { - id: 1 - name: "dummy_name" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 24698652 - } - size: 1024 -} -tables { - preamble { - id: 41307018 - name: "ingress.tables.prefix\342\227\225\342\200\277\342\227\225\360\237\230\200\343\203\204simple_table_1" - alias: "prefix\342\227\225\342\200\277\342\227\225\360\237\230\200\343\203\204simple_table_1" - } - match_fields { - id: 1 - name: "dummy_name" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 24698652 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 24698652 - name: "ingress.tables.increment" - alias: "increment" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fbab1a0a231 --- /dev/null +++ b/testdata/p4_16_samples_outputs/nonstandard_table_names-bmv2.p4.p4info.txtpb @@ -0,0 +1,123 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44010113 + name: "ingress.tables.prefix|simple_table_1" + alias: "prefix|simple_table_1" + } + match_fields { + id: 1 + name: "dummy_name" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 24698652 + } + size: 1024 +} +tables { + preamble { + id: 46184800 + name: "ingress.tables.@prefix@simple_table_2" + alias: "@prefix@simple_table_2" + } + match_fields { + id: 1 + name: "dummy_name" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 24698652 + } + size: 1024 +} +tables { + preamble { + id: 45435893 + name: "ingress.tables.<>]{]prefix/simple_table_3" + alias: "<>]{]prefix/simple_table_3" + } + match_fields { + id: 1 + name: "dummy_name" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 24698652 + } + size: 1024 +} +tables { + preamble { + id: 35450577 + name: "ingress.tables.!@#$%^&*()_+=-prefix^simple_table_1" + alias: "!@#$%^&*()_+=-prefix^simple_table_1" + } + match_fields { + id: 1 + name: "dummy_name" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 24698652 + } + size: 1024 +} +tables { + preamble { + id: 41307018 + name: "ingress.tables.prefix\342\227\225\342\200\277\342\227\225\360\237\230\200\343\203\204simple_table_1" + alias: "prefix\342\227\225\342\200\277\342\227\225\360\237\230\200\343\203\204simple_table_1" + } + match_fields { + id: 1 + name: "dummy_name" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 24698652 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 24698652 + name: "ingress.tables.increment" + alias: "increment" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/omec/up4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/omec/up4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/omec/up4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb new file mode 100644 index 00000000000..89bc7eaf0e5 --- /dev/null +++ b/testdata/p4_16_samples_outputs/omec/up4.p4.p4info.txtpb @@ -0,0 +1,835 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40931612 + name: "PreQosPipe.my_station" + alias: "my_station" + } + match_fields { + id: 1 + name: "dst_mac" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 33923840 + name: "PreQosPipe.interfaces" + alias: "interfaces" + } + match_fields { + id: 1 + name: "ipv4_dst_prefix" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 26090030 + } + const_default_action_id: 26090030 + size: 1024 +} +tables { + preamble { + id: 44976597 + name: "PreQosPipe.sessions_uplink" + alias: "sessions_uplink" + } + match_fields { + id: 1 + name: "n3_address" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 2 + name: "teid" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 19461580 + } + action_refs { + id: 22196934 + } + action_refs { + id: 28401267 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28401267 + size: 1024 +} +tables { + preamble { + id: 34742049 + name: "PreQosPipe.sessions_downlink" + alias: "sessions_downlink" + } + match_fields { + id: 1 + name: "ue_address" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 21848329 + } + action_refs { + id: 20229579 + } + action_refs { + id: 20249483 + } + action_refs { + id: 28401267 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28401267 + size: 1024 +} +tables { + preamble { + id: 37595532 + name: "PreQosPipe.terminations_uplink" + alias: "terminations_uplink" + } + match_fields { + id: 1 + name: "ue_address" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 2 + name: "app_id" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 28305359 + } + action_refs { + id: 20977365 + } + action_refs { + id: 28401267 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28401267 + size: 1024 +} +tables { + preamble { + id: 34778590 + name: "PreQosPipe.terminations_downlink" + alias: "terminations_downlink" + } + match_fields { + id: 1 + name: "ue_address" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 2 + name: "app_id" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 32699713 + } + action_refs { + id: 31264233 + } + action_refs { + id: 28401267 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 28401267 + size: 1024 +} +tables { + preamble { + id: 46868458 + name: "PreQosPipe.applications" + alias: "applications" + } + match_fields { + id: 1 + name: "slice_id" + bitwidth: 4 + match_type: EXACT + } + match_fields { + id: 2 + name: "app_ip_addr" + bitwidth: 32 + match_type: LPM + } + match_fields { + id: 3 + name: "app_l4_port" + bitwidth: 16 + match_type: RANGE + } + match_fields { + id: 4 + name: "app_ip_proto" + bitwidth: 8 + match_type: TERNARY + } + action_refs { + id: 23010411 + } + const_default_action_id: 23010411 + size: 1024 +} +tables { + preamble { + id: 49497304 + name: "PreQosPipe.tunnel_peers" + alias: "tunnel_peers" + } + match_fields { + id: 1 + name: "tunnel_peer_id" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 32742981 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 39015874 + name: "PreQosPipe.Routing.routes_v4" + alias: "routes_v4" + } + match_fields { + id: 1 + name: "dst_prefix" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 23965128 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + implementation_id: 297808402 + size: 1024 +} +tables { + preamble { + id: 47204971 + name: "PreQosPipe.Acl.acls" + alias: "Acl.acls" + } + match_fields { + id: 1 + name: "inport" + bitwidth: 9 + match_type: TERNARY + } + match_fields { + id: 2 + name: "src_iface" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 3 + name: "eth_src" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 4 + name: "eth_dst" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 5 + name: "eth_type" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 6 + name: "ipv4_src" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 7 + name: "ipv4_dst" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 8 + name: "ipv4_proto" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 9 + name: "l4_sport" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 10 + name: "l4_dport" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 30494847 + } + action_refs { + id: 26495283 + } + action_refs { + id: 21596798 + } + action_refs { + id: 18812293 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + direct_resource_ids: 325583051 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23766285 + name: "PreQosPipe._initialize_metadata" + alias: "_initialize_metadata" + } +} +actions { + preamble { + id: 26090030 + name: "PreQosPipe.set_source_iface" + alias: "set_source_iface" + } + params { + id: 1 + name: "src_iface" + bitwidth: 8 + } + params { + id: 2 + name: "direction" + bitwidth: 8 + } + params { + id: 3 + name: "slice_id" + bitwidth: 4 + } +} +actions { + preamble { + id: 28401267 + name: "PreQosPipe.do_drop" + alias: "do_drop" + } +} +actions { + preamble { + id: 19461580 + name: "PreQosPipe.set_session_uplink" + alias: "set_session_uplink" + } + params { + id: 1 + name: "session_meter_idx" + bitwidth: 32 + } +} +actions { + preamble { + id: 22196934 + name: "PreQosPipe.set_session_uplink_drop" + alias: "set_session_uplink_drop" + } +} +actions { + preamble { + id: 21848329 + name: "PreQosPipe.set_session_downlink" + alias: "set_session_downlink" + } + params { + id: 1 + name: "tunnel_peer_id" + bitwidth: 8 + } + params { + id: 2 + name: "session_meter_idx" + bitwidth: 32 + } +} +actions { + preamble { + id: 20229579 + name: "PreQosPipe.set_session_downlink_drop" + alias: "set_session_downlink_drop" + } +} +actions { + preamble { + id: 20249483 + name: "PreQosPipe.set_session_downlink_buff" + alias: "set_session_downlink_buff" + } + params { + id: 1 + name: "session_meter_idx" + bitwidth: 32 + } +} +actions { + preamble { + id: 28305359 + name: "PreQosPipe.uplink_term_fwd" + alias: "uplink_term_fwd" + } + params { + id: 1 + name: "ctr_idx" + bitwidth: 32 + } + params { + id: 2 + name: "tc" + bitwidth: 2 + } + params { + id: 3 + name: "app_meter_idx" + bitwidth: 32 + } +} +actions { + preamble { + id: 20977365 + name: "PreQosPipe.uplink_term_drop" + alias: "uplink_term_drop" + } + params { + id: 1 + name: "ctr_idx" + bitwidth: 32 + } +} +actions { + preamble { + id: 32699713 + name: "PreQosPipe.downlink_term_fwd" + alias: "downlink_term_fwd" + } + params { + id: 1 + name: "ctr_idx" + bitwidth: 32 + } + params { + id: 2 + name: "teid" + bitwidth: 32 + } + params { + id: 3 + name: "qfi" + bitwidth: 6 + } + params { + id: 4 + name: "tc" + bitwidth: 2 + } + params { + id: 5 + name: "app_meter_idx" + bitwidth: 32 + } +} +actions { + preamble { + id: 31264233 + name: "PreQosPipe.downlink_term_drop" + alias: "downlink_term_drop" + } + params { + id: 1 + name: "ctr_idx" + bitwidth: 32 + } +} +actions { + preamble { + id: 23010411 + name: "PreQosPipe.set_app_id" + alias: "set_app_id" + } + params { + id: 1 + name: "app_id" + bitwidth: 8 + } +} +actions { + preamble { + id: 32742981 + name: "PreQosPipe.load_tunnel_param" + alias: "load_tunnel_param" + } + params { + id: 1 + name: "src_addr" + bitwidth: 32 + } + params { + id: 2 + name: "dst_addr" + bitwidth: 32 + } + params { + id: 3 + name: "sport" + bitwidth: 16 + } +} +actions { + preamble { + id: 29247910 + name: "PreQosPipe.do_gtpu_tunnel" + alias: "do_gtpu_tunnel" + } +} +actions { + preamble { + id: 31713420 + name: "PreQosPipe.do_gtpu_tunnel_with_psc" + alias: "do_gtpu_tunnel_with_psc" + } +} +actions { + preamble { + id: 31448256 + name: "PreQosPipe.Routing.drop" + alias: "Routing.drop" + } +} +actions { + preamble { + id: 23965128 + name: "PreQosPipe.Routing.route" + alias: "route" + } + params { + id: 1 + name: "src_mac" + bitwidth: 48 + } + params { + id: 2 + name: "dst_mac" + bitwidth: 48 + } + params { + id: 3 + name: "egress_port" + bitwidth: 9 + } +} +actions { + preamble { + id: 30494847 + name: "PreQosPipe.Acl.set_port" + alias: "set_port" + } + params { + id: 1 + name: "port" + bitwidth: 9 + } +} +actions { + preamble { + id: 26495283 + name: "PreQosPipe.Acl.punt" + alias: "punt" + } +} +actions { + preamble { + id: 21596798 + name: "PreQosPipe.Acl.clone_to_cpu" + alias: "clone_to_cpu" + } +} +actions { + preamble { + id: 18812293 + name: "PreQosPipe.Acl.drop" + alias: "Acl.drop" + } +} +action_profiles { + preamble { + id: 297808402 + name: "hashed_selector" + alias: "hashed_selector" + } + table_ids: 39015874 + with_selector: true + size: 1024 +} +counters { + preamble { + id: 315693181 + name: "PreQosPipe.pre_qos_counter" + alias: "pre_qos_counter" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 302958180 + name: "PostQosPipe.post_qos_counter" + alias: "post_qos_counter" + } + spec { + unit: BOTH + } + size: 1024 +} +direct_counters { + preamble { + id: 325583051 + name: "acls" + alias: "acls" + } + spec { + unit: BOTH + } + direct_table_id: 47204971 +} +meters { + preamble { + id: 338231090 + name: "PreQosPipe.app_meter" + alias: "app_meter" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 347593234 + name: "PreQosPipe.session_meter" + alias: "session_meter" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 336833095 + name: "PreQosPipe.slice_tc_meter" + alias: "slice_tc_meter" + } + spec { + unit: BYTES + } + size: 64 +} +controller_packet_metadata { + preamble { + id: 75327753 + name: "packet_out" + alias: "packet_out" + annotations: "@controller_header(\"packet_out\")" + } + metadata { + id: 1 + name: "reserved" + bitwidth: 8 + } +} +controller_packet_metadata { + preamble { + id: 80671331 + name: "packet_in" + alias: "packet_in" + annotations: "@controller_header(\"packet_in\")" + } + metadata { + id: 1 + name: "ingress_port" + bitwidth: 9 + } + metadata { + id: 2 + name: "_pad" + bitwidth: 7 + } +} +digests { + preamble { + id: 396224266 + name: "ddn_digest_t" + alias: "ddn_digest_t" + } + type_spec { + struct { + name: "ddn_digest_t" + } + } +} +type_info { + structs { + key: "ddn_digest_t" + value { + members { + name: "ue_address" + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + } + } + } + serializable_enums { + key: "Direction" + value { + underlying_type { + bitwidth: 8 + } + members { + name: "UNKNOWN" + value: "\000" + } + members { + name: "UPLINK" + value: "\001" + } + members { + name: "DOWNLINK" + value: "\002" + } + members { + name: "OTHER" + value: "\003" + } + } + } + serializable_enums { + key: "InterfaceType" + value { + underlying_type { + bitwidth: 8 + } + members { + name: "UNKNOWN" + value: "\000" + } + members { + name: "ACCESS" + value: "\001" + } + members { + name: "CORE" + value: "\002" + } + } + } + serializable_enums { + key: "Slice" + value { + underlying_type { + bitwidth: 4 + } + members { + name: "DEFAULT" + value: "\000" + } + } + } + serializable_enums { + key: "TrafficClass" + value { + underlying_type { + bitwidth: 2 + } + members { + name: "BEST_EFFORT" + value: "\000" + } + members { + name: "CONTROL" + value: "\001" + } + members { + name: "REAL_TIME" + value: "\002" + } + members { + name: "ELASTIC" + value: "\003" + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/p416-type-use3.p4.entries.txt b/testdata/p4_16_samples_outputs/p416-type-use3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/p416-type-use3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/p416-type-use3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/p416-type-use3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/p416-type-use3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txt b/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txt deleted file mode 100644 index 498e106f147..00000000000 --- a/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txt +++ /dev/null @@ -1,358 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 42499711 - name: "ingress.custom_table" - alias: "custom_table" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - type_name { - name: "EthT_t" - } - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.custom.e" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 4 - name: "hdr.custom.ed" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 5 - name: "hdr.custom.et" - bitwidth: 8 - match_type: EXACT - type_name { - name: "CustomT_t" - } - } - match_fields { - id: 6 - name: "hdr.custom.edd" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 7 - name: "hdr.custom.eddt" - bitwidth: 8 - match_type: EXACT - type_name { - name: "CustomDDT_t" - } - } - match_fields { - id: 8 - name: "hdr.custom.edtd" - bitwidth: 8 - match_type: EXACT - type_name { - name: "CustomDT_t" - } - } - match_fields { - id: 9 - name: "hdr.custom.edtt" - bitwidth: 8 - match_type: EXACT - type_name { - name: "CustomDTT_t" - } - } - match_fields { - id: 10 - name: "hdr.custom.etdd" - bitwidth: 8 - match_type: EXACT - type_name { - name: "CustomT_t" - } - } - match_fields { - id: 11 - name: "hdr.custom.etdt" - bitwidth: 8 - match_type: EXACT - type_name { - name: "CustomTDT_t" - } - } - match_fields { - id: 12 - name: "hdr.custom.ettd" - bitwidth: 8 - match_type: EXACT - type_name { - name: "CustomTT_t" - } - } - match_fields { - id: 13 - name: "hdr.custom.ettt" - bitwidth: 8 - match_type: EXACT - type_name { - name: "CustomTTT_t" - } - } - action_refs { - id: 28429210 - } - action_refs { - id: 21844022 - } - action_refs { - id: 21580947 - } - size: 1024 -} -actions { - preamble { - id: 28429210 - name: "ingress.set_output" - alias: "set_output" - } - params { - id: 1 - name: "out_port" - bitwidth: 9 - } -} -actions { - preamble { - id: 21844022 - name: "ingress.set_headers" - alias: "set_headers" - } - params { - id: 1 - name: "e" - bitwidth: 8 - } - params { - id: 2 - name: "ed" - bitwidth: 8 - } - params { - id: 3 - name: "et" - bitwidth: 8 - type_name { - name: "CustomT_t" - } - } - params { - id: 4 - name: "edd" - bitwidth: 8 - } - params { - id: 5 - name: "edt" - bitwidth: 8 - type_name { - name: "CustomDT_t" - } - } - params { - id: 6 - name: "etd" - bitwidth: 8 - type_name { - name: "CustomT_t" - } - } - params { - id: 7 - name: "ett" - bitwidth: 8 - type_name { - name: "CustomTT_t" - } - } - params { - id: 8 - name: "eddd" - bitwidth: 8 - } - params { - id: 9 - name: "eddt" - bitwidth: 8 - type_name { - name: "CustomDDT_t" - } - } - params { - id: 10 - name: "edtd" - bitwidth: 8 - type_name { - name: "CustomDT_t" - } - } - params { - id: 11 - name: "edtt" - bitwidth: 8 - type_name { - name: "CustomDTT_t" - } - } - params { - id: 12 - name: "etdd" - bitwidth: 8 - type_name { - name: "CustomT_t" - } - } - params { - id: 13 - name: "etdt" - bitwidth: 8 - type_name { - name: "CustomTDT_t" - } - } - params { - id: 14 - name: "ettd" - bitwidth: 8 - type_name { - name: "CustomTT_t" - } - } - params { - id: 15 - name: "ettt" - bitwidth: 8 - type_name { - name: "CustomTTT_t" - } - } -} -actions { - preamble { - id: 21580947 - name: "ingress.my_drop" - alias: "my_drop" - } -} -type_info { - new_types { - key: "CustomDDT_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "CustomDTT_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "CustomDT_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "CustomTDT_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "CustomTTT_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "CustomTT_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "CustomT_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "EthT_t" - value { - translated_type { - uri: "p4.org/psa/v1/EthT_t" - sdn_bitwidth: 48 - } - annotations: "@custom_annotation_0" - annotations: "@custom_annotation_1(\"my annon\")" - } - } -} diff --git a/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb new file mode 100644 index 00000000000..5dca49d1870 --- /dev/null +++ b/testdata/p4_16_samples_outputs/p416-type-use3.p4.p4info.txtpb @@ -0,0 +1,359 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 42499711 + name: "ingress.custom_table" + alias: "custom_table" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + type_name { + name: "EthT_t" + } + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.custom.e" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 4 + name: "hdr.custom.ed" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 5 + name: "hdr.custom.et" + bitwidth: 8 + match_type: EXACT + type_name { + name: "CustomT_t" + } + } + match_fields { + id: 6 + name: "hdr.custom.edd" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 7 + name: "hdr.custom.eddt" + bitwidth: 8 + match_type: EXACT + type_name { + name: "CustomDDT_t" + } + } + match_fields { + id: 8 + name: "hdr.custom.edtd" + bitwidth: 8 + match_type: EXACT + type_name { + name: "CustomDT_t" + } + } + match_fields { + id: 9 + name: "hdr.custom.edtt" + bitwidth: 8 + match_type: EXACT + type_name { + name: "CustomDTT_t" + } + } + match_fields { + id: 10 + name: "hdr.custom.etdd" + bitwidth: 8 + match_type: EXACT + type_name { + name: "CustomT_t" + } + } + match_fields { + id: 11 + name: "hdr.custom.etdt" + bitwidth: 8 + match_type: EXACT + type_name { + name: "CustomTDT_t" + } + } + match_fields { + id: 12 + name: "hdr.custom.ettd" + bitwidth: 8 + match_type: EXACT + type_name { + name: "CustomTT_t" + } + } + match_fields { + id: 13 + name: "hdr.custom.ettt" + bitwidth: 8 + match_type: EXACT + type_name { + name: "CustomTTT_t" + } + } + action_refs { + id: 28429210 + } + action_refs { + id: 21844022 + } + action_refs { + id: 21580947 + } + size: 1024 +} +actions { + preamble { + id: 28429210 + name: "ingress.set_output" + alias: "set_output" + } + params { + id: 1 + name: "out_port" + bitwidth: 9 + } +} +actions { + preamble { + id: 21844022 + name: "ingress.set_headers" + alias: "set_headers" + } + params { + id: 1 + name: "e" + bitwidth: 8 + } + params { + id: 2 + name: "ed" + bitwidth: 8 + } + params { + id: 3 + name: "et" + bitwidth: 8 + type_name { + name: "CustomT_t" + } + } + params { + id: 4 + name: "edd" + bitwidth: 8 + } + params { + id: 5 + name: "edt" + bitwidth: 8 + type_name { + name: "CustomDT_t" + } + } + params { + id: 6 + name: "etd" + bitwidth: 8 + type_name { + name: "CustomT_t" + } + } + params { + id: 7 + name: "ett" + bitwidth: 8 + type_name { + name: "CustomTT_t" + } + } + params { + id: 8 + name: "eddd" + bitwidth: 8 + } + params { + id: 9 + name: "eddt" + bitwidth: 8 + type_name { + name: "CustomDDT_t" + } + } + params { + id: 10 + name: "edtd" + bitwidth: 8 + type_name { + name: "CustomDT_t" + } + } + params { + id: 11 + name: "edtt" + bitwidth: 8 + type_name { + name: "CustomDTT_t" + } + } + params { + id: 12 + name: "etdd" + bitwidth: 8 + type_name { + name: "CustomT_t" + } + } + params { + id: 13 + name: "etdt" + bitwidth: 8 + type_name { + name: "CustomTDT_t" + } + } + params { + id: 14 + name: "ettd" + bitwidth: 8 + type_name { + name: "CustomTT_t" + } + } + params { + id: 15 + name: "ettt" + bitwidth: 8 + type_name { + name: "CustomTTT_t" + } + } +} +actions { + preamble { + id: 21580947 + name: "ingress.my_drop" + alias: "my_drop" + } +} +type_info { + new_types { + key: "CustomDDT_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "CustomDTT_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "CustomDT_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "CustomTDT_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "CustomTTT_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "CustomTT_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "CustomT_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "EthT_t" + value { + translated_type { + uri: "p4.org/psa/v1/EthT_t" + sdn_bitwidth: 48 + } + annotations: "@custom_annotation_0" + annotations: "@custom_annotation_1(\"my annon\")" + } + } +} diff --git a/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.entries.txt b/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.entries.txtpb b/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.p4info.txt b/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.p4info.txt deleted file mode 100644 index ef76a7f96f3..00000000000 --- a/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.p4info.txt +++ /dev/null @@ -1,134 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -digests { - preamble { - id: 387633770 - name: "MyID.digest" - alias: "digest" - } - type_spec { - struct { - name: "digest_t" - } - } -} -type_info { - structs { - key: "digest_t" - value { - members { - name: "h" - type_spec { - header { - name: "h_t" - } - } - } - members { - name: "port" - type_spec { - new_type { - name: "PortId_t" - } - } - } - members { - name: "s2" - type_spec { - struct { - name: "s2_t_0" - } - } - } - members { - name: "s3" - type_spec { - struct { - name: "s3_t" - } - } - } - } - } - structs { - key: "s2_t_0" - value { - members { - name: "f16" - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - } - members { - name: "f" - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - } - } - } - structs { - key: "s3_t" - value { - members { - name: "f" - type_spec { - bitstring { - bit { - bitwidth: 64 - } - } - } - } - } - } - headers { - key: "h_t" - value { - members { - name: "s.f8" - type_spec { - bit { - bitwidth: 8 - } - } - } - members { - name: "s.f16" - type_spec { - bit { - bitwidth: 16 - } - } - } - members { - name: "f32" - type_spec { - bit { - bitwidth: 32 - } - } - } - } - } - new_types { - key: "PortId_t" - value { - translated_type { - uri: "p4.org/psa/v1/PortId_t" - sdn_bitwidth: 32 - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.p4info.txtpb new file mode 100644 index 00000000000..69bb01d7c82 --- /dev/null +++ b/testdata/p4_16_samples_outputs/p4rt_digest_complex.p4.p4info.txtpb @@ -0,0 +1,135 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +digests { + preamble { + id: 387633770 + name: "MyID.digest" + alias: "digest" + } + type_spec { + struct { + name: "digest_t" + } + } +} +type_info { + structs { + key: "digest_t" + value { + members { + name: "h" + type_spec { + header { + name: "h_t" + } + } + } + members { + name: "port" + type_spec { + new_type { + name: "PortId_t" + } + } + } + members { + name: "s2" + type_spec { + struct { + name: "s2_t_0" + } + } + } + members { + name: "s3" + type_spec { + struct { + name: "s3_t" + } + } + } + } + } + structs { + key: "s2_t_0" + value { + members { + name: "f16" + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + } + members { + name: "f" + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + } + } + } + structs { + key: "s3_t" + value { + members { + name: "f" + type_spec { + bitstring { + bit { + bitwidth: 64 + } + } + } + } + } + } + headers { + key: "h_t" + value { + members { + name: "s.f8" + type_spec { + bit { + bitwidth: 8 + } + } + } + members { + name: "s.f16" + type_spec { + bit { + bitwidth: 16 + } + } + } + members { + name: "f32" + type_spec { + bit { + bitwidth: 32 + } + } + } + } + } + new_types { + key: "PortId_t" + value { + translated_type { + uri: "p4.org/psa/v1/PortId_t" + sdn_bitwidth: 32 + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txt deleted file mode 100644 index 11ea721b03b..00000000000 --- a/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -tables { - preamble { - id: 34660133 - name: "pipe.filter_tbl" - alias: "filter_tbl" - } - match_fields { - id: 1 - name: "headers.ipv4.srcAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 18876683 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 18876683 - name: "pipe.Reject" - alias: "Reject" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..fe1faf07f47 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parenthesis-test_ubpf.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +tables { + preamble { + id: 34660133 + name: "pipe.filter_tbl" + alias: "filter_tbl" + } + match_fields { + id: 1 + name: "headers.ipv4.srcAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 18876683 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 18876683 + name: "pipe.Reject" + alias: "Reject" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/parser-if.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-if.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-if.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-if.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-if.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-if.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-if.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-if.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-if.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-if.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-if.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-if.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-locals2.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-locals2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-locals2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-locals2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-locals2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-locals2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txt deleted file mode 100644 index 9ddf356a9ad..00000000000 --- a/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txt +++ /dev/null @@ -1,31 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48165785 - name: "cIngress.guh" - alias: "guh" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 25131402 - } - size: 1024 -} -actions { - preamble { - id: 25131402 - name: "cIngress.foo" - alias: "foo" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb new file mode 100644 index 00000000000..ae22de48280 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-locals2.p4.p4info.txtpb @@ -0,0 +1,32 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48165785 + name: "cIngress.guh" + alias: "guh" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 25131402 + } + size: 1024 +} +actions { + preamble { + id: 25131402 + name: "cIngress.foo" + alias: "foo" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/parser-pragma.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-pragma.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-pragma.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-pragma.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-pragma.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-pragma.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-pragma.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-pragma.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-pragma.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-pragma.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-pragma.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-pragma.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-issue3537-1.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-issue3537.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-t1-cond.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test1.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test10.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test3.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test4.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test5.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test6.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test7.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test8.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser-unroll-test9.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-t1-cond.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-t1-cond.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-t1-cond.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-t1-cond.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-t1-cond.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test1.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test1.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test1.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test1.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test1.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test2.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test2.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test2.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test2.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test2.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test3.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test3.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test3.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test3.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test3.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test4.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test4.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test4.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test4.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test4.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test5.p4.entries.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test5.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test5.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test5.p4.p4info.txt deleted file mode 100644 index 9ec92493e4c..00000000000 --- a/testdata/p4_16_samples_outputs/parser-unroll/parser-unroll-test5.p4.p4info.txt +++ /dev/null @@ -1,3 +0,0 @@ -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/parser_error-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.entries.txtpb b/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb new file mode 100644 index 00000000000..dafd050fb72 --- /dev/null +++ b/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.p4info.txtpb @@ -0,0 +1,1284 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + name: "fabric_border_router.p4" + arch: "v1model" + organization: "Google" +} +tables { + preamble { + id: 33554689 + name: "ingress.acl_pre_ingress.acl_pre_ingress_table" + alias: "acl_pre_ingress_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + annotations: "@sai_acl(PRE_INGRESS)" + annotations: "@entry_restriction(\"\n // Only allow IP field matches for IP packets.\n dscp::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n dst_ip::mask != 0 -> is_ipv4 == 1;\n dst_ipv6::mask != 0 -> is_ipv6 == 1;\n // Forbid illegal combinations of IP_TYPE fields.\n is_ip::mask != 0 -> (is_ipv4::mask == 0 && is_ipv6::mask == 0);\n is_ipv4::mask != 0 -> (is_ip::mask == 0 && is_ipv6::mask == 0);\n is_ipv6::mask != 0 -> (is_ip::mask == 0 && is_ipv4::mask == 0);\n // Forbid unsupported combinations of IP_TYPE fields.\n is_ipv4::mask != 0 -> (is_ipv4 == 1);\n is_ipv6::mask != 0 -> (is_ipv6 == 1);\n // Reserve high priorities for switch-internal use.\n // TODO: Remove once inband workaround is obsolete.\n ::priority < 0x7fffffff;\n \")" + } + match_fields { + id: 1 + name: "is_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IP)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 2 + name: "is_ipv4" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV4ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 3 + name: "is_ipv6" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV6ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 4 + name: "src_mac" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_SRC_MAC)" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 9 + name: "dst_mac" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DST_MAC)" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 5 + name: "dst_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DST_IP)" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 6 + name: "dst_ipv6" + annotations: "@composite_field(@ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD3 ) , @ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD2 ))" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 64 + match_type: TERNARY + } + match_fields { + id: 7 + name: "dscp" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DSCP)" + bitwidth: 6 + match_type: TERNARY + } + match_fields { + id: 8 + name: "in_port" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_IN_PORT)" + bitwidth: 9 + match_type: OPTIONAL + type_name { + name: "port_id_t" + } + } + action_refs { + id: 16777472 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + direct_resource_ids: 318767361 + size: 255 +} +tables { + preamble { + id: 33554503 + name: "ingress.l3_admit.l3_admit_table" + alias: "l3_admit_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "dst_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 2 + name: "in_port" + bitwidth: 9 + match_type: OPTIONAL + type_name { + name: "port_id_t" + } + } + action_refs { + id: 16777224 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 128 +} +tables { + preamble { + id: 33554496 + name: "ingress.routing.neighbor_table" + alias: "neighbor_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "router_interface_id" + annotations: "@refers_to(router_interface_table , router_interface_id)" + bitwidth: 10 + match_type: EXACT + type_name { + name: "router_interface_id_t" + } + } + match_fields { + id: 2 + name: "neighbor_id" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 16777217 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +tables { + preamble { + id: 33554497 + name: "ingress.routing.router_interface_table" + alias: "router_interface_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "router_interface_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "router_interface_id_t" + } + } + action_refs { + id: 16777218 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 256 +} +tables { + preamble { + id: 33554498 + name: "ingress.routing.nexthop_table" + alias: "nexthop_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "nexthop_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "nexthop_id_t" + } + } + action_refs { + id: 16777219 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777236 + annotations: "@proto_id(3)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +tables { + preamble { + id: 33554499 + name: "ingress.routing.wcmp_group_table" + alias: "wcmp_group_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + annotations: "@oneshot" + } + match_fields { + id: 1 + name: "wcmp_group_id" + bitwidth: 12 + match_type: EXACT + type_name { + name: "wcmp_group_id_t" + } + } + action_refs { + id: 16777221 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + implementation_id: 299650760 + size: 3968 +} +tables { + preamble { + id: 33554506 + name: "ingress.routing.vrf_table" + alias: "vrf_table" + annotations: "@entry_restriction(\"\n // The VRF ID 0 (or \'\' in P4Runtime) encodes the default VRF, which cannot\n // be read or written via this table, but is always present implicitly.\n // TODO: This constraint should read `vrf_id != \'\'` (since\n // constraints are a control plane (P4Runtime) concept), but\n // p4-constraints does not currently support strings.\n vrf_id != 0;\n \")" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "vrf_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "vrf_id_t" + } + } + action_refs { + id: 24742814 + annotations: "@proto_id(1)" + } + const_default_action_id: 24742814 + size: 64 +} +tables { + preamble { + id: 33554500 + name: "ingress.routing.ipv4_table" + alias: "ipv4_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "vrf_id" + annotations: "@refers_to(vrf_table , vrf_id)" + bitwidth: 10 + match_type: EXACT + type_name { + name: "vrf_id_t" + } + } + match_fields { + id: 2 + name: "ipv4_dst" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 16777222 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777221 + annotations: "@proto_id(2)" + } + action_refs { + id: 16777220 + annotations: "@proto_id(3)" + } + action_refs { + id: 16777231 + annotations: "@proto_id(4)" + } + action_refs { + id: 16777232 + annotations: "@proto_id(5)" + } + action_refs { + id: 16777233 + annotations: "@proto_id(6)" + } + action_refs { + id: 16777237 + annotations: "@proto_id(7)" + } + const_default_action_id: 16777222 + size: 32768 +} +tables { + preamble { + id: 33554501 + name: "ingress.routing.ipv6_table" + alias: "ipv6_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "vrf_id" + annotations: "@refers_to(vrf_table , vrf_id)" + bitwidth: 10 + match_type: EXACT + type_name { + name: "vrf_id_t" + } + } + match_fields { + id: 2 + name: "ipv6_dst" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 128 + match_type: LPM + } + action_refs { + id: 16777222 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777221 + annotations: "@proto_id(2)" + } + action_refs { + id: 16777220 + annotations: "@proto_id(3)" + } + action_refs { + id: 16777231 + annotations: "@proto_id(4)" + } + action_refs { + id: 16777232 + annotations: "@proto_id(5)" + } + action_refs { + id: 16777233 + annotations: "@proto_id(6)" + } + action_refs { + id: 16777237 + annotations: "@proto_id(7)" + } + const_default_action_id: 16777222 + size: 4096 +} +tables { + preamble { + id: 33554688 + name: "ingress.acl_ingress.acl_ingress_table" + alias: "acl_ingress_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + annotations: "@sai_acl(INGRESS)" + annotations: "@entry_restriction(\"\n // Forbid using ether_type for IP packets (by convention, use is_ip* instead).\n ether_type != 0x0800 && ether_type != 0x86dd;\n // Only allow IP field matches for IP packets.\n dst_ip::mask != 0 -> is_ipv4 == 1;\n dst_ipv6::mask != 0 -> is_ipv6 == 1;\n ttl::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n dscp::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n ecn::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n ip_protocol::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n // Only allow l4_dst_port and l4_src_port matches for TCP/UDP packets.\n l4_src_port::mask != 0 -> (ip_protocol == 6 || ip_protocol == 17);\n l4_dst_port::mask != 0 -> (ip_protocol == 6 || ip_protocol == 17);\n\n\n\n\n // Only allow icmp_type matches for ICMP packets\n\n icmp_type::mask != 0 -> ip_protocol == 1;\n\n icmpv6_type::mask != 0 -> ip_protocol == 58;\n // Forbid illegal combinations of IP_TYPE fields.\n is_ip::mask != 0 -> (is_ipv4::mask == 0 && is_ipv6::mask == 0);\n is_ipv4::mask != 0 -> (is_ip::mask == 0 && is_ipv6::mask == 0);\n is_ipv6::mask != 0 -> (is_ip::mask == 0 && is_ipv4::mask == 0);\n // Forbid unsupported combinations of IP_TYPE fields.\n is_ipv4::mask != 0 -> (is_ipv4 == 1);\n is_ipv6::mask != 0 -> (is_ipv6 == 1);\n \")" + } + match_fields { + id: 1 + name: "is_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IP)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 2 + name: "is_ipv4" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV4ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 3 + name: "is_ipv6" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV6ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 4 + name: "ether_type" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ETHER_TYPE)" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 5 + name: "dst_mac" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DST_MAC)" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 6 + name: "src_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_SRC_IP)" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 7 + name: "dst_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DST_IP)" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 8 + name: "src_ipv6" + annotations: "@composite_field(@ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD3 ) , @ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD2 ))" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 64 + match_type: TERNARY + } + match_fields { + id: 9 + name: "dst_ipv6" + annotations: "@composite_field(@ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD3 ) , @ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD2 ))" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 64 + match_type: TERNARY + } + match_fields { + id: 10 + name: "ttl" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_TTL)" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 11 + name: "dscp" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DSCP)" + bitwidth: 6 + match_type: TERNARY + } + match_fields { + id: 12 + name: "ecn" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ECN)" + bitwidth: 2 + match_type: TERNARY + } + match_fields { + id: 13 + name: "ip_protocol" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_IP_PROTOCOL)" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 19 + name: "icmp_type" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ICMP_TYPE)" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 14 + name: "icmpv6_type" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ICMPV6_TYPE)" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 20 + name: "l4_src_port" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_L4_SRC_PORT)" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 15 + name: "l4_dst_port" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_L4_DST_PORT)" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 17 + name: "in_port" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_IN_PORT)" + bitwidth: 9 + match_type: OPTIONAL + type_name { + name: "port_id_t" + } + } + match_fields { + id: 18 + name: "route_metadata" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ROUTE_DST_USER_META)" + bitwidth: 6 + match_type: OPTIONAL + } + action_refs { + id: 16777473 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777474 + annotations: "@proto_id(2)" + } + action_refs { + id: 16777475 + annotations: "@proto_id(3)" + } + action_refs { + id: 16777476 + annotations: "@proto_id(4)" + } + action_refs { + id: 16777481 + annotations: "@proto_id(5)" + } + action_refs { + id: 16777625 + annotations: "@proto_id(99)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + direct_resource_ids: 318767362 + direct_resource_ids: 352321792 + size: 128 +} +tables { + preamble { + id: 33554502 + name: "ingress.mirroring_clone.mirror_session_table" + alias: "mirror_session_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "mirror_session_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "mirror_session_id_t" + } + } + action_refs { + id: 16777223 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 2 +} +tables { + preamble { + id: 33554504 + name: "ingress.mirroring_clone.mirror_port_to_pre_session_table" + alias: "mirror_port_to_pre_session_table" + annotations: "@p4runtime_role(\"packet_replication_engine_manager\")" + } + match_fields { + id: 1 + name: "mirror_port" + bitwidth: 9 + match_type: EXACT + type_name { + name: "port_id_t" + } + } + action_refs { + id: 16777225 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +tables { + preamble { + id: 33554692 + name: "egress.acl_egress.acl_egress_table" + alias: "acl_egress_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + annotations: "@sai_acl(EGRESS)" + annotations: "@entry_restriction(\"\n // Forbid using ether_type for IP packets (by convention, use is_ip* instead).\n ether_type != 0x0800 && ether_type != 0x86dd;\n dscp::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n // Only allow IP field matches for IP packets.\n // TODO: Enable once p4-constraints bug is fixed.\n // ip_protocol::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n // Only allow l4_dst_port matches for TCP/UDP packets.\n l4_dst_port::mask != 0 -> (ip_protocol == 6 || ip_protocol == 17);\n // Forbid illegal combinations of IP_TYPE fields.\n is_ip::mask != 0 -> (is_ipv4::mask == 0 && is_ipv6::mask == 0);\n is_ipv4::mask != 0 -> (is_ip::mask == 0 && is_ipv6::mask == 0);\n is_ipv6::mask != 0 -> (is_ip::mask == 0 && is_ipv4::mask == 0);\n // Forbid unsupported combinations of IP_TYPE fields.\n is_ipv4::mask != 0 -> (is_ipv4 == 1);\n is_ipv6::mask != 0 -> (is_ipv6 == 1);\n \")" + } + match_fields { + id: 1 + name: "ether_type" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ETHER_TYPE)" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 2 + name: "ip_protocol" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_IP_PROTOCOL)" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 3 + name: "l4_dst_port" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_L4_DST_PORT)" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 4 + name: "out_port" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_OUT_PORT)" + bitwidth: 9 + match_type: OPTIONAL + type_name { + name: "port_id_t" + } + } + match_fields { + id: 5 + name: "is_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IP)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 6 + name: "is_ipv4" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV4ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 7 + name: "is_ipv6" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV6ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 8 + name: "dscp" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DSCP)" + bitwidth: 6 + match_type: TERNARY + } + action_refs { + id: 16777481 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + direct_resource_ids: 318767364 + size: 128 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 16777481 + name: "acl_drop" + alias: "acl_drop" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP)" + } +} +actions { + preamble { + id: 16777472 + name: "ingress.acl_pre_ingress.set_vrf" + alias: "set_vrf" + annotations: "@sai_action(SAI_PACKET_ACTION_FORWARD)" + } + params { + id: 1 + name: "vrf_id" + annotations: "@sai_action_param(SAI_ACL_ENTRY_ATTR_ACTION_SET_VRF)" + annotations: "@refers_to(vrf_table , vrf_id)" + bitwidth: 10 + type_name { + name: "vrf_id_t" + } + } +} +actions { + preamble { + id: 16777224 + name: "ingress.l3_admit.admit_to_l3" + alias: "admit_to_l3" + } +} +actions { + preamble { + id: 16777217 + name: "ingress.routing.set_dst_mac" + alias: "set_dst_mac" + } + params { + id: 1 + name: "dst_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } +} +actions { + preamble { + id: 16777218 + name: "ingress.routing.set_port_and_src_mac" + alias: "set_port_and_src_mac" + } + params { + id: 1 + name: "port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + params { + id: 2 + name: "src_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } +} +actions { + preamble { + id: 16777236 + name: "ingress.routing.set_ip_nexthop" + alias: "set_ip_nexthop" + } + params { + id: 1 + name: "router_interface_id" + annotations: "@refers_to(router_interface_table , router_interface_id)" + annotations: "@refers_to(neighbor_table , router_interface_id)" + bitwidth: 10 + type_name { + name: "router_interface_id_t" + } + } + params { + id: 2 + name: "neighbor_id" + annotations: "@format(IPV6_ADDRESS)" + annotations: "@refers_to(neighbor_table , neighbor_id)" + bitwidth: 128 + } +} +actions { + preamble { + id: 16777219 + name: "ingress.routing.set_nexthop" + alias: "set_nexthop" + annotations: "@deprecated(\"Use set_ip_nexthop instead.\")" + } + params { + id: 1 + name: "router_interface_id" + annotations: "@refers_to(router_interface_table , router_interface_id)" + annotations: "@refers_to(neighbor_table , router_interface_id)" + bitwidth: 10 + type_name { + name: "router_interface_id_t" + } + } + params { + id: 2 + name: "neighbor_id" + annotations: "@format(IPV6_ADDRESS)" + annotations: "@refers_to(neighbor_table , neighbor_id)" + bitwidth: 128 + } +} +actions { + preamble { + id: 16777221 + name: "ingress.routing.set_nexthop_id" + alias: "set_nexthop_id" + } + params { + id: 1 + name: "nexthop_id" + annotations: "@refers_to(nexthop_table , nexthop_id)" + bitwidth: 10 + type_name { + name: "nexthop_id_t" + } + } +} +actions { + preamble { + id: 16777232 + name: "ingress.routing.set_nexthop_id_and_metadata" + alias: "set_nexthop_id_and_metadata" + } + params { + id: 1 + name: "nexthop_id" + annotations: "@refers_to(nexthop_table , nexthop_id)" + bitwidth: 10 + type_name { + name: "nexthop_id_t" + } + } + params { + id: 2 + name: "route_metadata" + bitwidth: 6 + } +} +actions { + preamble { + id: 24742814 + name: "ingress.routing.no_action" + alias: "no_action" + } +} +actions { + preamble { + id: 16777222 + name: "ingress.routing.drop" + alias: "drop" + } +} +actions { + preamble { + id: 16777220 + name: "ingress.routing.set_wcmp_group_id" + alias: "set_wcmp_group_id" + } + params { + id: 1 + name: "wcmp_group_id" + annotations: "@refers_to(wcmp_group_table , wcmp_group_id)" + bitwidth: 12 + type_name { + name: "wcmp_group_id_t" + } + } +} +actions { + preamble { + id: 16777233 + name: "ingress.routing.set_wcmp_group_id_and_metadata" + alias: "set_wcmp_group_id_and_metadata" + } + params { + id: 1 + name: "wcmp_group_id" + annotations: "@refers_to(wcmp_group_table , wcmp_group_id)" + bitwidth: 12 + type_name { + name: "wcmp_group_id_t" + } + } + params { + id: 2 + name: "route_metadata" + bitwidth: 6 + } +} +actions { + preamble { + id: 16777231 + name: "ingress.routing.trap" + alias: "trap" + } +} +actions { + preamble { + id: 16777237 + name: "ingress.routing.set_metadata_and_drop" + alias: "set_metadata_and_drop" + } + params { + id: 1 + name: "route_metadata" + bitwidth: 6 + } +} +actions { + preamble { + id: 16777473 + name: "ingress.acl_ingress.acl_copy" + alias: "acl_copy" + annotations: "@sai_action(SAI_PACKET_ACTION_COPY , SAI_PACKET_COLOR_GREEN)" + annotations: "@sai_action(SAI_PACKET_ACTION_FORWARD , SAI_PACKET_COLOR_YELLOW)" + annotations: "@sai_action(SAI_PACKET_ACTION_FORWARD , SAI_PACKET_COLOR_RED)" + } + params { + id: 1 + name: "qos_queue" + annotations: "@sai_action_param(QOS_QUEUE)" + bitwidth: 8 + type_name { + name: "qos_queue_t" + } + } +} +actions { + preamble { + id: 16777474 + name: "ingress.acl_ingress.acl_trap" + alias: "acl_trap" + annotations: "@sai_action(SAI_PACKET_ACTION_TRAP , SAI_PACKET_COLOR_GREEN)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_YELLOW)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_RED)" + } + params { + id: 1 + name: "qos_queue" + annotations: "@sai_action_param(QOS_QUEUE)" + bitwidth: 8 + type_name { + name: "qos_queue_t" + } + } +} +actions { + preamble { + id: 16777625 + name: "ingress.acl_ingress.acl_experimental_trap" + alias: "acl_experimental_trap" + annotations: "@sai_action(SAI_PACKET_ACTION_TRAP , SAI_PACKET_COLOR_GREEN)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_YELLOW)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_RED)" + } + params { + id: 1 + name: "qos_queue" + annotations: "@sai_action_param(QOS_QUEUE)" + bitwidth: 8 + type_name { + name: "qos_queue_t" + } + } +} +actions { + preamble { + id: 16777475 + name: "ingress.acl_ingress.acl_forward" + alias: "acl_forward" + annotations: "@sai_action(SAI_PACKET_ACTION_FORWARD , SAI_PACKET_COLOR_GREEN)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_YELLOW)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_RED)" + } +} +actions { + preamble { + id: 16777476 + name: "ingress.acl_ingress.acl_mirror" + alias: "acl_mirror" + annotations: "@sai_action(SAI_PACKET_ACTION_FORWARD)" + } + params { + id: 1 + name: "mirror_session_id" + annotations: "@refers_to(mirror_session_table , mirror_session_id)" + annotations: "@sai_action_param(SAI_ACL_ENTRY_ATTR_ACTION_MIRROR_INGRESS)" + bitwidth: 10 + type_name { + name: "mirror_session_id_t" + } + } +} +actions { + preamble { + id: 16777223 + name: "ingress.mirroring_clone.mirror_as_ipv4_erspan" + alias: "mirror_as_ipv4_erspan" + } + params { + id: 1 + name: "port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + params { + id: 2 + name: "src_ip" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + } + params { + id: 3 + name: "dst_ip" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + } + params { + id: 4 + name: "src_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } + params { + id: 5 + name: "dst_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } + params { + id: 6 + name: "ttl" + bitwidth: 8 + } + params { + id: 7 + name: "tos" + bitwidth: 8 + } +} +actions { + preamble { + id: 16777225 + name: "ingress.mirroring_clone.set_pre_session" + alias: "set_pre_session" + } + params { + id: 1 + name: "id" + bitwidth: 32 + } +} +action_profiles { + preamble { + id: 299650760 + name: "ingress.routing.wcmp_group_selector" + alias: "wcmp_group_selector" + } + table_ids: 33554499 + with_selector: true + size: 65536 + max_group_size: 256 +} +direct_counters { + preamble { + id: 318767361 + name: "ingress.acl_pre_ingress.acl_pre_ingress_counter" + alias: "acl_pre_ingress_counter" + } + spec { + unit: BOTH + } + direct_table_id: 33554689 +} +direct_counters { + preamble { + id: 318767362 + name: "ingress.acl_ingress.acl_ingress_counter" + alias: "acl_ingress_counter" + } + spec { + unit: BOTH + } + direct_table_id: 33554688 +} +direct_counters { + preamble { + id: 318767364 + name: "egress.acl_egress.acl_egress_counter" + alias: "acl_egress_counter" + } + spec { + unit: BOTH + } + direct_table_id: 33554692 +} +direct_meters { + preamble { + id: 352321792 + name: "ingress.acl_ingress.acl_ingress_meter" + alias: "acl_ingress_meter" + } + spec { + unit: BYTES + } + direct_table_id: 33554688 +} +controller_packet_metadata { + preamble { + id: 81826293 + name: "packet_in" + alias: "packet_in" + annotations: "@controller_header(\"packet_in\")" + } + metadata { + id: 1 + name: "ingress_port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + metadata { + id: 2 + name: "target_egress_port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } +} +controller_packet_metadata { + preamble { + id: 76689799 + name: "packet_out" + alias: "packet_out" + annotations: "@controller_header(\"packet_out\")" + } + metadata { + id: 1 + name: "egress_port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + metadata { + id: 2 + name: "submit_to_ingress" + bitwidth: 1 + } + metadata { + id: 3 + name: "unused_pad" + bitwidth: 7 + } +} +type_info { + new_types { + key: "mirror_session_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "nexthop_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "port_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 9 + } + } + } + } + } + new_types { + key: "qos_queue_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "router_interface_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "vrf_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "wcmp_group_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 12 + } + } + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.entries.txtpb b/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb new file mode 100644 index 00000000000..a2742d05d6b --- /dev/null +++ b/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.p4info.txtpb @@ -0,0 +1,1148 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + name: "middleblock.p4" + arch: "v1model" + organization: "Google" +} +tables { + preamble { + id: 33554689 + name: "ingress.acl_pre_ingress.acl_pre_ingress_table" + alias: "acl_pre_ingress_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + annotations: "@sai_acl(PRE_INGRESS)" + annotations: "@entry_restriction(\"\n // Only allow IP field matches for IP packets.\n dscp::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n dst_ip::mask != 0 -> is_ipv4 == 1;\n dst_ipv6::mask != 0 -> is_ipv6 == 1;\n // Forbid illegal combinations of IP_TYPE fields.\n is_ip::mask != 0 -> (is_ipv4::mask == 0 && is_ipv6::mask == 0);\n is_ipv4::mask != 0 -> (is_ip::mask == 0 && is_ipv6::mask == 0);\n is_ipv6::mask != 0 -> (is_ip::mask == 0 && is_ipv4::mask == 0);\n // Forbid unsupported combinations of IP_TYPE fields.\n is_ipv4::mask != 0 -> (is_ipv4 == 1);\n is_ipv6::mask != 0 -> (is_ipv6 == 1);\n // Reserve high priorities for switch-internal use.\n // TODO: Remove once inband workaround is obsolete.\n ::priority < 0x7fffffff;\n \")" + } + match_fields { + id: 1 + name: "is_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IP)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 2 + name: "is_ipv4" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV4ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 3 + name: "is_ipv6" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV6ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 4 + name: "src_mac" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_SRC_MAC)" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 5 + name: "dst_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DST_IP)" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 6 + name: "dst_ipv6" + annotations: "@composite_field(@ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD3 ) , @ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD2 ))" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 64 + match_type: TERNARY + } + match_fields { + id: 7 + name: "dscp" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DSCP)" + bitwidth: 6 + match_type: TERNARY + } + match_fields { + id: 8 + name: "in_port" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_IN_PORT)" + bitwidth: 9 + match_type: OPTIONAL + type_name { + name: "port_id_t" + } + } + action_refs { + id: 16777472 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + direct_resource_ids: 318767361 + size: 255 +} +tables { + preamble { + id: 33554503 + name: "ingress.l3_admit.l3_admit_table" + alias: "l3_admit_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "dst_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 2 + name: "in_port" + bitwidth: 9 + match_type: OPTIONAL + type_name { + name: "port_id_t" + } + } + action_refs { + id: 16777224 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 128 +} +tables { + preamble { + id: 33554496 + name: "ingress.routing.neighbor_table" + alias: "neighbor_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "router_interface_id" + annotations: "@refers_to(router_interface_table , router_interface_id)" + bitwidth: 10 + match_type: EXACT + type_name { + name: "router_interface_id_t" + } + } + match_fields { + id: 2 + name: "neighbor_id" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 16777217 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +tables { + preamble { + id: 33554497 + name: "ingress.routing.router_interface_table" + alias: "router_interface_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "router_interface_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "router_interface_id_t" + } + } + action_refs { + id: 16777218 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 256 +} +tables { + preamble { + id: 33554498 + name: "ingress.routing.nexthop_table" + alias: "nexthop_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "nexthop_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "nexthop_id_t" + } + } + action_refs { + id: 16777219 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777236 + annotations: "@proto_id(3)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +tables { + preamble { + id: 33554499 + name: "ingress.routing.wcmp_group_table" + alias: "wcmp_group_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + annotations: "@oneshot" + } + match_fields { + id: 1 + name: "wcmp_group_id" + bitwidth: 12 + match_type: EXACT + type_name { + name: "wcmp_group_id_t" + } + } + action_refs { + id: 16777221 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + implementation_id: 299650760 + size: 3968 +} +tables { + preamble { + id: 33554506 + name: "ingress.routing.vrf_table" + alias: "vrf_table" + annotations: "@entry_restriction(\"\n // The VRF ID 0 (or \'\' in P4Runtime) encodes the default VRF, which cannot\n // be read or written via this table, but is always present implicitly.\n // TODO: This constraint should read `vrf_id != \'\'` (since\n // constraints are a control plane (P4Runtime) concept), but\n // p4-constraints does not currently support strings.\n vrf_id != 0;\n \")" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "vrf_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "vrf_id_t" + } + } + action_refs { + id: 24742814 + annotations: "@proto_id(1)" + } + const_default_action_id: 24742814 + size: 64 +} +tables { + preamble { + id: 33554500 + name: "ingress.routing.ipv4_table" + alias: "ipv4_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "vrf_id" + annotations: "@refers_to(vrf_table , vrf_id)" + bitwidth: 10 + match_type: EXACT + type_name { + name: "vrf_id_t" + } + } + match_fields { + id: 2 + name: "ipv4_dst" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 16777222 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777221 + annotations: "@proto_id(2)" + } + action_refs { + id: 16777220 + annotations: "@proto_id(3)" + } + action_refs { + id: 16777231 + annotations: "@proto_id(4)" + } + action_refs { + id: 16777232 + annotations: "@proto_id(5)" + } + action_refs { + id: 16777233 + annotations: "@proto_id(6)" + } + const_default_action_id: 16777222 + size: 32768 +} +tables { + preamble { + id: 33554501 + name: "ingress.routing.ipv6_table" + alias: "ipv6_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "vrf_id" + annotations: "@refers_to(vrf_table , vrf_id)" + bitwidth: 10 + match_type: EXACT + type_name { + name: "vrf_id_t" + } + } + match_fields { + id: 2 + name: "ipv6_dst" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 128 + match_type: LPM + } + action_refs { + id: 16777222 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777221 + annotations: "@proto_id(2)" + } + action_refs { + id: 16777220 + annotations: "@proto_id(3)" + } + action_refs { + id: 16777231 + annotations: "@proto_id(4)" + } + action_refs { + id: 16777232 + annotations: "@proto_id(5)" + } + action_refs { + id: 16777233 + annotations: "@proto_id(6)" + } + const_default_action_id: 16777222 + size: 4096 +} +tables { + preamble { + id: 33554688 + name: "ingress.acl_ingress.acl_ingress_table" + alias: "acl_ingress_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + annotations: "@sai_acl(INGRESS)" + annotations: "@entry_restriction(\"\n // Forbid using ether_type for IP packets (by convention, use is_ip* instead).\n ether_type != 0x0800 && ether_type != 0x86dd;\n // Only allow IP field matches for IP packets.\n dst_ip::mask != 0 -> is_ipv4 == 1;\n dst_ipv6::mask != 0 -> is_ipv6 == 1;\n ttl::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n dscp::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n ecn::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n ip_protocol::mask != 0 -> (is_ip == 1 || is_ipv4 == 1 || is_ipv6 == 1);\n // Only allow l4_dst_port and l4_src_port matches for TCP/UDP packets.\n l4_src_port::mask != 0 -> (ip_protocol == 6 || ip_protocol == 17);\n l4_dst_port::mask != 0 -> (ip_protocol == 6 || ip_protocol == 17);\n\n // Only allow arp_tpa matches for ARP packets.\n arp_tpa::mask != 0 -> ether_type == 0x0806;\n\n // Only allow icmp_type matches for ICMP packets\n\n\n\n icmpv6_type::mask != 0 -> ip_protocol == 58;\n // Forbid illegal combinations of IP_TYPE fields.\n is_ip::mask != 0 -> (is_ipv4::mask == 0 && is_ipv6::mask == 0);\n is_ipv4::mask != 0 -> (is_ip::mask == 0 && is_ipv6::mask == 0);\n is_ipv6::mask != 0 -> (is_ip::mask == 0 && is_ipv4::mask == 0);\n // Forbid unsupported combinations of IP_TYPE fields.\n is_ipv4::mask != 0 -> (is_ipv4 == 1);\n is_ipv6::mask != 0 -> (is_ipv6 == 1);\n \")" + } + match_fields { + id: 1 + name: "is_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IP)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 2 + name: "is_ipv4" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV4ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 3 + name: "is_ipv6" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV6ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 4 + name: "ether_type" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ETHER_TYPE)" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 5 + name: "dst_mac" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DST_MAC)" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 6 + name: "src_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_SRC_IP)" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 7 + name: "dst_ip" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DST_IP)" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + match_type: TERNARY + } + match_fields { + id: 8 + name: "src_ipv6" + annotations: "@composite_field(@ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD3 ) , @ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_SRC_IPV6_WORD2 ))" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 64 + match_type: TERNARY + } + match_fields { + id: 9 + name: "dst_ipv6" + annotations: "@composite_field(@ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD3 ) , @ sai_field ( SAI_ACL_TABLE_ATTR_FIELD_DST_IPV6_WORD2 ))" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 64 + match_type: TERNARY + } + match_fields { + id: 10 + name: "ttl" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_TTL)" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 11 + name: "dscp" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_DSCP)" + bitwidth: 6 + match_type: TERNARY + } + match_fields { + id: 12 + name: "ecn" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ECN)" + bitwidth: 2 + match_type: TERNARY + } + match_fields { + id: 13 + name: "ip_protocol" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_IP_PROTOCOL)" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 14 + name: "icmpv6_type" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ICMPV6_TYPE)" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 20 + name: "l4_src_port" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_L4_SRC_PORT)" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 15 + name: "l4_dst_port" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_L4_DST_PORT)" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 16 + name: "arp_tpa" + annotations: "@composite_field(@ sai_udf ( base = SAI_UDF_BASE_L3 , offset = 24 , length = 2 ) , @ sai_udf ( base = SAI_UDF_BASE_L3 , offset = 26 , length = 2 ))" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + match_type: TERNARY + } + action_refs { + id: 16777473 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777474 + annotations: "@proto_id(2)" + } + action_refs { + id: 16777475 + annotations: "@proto_id(3)" + } + action_refs { + id: 16777476 + annotations: "@proto_id(4)" + } + action_refs { + id: 16777481 + annotations: "@proto_id(5)" + } + action_refs { + id: 16777625 + annotations: "@proto_id(99)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + direct_resource_ids: 318767362 + direct_resource_ids: 352321792 + size: 128 +} +tables { + preamble { + id: 33554502 + name: "ingress.mirroring_clone.mirror_session_table" + alias: "mirror_session_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "mirror_session_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "mirror_session_id_t" + } + } + action_refs { + id: 16777223 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 2 +} +tables { + preamble { + id: 33554504 + name: "ingress.mirroring_clone.mirror_port_to_pre_session_table" + alias: "mirror_port_to_pre_session_table" + annotations: "@p4runtime_role(\"packet_replication_engine_manager\")" + } + match_fields { + id: 1 + name: "mirror_port" + bitwidth: 9 + match_type: EXACT + type_name { + name: "port_id_t" + } + } + action_refs { + id: 16777225 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 16777481 + name: "acl_drop" + alias: "acl_drop" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP)" + } +} +actions { + preamble { + id: 16777472 + name: "ingress.acl_pre_ingress.set_vrf" + alias: "set_vrf" + annotations: "@sai_action(SAI_PACKET_ACTION_FORWARD)" + } + params { + id: 1 + name: "vrf_id" + annotations: "@sai_action_param(SAI_ACL_ENTRY_ATTR_ACTION_SET_VRF)" + annotations: "@refers_to(vrf_table , vrf_id)" + bitwidth: 10 + type_name { + name: "vrf_id_t" + } + } +} +actions { + preamble { + id: 16777224 + name: "ingress.l3_admit.admit_to_l3" + alias: "admit_to_l3" + } +} +actions { + preamble { + id: 16777217 + name: "ingress.routing.set_dst_mac" + alias: "set_dst_mac" + } + params { + id: 1 + name: "dst_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } +} +actions { + preamble { + id: 16777218 + name: "ingress.routing.set_port_and_src_mac" + alias: "set_port_and_src_mac" + } + params { + id: 1 + name: "port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + params { + id: 2 + name: "src_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } +} +actions { + preamble { + id: 16777236 + name: "ingress.routing.set_ip_nexthop" + alias: "set_ip_nexthop" + } + params { + id: 1 + name: "router_interface_id" + annotations: "@refers_to(router_interface_table , router_interface_id)" + annotations: "@refers_to(neighbor_table , router_interface_id)" + bitwidth: 10 + type_name { + name: "router_interface_id_t" + } + } + params { + id: 2 + name: "neighbor_id" + annotations: "@format(IPV6_ADDRESS)" + annotations: "@refers_to(neighbor_table , neighbor_id)" + bitwidth: 128 + } +} +actions { + preamble { + id: 16777219 + name: "ingress.routing.set_nexthop" + alias: "set_nexthop" + annotations: "@deprecated(\"Use set_ip_nexthop instead.\")" + } + params { + id: 1 + name: "router_interface_id" + annotations: "@refers_to(router_interface_table , router_interface_id)" + annotations: "@refers_to(neighbor_table , router_interface_id)" + bitwidth: 10 + type_name { + name: "router_interface_id_t" + } + } + params { + id: 2 + name: "neighbor_id" + annotations: "@format(IPV6_ADDRESS)" + annotations: "@refers_to(neighbor_table , neighbor_id)" + bitwidth: 128 + } +} +actions { + preamble { + id: 16777221 + name: "ingress.routing.set_nexthop_id" + alias: "set_nexthop_id" + } + params { + id: 1 + name: "nexthop_id" + annotations: "@refers_to(nexthop_table , nexthop_id)" + bitwidth: 10 + type_name { + name: "nexthop_id_t" + } + } +} +actions { + preamble { + id: 16777232 + name: "ingress.routing.set_nexthop_id_and_metadata" + alias: "set_nexthop_id_and_metadata" + } + params { + id: 1 + name: "nexthop_id" + annotations: "@refers_to(nexthop_table , nexthop_id)" + bitwidth: 10 + type_name { + name: "nexthop_id_t" + } + } + params { + id: 2 + name: "route_metadata" + bitwidth: 6 + } +} +actions { + preamble { + id: 24742814 + name: "ingress.routing.no_action" + alias: "no_action" + } +} +actions { + preamble { + id: 16777222 + name: "ingress.routing.drop" + alias: "drop" + } +} +actions { + preamble { + id: 16777220 + name: "ingress.routing.set_wcmp_group_id" + alias: "set_wcmp_group_id" + } + params { + id: 1 + name: "wcmp_group_id" + annotations: "@refers_to(wcmp_group_table , wcmp_group_id)" + bitwidth: 12 + type_name { + name: "wcmp_group_id_t" + } + } +} +actions { + preamble { + id: 16777233 + name: "ingress.routing.set_wcmp_group_id_and_metadata" + alias: "set_wcmp_group_id_and_metadata" + } + params { + id: 1 + name: "wcmp_group_id" + annotations: "@refers_to(wcmp_group_table , wcmp_group_id)" + bitwidth: 12 + type_name { + name: "wcmp_group_id_t" + } + } + params { + id: 2 + name: "route_metadata" + bitwidth: 6 + } +} +actions { + preamble { + id: 16777231 + name: "ingress.routing.trap" + alias: "trap" + } +} +actions { + preamble { + id: 16777473 + name: "ingress.acl_ingress.acl_copy" + alias: "acl_copy" + annotations: "@sai_action(SAI_PACKET_ACTION_COPY , SAI_PACKET_COLOR_GREEN)" + annotations: "@sai_action(SAI_PACKET_ACTION_FORWARD , SAI_PACKET_COLOR_YELLOW)" + annotations: "@sai_action(SAI_PACKET_ACTION_FORWARD , SAI_PACKET_COLOR_RED)" + } + params { + id: 1 + name: "qos_queue" + annotations: "@sai_action_param(QOS_QUEUE)" + bitwidth: 8 + type_name { + name: "qos_queue_t" + } + } +} +actions { + preamble { + id: 16777474 + name: "ingress.acl_ingress.acl_trap" + alias: "acl_trap" + annotations: "@sai_action(SAI_PACKET_ACTION_TRAP , SAI_PACKET_COLOR_GREEN)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_YELLOW)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_RED)" + } + params { + id: 1 + name: "qos_queue" + annotations: "@sai_action_param(QOS_QUEUE)" + bitwidth: 8 + type_name { + name: "qos_queue_t" + } + } +} +actions { + preamble { + id: 16777625 + name: "ingress.acl_ingress.acl_experimental_trap" + alias: "acl_experimental_trap" + annotations: "@sai_action(SAI_PACKET_ACTION_TRAP , SAI_PACKET_COLOR_GREEN)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_YELLOW)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_RED)" + } + params { + id: 1 + name: "qos_queue" + annotations: "@sai_action_param(QOS_QUEUE)" + bitwidth: 8 + type_name { + name: "qos_queue_t" + } + } +} +actions { + preamble { + id: 16777475 + name: "ingress.acl_ingress.acl_forward" + alias: "acl_forward" + annotations: "@sai_action(SAI_PACKET_ACTION_FORWARD , SAI_PACKET_COLOR_GREEN)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_YELLOW)" + annotations: "@sai_action(SAI_PACKET_ACTION_DROP , SAI_PACKET_COLOR_RED)" + } +} +actions { + preamble { + id: 16777476 + name: "ingress.acl_ingress.acl_mirror" + alias: "acl_mirror" + annotations: "@sai_action(SAI_PACKET_ACTION_FORWARD)" + } + params { + id: 1 + name: "mirror_session_id" + annotations: "@refers_to(mirror_session_table , mirror_session_id)" + annotations: "@sai_action_param(SAI_ACL_ENTRY_ATTR_ACTION_MIRROR_INGRESS)" + bitwidth: 10 + type_name { + name: "mirror_session_id_t" + } + } +} +actions { + preamble { + id: 16777223 + name: "ingress.mirroring_clone.mirror_as_ipv4_erspan" + alias: "mirror_as_ipv4_erspan" + } + params { + id: 1 + name: "port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + params { + id: 2 + name: "src_ip" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + } + params { + id: 3 + name: "dst_ip" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + } + params { + id: 4 + name: "src_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } + params { + id: 5 + name: "dst_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } + params { + id: 6 + name: "ttl" + bitwidth: 8 + } + params { + id: 7 + name: "tos" + bitwidth: 8 + } +} +actions { + preamble { + id: 16777225 + name: "ingress.mirroring_clone.set_pre_session" + alias: "set_pre_session" + } + params { + id: 1 + name: "id" + bitwidth: 32 + } +} +action_profiles { + preamble { + id: 299650760 + name: "ingress.routing.wcmp_group_selector" + alias: "wcmp_group_selector" + } + table_ids: 33554499 + with_selector: true + size: 65536 + max_group_size: 256 +} +direct_counters { + preamble { + id: 318767361 + name: "ingress.acl_pre_ingress.acl_pre_ingress_counter" + alias: "acl_pre_ingress_counter" + } + spec { + unit: BOTH + } + direct_table_id: 33554689 +} +direct_counters { + preamble { + id: 318767362 + name: "ingress.acl_ingress.acl_ingress_counter" + alias: "acl_ingress_counter" + } + spec { + unit: BOTH + } + direct_table_id: 33554688 +} +direct_meters { + preamble { + id: 352321792 + name: "ingress.acl_ingress.acl_ingress_meter" + alias: "acl_ingress_meter" + } + spec { + unit: BYTES + } + direct_table_id: 33554688 +} +controller_packet_metadata { + preamble { + id: 81826293 + name: "packet_in" + alias: "packet_in" + annotations: "@controller_header(\"packet_in\")" + } + metadata { + id: 1 + name: "ingress_port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + metadata { + id: 2 + name: "target_egress_port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } +} +controller_packet_metadata { + preamble { + id: 76689799 + name: "packet_out" + alias: "packet_out" + annotations: "@controller_header(\"packet_out\")" + } + metadata { + id: 1 + name: "egress_port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + metadata { + id: 2 + name: "submit_to_ingress" + bitwidth: 1 + } + metadata { + id: 3 + name: "unused_pad" + bitwidth: 7 + } +} +type_info { + new_types { + key: "mirror_session_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "nexthop_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "port_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 9 + } + } + } + } + } + new_types { + key: "qos_queue_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "router_interface_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "vrf_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "wcmp_group_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 12 + } + } + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.entries.txtpb b/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb new file mode 100644 index 00000000000..380996cec3c --- /dev/null +++ b/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.p4info.txtpb @@ -0,0 +1,840 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + name: "wbb.p4" + arch: "v1model" + organization: "Google" +} +tables { + preamble { + id: 33554503 + name: "ingress.l3_admit.l3_admit_table" + alias: "l3_admit_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "dst_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + match_type: TERNARY + } + match_fields { + id: 2 + name: "in_port" + bitwidth: 9 + match_type: OPTIONAL + type_name { + name: "port_id_t" + } + } + action_refs { + id: 16777224 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 128 +} +tables { + preamble { + id: 33554496 + name: "ingress.routing.neighbor_table" + alias: "neighbor_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "router_interface_id" + annotations: "@refers_to(router_interface_table , router_interface_id)" + bitwidth: 10 + match_type: EXACT + type_name { + name: "router_interface_id_t" + } + } + match_fields { + id: 2 + name: "neighbor_id" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 16777217 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +tables { + preamble { + id: 33554497 + name: "ingress.routing.router_interface_table" + alias: "router_interface_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "router_interface_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "router_interface_id_t" + } + } + action_refs { + id: 16777218 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 256 +} +tables { + preamble { + id: 33554498 + name: "ingress.routing.nexthop_table" + alias: "nexthop_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "nexthop_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "nexthop_id_t" + } + } + action_refs { + id: 16777219 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777236 + annotations: "@proto_id(3)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +tables { + preamble { + id: 33554499 + name: "ingress.routing.wcmp_group_table" + alias: "wcmp_group_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + annotations: "@oneshot" + } + match_fields { + id: 1 + name: "wcmp_group_id" + bitwidth: 12 + match_type: EXACT + type_name { + name: "wcmp_group_id_t" + } + } + action_refs { + id: 16777221 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + implementation_id: 299650760 + size: 3968 +} +tables { + preamble { + id: 33554506 + name: "ingress.routing.vrf_table" + alias: "vrf_table" + annotations: "@entry_restriction(\"\n // The VRF ID 0 (or \'\' in P4Runtime) encodes the default VRF, which cannot\n // be read or written via this table, but is always present implicitly.\n // TODO: This constraint should read `vrf_id != \'\'` (since\n // constraints are a control plane (P4Runtime) concept), but\n // p4-constraints does not currently support strings.\n vrf_id != 0;\n \")" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "vrf_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "vrf_id_t" + } + } + action_refs { + id: 24742814 + annotations: "@proto_id(1)" + } + const_default_action_id: 24742814 + size: 64 +} +tables { + preamble { + id: 33554500 + name: "ingress.routing.ipv4_table" + alias: "ipv4_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "vrf_id" + annotations: "@refers_to(vrf_table , vrf_id)" + bitwidth: 10 + match_type: EXACT + type_name { + name: "vrf_id_t" + } + } + match_fields { + id: 2 + name: "ipv4_dst" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 16777222 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777221 + annotations: "@proto_id(2)" + } + action_refs { + id: 16777220 + annotations: "@proto_id(3)" + } + action_refs { + id: 16777231 + annotations: "@proto_id(4)" + } + action_refs { + id: 16777232 + annotations: "@proto_id(5)" + } + action_refs { + id: 16777233 + annotations: "@proto_id(6)" + } + const_default_action_id: 16777222 + size: 32768 +} +tables { + preamble { + id: 33554501 + name: "ingress.routing.ipv6_table" + alias: "ipv6_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "vrf_id" + annotations: "@refers_to(vrf_table , vrf_id)" + bitwidth: 10 + match_type: EXACT + type_name { + name: "vrf_id_t" + } + } + match_fields { + id: 2 + name: "ipv6_dst" + annotations: "@format(IPV6_ADDRESS)" + bitwidth: 128 + match_type: LPM + } + action_refs { + id: 16777222 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777221 + annotations: "@proto_id(2)" + } + action_refs { + id: 16777220 + annotations: "@proto_id(3)" + } + action_refs { + id: 16777231 + annotations: "@proto_id(4)" + } + action_refs { + id: 16777232 + annotations: "@proto_id(5)" + } + action_refs { + id: 16777233 + annotations: "@proto_id(6)" + } + const_default_action_id: 16777222 + size: 4096 +} +tables { + preamble { + id: 33554691 + name: "ingress.acl_wbb_ingress.acl_wbb_ingress_table" + alias: "acl_wbb_ingress_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + annotations: "@sai_acl(INGRESS)" + annotations: "@entry_restriction(\"\n // WBB only allows for very specific table entries:\n\n // Traceroute (6 entries)\n (\n // IPv4 or IPv6\n ((is_ipv4 == 1 && is_ipv6::mask == 0) ||\n (is_ipv4::mask == 0 && is_ipv6 == 1)) &&\n // TTL 0, 1, and 2\n (ttl == 0 || ttl == 1 || ttl == 2) &&\n ether_type::mask == 0 && outer_vlan_id::mask == 0\n ) ||\n // LLDP\n (\n ether_type == 0x88cc &&\n is_ipv4::mask == 0 && is_ipv6::mask == 0 && ttl::mask == 0 &&\n outer_vlan_id::mask == 0\n ) ||\n // ND\n (\n // TODO remove optional match for VLAN ID once VLAN ID is\n // completely removed from ND flows.\n (( outer_vlan_id::mask == 0xfff && outer_vlan_id == 0x0FA0) ||\n outer_vlan_id::mask == 0);\n ether_type == 0x6007;\n is_ipv4::mask == 0;\n is_ipv6::mask == 0;\n ttl::mask == 0\n )\n \")" + } + match_fields { + id: 1 + name: "is_ipv4" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV4ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 2 + name: "is_ipv6" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ACL_IP_TYPE / IPV6ANY)" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 3 + name: "ether_type" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_ETHER_TYPE)" + bitwidth: 16 + match_type: TERNARY + } + match_fields { + id: 4 + name: "ttl" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_TTL)" + bitwidth: 8 + match_type: TERNARY + } + match_fields { + id: 5 + name: "outer_vlan_id" + annotations: "@sai_field(SAI_ACL_TABLE_ATTR_FIELD_OUTER_VLAN_ID)" + bitwidth: 12 + match_type: TERNARY + } + action_refs { + id: 16777479 + annotations: "@proto_id(1)" + } + action_refs { + id: 16777480 + annotations: "@proto_id(2)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + direct_resource_ids: 318767363 + direct_resource_ids: 352321793 + size: 8 +} +tables { + preamble { + id: 33554502 + name: "ingress.mirroring_clone.mirror_session_table" + alias: "mirror_session_table" + annotations: "@p4runtime_role(\"sdn_controller\")" + } + match_fields { + id: 1 + name: "mirror_session_id" + bitwidth: 10 + match_type: EXACT + type_name { + name: "mirror_session_id_t" + } + } + action_refs { + id: 16777223 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 2 +} +tables { + preamble { + id: 33554504 + name: "ingress.mirroring_clone.mirror_port_to_pre_session_table" + alias: "mirror_port_to_pre_session_table" + annotations: "@p4runtime_role(\"packet_replication_engine_manager\")" + } + match_fields { + id: 1 + name: "mirror_port" + bitwidth: 9 + match_type: EXACT + type_name { + name: "port_id_t" + } + } + action_refs { + id: 16777225 + annotations: "@proto_id(1)" + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 16777224 + name: "ingress.l3_admit.admit_to_l3" + alias: "admit_to_l3" + } +} +actions { + preamble { + id: 16777217 + name: "ingress.routing.set_dst_mac" + alias: "set_dst_mac" + } + params { + id: 1 + name: "dst_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } +} +actions { + preamble { + id: 16777218 + name: "ingress.routing.set_port_and_src_mac" + alias: "set_port_and_src_mac" + } + params { + id: 1 + name: "port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + params { + id: 2 + name: "src_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } +} +actions { + preamble { + id: 16777236 + name: "ingress.routing.set_ip_nexthop" + alias: "set_ip_nexthop" + } + params { + id: 1 + name: "router_interface_id" + annotations: "@refers_to(router_interface_table , router_interface_id)" + annotations: "@refers_to(neighbor_table , router_interface_id)" + bitwidth: 10 + type_name { + name: "router_interface_id_t" + } + } + params { + id: 2 + name: "neighbor_id" + annotations: "@format(IPV6_ADDRESS)" + annotations: "@refers_to(neighbor_table , neighbor_id)" + bitwidth: 128 + } +} +actions { + preamble { + id: 16777219 + name: "ingress.routing.set_nexthop" + alias: "set_nexthop" + annotations: "@deprecated(\"Use set_ip_nexthop instead.\")" + } + params { + id: 1 + name: "router_interface_id" + annotations: "@refers_to(router_interface_table , router_interface_id)" + annotations: "@refers_to(neighbor_table , router_interface_id)" + bitwidth: 10 + type_name { + name: "router_interface_id_t" + } + } + params { + id: 2 + name: "neighbor_id" + annotations: "@format(IPV6_ADDRESS)" + annotations: "@refers_to(neighbor_table , neighbor_id)" + bitwidth: 128 + } +} +actions { + preamble { + id: 16777221 + name: "ingress.routing.set_nexthop_id" + alias: "set_nexthop_id" + } + params { + id: 1 + name: "nexthop_id" + annotations: "@refers_to(nexthop_table , nexthop_id)" + bitwidth: 10 + type_name { + name: "nexthop_id_t" + } + } +} +actions { + preamble { + id: 16777232 + name: "ingress.routing.set_nexthop_id_and_metadata" + alias: "set_nexthop_id_and_metadata" + } + params { + id: 1 + name: "nexthop_id" + annotations: "@refers_to(nexthop_table , nexthop_id)" + bitwidth: 10 + type_name { + name: "nexthop_id_t" + } + } + params { + id: 2 + name: "route_metadata" + bitwidth: 6 + } +} +actions { + preamble { + id: 24742814 + name: "ingress.routing.no_action" + alias: "no_action" + } +} +actions { + preamble { + id: 16777222 + name: "ingress.routing.drop" + alias: "drop" + } +} +actions { + preamble { + id: 16777220 + name: "ingress.routing.set_wcmp_group_id" + alias: "set_wcmp_group_id" + } + params { + id: 1 + name: "wcmp_group_id" + annotations: "@refers_to(wcmp_group_table , wcmp_group_id)" + bitwidth: 12 + type_name { + name: "wcmp_group_id_t" + } + } +} +actions { + preamble { + id: 16777233 + name: "ingress.routing.set_wcmp_group_id_and_metadata" + alias: "set_wcmp_group_id_and_metadata" + } + params { + id: 1 + name: "wcmp_group_id" + annotations: "@refers_to(wcmp_group_table , wcmp_group_id)" + bitwidth: 12 + type_name { + name: "wcmp_group_id_t" + } + } + params { + id: 2 + name: "route_metadata" + bitwidth: 6 + } +} +actions { + preamble { + id: 16777231 + name: "ingress.routing.trap" + alias: "trap" + } +} +actions { + preamble { + id: 16777479 + name: "ingress.acl_wbb_ingress.acl_wbb_ingress_copy" + alias: "acl_wbb_ingress_copy" + annotations: "@sai_action(SAI_PACKET_ACTION_COPY)" + } +} +actions { + preamble { + id: 16777480 + name: "ingress.acl_wbb_ingress.acl_wbb_ingress_trap" + alias: "acl_wbb_ingress_trap" + annotations: "@sai_action(SAI_PACKET_ACTION_TRAP)" + } +} +actions { + preamble { + id: 16777223 + name: "ingress.mirroring_clone.mirror_as_ipv4_erspan" + alias: "mirror_as_ipv4_erspan" + } + params { + id: 1 + name: "port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + params { + id: 2 + name: "src_ip" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + } + params { + id: 3 + name: "dst_ip" + annotations: "@format(IPV4_ADDRESS)" + bitwidth: 32 + } + params { + id: 4 + name: "src_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } + params { + id: 5 + name: "dst_mac" + annotations: "@format(MAC_ADDRESS)" + bitwidth: 48 + } + params { + id: 6 + name: "ttl" + bitwidth: 8 + } + params { + id: 7 + name: "tos" + bitwidth: 8 + } +} +actions { + preamble { + id: 16777225 + name: "ingress.mirroring_clone.set_pre_session" + alias: "set_pre_session" + } + params { + id: 1 + name: "id" + bitwidth: 32 + } +} +action_profiles { + preamble { + id: 299650760 + name: "ingress.routing.wcmp_group_selector" + alias: "wcmp_group_selector" + } + table_ids: 33554499 + with_selector: true + size: 65536 + max_group_size: 256 +} +direct_counters { + preamble { + id: 318767363 + name: "ingress.acl_wbb_ingress.acl_wbb_ingress_counter" + alias: "acl_wbb_ingress_counter" + } + spec { + unit: BOTH + } + direct_table_id: 33554691 +} +direct_meters { + preamble { + id: 352321793 + name: "ingress.acl_wbb_ingress.acl_wbb_ingress_meter" + alias: "acl_wbb_ingress_meter" + } + spec { + unit: BYTES + } + direct_table_id: 33554691 +} +controller_packet_metadata { + preamble { + id: 81826293 + name: "packet_in" + alias: "packet_in" + annotations: "@controller_header(\"packet_in\")" + } + metadata { + id: 1 + name: "ingress_port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + metadata { + id: 2 + name: "target_egress_port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } +} +controller_packet_metadata { + preamble { + id: 76689799 + name: "packet_out" + alias: "packet_out" + annotations: "@controller_header(\"packet_out\")" + } + metadata { + id: 1 + name: "egress_port" + bitwidth: 9 + type_name { + name: "port_id_t" + } + } + metadata { + id: 2 + name: "submit_to_ingress" + bitwidth: 1 + } + metadata { + id: 3 + name: "unused_pad" + bitwidth: 7 + } +} +type_info { + new_types { + key: "mirror_session_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "nexthop_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "port_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 9 + } + } + } + } + } + new_types { + key: "router_interface_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "vrf_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 10 + } + } + } + } + } + new_types { + key: "wcmp_group_id_t" + value { + original_type { + bitstring { + bit { + bitwidth: 12 + } + } + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4-error b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4-error deleted file mode 100644 index a5190f2c882..00000000000 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4-error +++ /dev/null @@ -1,33 +0,0 @@ -pna-dpdk-invalid-hdr-warnings5.p4(31): [--Wwarn=invalid_header] warning: accessing a field of an invalid header hdr.u1.h1 - hdr.u1.h1.data = 1; - ^^^^^^^^^ -pna-dpdk-invalid-hdr-warnings5.p4(36): [--Wwarn=invalid_header] warning: accessing a field of an invalid header hdr.u1.h3 - hdr.u1.h3.data = 1; - ^^^^^^^^^ -pna-dpdk-invalid-hdr-warnings5.p4(50): [--Wwarn=invalid_header] warning: accessing a field of a potentially invalid header hdr.u1.h1 - hdr.u1.h1.data = 1; - ^^^^^^^^^ -pna-dpdk-invalid-hdr-warnings5.p4(51): [--Wwarn=invalid_header] warning: accessing a field of a potentially invalid header hdr.u1.h2 - hdr.u1.h2.data = 1; - ^^^^^^^^^ -pna-dpdk-invalid-hdr-warnings5.p4(52): [--Wwarn=invalid_header] warning: accessing a field of an invalid header hdr.u1.h3 - hdr.u1.h3.data = 1; - ^^^^^^^^^ -pna-dpdk-invalid-hdr-warnings5.p4(70): [--Wwarn=invalid_header] warning: accessing a field of an invalid header u2.h1 - u2.h1.data = 1; - ^^^^^ -pna-dpdk-invalid-hdr-warnings5.p4(79): [--Wwarn=invalid_header] warning: accessing a field of a potentially invalid header u1.h1 - u1.h1.data = 1; - ^^^^^ -pna-dpdk-invalid-hdr-warnings5.p4(80): [--Wwarn=invalid_header] warning: accessing a field of a potentially invalid header u1.h2 - u1.h2.data = 1; - ^^^^^ -pna-dpdk-invalid-hdr-warnings5.p4(84): [--Wwarn=invalid_header] warning: accessing a field of an invalid header u1.h1 - u1.h1.data = 1; - ^^^^^ -pna-dpdk-invalid-hdr-warnings5.p4(85): [--Wwarn=invalid_header] warning: accessing a field of an invalid header u1.h2 - u1.h2.data = 1; - ^^^^^ -pna-dpdk-invalid-hdr-warnings5.p4(86): [--Wwarn=invalid_header] warning: accessing a field of an invalid header u1.h3 - u1.h3.data = 1; - ^^^^^ diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4.bfrt.json b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4.bfrt.json deleted file mode 100644 index b6d66a630db..00000000000 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4.bfrt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4.spec b/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4.spec deleted file mode 100644 index d5d7aa8bbcc..00000000000 --- a/testdata/p4_16_samples_outputs/pna-dpdk-invalid-hdr-warnings5.p4.spec +++ /dev/null @@ -1,118 +0,0 @@ - -struct Header1 { - bit<32> data -} - -struct Header2 { - bit<16> data -} - -header h1 instanceof Header1 -header u1_h1 instanceof Header1 -header u1_h2 instanceof Header2 -header u1_h3 instanceof Header1 -header u2_h1 instanceof Header1 -header u2_h2 instanceof Header2 -header u2_h3 instanceof Header1 -header MainControlT_u1_0_h1 instanceof Header1 -header MainControlT_u1_0_h2 instanceof Header2 -header MainControlT_u1_0_h3 instanceof Header1 -header MainControlT_u2_0_h1 instanceof Header1 -header MainControlT_u2_0_h2 instanceof Header2 -header MainControlT_u2_0_h3 instanceof Header1 - -struct M { - bit<32> pna_main_input_metadata_input_port - bit<32> pna_main_output_metadata_output_port - bit<8> MainParserT_parser_tmp -} -metadata instanceof M - -regarray direction size 0x100 initval 0 - -apply { - rx m.pna_main_input_metadata_input_port - validate h.u1_h1 - invalidate h.u1_h2 - invalidate h.u1_h3 - extract h.u1_h3 - validate h.u1_h3 - mov h.u1_h3.data 0x1 - invalidate h.u1_h1 - invalidate h.u1_h2 - mov m.MainParserT_parser_tmp 1 - jmpv LABEL_END h.u1_h3 - mov m.MainParserT_parser_tmp 0 - LABEL_END : jmpeq PARSERIMPL_START_TRUE m.MainParserT_parser_tmp 1 - invalidate h.u1_h1 - jmp PARSERIMPL_START_JOIN - PARSERIMPL_START_TRUE : validate h.u1_h1 - jmpnv LABEL_FALSE h.u1_h3 - validate h.u1_h1 - jmp LABEL_END_0 - LABEL_FALSE : invalidate h.u1_h1 - LABEL_END_0 : mov h.u1_h1.data h.u1_h3.data - invalidate h.u1_h2 - invalidate h.u1_h3 - PARSERIMPL_START_JOIN : validate h.u1_h1 - mov h.u1_h1.data 0x1 - invalidate h.u1_h2 - invalidate h.u1_h3 - validate h.u1_h1 - mov h.u1_h1.data 0x1 - invalidate h.u1_h2 - invalidate h.u1_h3 - validate h.u1_h2 - mov h.u1_h2.data 0x1 - invalidate h.u1_h1 - invalidate h.u1_h3 - validate h.u1_h3 - mov h.u1_h3.data 0x1 - invalidate h.u1_h1 - invalidate h.u1_h2 - invalidate h.MainControlT_u1_0_h1 - invalidate h.MainControlT_u1_0_h2 - invalidate h.MainControlT_u1_0_h3 - invalidate h.MainControlT_u2_0_h1 - invalidate h.MainControlT_u2_0_h2 - invalidate h.MainControlT_u2_0_h3 - validate h.MainControlT_u1_0_h1 - invalidate h.MainControlT_u1_0_h2 - invalidate h.MainControlT_u1_0_h3 - validate h.MainControlT_u1_0_h1 - mov h.MainControlT_u1_0_h1.data 0x1 - invalidate h.MainControlT_u1_0_h2 - invalidate h.MainControlT_u1_0_h3 - validate h.MainControlT_u1_0_h2 - invalidate h.MainControlT_u1_0_h1 - invalidate h.MainControlT_u1_0_h3 - jmpnv LABEL_FALSE_0 h.MainControlT_u1_0_h1 - validate h.MainControlT_u2_0_h1 - invalidate h.MainControlT_u2_0_h2 - invalidate h.MainControlT_u2_0_h3 - jmp LABEL_END_1 - LABEL_FALSE_0 : invalidate h.MainControlT_u2_0_h1 - LABEL_END_1 : jmpnv LABEL_FALSE_1 h.MainControlT_u1_0_h2 - validate h.MainControlT_u2_0_h2 - invalidate h.MainControlT_u2_0_h1 - invalidate h.MainControlT_u2_0_h3 - jmp LABEL_END_2 - LABEL_FALSE_1 : invalidate h.MainControlT_u2_0_h2 - LABEL_END_2 : jmpnv LABEL_FALSE_2 h.MainControlT_u1_0_h3 - validate h.MainControlT_u2_0_h3 - invalidate h.MainControlT_u2_0_h1 - invalidate h.MainControlT_u2_0_h2 - jmp LABEL_END_3 - LABEL_FALSE_2 : invalidate h.MainControlT_u2_0_h3 - LABEL_END_3 : validate h.MainControlT_u2_0_h2 - mov h.MainControlT_u2_0_h2.data 0x1 - invalidate h.MainControlT_u2_0_h1 - invalidate h.MainControlT_u2_0_h3 - validate h.MainControlT_u1_0_h2 - invalidate h.MainControlT_u1_0_h1 - invalidate h.MainControlT_u1_0_h3 - invalidate h.MainControlT_u1_0_h3 - tx m.pna_main_output_metadata_output_port -} - - diff --git a/testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4-error b/testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4-error deleted file mode 100644 index 2e7714a06fe..00000000000 --- a/testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4-error +++ /dev/null @@ -1 +0,0 @@ -[--Wwarn=mismatch] warning: Mismatched header/metadata struct for key elements in table inbound_table. Copying all match fields to metadata diff --git a/testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4-stderr b/testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4-stderr deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4.bfrt.json b/testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4.bfrt.json deleted file mode 100644 index 07c3cd9b258..00000000000 --- a/testdata/p4_16_samples_outputs/pna-example-ipsec-accelerator.p4.bfrt.json +++ /dev/null @@ -1,312 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.inbound_table", - "id" : 35540122, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdrs.esp.spi", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.outbound_table", - "id" : 48399063, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.src_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 23593891, - "name" : "MainControlImpl.ipsec_enable", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "sa_index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 22127699, - "name" : "MainControlImpl.ipsec_bypass", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.routing_table", - "id" : 40259446, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdrs.ipv4.dst_addr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26920063, - "name" : "MainControlImpl.next_hop_id_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "next_hop_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "pipe.MainControlImpl.next_hop_table", - "id" : 40586775, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "meta.next_hop_id", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 19398794, - "name" : "MainControlImpl.next_hop_set", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "dst_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 2, - "name" : "src_addr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 48 - } - }, - { - "id" : 3, - "name" : "ether_type", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 4, - "name" : "port_id", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 24740121, - "name" : "MainControlImpl.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4-error b/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4-error deleted file mode 100644 index 67a5fb0cef9..00000000000 --- a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4-error +++ /dev/null @@ -1,10 +0,0 @@ -pna-example-tcp-connection-tracking-err-1.p4(206): [--Wwarn=uninitialized_use] warning: update_aging_info may be uninitialized - if (update_aging_info) { - ^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err-1.p4(208): [--Wwarn=uninitialized_use] warning: new_expire_time_profile_id may not be completely initialized - set_entry_expire_time(new_expire_time_profile_id); - ^^^^^^^^^^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err-1.p4(240): [--Wwarn=uninitialized_use] warning: new_expire_time_profile_id may not be completely initialized - expire_time_profile_id = new_expire_time_profile_id); - ^^^^^^^^^^^^^^^^^^^^^^^^^^ -[--Wwarn=mismatch] warning: Mismatched header/metadata struct for key elements in table ct_tcp_table. Copying all match fields to metadata diff --git a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4.bfrt.json b/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4.bfrt.json deleted file mode 100644 index 246cce53898..00000000000 --- a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4.bfrt.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.set_ct_options", - "id" : 48249440, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.tcp.flags", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Ternary", - "type" : { - "type" : "bytes", - "width" : 8 - } - }, - { - "id" : 65537, - "name" : "$MATCH_PRIORITY", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "action_specs" : [ - { - "id" : 23677896, - "name" : "MainControlImpl.tcp_syn_packet", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 27056431, - "name" : "MainControlImpl.tcp_fin_or_rst_packet", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 23970644, - "name" : "MainControlImpl.tcp_other_packets", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope", "ConstTable"] - }, - { - "name" : "pipe.MainControlImpl.ct_tcp_table", - "id" : 35731637, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "ipv4_addr_0", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "ipv4_addr_1", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdr.ipv4.protocol", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 8 - } - }, - { - "id" : 4, - "name" : "tcp_port_0", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 5, - "name" : "tcp_port_1", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 16 - } - } - ], - "action_specs" : [ - { - "id" : 17749373, - "name" : "MainControlImpl.ct_tcp_table_hit", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [] - }, - { - "id" : 22853387, - "name" : "MainControlImpl.ct_tcp_table_miss", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4.spec b/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4.spec deleted file mode 100644 index f9867983572..00000000000 --- a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err-1.p4.spec +++ /dev/null @@ -1,175 +0,0 @@ - -struct ethernet_t { - bit<48> dstAddr - bit<48> srcAddr - bit<16> etherType -} - -struct ipv4_t { - bit<8> version_ihl - bit<8> diffserv - bit<16> totalLength - bit<16> identification - bit<16> flags_fragOffset - bit<8> ttl - bit<8> protocol - bit<16> hdrChecksum - bit<32> srcAddr - bit<32> dstAddr -} - -struct tcp_t { - bit<16> srcPort - bit<16> dstPort - bit<32> seqNo - bit<32> ackNo - bit<8> dataOffset_res - bit<8> flags - bit<16> window - bit<16> checksum - bit<16> urgentPtr -} - -struct metadata_t { - bit<32> pna_main_input_metadata_direction - bit<32> pna_main_input_metadata_input_port - bit<32> pna_main_output_metadata_output_port - bit<8> MainControlImpl_ct_tcp_table_ipv4_protocol - bit<8> MainControlT_do_add_on_miss - bit<8> MainControlT_update_aging_info - bit<8> MainControlT_update_expire_time - bit<8> MainControlT_new_expire_time_profile_id - bit<32> MainControlT_key - bit<32> MainControlT_key_0 - bit<16> MainControlT_key_1 - bit<16> MainControlT_key_2 -} -metadata instanceof metadata_t - -header eth instanceof ethernet_t -header ipv4 instanceof ipv4_t -header tcp instanceof tcp_t - -regarray direction size 0x100 initval 0 - -action tcp_syn_packet args none { - mov m.MainControlT_do_add_on_miss 1 - mov m.MainControlT_update_aging_info 1 - mov m.MainControlT_update_expire_time 1 - mov m.MainControlT_new_expire_time_profile_id 0x1 - return -} - -action tcp_fin_or_rst_packet args none { - mov m.MainControlT_update_aging_info 1 - mov m.MainControlT_update_expire_time 1 - mov m.MainControlT_new_expire_time_profile_id 0x0 - return -} - -action tcp_other_packets args none { - mov m.MainControlT_update_aging_info 1 - mov m.MainControlT_update_expire_time 1 - mov m.MainControlT_new_expire_time_profile_id 0x2 - return -} - -action ct_tcp_table_hit args none { - jmpneq LABEL_END_5 m.MainControlT_update_aging_info 0x1 - jmpneq LABEL_FALSE_2 m.MainControlT_update_expire_time 0x1 - rearm m.MainControlT_new_expire_time_profile_id - jmp LABEL_END_5 - LABEL_FALSE_2 : rearm - LABEL_END_5 : return -} - -action ct_tcp_table_miss args none { - jmpneq LABEL_FALSE_3 m.MainControlT_do_add_on_miss 0x1 - learn ct_tcp_table_hit m.MainControlT_new_expire_time_profile_id - jmp LABEL_END_7 - LABEL_FALSE_3 : drop - LABEL_END_7 : return -} - -table set_ct_options { - key { - h.tcp.flags wildcard - } - actions { - tcp_syn_packet - tcp_fin_or_rst_packet - tcp_other_packets - } - default_action tcp_other_packets args none const - size 0x10000 -} - - -learner ct_tcp_table { - key { - m.MainControlT_key - m.MainControlT_key_0 - m.MainControlImpl_ct_tcp_table_ipv4_protocol - m.MainControlT_key_1 - m.MainControlT_key_2 - } - actions { - ct_tcp_table_hit @tableonly - ct_tcp_table_miss @defaultonly - } - default_action ct_tcp_table_miss args none - size 0x10000 - timeout { - 10 - 30 - 60 - 120 - 300 - 43200 - 120 - 120 - - } -} - -apply { - rx m.pna_main_input_metadata_input_port - extract h.eth - jmpeq MAINPARSERIMPL_PARSE_IPV4 h.eth.etherType 0x800 - jmp MAINPARSERIMPL_ACCEPT - MAINPARSERIMPL_PARSE_IPV4 : extract h.ipv4 - jmpeq MAINPARSERIMPL_PARSE_TCP h.ipv4.protocol 0x6 - jmp MAINPARSERIMPL_ACCEPT - MAINPARSERIMPL_PARSE_TCP : extract h.tcp - MAINPARSERIMPL_ACCEPT : mov m.MainControlT_do_add_on_miss 0 - mov m.MainControlT_update_expire_time 0 - regrd m.pna_main_input_metadata_direction direction m.pna_main_input_metadata_input_port - jmpneq LABEL_END m.pna_main_input_metadata_direction 0x1 - jmpnv LABEL_END h.ipv4 - jmpnv LABEL_END h.tcp - table set_ct_options - LABEL_END : jmpnv LABEL_END_0 h.ipv4 - jmpnv LABEL_END_0 h.tcp - jmpeq LABEL_TRUE_1 m.pna_main_input_metadata_direction 0x0 - mov m.MainControlT_key h.ipv4.dstAddr - jmp LABEL_END_1 - LABEL_TRUE_1 : mov m.MainControlT_key h.ipv4.srcAddr - LABEL_END_1 : jmpeq LABEL_TRUE_2 m.pna_main_input_metadata_direction 0x0 - mov m.MainControlT_key_0 h.ipv4.srcAddr - jmp LABEL_END_2 - LABEL_TRUE_2 : mov m.MainControlT_key_0 h.ipv4.dstAddr - LABEL_END_2 : jmpeq LABEL_TRUE_3 m.pna_main_input_metadata_direction 0x0 - mov m.MainControlT_key_1 h.tcp.dstPort - jmp LABEL_END_3 - LABEL_TRUE_3 : mov m.MainControlT_key_1 h.tcp.srcPort - LABEL_END_3 : jmpeq LABEL_TRUE_4 m.pna_main_input_metadata_direction 0x0 - mov m.MainControlT_key_2 h.tcp.srcPort - jmp LABEL_END_4 - LABEL_TRUE_4 : mov m.MainControlT_key_2 h.tcp.dstPort - LABEL_END_4 : mov m.MainControlImpl_ct_tcp_table_ipv4_protocol h.ipv4.protocol - table ct_tcp_table - LABEL_END_0 : emit h.eth - tx m.pna_main_output_metadata_output_port -} - - diff --git a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4-error b/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4-error deleted file mode 100644 index ca9adc6cfe3..00000000000 --- a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4-error +++ /dev/null @@ -1,10 +0,0 @@ -pna-example-tcp-connection-tracking-err.p4(206): [--Wwarn=uninitialized_use] warning: update_aging_info may be uninitialized - if (update_aging_info) { - ^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err.p4(208): [--Wwarn=uninitialized_use] warning: new_expire_time_profile_id may not be completely initialized - set_entry_expire_time(new_expire_time_profile_id); - ^^^^^^^^^^^^^^^^^^^^^^^^^^ -pna-example-tcp-connection-tracking-err.p4(240): [--Wwarn=uninitialized_use] warning: new_expire_time_profile_id may not be completely initialized - expire_time_profile_id = new_expire_time_profile_id); - ^^^^^^^^^^^^^^^^^^^^^^^^^^ -[--Wwarn=mismatch] warning: Mismatched header/metadata struct for key elements in table ct_tcp_table. Copying all match fields to metadata diff --git a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4.bfrt.json b/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4.bfrt.json deleted file mode 100644 index 246cce53898..00000000000 --- a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4.bfrt.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "pipe.MainControlImpl.set_ct_options", - "id" : 48249440, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "hdr.tcp.flags", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Ternary", - "type" : { - "type" : "bytes", - "width" : 8 - } - }, - { - "id" : 65537, - "name" : "$MATCH_PRIORITY", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "action_specs" : [ - { - "id" : 23677896, - "name" : "MainControlImpl.tcp_syn_packet", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 27056431, - "name" : "MainControlImpl.tcp_fin_or_rst_packet", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 23970644, - "name" : "MainControlImpl.tcp_other_packets", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope", "ConstTable"] - }, - { - "name" : "pipe.MainControlImpl.ct_tcp_table", - "id" : 35731637, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : true, - "key" : [ - { - "id" : 1, - "name" : "ipv4_addr_0", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "ipv4_addr_1", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 3, - "name" : "hdr.ipv4.protocol", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 8 - } - }, - { - "id" : 4, - "name" : "tcp_port_0", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 16 - } - }, - { - "id" : 5, - "name" : "tcp_port_1", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 16 - } - } - ], - "action_specs" : [ - { - "id" : 17749373, - "name" : "MainControlImpl.ct_tcp_table_hit", - "action_scope" : "TableOnly", - "annotations" : [ - { - "name" : "@tableonly" - } - ], - "data" : [] - }, - { - "id" : 22853387, - "name" : "MainControlImpl.ct_tcp_table_miss", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4.spec b/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4.spec deleted file mode 100644 index f9867983572..00000000000 --- a/testdata/p4_16_samples_outputs/pna-example-tcp-connection-tracking-err.p4.spec +++ /dev/null @@ -1,175 +0,0 @@ - -struct ethernet_t { - bit<48> dstAddr - bit<48> srcAddr - bit<16> etherType -} - -struct ipv4_t { - bit<8> version_ihl - bit<8> diffserv - bit<16> totalLength - bit<16> identification - bit<16> flags_fragOffset - bit<8> ttl - bit<8> protocol - bit<16> hdrChecksum - bit<32> srcAddr - bit<32> dstAddr -} - -struct tcp_t { - bit<16> srcPort - bit<16> dstPort - bit<32> seqNo - bit<32> ackNo - bit<8> dataOffset_res - bit<8> flags - bit<16> window - bit<16> checksum - bit<16> urgentPtr -} - -struct metadata_t { - bit<32> pna_main_input_metadata_direction - bit<32> pna_main_input_metadata_input_port - bit<32> pna_main_output_metadata_output_port - bit<8> MainControlImpl_ct_tcp_table_ipv4_protocol - bit<8> MainControlT_do_add_on_miss - bit<8> MainControlT_update_aging_info - bit<8> MainControlT_update_expire_time - bit<8> MainControlT_new_expire_time_profile_id - bit<32> MainControlT_key - bit<32> MainControlT_key_0 - bit<16> MainControlT_key_1 - bit<16> MainControlT_key_2 -} -metadata instanceof metadata_t - -header eth instanceof ethernet_t -header ipv4 instanceof ipv4_t -header tcp instanceof tcp_t - -regarray direction size 0x100 initval 0 - -action tcp_syn_packet args none { - mov m.MainControlT_do_add_on_miss 1 - mov m.MainControlT_update_aging_info 1 - mov m.MainControlT_update_expire_time 1 - mov m.MainControlT_new_expire_time_profile_id 0x1 - return -} - -action tcp_fin_or_rst_packet args none { - mov m.MainControlT_update_aging_info 1 - mov m.MainControlT_update_expire_time 1 - mov m.MainControlT_new_expire_time_profile_id 0x0 - return -} - -action tcp_other_packets args none { - mov m.MainControlT_update_aging_info 1 - mov m.MainControlT_update_expire_time 1 - mov m.MainControlT_new_expire_time_profile_id 0x2 - return -} - -action ct_tcp_table_hit args none { - jmpneq LABEL_END_5 m.MainControlT_update_aging_info 0x1 - jmpneq LABEL_FALSE_2 m.MainControlT_update_expire_time 0x1 - rearm m.MainControlT_new_expire_time_profile_id - jmp LABEL_END_5 - LABEL_FALSE_2 : rearm - LABEL_END_5 : return -} - -action ct_tcp_table_miss args none { - jmpneq LABEL_FALSE_3 m.MainControlT_do_add_on_miss 0x1 - learn ct_tcp_table_hit m.MainControlT_new_expire_time_profile_id - jmp LABEL_END_7 - LABEL_FALSE_3 : drop - LABEL_END_7 : return -} - -table set_ct_options { - key { - h.tcp.flags wildcard - } - actions { - tcp_syn_packet - tcp_fin_or_rst_packet - tcp_other_packets - } - default_action tcp_other_packets args none const - size 0x10000 -} - - -learner ct_tcp_table { - key { - m.MainControlT_key - m.MainControlT_key_0 - m.MainControlImpl_ct_tcp_table_ipv4_protocol - m.MainControlT_key_1 - m.MainControlT_key_2 - } - actions { - ct_tcp_table_hit @tableonly - ct_tcp_table_miss @defaultonly - } - default_action ct_tcp_table_miss args none - size 0x10000 - timeout { - 10 - 30 - 60 - 120 - 300 - 43200 - 120 - 120 - - } -} - -apply { - rx m.pna_main_input_metadata_input_port - extract h.eth - jmpeq MAINPARSERIMPL_PARSE_IPV4 h.eth.etherType 0x800 - jmp MAINPARSERIMPL_ACCEPT - MAINPARSERIMPL_PARSE_IPV4 : extract h.ipv4 - jmpeq MAINPARSERIMPL_PARSE_TCP h.ipv4.protocol 0x6 - jmp MAINPARSERIMPL_ACCEPT - MAINPARSERIMPL_PARSE_TCP : extract h.tcp - MAINPARSERIMPL_ACCEPT : mov m.MainControlT_do_add_on_miss 0 - mov m.MainControlT_update_expire_time 0 - regrd m.pna_main_input_metadata_direction direction m.pna_main_input_metadata_input_port - jmpneq LABEL_END m.pna_main_input_metadata_direction 0x1 - jmpnv LABEL_END h.ipv4 - jmpnv LABEL_END h.tcp - table set_ct_options - LABEL_END : jmpnv LABEL_END_0 h.ipv4 - jmpnv LABEL_END_0 h.tcp - jmpeq LABEL_TRUE_1 m.pna_main_input_metadata_direction 0x0 - mov m.MainControlT_key h.ipv4.dstAddr - jmp LABEL_END_1 - LABEL_TRUE_1 : mov m.MainControlT_key h.ipv4.srcAddr - LABEL_END_1 : jmpeq LABEL_TRUE_2 m.pna_main_input_metadata_direction 0x0 - mov m.MainControlT_key_0 h.ipv4.srcAddr - jmp LABEL_END_2 - LABEL_TRUE_2 : mov m.MainControlT_key_0 h.ipv4.dstAddr - LABEL_END_2 : jmpeq LABEL_TRUE_3 m.pna_main_input_metadata_direction 0x0 - mov m.MainControlT_key_1 h.tcp.dstPort - jmp LABEL_END_3 - LABEL_TRUE_3 : mov m.MainControlT_key_1 h.tcp.srcPort - LABEL_END_3 : jmpeq LABEL_TRUE_4 m.pna_main_input_metadata_direction 0x0 - mov m.MainControlT_key_2 h.tcp.srcPort - jmp LABEL_END_4 - LABEL_TRUE_4 : mov m.MainControlT_key_2 h.tcp.dstPort - LABEL_END_4 : mov m.MainControlImpl_ct_tcp_table_ipv4_protocol h.ipv4.protocol - table ct_tcp_table - LABEL_END_0 : emit h.eth - tx m.pna_main_output_metadata_output_port -} - - diff --git a/testdata/p4_16_samples_outputs/pred.p4.entries.txt b/testdata/p4_16_samples_outputs/pred.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/pred.p4.p4info.txt b/testdata/p4_16_samples_outputs/pred.p4.p4info.txt deleted file mode 100644 index a36d62e6512..00000000000 --- a/testdata/p4_16_samples_outputs/pred.p4.p4info.txt +++ /dev/null @@ -1,10 +0,0 @@ -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 33546633 - name: "Ing.cond" - alias: "cond" - } -} diff --git a/testdata/p4_16_samples_outputs/pred1.p4.entries.txt b/testdata/p4_16_samples_outputs/pred1.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/pred1.p4.p4info.txt b/testdata/p4_16_samples_outputs/pred1.p4.p4info.txt deleted file mode 100644 index a36d62e6512..00000000000 --- a/testdata/p4_16_samples_outputs/pred1.p4.p4info.txt +++ /dev/null @@ -1,10 +0,0 @@ -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 33546633 - name: "Ing.cond" - alias: "cond" - } -} diff --git a/testdata/p4_16_samples_outputs/pred2.p4.entries.txt b/testdata/p4_16_samples_outputs/pred2.p4.entries.txt deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/pred2.p4.p4info.txt b/testdata/p4_16_samples_outputs/pred2.p4.p4info.txt deleted file mode 100644 index 2e55416349a..00000000000 --- a/testdata/p4_16_samples_outputs/pred2.p4.p4info.txt +++ /dev/null @@ -1,24 +0,0 @@ -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 41666347 - name: "Ing.tbl_cond" - alias: "tbl_cond" - } - action_refs { - id: 33546633 - } - const_default_action_id: 33546633 - size: 1024 -} -actions { - preamble { - id: 33546633 - name: "Ing.cond" - alias: "cond" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/predication_issue.p4.entries.txt b/testdata/p4_16_samples_outputs/predication_issue.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/predication_issue.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/predication_issue.p4.entries.txtpb b/testdata/p4_16_samples_outputs/predication_issue.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/predication_issue.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/predication_issue.p4.p4info.txt b/testdata/p4_16_samples_outputs/predication_issue.p4.p4info.txt deleted file mode 100644 index ff4a208df01..00000000000 --- a/testdata/p4_16_samples_outputs/predication_issue.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 18507033 - name: "assign_addrs" - alias: "assign_addrs" - } -} diff --git a/testdata/p4_16_samples_outputs/predication_issue.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/predication_issue.p4.p4info.txtpb new file mode 100644 index 00000000000..ed7866ca788 --- /dev/null +++ b/testdata/p4_16_samples_outputs/predication_issue.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 18507033 + name: "assign_addrs" + alias: "assign_addrs" + } +} diff --git a/testdata/p4_16_samples_outputs/predication_issue_1.p4.entries.txt b/testdata/p4_16_samples_outputs/predication_issue_1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/predication_issue_1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/predication_issue_1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/predication_issue_1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/predication_issue_1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/predication_issue_1.p4.p4info.txt b/testdata/p4_16_samples_outputs/predication_issue_1.p4.p4info.txt deleted file mode 100644 index fb233de361c..00000000000 --- a/testdata/p4_16_samples_outputs/predication_issue_1.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 19308316 - name: "assign" - alias: "assign" - } -} diff --git a/testdata/p4_16_samples_outputs/predication_issue_1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/predication_issue_1.p4.p4info.txtpb new file mode 100644 index 00000000000..b8a693a2527 --- /dev/null +++ b/testdata/p4_16_samples_outputs/predication_issue_1.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 19308316 + name: "assign" + alias: "assign" + } +} diff --git a/testdata/p4_16_samples_outputs/predication_issue_2.p4.entries.txt b/testdata/p4_16_samples_outputs/predication_issue_2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/predication_issue_2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/predication_issue_2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/predication_issue_2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/predication_issue_2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/predication_issue_2.p4.p4info.txt b/testdata/p4_16_samples_outputs/predication_issue_2.p4.p4info.txt deleted file mode 100644 index 9b2d578f198..00000000000 --- a/testdata/p4_16_samples_outputs/predication_issue_2.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 25524983 - name: "ingress.simple_action" - alias: "simple_action" - } -} diff --git a/testdata/p4_16_samples_outputs/predication_issue_2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/predication_issue_2.p4.p4info.txtpb new file mode 100644 index 00000000000..07882959409 --- /dev/null +++ b/testdata/p4_16_samples_outputs/predication_issue_2.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 25524983 + name: "ingress.simple_action" + alias: "simple_action" + } +} diff --git a/testdata/p4_16_samples_outputs/predication_issue_3.p4.entries.txt b/testdata/p4_16_samples_outputs/predication_issue_3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/predication_issue_3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/predication_issue_3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/predication_issue_3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/predication_issue_3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/predication_issue_3.p4.p4info.txt b/testdata/p4_16_samples_outputs/predication_issue_3.p4.p4info.txt deleted file mode 100644 index 6d47b6e2219..00000000000 --- a/testdata/p4_16_samples_outputs/predication_issue_3.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 18677303 - name: "ingress.perform_action" - alias: "perform_action" - } -} diff --git a/testdata/p4_16_samples_outputs/predication_issue_3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/predication_issue_3.p4.p4info.txtpb new file mode 100644 index 00000000000..f850550e66b --- /dev/null +++ b/testdata/p4_16_samples_outputs/predication_issue_3.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 18677303 + name: "ingress.perform_action" + alias: "perform_action" + } +} diff --git a/testdata/p4_16_samples_outputs/predication_issue_4.p4.entries.txt b/testdata/p4_16_samples_outputs/predication_issue_4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/predication_issue_4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/predication_issue_4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/predication_issue_4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/predication_issue_4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/predication_issue_4.p4.p4info.txt b/testdata/p4_16_samples_outputs/predication_issue_4.p4.p4info.txt deleted file mode 100644 index 6d47b6e2219..00000000000 --- a/testdata/p4_16_samples_outputs/predication_issue_4.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 18677303 - name: "ingress.perform_action" - alias: "perform_action" - } -} diff --git a/testdata/p4_16_samples_outputs/predication_issue_4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/predication_issue_4.p4.p4info.txtpb new file mode 100644 index 00000000000..f850550e66b --- /dev/null +++ b/testdata/p4_16_samples_outputs/predication_issue_4.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 18677303 + name: "ingress.perform_action" + alias: "perform_action" + } +} diff --git a/testdata/p4_16_samples_outputs/proliferation1.p4.entries.txt b/testdata/p4_16_samples_outputs/proliferation1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/proliferation1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/proliferation1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/proliferation1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/proliferation1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/proliferation1.p4.p4info.txt b/testdata/p4_16_samples_outputs/proliferation1.p4.p4info.txt deleted file mode 100644 index 0720c768468..00000000000 --- a/testdata/p4_16_samples_outputs/proliferation1.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 22648003 - name: "MyIngress.do_n_rounds" - alias: "do_n_rounds" - } -} diff --git a/testdata/p4_16_samples_outputs/proliferation1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/proliferation1.p4.p4info.txtpb new file mode 100644 index 00000000000..0d4b26a9873 --- /dev/null +++ b/testdata/p4_16_samples_outputs/proliferation1.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 22648003 + name: "MyIngress.do_n_rounds" + alias: "do_n_rounds" + } +} diff --git a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txt deleted file mode 100644 index 15c4dc9a987..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txt +++ /dev/null @@ -1,72 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - implementation_id: 298015716 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -action_profiles { - preamble { - id: 298015716 - name: "MyIC.ap" - alias: "ap" - } - table_ids: 39967501 - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb new file mode 100644 index 00000000000..a86dbc7c757 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.p4info.txtpb @@ -0,0 +1,73 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + implementation_id: 298015716 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +action_profiles { + preamble { + id: 298015716 + name: "MyIC.ap" + alias: "ap" + } + table_ids: 39967501 + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txt deleted file mode 100644 index 4feac8427dd..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txt +++ /dev/null @@ -1,97 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - implementation_id: 298015716 - size: 1024 -} -tables { - preamble { - id: 47318070 - name: "MyIC.tbl2" - alias: "tbl2" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - implementation_id: 298015716 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -action_profiles { - preamble { - id: 298015716 - name: "MyIC.ap" - alias: "ap" - } - table_ids: 39967501 - table_ids: 47318070 - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb new file mode 100644 index 00000000000..960fa335b31 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.p4info.txtpb @@ -0,0 +1,98 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + implementation_id: 298015716 + size: 1024 +} +tables { + preamble { + id: 47318070 + name: "MyIC.tbl2" + alias: "tbl2" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + implementation_id: 298015716 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +action_profiles { + preamble { + id: 298015716 + name: "MyIC.ap" + alias: "ap" + } + table_ids: 39967501 + table_ids: 47318070 + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txt deleted file mode 100644 index e139eb043f8..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txt +++ /dev/null @@ -1,91 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 23466264 - } - implementation_id: 298015716 - size: 1024 -} -tables { - preamble { - id: 47318070 - name: "MyIC.tbl2" - alias: "tbl2" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - implementation_id: 298015716 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -action_profiles { - preamble { - id: 298015716 - name: "MyIC.ap" - alias: "ap" - } - table_ids: 39967501 - table_ids: 47318070 - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb new file mode 100644 index 00000000000..2064dc01292 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.p4info.txtpb @@ -0,0 +1,92 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 23466264 + } + implementation_id: 298015716 + size: 1024 +} +tables { + preamble { + id: 47318070 + name: "MyIC.tbl2" + alias: "tbl2" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + implementation_id: 298015716 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +action_profiles { + preamble { + id: 298015716 + name: "MyIC.ap" + alias: "ap" + } + table_ids: 39967501 + table_ids: 47318070 + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txt deleted file mode 100644 index de5986cf9fa..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txt +++ /dev/null @@ -1,73 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - implementation_id: 294316857 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -action_profiles { - preamble { - id: 294316857 - name: "MyIC.as" - alias: "as" - } - table_ids: 39967501 - with_selector: true - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb new file mode 100644 index 00000000000..b81118f47ff --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.p4info.txtpb @@ -0,0 +1,74 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + implementation_id: 294316857 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +action_profiles { + preamble { + id: 294316857 + name: "MyIC.as" + alias: "as" + } + table_ids: 39967501 + with_selector: true + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txt deleted file mode 100644 index de5986cf9fa..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txt +++ /dev/null @@ -1,73 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - implementation_id: 294316857 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -action_profiles { - preamble { - id: 294316857 - name: "MyIC.as" - alias: "as" - } - table_ids: 39967501 - with_selector: true - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb new file mode 100644 index 00000000000..b81118f47ff --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.p4info.txtpb @@ -0,0 +1,74 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + implementation_id: 294316857 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +action_profiles { + preamble { + id: 294316857 + name: "MyIC.as" + alias: "as" + } + table_ids: 39967501 + with_selector: true + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txt deleted file mode 100644 index e545f33f211..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txt +++ /dev/null @@ -1,62 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb new file mode 100644 index 00000000000..e7789178f0b --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.p4info.txtpb @@ -0,0 +1,63 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txt deleted file mode 100644 index a5cafca3334..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txt +++ /dev/null @@ -1,84 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - implementation_id: 294316857 - size: 1024 -} -tables { - preamble { - id: 49266188 - name: "MyIC.foo" - alias: "foo" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -action_profiles { - preamble { - id: 294316857 - name: "MyIC.as" - alias: "as" - } - table_ids: 39967501 - with_selector: true - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb new file mode 100644 index 00000000000..6f30891066a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.p4info.txtpb @@ -0,0 +1,85 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + implementation_id: 294316857 + size: 1024 +} +tables { + preamble { + id: 49266188 + name: "MyIC.foo" + alias: "foo" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +action_profiles { + preamble { + id: 294316857 + name: "MyIC.as" + alias: "as" + } + table_ids: 39967501 + with_selector: true + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txt deleted file mode 100644 index d99eb5d7fa4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txt +++ /dev/null @@ -1,95 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 30030382 - } - action_refs { - id: 28661769 - } - implementation_id: 294316857 - size: 1024 -} -tables { - preamble { - id: 49266188 - name: "MyIC.foo" - alias: "foo" - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 49390123 - name: "MyIC.bar" - alias: "bar" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 30030382 - name: "a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 28661769 - name: "a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -action_profiles { - preamble { - id: 294316857 - name: "MyIC.as" - alias: "as" - } - table_ids: 39967501 - with_selector: true - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb new file mode 100644 index 00000000000..b9d5a175e0f --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.p4info.txtpb @@ -0,0 +1,96 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 30030382 + } + action_refs { + id: 28661769 + } + implementation_id: 294316857 + size: 1024 +} +tables { + preamble { + id: 49266188 + name: "MyIC.foo" + alias: "foo" + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 49390123 + name: "MyIC.bar" + alias: "bar" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 30030382 + name: "a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 28661769 + name: "a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +action_profiles { + preamble { + id: 294316857 + name: "MyIC.as" + alias: "as" + } + table_ids: 39967501 + with_selector: true + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector6.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-action-selector6.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector6.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-action-selector6.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector6.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector6.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txt deleted file mode 100644 index d67ad8a9871..00000000000 --- a/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txt +++ /dev/null @@ -1,128 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 30030382 - } - action_refs { - id: 28661769 - } - implementation_id: 294316857 - size: 1024 -} -tables { - preamble { - id: 42525091 - name: "MyIC.tbl1" - alias: "tbl1" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 30030382 - } - action_refs { - id: 28661769 - } - implementation_id: 298015716 - size: 1024 -} -tables { - preamble { - id: 49266188 - name: "MyIC.foo" - alias: "foo" - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 49390123 - name: "MyIC.bar" - alias: "bar" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 30030382 - name: "a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 28661769 - name: "a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -action_profiles { - preamble { - id: 298015716 - name: "MyIC.ap" - alias: "ap" - } - table_ids: 42525091 - size: 1024 -} -action_profiles { - preamble { - id: 294316857 - name: "MyIC.as" - alias: "as" - } - table_ids: 39967501 - with_selector: true - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb new file mode 100644 index 00000000000..0ed6e61f2df --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-action-selector6.p4.p4info.txtpb @@ -0,0 +1,129 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 30030382 + } + action_refs { + id: 28661769 + } + implementation_id: 294316857 + size: 1024 +} +tables { + preamble { + id: 42525091 + name: "MyIC.tbl1" + alias: "tbl1" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 30030382 + } + action_refs { + id: 28661769 + } + implementation_id: 298015716 + size: 1024 +} +tables { + preamble { + id: 49266188 + name: "MyIC.foo" + alias: "foo" + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 49390123 + name: "MyIC.bar" + alias: "bar" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 30030382 + name: "a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 28661769 + name: "a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +action_profiles { + preamble { + id: 298015716 + name: "MyIC.ap" + alias: "ap" + } + table_ids: 42525091 + size: 1024 +} +action_profiles { + preamble { + id: 294316857 + name: "MyIC.as" + alias: "as" + } + table_ids: 39967501 + with_selector: true + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txt deleted file mode 100644 index 62f974767e0..00000000000 --- a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 34888878 - name: "cIngress.tbl" - alias: "tbl" - } - action_refs { - id: 17064084 - } - size: 1024 -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 17064084 - name: "cIngress.execute" - alias: "execute" - } -} -counters { - preamble { - id: 304351549 - name: "cIngress.counter" - alias: "counter" - } - spec { - unit: PACKETS - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..d7d77b34cea --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 34888878 + name: "cIngress.tbl" + alias: "tbl" + } + action_refs { + id: 17064084 + } + size: 1024 +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 17064084 + name: "cIngress.execute" + alias: "execute" + } +} +counters { + preamble { + id: 304351549 + name: "cIngress.counter" + alias: "counter" + } + spec { + unit: PACKETS + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txt deleted file mode 100644 index 816f6467a88..00000000000 --- a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 22078320 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 22078320 - name: "MyIC.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb new file mode 100644 index 00000000000..d75ec35b4b7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 22078320 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 22078320 + name: "MyIC.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-counter1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-counter1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-counter1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-counter1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-counter1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-counter1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txt deleted file mode 100644 index 217e87634b2..00000000000 --- a/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txt +++ /dev/null @@ -1,53 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 22078320 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 22078320 - name: "MyIC.execute" - alias: "execute" - } -} -counters { - preamble { - id: 306209163 - name: "MyIC.counter" - alias: "counter" - } - spec { - unit: PACKETS - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb new file mode 100644 index 00000000000..fd7c56f2b61 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-counter1.p4.p4info.txtpb @@ -0,0 +1,54 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 22078320 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 22078320 + name: "MyIC.execute" + alias: "execute" + } +} +counters { + preamble { + id: 306209163 + name: "MyIC.counter" + alias: "counter" + } + spec { + unit: PACKETS + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-counter2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-counter2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-counter2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-counter2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-counter2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-counter2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txt deleted file mode 100644 index b0e281c57cc..00000000000 --- a/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txt +++ /dev/null @@ -1,64 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 22078320 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 22078320 - name: "MyIC.execute" - alias: "execute" - } -} -counters { - preamble { - id: 303203245 - name: "MyIC.counter0" - alias: "counter0" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 305966593 - name: "MyIC.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb new file mode 100644 index 00000000000..8d86d076601 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-counter2.p4.p4info.txtpb @@ -0,0 +1,65 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 22078320 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 22078320 + name: "MyIC.execute" + alias: "execute" + } +} +counters { + preamble { + id: 303203245 + name: "MyIC.counter0" + alias: "counter0" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 305966593 + name: "MyIC.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-counter3.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-counter3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-counter3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-counter3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-counter3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-counter3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-counter3.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-counter3.p4.p4info.txt deleted file mode 100644 index 6d1316521f4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-counter3.p4.p4info.txt +++ /dev/null @@ -1,29 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -counters { - preamble { - id: 303203245 - name: "MyIC.counter0" - alias: "counter0" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 305966593 - name: "MyIC.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-counter3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-counter3.p4.p4info.txtpb new file mode 100644 index 00000000000..94002eb86a9 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-counter3.p4.p4info.txtpb @@ -0,0 +1,30 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +counters { + preamble { + id: 303203245 + name: "MyIC.counter0" + alias: "counter0" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 305966593 + name: "MyIC.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-counter4.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-counter4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-counter4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-counter4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-counter4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-counter4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txt deleted file mode 100644 index 9064cca104b..00000000000 --- a/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - direct_resource_ids: 319980461 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -direct_counters { - preamble { - id: 319980461 - name: "MyIC.counter0" - alias: "counter0" - } - spec { - unit: PACKETS - } - direct_table_id: 39967501 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb new file mode 100644 index 00000000000..952cc49eedc --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-counter4.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + direct_resource_ids: 319980461 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +direct_counters { + preamble { + id: 319980461 + name: "MyIC.counter0" + alias: "counter0" + } + spec { + unit: PACKETS + } + direct_table_id: 39967501 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txt deleted file mode 100644 index 9d2528d1436..00000000000 --- a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txt +++ /dev/null @@ -1,68 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 22078320 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 22078320 - name: "MyIC.execute" - alias: "execute" - } -} -counters { - preamble { - id: 306209163 - name: "MyIC.counter" - alias: "counter" - } - spec { - unit: PACKETS - } - size: 1024 - index_type_name { - name: "CounterIndex_t" - } -} -type_info { - new_types { - key: "CounterIndex_t" - value { - original_type { - bitstring { - bit { - bitwidth: 12 - } - } - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb new file mode 100644 index 00000000000..e1b0f5fadb3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.p4info.txtpb @@ -0,0 +1,69 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 22078320 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 22078320 + name: "MyIC.execute" + alias: "execute" + } +} +counters { + preamble { + id: 306209163 + name: "MyIC.counter" + alias: "counter" + } + spec { + unit: PACKETS + } + size: 1024 + index_type_name { + name: "CounterIndex_t" + } +} +type_info { + new_types { + key: "CounterIndex_t" + value { + original_type { + bitstring { + bit { + bitwidth: 12 + } + } + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txt deleted file mode 100644 index 5a541c871c5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txt +++ /dev/null @@ -1,38 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1000000 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb new file mode 100644 index 00000000000..09088e7de68 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-128bitCast.p4.p4info.txtpb @@ -0,0 +1,39 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1000000 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txt deleted file mode 100644 index 379556fa339..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "a.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 25756908 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25756908 - name: "MyIC.forward" - alias: "forward" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb new file mode 100644 index 00000000000..023eccf53fe --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations-1.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "a.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 25756908 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25756908 + name: "MyIC.forward" + alias: "forward" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txt deleted file mode 100644 index 379556fa339..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "a.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 25756908 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25756908 - name: "MyIC.forward" - alias: "forward" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb new file mode 100644 index 00000000000..023eccf53fe --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-binary-operations.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "a.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 25756908 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25756908 + name: "MyIC.forward" + alias: "forward" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txt deleted file mode 100644 index f4a590fbef1..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txt +++ /dev/null @@ -1,147 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 33686666 - name: "ingress.vxlan" - alias: "vxlan" - } - match_fields { - id: 1 - name: "headers.ethernet.dst_addr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 32131245 - } - action_refs { - id: 33281717 - } - const_default_action_id: 33281717 - size: 1048576 -} -actions { - preamble { - id: 32131245 - name: "ingress.vxlan_encap" - alias: "vxlan_encap" - } - params { - id: 1 - name: "ethernet_dst_addr" - bitwidth: 48 - } - params { - id: 2 - name: "ethernet_src_addr" - bitwidth: 48 - } - params { - id: 3 - name: "ethernet_ether_type" - bitwidth: 16 - } - params { - id: 4 - name: "ipv4_diffserv" - bitwidth: 8 - } - params { - id: 5 - name: "ipv4_total_len" - bitwidth: 16 - } - params { - id: 6 - name: "ipv4_identification" - bitwidth: 16 - } - params { - id: 7 - name: "ipv4_flags_offset" - bitwidth: 16 - } - params { - id: 8 - name: "ipv4_ttl" - bitwidth: 8 - } - params { - id: 9 - name: "ipv4_protocol" - bitwidth: 8 - } - params { - id: 10 - name: "ipv4_hdr_checksum" - bitwidth: 16 - } - params { - id: 11 - name: "ipv4_src_addr" - bitwidth: 32 - } - params { - id: 12 - name: "ipv4_dst_addr" - bitwidth: 32 - } - params { - id: 13 - name: "udp_src_port" - bitwidth: 16 - } - params { - id: 14 - name: "udp_dst_port" - bitwidth: 16 - } - params { - id: 15 - name: "udp_length" - bitwidth: 16 - } - params { - id: 16 - name: "udp_checksum" - bitwidth: 16 - } - params { - id: 17 - name: "vxlan_flags" - bitwidth: 8 - } - params { - id: 18 - name: "vxlan_reserved" - bitwidth: 24 - } - params { - id: 19 - name: "vxlan_vni" - bitwidth: 24 - } - params { - id: 20 - name: "vxlan_reserved2" - bitwidth: 8 - } - params { - id: 21 - name: "port_out" - bitwidth: 32 - } -} -actions { - preamble { - id: 33281717 - name: "ingress.drop" - alias: "drop" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb new file mode 100644 index 00000000000..625352189b8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-checksum-arg-header.p4.p4info.txtpb @@ -0,0 +1,148 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 33686666 + name: "ingress.vxlan" + alias: "vxlan" + } + match_fields { + id: 1 + name: "headers.ethernet.dst_addr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 32131245 + } + action_refs { + id: 33281717 + } + const_default_action_id: 33281717 + size: 1048576 +} +actions { + preamble { + id: 32131245 + name: "ingress.vxlan_encap" + alias: "vxlan_encap" + } + params { + id: 1 + name: "ethernet_dst_addr" + bitwidth: 48 + } + params { + id: 2 + name: "ethernet_src_addr" + bitwidth: 48 + } + params { + id: 3 + name: "ethernet_ether_type" + bitwidth: 16 + } + params { + id: 4 + name: "ipv4_diffserv" + bitwidth: 8 + } + params { + id: 5 + name: "ipv4_total_len" + bitwidth: 16 + } + params { + id: 6 + name: "ipv4_identification" + bitwidth: 16 + } + params { + id: 7 + name: "ipv4_flags_offset" + bitwidth: 16 + } + params { + id: 8 + name: "ipv4_ttl" + bitwidth: 8 + } + params { + id: 9 + name: "ipv4_protocol" + bitwidth: 8 + } + params { + id: 10 + name: "ipv4_hdr_checksum" + bitwidth: 16 + } + params { + id: 11 + name: "ipv4_src_addr" + bitwidth: 32 + } + params { + id: 12 + name: "ipv4_dst_addr" + bitwidth: 32 + } + params { + id: 13 + name: "udp_src_port" + bitwidth: 16 + } + params { + id: 14 + name: "udp_dst_port" + bitwidth: 16 + } + params { + id: 15 + name: "udp_length" + bitwidth: 16 + } + params { + id: 16 + name: "udp_checksum" + bitwidth: 16 + } + params { + id: 17 + name: "vxlan_flags" + bitwidth: 8 + } + params { + id: 18 + name: "vxlan_reserved" + bitwidth: 24 + } + params { + id: 19 + name: "vxlan_vni" + bitwidth: 24 + } + params { + id: 20 + name: "vxlan_reserved2" + bitwidth: 8 + } + params { + id: 21 + name: "port_out" + bitwidth: 32 + } +} +actions { + preamble { + id: 33281717 + name: "ingress.drop" + alias: "drop" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txt deleted file mode 100644 index 8fed7d742f5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: TERNARY - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb new file mode 100644 index 00000000000..4d8217e326e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txt deleted file mode 100644 index 8fed7d742f5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: TERNARY - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb new file mode 100644 index 00000000000..4d8217e326e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txt deleted file mode 100644 index 8fed7d742f5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: TERNARY - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb new file mode 100644 index 00000000000..4d8217e326e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txt deleted file mode 100644 index 76665905b1c..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txt +++ /dev/null @@ -1,52 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 38023373 - name: "ingress.table1" - alias: "table1" - } - match_fields { - id: 1 - name: "headers.ethernet.dst_addr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 25703749 - } - action_refs { - id: 33281717 - } - const_default_action_id: 33281717 - size: 1048576 -} -actions { - preamble { - id: 25703749 - name: "ingress.action1" - alias: "action1" - } - params { - id: 1 - name: "field" - bitwidth: 16 - } - params { - id: 2 - name: "field1" - bitwidth: 16 - } -} -actions { - preamble { - id: 33281717 - name: "ingress.drop" - alias: "drop" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb new file mode 100644 index 00000000000..7f1b884aadb --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct.p4.p4info.txtpb @@ -0,0 +1,53 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 38023373 + name: "ingress.table1" + alias: "table1" + } + match_fields { + id: 1 + name: "headers.ethernet.dst_addr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 25703749 + } + action_refs { + id: 33281717 + } + const_default_action_id: 33281717 + size: 1048576 +} +actions { + preamble { + id: 25703749 + name: "ingress.action1" + alias: "action1" + } + params { + id: 1 + name: "field" + bitwidth: 16 + } + params { + id: 2 + name: "field1" + bitwidth: 16 + } +} +actions { + preamble { + id: 33281717 + name: "ingress.drop" + alias: "drop" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txt deleted file mode 100644 index 5a541c871c5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txt +++ /dev/null @@ -1,38 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1000000 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb new file mode 100644 index 00000000000..09088e7de68 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-hdr-field-non-align.p4.p4info.txtpb @@ -0,0 +1,39 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1000000 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txt deleted file mode 100644 index 379556fa339..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "a.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 25756908 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25756908 - name: "MyIC.forward" - alias: "forward" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb new file mode 100644 index 00000000000..023eccf53fe --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-header-union-typedef.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "a.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 25756908 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25756908 + name: "MyIC.forward" + alias: "forward" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txt deleted file mode 100644 index f5b1a973b98..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44509340 - name: "MyIngressControl.MyIngressControl.stub" - alias: "stub" - } - match_fields { - id: 1 - name: "m.k1" - bitwidth: 128 - match_type: EXACT - } - action_refs { - id: 17706690 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1000000 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 17706690 - name: "MyIngressControl.MyIngressControl.macswp" - alias: "macswp" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb new file mode 100644 index 00000000000..0b83ddc89a2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-large-header-fields.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44509340 + name: "MyIngressControl.MyIngressControl.stub" + alias: "stub" + } + match_fields { + id: 1 + name: "m.k1" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 17706690 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1000000 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 17706690 + name: "MyIngressControl.MyIngressControl.macswp" + alias: "macswp" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txt deleted file mode 100644 index f5b1a973b98..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44509340 - name: "MyIngressControl.MyIngressControl.stub" - alias: "stub" - } - match_fields { - id: 1 - name: "m.k1" - bitwidth: 128 - match_type: EXACT - } - action_refs { - id: 17706690 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1000000 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 17706690 - name: "MyIngressControl.MyIngressControl.macswp" - alias: "macswp" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb new file mode 100644 index 00000000000..0b83ddc89a2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-large-struct-fields.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44509340 + name: "MyIngressControl.MyIngressControl.stub" + alias: "stub" + } + match_fields { + id: 1 + name: "m.k1" + bitwidth: 128 + match_type: EXACT + } + action_refs { + id: 17706690 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1000000 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 17706690 + name: "MyIngressControl.MyIngressControl.macswp" + alias: "macswp" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txt deleted file mode 100644 index c210a42ff4f..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ipv4.totalLen" - bitwidth: 16 - match_type: LPM - } - match_fields { - id: 2 - name: "hdr.ipv4.newfield" - bitwidth: 80 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb new file mode 100644 index 00000000000..a04e3806dfb --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err3.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ipv4.totalLen" + bitwidth: 16 + match_type: LPM + } + match_fields { + id: 2 + name: "hdr.ipv4.newfield" + bitwidth: 80 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txt deleted file mode 100644 index dac047b6f37..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: LPM - } - match_fields { - id: 2 - name: "hdr.ipv4.totalLen" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb new file mode 100644 index 00000000000..7420b70cf80 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: LPM + } + match_fields { + id: 2 + name: "hdr.ipv4.totalLen" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txt deleted file mode 100644 index 566238b8f2a..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: LPM - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "0x48" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb new file mode 100644 index 00000000000..f0ee79747a8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: LPM + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "0x48" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txt deleted file mode 100644 index 57a7adff5b9..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: LPM - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb new file mode 100644 index 00000000000..670e570b20b --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: LPM + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txt deleted file mode 100644 index 66eedf084e8..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txt +++ /dev/null @@ -1,46 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 29027610 - } - const_default_action_id: 20013177 - size: 1000000 -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } - params { - id: 1 - name: "tmp1" - bitwidth: 32 - } - params { - id: 2 - name: "tmp2" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb new file mode 100644 index 00000000000..475d27e1e73 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-01.p4.p4info.txtpb @@ -0,0 +1,47 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 29027610 + } + const_default_action_id: 20013177 + size: 1000000 +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } + params { + id: 1 + name: "tmp1" + bitwidth: 32 + } + params { + id: 2 + name: "tmp2" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txt deleted file mode 100644 index a7c776fde8e..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txt +++ /dev/null @@ -1,45 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 29027610 - } - size: 1000000 -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } - params { - id: 1 - name: "tmp1" - bitwidth: 32 - } - params { - id: 2 - name: "tmp2" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb new file mode 100644 index 00000000000..0daf777cb88 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-02.p4.p4info.txtpb @@ -0,0 +1,46 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 29027610 + } + size: 1000000 +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } + params { + id: 1 + name: "tmp1" + bitwidth: 32 + } + params { + id: 2 + name: "tmp2" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txt deleted file mode 100644 index c421382d76d..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txt +++ /dev/null @@ -1,36 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 29027610 - } - const_default_action_id: 20013177 - size: 1000000 -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb new file mode 100644 index 00000000000..441125e182b --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-03.p4.p4info.txtpb @@ -0,0 +1,37 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 29027610 + } + const_default_action_id: 20013177 + size: 1000000 +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txt deleted file mode 100644 index 90e7d3e8113..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txt +++ /dev/null @@ -1,35 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 29027610 - } - size: 1000000 -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb new file mode 100644 index 00000000000..13e5c55ff81 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-04.p4.p4info.txtpb @@ -0,0 +1,36 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 29027610 + } + size: 1000000 +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txt deleted file mode 100644 index 1e096082b1d..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txt +++ /dev/null @@ -1,57 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 29027610 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1000000 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } - params { - id: 1 - name: "tmp1" - bitwidth: 32 - } - params { - id: 2 - name: "tmp2" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb new file mode 100644 index 00000000000..43bddf7c1b3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-05.p4.p4info.txtpb @@ -0,0 +1,58 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 29027610 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1000000 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } + params { + id: 1 + name: "tmp1" + bitwidth: 32 + } + params { + id: 2 + name: "tmp2" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txt deleted file mode 100644 index b17bae0b6ab..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txt +++ /dev/null @@ -1,56 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 29027610 - } - action_refs { - id: 21257015 - } - size: 1000000 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } - params { - id: 1 - name: "tmp1" - bitwidth: 32 - } - params { - id: 2 - name: "tmp2" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb new file mode 100644 index 00000000000..f192d8515f8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-06.p4.p4info.txtpb @@ -0,0 +1,57 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 29027610 + } + action_refs { + id: 21257015 + } + size: 1000000 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } + params { + id: 1 + name: "tmp1" + bitwidth: 32 + } + params { + id: 2 + name: "tmp2" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txt deleted file mode 100644 index b17bae0b6ab..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txt +++ /dev/null @@ -1,56 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 29027610 - } - action_refs { - id: 21257015 - } - size: 1000000 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } - params { - id: 1 - name: "tmp1" - bitwidth: 32 - } - params { - id: 2 - name: "tmp2" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb new file mode 100644 index 00000000000..f192d8515f8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-07.p4.p4info.txtpb @@ -0,0 +1,57 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 29027610 + } + action_refs { + id: 21257015 + } + size: 1000000 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } + params { + id: 1 + name: "tmp1" + bitwidth: 32 + } + params { + id: 2 + name: "tmp2" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txt deleted file mode 100644 index 643637e78ef..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txt +++ /dev/null @@ -1,40 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 29027610 - } - size: 1000000 -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } - params { - id: 1 - name: "tmp2" - bitwidth: 32 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb new file mode 100644 index 00000000000..8846805c4eb --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-08.p4.p4info.txtpb @@ -0,0 +1,41 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 29027610 + } + size: 1000000 +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } + params { + id: 1 + name: "tmp2" + bitwidth: 32 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txt deleted file mode 100644 index a3218aba6a2..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txt +++ /dev/null @@ -1,46 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 29027610 - } - const_default_action_id: 20013177 - size: 1000000 -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } - params { - id: 1 - name: "tmp1" - bitwidth: 32 - } - params { - id: 2 - name: "tmp2" - bitwidth: 1 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb new file mode 100644 index 00000000000..82a9d5531d3 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-non-zero-arg-default-action-09.p4.p4info.txtpb @@ -0,0 +1,47 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 29027610 + } + const_default_action_id: 20013177 + size: 1000000 +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } + params { + id: 1 + name: "tmp1" + bitwidth: 32 + } + params { + id: 2 + name: "tmp2" + bitwidth: 1 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txt deleted file mode 100644 index 5a541c871c5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txt +++ /dev/null @@ -1,38 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 20013177 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1000000 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 20013177 - name: "MyIngressControl.macswp" - alias: "macswp" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb new file mode 100644 index 00000000000..09088e7de68 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-struct-field.p4.p4info.txtpb @@ -0,0 +1,39 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 20013177 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1000000 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 20013177 + name: "MyIngressControl.macswp" + alias: "macswp" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.entries.txt deleted file mode 100644 index 341954e6fdd..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.entries.txt +++ /dev/null @@ -1,123 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 44168292 - match { - field_id: 1 - exact { - value: "\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\001" - } - } - } - priority: 4 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44168292 - match { - field_id: 1 - exact { - value: "\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\002" - } - } - } - priority: 3 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44168292 - match { - field_id: 1 - exact { - value: "\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\003" - } - } - } - priority: 2 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44168292 - match { - field_id: 1 - exact { - value: "\004" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\004" - } - } - } - priority: 1 - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.entries.txtpb new file mode 100644 index 00000000000..226f8646d3d --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.entries.txtpb @@ -0,0 +1,124 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 44168292 + match { + field_id: 1 + exact { + value: "\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\001" + } + } + } + priority: 4 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44168292 + match { + field_id: 1 + exact { + value: "\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\002" + } + } + } + priority: 3 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44168292 + match { + field_id: 1 + exact { + value: "\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\003" + } + } + } + priority: 2 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44168292 + match { + field_id: 1 + exact { + value: "\004" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\004" + } + } + } + priority: 1 + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txt deleted file mode 100644 index 008678c8600..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44168292 - name: "ingress.t_exact_ternary" - alias: "t_exact_ternary" - } - match_fields { - id: 1 - name: "h.h.e" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "h.h.t" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb new file mode 100644 index 00000000000..345ec80604b --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-entries-exact-ternary.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44168292 + name: "ingress.t_exact_ternary" + alias: "t_exact_ternary" + } + match_fields { + id: 1 + name: "h.h.e" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "h.h.t" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txt deleted file mode 100644 index bf77be0abf6..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txt +++ /dev/null @@ -1,132 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "b.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 3 - name: "b.data1" - bitwidth: 16 - match_type: LPM - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - size: 1024 -} -tables { - preamble { - id: 49266188 - name: "MyIC.foo" - alias: "foo" - } - match_fields { - id: 1 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "b.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 3 - name: "b.data1" - bitwidth: 16 - match_type: LPM - } - action_refs { - id: 21257015 - } - action_refs { - id: 27325837 - } - action_refs { - id: 23466264 - } - size: 1024 -} -tables { - preamble { - id: 49390123 - name: "MyIC.bar" - alias: "bar" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -actions { - preamble { - id: 27325837 - name: "MyIC.a3" - alias: "a3" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb new file mode 100644 index 00000000000..fb0d08432a7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.p4info.txtpb @@ -0,0 +1,133 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "b.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 3 + name: "b.data1" + bitwidth: 16 + match_type: LPM + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + size: 1024 +} +tables { + preamble { + id: 49266188 + name: "MyIC.foo" + alias: "foo" + } + match_fields { + id: 1 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "b.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 3 + name: "b.data1" + bitwidth: 16 + match_type: LPM + } + action_refs { + id: 21257015 + } + action_refs { + id: 27325837 + } + action_refs { + id: 23466264 + } + size: 1024 +} +tables { + preamble { + id: 49390123 + name: "MyIC.bar" + alias: "bar" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +actions { + preamble { + id: 27325837 + name: "MyIC.a3" + alias: "a3" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txt deleted file mode 100644 index 081f5caa547..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txt +++ /dev/null @@ -1,96 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "b.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 3 - name: "b.data1" - bitwidth: 16 - match_type: LPM - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - size: 1024 -} -tables { - preamble { - id: 49266188 - name: "MyIC.foo" - alias: "foo" - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 49390123 - name: "MyIC.bar" - alias: "bar" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb new file mode 100644 index 00000000000..8ee44cc3c11 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.p4info.txtpb @@ -0,0 +1,97 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "b.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 3 + name: "b.data1" + bitwidth: 16 + match_type: LPM + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + size: 1024 +} +tables { + preamble { + id: 49266188 + name: "MyIC.foo" + alias: "foo" + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 49390123 + name: "MyIC.bar" + alias: "bar" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txt deleted file mode 100644 index f9349d2a4bb..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txt +++ /dev/null @@ -1,60 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "0x48" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "user_meta.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: LPM - } - match_fields { - id: 4 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb new file mode 100644 index 00000000000..4178a2c7ebc --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.p4info.txtpb @@ -0,0 +1,61 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "0x48" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "user_meta.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: LPM + } + match_fields { + id: 4 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txt deleted file mode 100644 index 8a43fc5dbfb..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txt +++ /dev/null @@ -1,60 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "user_meta.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 4 - name: "user_meta.data1" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb new file mode 100644 index 00000000000..748bb905ef7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-10.p4.p4info.txtpb @@ -0,0 +1,61 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "user_meta.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 4 + name: "user_meta.data1" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txt deleted file mode 100644 index 566238b8f2a..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: LPM - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "0x48" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb new file mode 100644 index 00000000000..f0ee79747a8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: LPM + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "0x48" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txt deleted file mode 100644 index deef757c078..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "user_meta.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 2 - name: "0x48" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb new file mode 100644 index 00000000000..4f465726169 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "user_meta.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "0x48" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txt deleted file mode 100644 index 4082498f4da..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 35478861 - name: "egress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "user_meta.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 2 - name: "0x48" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 17082815 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 17082815 - name: "egress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb new file mode 100644 index 00000000000..194188737ae --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 35478861 + name: "egress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "user_meta.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "0x48" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 17082815 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 17082815 + name: "egress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txt deleted file mode 100644 index af7548d2974..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.tcp.dstPort" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 2 - name: "0x48" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb new file mode 100644 index 00000000000..ef53980e224 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-5.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.tcp.dstPort" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "0x48" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txt deleted file mode 100644 index 1d561051c69..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "user_meta.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 2 - name: "user_meta.data3" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb new file mode 100644 index 00000000000..151cad032af --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-6.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "user_meta.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "user_meta.data3" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txt deleted file mode 100644 index 4969939463a..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "user_meta.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 2 - name: "0x48" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.tcp.dstPort" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb new file mode 100644 index 00000000000..2cbdf65dee8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-7.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "user_meta.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "0x48" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.tcp.dstPort" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txt deleted file mode 100644 index 5be661f990f..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb new file mode 100644 index 00000000000..6d2a2368c01 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-8.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txt deleted file mode 100644 index 93ca0630217..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txt +++ /dev/null @@ -1,84 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.tcp.dstPort" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 2 - name: "0x48" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 3 - name: "user_meta.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 4 - name: "user_meta.data2" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 5 - name: "user_meta.data4" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 6 - name: "user_meta.data5" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 7 - name: "user_meta.data6" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 8 - name: "user_meta.data3" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb new file mode 100644 index 00000000000..ca16113e5c6 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-9.p4.p4info.txtpb @@ -0,0 +1,85 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.tcp.dstPort" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "0x48" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 3 + name: "user_meta.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 4 + name: "user_meta.data2" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 5 + name: "user_meta.data4" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 6 + name: "user_meta.data5" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 7 + name: "user_meta.data6" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 8 + name: "user_meta.data3" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txt deleted file mode 100644 index ae7e76bd1c7..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txt +++ /dev/null @@ -1,60 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "user_meta.data" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: LPM - } - match_fields { - id: 3 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 4 - name: "0x48" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb new file mode 100644 index 00000000000..23416c7c00e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.p4info.txtpb @@ -0,0 +1,61 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "user_meta.data" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: LPM + } + match_fields { + id: 3 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 4 + name: "0x48" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txt deleted file mode 100644 index e6f3b22de0c..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txt +++ /dev/null @@ -1,90 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "b.data" - bitwidth: 16 - match_type: LPM - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - size: 1024 -} -tables { - preamble { - id: 49266188 - name: "MyIC.foo" - alias: "foo" - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 49390123 - name: "MyIC.bar" - alias: "bar" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb new file mode 100644 index 00000000000..dcdf86beca4 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.p4info.txtpb @@ -0,0 +1,91 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "b.data" + bitwidth: 16 + match_type: LPM + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + size: 1024 +} +tables { + preamble { + id: 49266188 + name: "MyIC.foo" + alias: "foo" + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 49390123 + name: "MyIC.bar" + alias: "bar" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txt deleted file mode 100644 index 3469bef6172..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txt +++ /dev/null @@ -1,90 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "user_meta.data1" - bitwidth: 64 - match_type: EXACT - } - match_fields { - id: 2 - name: "user_meta.data2" - bitwidth: 64 - match_type: EXACT - } - match_fields { - id: 3 - name: "user_meta.data3" - bitwidth: 64 - match_type: EXACT - } - match_fields { - id: 4 - name: "user_meta.data4" - bitwidth: 64 - match_type: EXACT - } - match_fields { - id: 5 - name: "user_meta.data5" - bitwidth: 64 - match_type: EXACT - } - match_fields { - id: 6 - name: "user_meta.data6" - bitwidth: 64 - match_type: EXACT - } - match_fields { - id: 7 - name: "user_meta.data7" - bitwidth: 64 - match_type: EXACT - } - match_fields { - id: 8 - name: "user_meta.data8" - bitwidth: 64 - match_type: EXACT - } - match_fields { - id: 9 - name: "user_meta.data9" - bitwidth: 64 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb new file mode 100644 index 00000000000..451e8cdda37 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error-1.p4.p4info.txtpb @@ -0,0 +1,91 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "user_meta.data1" + bitwidth: 64 + match_type: EXACT + } + match_fields { + id: 2 + name: "user_meta.data2" + bitwidth: 64 + match_type: EXACT + } + match_fields { + id: 3 + name: "user_meta.data3" + bitwidth: 64 + match_type: EXACT + } + match_fields { + id: 4 + name: "user_meta.data4" + bitwidth: 64 + match_type: EXACT + } + match_fields { + id: 5 + name: "user_meta.data5" + bitwidth: 64 + match_type: EXACT + } + match_fields { + id: 6 + name: "user_meta.data6" + bitwidth: 64 + match_type: EXACT + } + match_fields { + id: 7 + name: "user_meta.data7" + bitwidth: 64 + match_type: EXACT + } + match_fields { + id: 8 + name: "user_meta.data8" + bitwidth: 64 + match_type: EXACT + } + match_fields { + id: 9 + name: "user_meta.data9" + bitwidth: 64 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txt deleted file mode 100644 index 34cd9f4d6bd..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txt +++ /dev/null @@ -1,60 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "user_meta.data1" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.tcp.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 4 - name: "hdr.ipv4.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb new file mode 100644 index 00000000000..4cb050950c6 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-error.p4.p4info.txtpb @@ -0,0 +1,61 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "user_meta.data1" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.tcp.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 4 + name: "hdr.ipv4.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txt deleted file mode 100644 index 9f56d430945..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb new file mode 100644 index 00000000000..991c4258c87 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txt deleted file mode 100644 index fdb065d2e42..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdrValid" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb new file mode 100644 index 00000000000..b3b736dc129 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdrValid" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txt deleted file mode 100644 index fdb065d2e42..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdrValid" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb new file mode 100644 index 00000000000..b3b736dc129 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdrValid" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txt deleted file mode 100644 index dc528bc3c41..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdrValid" - bitwidth: 1 - match_type: OPTIONAL - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb new file mode 100644 index 00000000000..ff148623905 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdrValid" + bitwidth: 1 + match_type: OPTIONAL + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txt deleted file mode 100644 index fdb065d2e42..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdrValid" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb new file mode 100644 index 00000000000..b3b736dc129 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdrValid" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txt deleted file mode 100644 index fdb065d2e42..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdrValid" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb new file mode 100644 index 00000000000..b3b736dc129 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdrValid" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txt deleted file mode 100644 index 2f6d9118b65..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.tcp.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ipv4.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb new file mode 100644 index 00000000000..e09bbd5fd24 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.tcp.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ipv4.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txt deleted file mode 100644 index 8fed7d742f5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: TERNARY - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb new file mode 100644 index 00000000000..4d8217e326e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-tmp-mask-align.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txt deleted file mode 100644 index a673545f60f..00000000000 --- a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txt +++ /dev/null @@ -1,152 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 47735139 - name: "ingress.vxlan_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk" - alias: "vxlan_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk" - } - match_fields { - id: 1 - name: "headers.ethernet.dst_addr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 30831807 - } - action_refs { - id: 33281717 - } - const_default_action_id: 33281717 - size: 1048576 -} -actions { - preamble { - id: 30831807 - name: "ingress.vxlan_encap_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk" - alias: "vxlan_encap_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk" - } - params { - id: 1 - name: "ethernet_dst_addr" - bitwidth: 48 - } - params { - id: 2 - name: "ethernet_src_addr" - bitwidth: 48 - } - params { - id: 3 - name: "ethernet_ether_type" - bitwidth: 16 - } - params { - id: 4 - name: "ipv4_ver_ihl" - bitwidth: 8 - } - params { - id: 5 - name: "ipv4_diffserv" - bitwidth: 8 - } - params { - id: 6 - name: "ipv4_total_len" - bitwidth: 16 - } - params { - id: 7 - name: "ipv4_identification" - bitwidth: 16 - } - params { - id: 8 - name: "ipv4_flags_offset" - bitwidth: 16 - } - params { - id: 9 - name: "ipv4_ttl" - bitwidth: 8 - } - params { - id: 10 - name: "ipv4_protocol" - bitwidth: 8 - } - params { - id: 11 - name: "ipv4_hdr_checksum" - bitwidth: 16 - } - params { - id: 12 - name: "ipv4_src_addr" - bitwidth: 32 - } - params { - id: 13 - name: "ipv4_dst_addr" - bitwidth: 32 - } - params { - id: 14 - name: "udp_src_port" - bitwidth: 16 - } - params { - id: 15 - name: "udp_dst_port" - bitwidth: 16 - } - params { - id: 16 - name: "udp_length" - bitwidth: 16 - } - params { - id: 17 - name: "udp_checksum" - bitwidth: 16 - } - params { - id: 18 - name: "vxlan_flags" - bitwidth: 8 - } - params { - id: 19 - name: "vxlan_reserved" - bitwidth: 24 - } - params { - id: 20 - name: "vxlan_vni" - bitwidth: 24 - } - params { - id: 21 - name: "vxlan_reserved2" - bitwidth: 8 - } - params { - id: 22 - name: "port_out" - bitwidth: 32 - } -} -actions { - preamble { - id: 33281717 - name: "ingress.drop" - alias: "drop" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb new file mode 100644 index 00000000000..df3e94091b8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-dpdk-token-too-big.p4.p4info.txtpb @@ -0,0 +1,153 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 47735139 + name: "ingress.vxlan_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk" + alias: "vxlan_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk" + } + match_fields { + id: 1 + name: "headers.ethernet.dst_addr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 30831807 + } + action_refs { + id: 33281717 + } + const_default_action_id: 33281717 + size: 1048576 +} +actions { + preamble { + id: 30831807 + name: "ingress.vxlan_encap_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk" + alias: "vxlan_encap_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk_dpdk" + } + params { + id: 1 + name: "ethernet_dst_addr" + bitwidth: 48 + } + params { + id: 2 + name: "ethernet_src_addr" + bitwidth: 48 + } + params { + id: 3 + name: "ethernet_ether_type" + bitwidth: 16 + } + params { + id: 4 + name: "ipv4_ver_ihl" + bitwidth: 8 + } + params { + id: 5 + name: "ipv4_diffserv" + bitwidth: 8 + } + params { + id: 6 + name: "ipv4_total_len" + bitwidth: 16 + } + params { + id: 7 + name: "ipv4_identification" + bitwidth: 16 + } + params { + id: 8 + name: "ipv4_flags_offset" + bitwidth: 16 + } + params { + id: 9 + name: "ipv4_ttl" + bitwidth: 8 + } + params { + id: 10 + name: "ipv4_protocol" + bitwidth: 8 + } + params { + id: 11 + name: "ipv4_hdr_checksum" + bitwidth: 16 + } + params { + id: 12 + name: "ipv4_src_addr" + bitwidth: 32 + } + params { + id: 13 + name: "ipv4_dst_addr" + bitwidth: 32 + } + params { + id: 14 + name: "udp_src_port" + bitwidth: 16 + } + params { + id: 15 + name: "udp_dst_port" + bitwidth: 16 + } + params { + id: 16 + name: "udp_length" + bitwidth: 16 + } + params { + id: 17 + name: "udp_checksum" + bitwidth: 16 + } + params { + id: 18 + name: "vxlan_flags" + bitwidth: 8 + } + params { + id: 19 + name: "vxlan_reserved" + bitwidth: 24 + } + params { + id: 20 + name: "vxlan_vni" + bitwidth: 24 + } + params { + id: 21 + name: "vxlan_reserved2" + bitwidth: 8 + } + params { + id: 22 + name: "port_out" + bitwidth: 32 + } +} +actions { + preamble { + id: 33281717 + name: "ingress.drop" + alias: "drop" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.p4info.txt deleted file mode 100644 index ed28782f7ef..00000000000 --- a/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} diff --git a/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..cfbdc3d692a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} diff --git a/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.p4info.txt deleted file mode 100644 index ed28782f7ef..00000000000 --- a/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} diff --git a/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..cfbdc3d692a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} diff --git a/testdata/p4_16_samples_outputs/psa-drop.p4.spec b/testdata/p4_16_samples_outputs/psa-drop.p4.spec deleted file mode 100644 index 7e7da1ca7b9..00000000000 --- a/testdata/p4_16_samples_outputs/psa-drop.p4.spec +++ /dev/null @@ -1,83 +0,0 @@ - -struct EMPTY_M { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path - bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<8> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id - bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group - bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<8> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop -} -metadata instanceof EMPTY_M - -struct psa_ingress_output_metadata_t { - bit<8> class_of_service - bit<8> clone - bit<16> clone_session_id - bit<8> drop - bit<8> resubmit - bit<32> multicast_group - bit<32> egress_port -} - -struct psa_egress_output_metadata_t { - bit<8> clone - bit<16> clone_session_id - bit<8> drop -} - -struct psa_egress_deparser_input_metadata_t { - bit<32> egress_port -} - -action NoAction args none { - return -} - -action drop args none { - mov m.psa_ingress_output_metadata_drop 1 - return -} - -table tbl { - key { - h.srcAddr exact - } - actions { - NoAction - drop - } - default_action NoAction args none - size 0x10000 -} - - -apply { - rx m.psa_ingress_input_metadata_ingress_port - mov m.psa_ingress_output_metadata_drop 0x0 - extract h - table tbl - jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0 - tx m.psa_ingress_output_metadata_egress_port - LABEL_DROP : drop -} - - diff --git a/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.p4info.txt deleted file mode 100644 index 780534836f1..00000000000 --- a/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.p4info.txt +++ /dev/null @@ -1,28 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21538986 - name: "egress_drop" - alias: "egress_drop" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21288787 - name: "cEgress.clone" - alias: "clone" - } -} diff --git a/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..021563c0c72 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.p4info.txtpb @@ -0,0 +1,29 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21538986 + name: "egress_drop" + alias: "egress_drop" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21288787 + name: "cEgress.clone" + alias: "clone" + } +} diff --git a/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.p4info.txt deleted file mode 100644 index 3dd7085a2bb..00000000000 --- a/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.p4info.txt +++ /dev/null @@ -1,22 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -registers { - preamble { - id: 369999048 - name: "cEgress.egress_pkt_seen" - alias: "egress_pkt_seen" - } - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - size: 256 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..0fdd42528b7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.p4info.txtpb @@ -0,0 +1,23 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +registers { + preamble { + id: 369999048 + name: "cEgress.egress_pkt_seen" + alias: "egress_pkt_seen" + } + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + size: 256 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txt deleted file mode 100644 index 848a6865714..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txt +++ /dev/null @@ -1,98 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 35996228 - name: "ingress.ipv4_da_lpm" - alias: "ipv4_da_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 27207020 - } - action_refs { - id: 25648360 - } - direct_resource_ids: 332805598 - size: 1024 -} -actions { - preamble { - id: 27207020 - name: "ingress.next_hop" - alias: "next_hop" - } - params { - id: 1 - name: "oport" - bitwidth: 32 - type_name { - name: "PortId_t" - } - } -} -actions { - preamble { - id: 25648360 - name: "ingress.default_route_drop" - alias: "default_route_drop" - } -} -counters { - preamble { - id: 306657404 - name: "ingress.port_bytes_in" - alias: "port_bytes_in" - } - spec { - unit: BYTES - } - size: 512 - index_type_name { - name: "PortId_t" - } -} -counters { - preamble { - id: 309984546 - name: "egress.port_bytes_out" - alias: "port_bytes_out" - } - spec { - unit: BYTES - } - size: 512 - index_type_name { - name: "PortId_t" - } -} -direct_counters { - preamble { - id: 332805598 - name: "ingress.per_prefix_pkt_byte_count" - alias: "per_prefix_pkt_byte_count" - } - spec { - unit: BOTH - } - direct_table_id: 35996228 -} -type_info { - new_types { - key: "PortId_t" - value { - translated_type { - uri: "p4.org/psa/v1/PortId_t" - sdn_bitwidth: 32 - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..b2b2ebe63c4 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-counters-bmv2.p4.p4info.txtpb @@ -0,0 +1,99 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 35996228 + name: "ingress.ipv4_da_lpm" + alias: "ipv4_da_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 27207020 + } + action_refs { + id: 25648360 + } + direct_resource_ids: 332805598 + size: 1024 +} +actions { + preamble { + id: 27207020 + name: "ingress.next_hop" + alias: "next_hop" + } + params { + id: 1 + name: "oport" + bitwidth: 32 + type_name { + name: "PortId_t" + } + } +} +actions { + preamble { + id: 25648360 + name: "ingress.default_route_drop" + alias: "default_route_drop" + } +} +counters { + preamble { + id: 306657404 + name: "ingress.port_bytes_in" + alias: "port_bytes_in" + } + spec { + unit: BYTES + } + size: 512 + index_type_name { + name: "PortId_t" + } +} +counters { + preamble { + id: 309984546 + name: "egress.port_bytes_out" + alias: "port_bytes_out" + } + spec { + unit: BYTES + } + size: 512 + index_type_name { + name: "PortId_t" + } +} +direct_counters { + preamble { + id: 332805598 + name: "ingress.per_prefix_pkt_byte_count" + alias: "per_prefix_pkt_byte_count" + } + spec { + unit: BOTH + } + direct_table_id: 35996228 +} +type_info { + new_types { + key: "PortId_t" + value { + translated_type { + uri: "p4.org/psa/v1/PortId_t" + sdn_bitwidth: 32 + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txt deleted file mode 100644 index a4da943f46c..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txt +++ /dev/null @@ -1,200 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 47392102 - name: "ingress.learned_sources" - alias: "learned_sources" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 26564927 - } - size: 1024 -} -tables { - preamble { - id: 41262190 - name: "ingress.l2_tbl" - alias: "l2_tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 31052161 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 36288301 - name: "ingress.tst_tbl" - alias: "tst_tbl" - } - match_fields { - id: 1 - name: "meta.mac_learn_msg.ingress_port" - bitwidth: 32 - match_type: EXACT - type_name { - name: "PortId_t" - } - } - action_refs { - id: 29249116 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 26564927 - name: "ingress.unknown_source" - alias: "unknown_source" - } -} -actions { - preamble { - id: 31052161 - name: "ingress.do_L2_forward" - alias: "do_L2_forward" - } - params { - id: 1 - name: "egress_port" - bitwidth: 32 - type_name { - name: "PortId_t" - } - } -} -actions { - preamble { - id: 29249116 - name: "ingress.do_tst" - alias: "do_tst" - } - params { - id: 1 - name: "egress_port" - bitwidth: 32 - type_name { - name: "PortId_t" - } - } - params { - id: 2 - name: "serEnumT" - bitwidth: 16 - } -} -digests { - preamble { - id: 401112174 - name: "IngressDeparserImpl.mac_learn_digest" - alias: "mac_learn_digest" - } - type_spec { - struct { - name: "mac_learn_digest_t" - } - } -} -type_info { - structs { - key: "mac_learn_digest_t" - value { - members { - name: "srcAddr" - type_spec { - bitstring { - bit { - bitwidth: 48 - } - } - } - } - members { - name: "ingress_port" - type_spec { - new_type { - name: "PortId_t" - } - } - } - } - } - serializable_enums { - key: "EthTypes" - value { - underlying_type { - bitwidth: 16 - } - members { - name: "IPv4" - value: "\010\000" - } - members { - name: "ARP" - value: "\010\006" - } - members { - name: "RARP" - value: "\2005" - } - members { - name: "EtherTalk" - value: "\200\233" - } - members { - name: "VLAN" - value: "\201\000" - } - members { - name: "IPX" - value: "\2017" - } - members { - name: "IPv6" - value: "\206\335" - } - } - } - new_types { - key: "PortId_t" - value { - translated_type { - uri: "p4.org/psa/v1/PortId_t" - sdn_bitwidth: 32 - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..4062f6e4d31 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-digest-bmv2.p4.p4info.txtpb @@ -0,0 +1,201 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 47392102 + name: "ingress.learned_sources" + alias: "learned_sources" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 26564927 + } + size: 1024 +} +tables { + preamble { + id: 41262190 + name: "ingress.l2_tbl" + alias: "l2_tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 31052161 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 36288301 + name: "ingress.tst_tbl" + alias: "tst_tbl" + } + match_fields { + id: 1 + name: "meta.mac_learn_msg.ingress_port" + bitwidth: 32 + match_type: EXACT + type_name { + name: "PortId_t" + } + } + action_refs { + id: 29249116 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 26564927 + name: "ingress.unknown_source" + alias: "unknown_source" + } +} +actions { + preamble { + id: 31052161 + name: "ingress.do_L2_forward" + alias: "do_L2_forward" + } + params { + id: 1 + name: "egress_port" + bitwidth: 32 + type_name { + name: "PortId_t" + } + } +} +actions { + preamble { + id: 29249116 + name: "ingress.do_tst" + alias: "do_tst" + } + params { + id: 1 + name: "egress_port" + bitwidth: 32 + type_name { + name: "PortId_t" + } + } + params { + id: 2 + name: "serEnumT" + bitwidth: 16 + } +} +digests { + preamble { + id: 401112174 + name: "IngressDeparserImpl.mac_learn_digest" + alias: "mac_learn_digest" + } + type_spec { + struct { + name: "mac_learn_digest_t" + } + } +} +type_info { + structs { + key: "mac_learn_digest_t" + value { + members { + name: "srcAddr" + type_spec { + bitstring { + bit { + bitwidth: 48 + } + } + } + } + members { + name: "ingress_port" + type_spec { + new_type { + name: "PortId_t" + } + } + } + } + } + serializable_enums { + key: "EthTypes" + value { + underlying_type { + bitwidth: 16 + } + members { + name: "IPv4" + value: "\010\000" + } + members { + name: "ARP" + value: "\010\006" + } + members { + name: "RARP" + value: "\2005" + } + members { + name: "EtherTalk" + value: "\200\233" + } + members { + name: "VLAN" + value: "\201\000" + } + members { + name: "IPX" + value: "\2017" + } + members { + name: "IPv6" + value: "\206\335" + } + } + } + new_types { + key: "PortId_t" + value { + translated_type { + uri: "p4.org/psa/v1/PortId_t" + sdn_bitwidth: 32 + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txt deleted file mode 100644 index afe98ef2fbe..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txt +++ /dev/null @@ -1,113 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -actions { - preamble { - id: 30967736 - name: "ingress.test" - alias: "test" - } -} -counters { - preamble { - id: 314114784 - name: "ingress.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 318473483 - name: "ingress.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 313911423 - name: "ingress.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb new file mode 100644 index 00000000000..56dae4ad817 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_1.p4.p4info.txtpb @@ -0,0 +1,114 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +actions { + preamble { + id: 30967736 + name: "ingress.test" + alias: "test" + } +} +counters { + preamble { + id: 314114784 + name: "ingress.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 318473483 + name: "ingress.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 313911423 + name: "ingress.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txt deleted file mode 100644 index afe98ef2fbe..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txt +++ /dev/null @@ -1,113 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -actions { - preamble { - id: 30967736 - name: "ingress.test" - alias: "test" - } -} -counters { - preamble { - id: 314114784 - name: "ingress.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 318473483 - name: "ingress.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 313911423 - name: "ingress.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb new file mode 100644 index 00000000000..56dae4ad817 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_2.p4.p4info.txtpb @@ -0,0 +1,114 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +actions { + preamble { + id: 30967736 + name: "ingress.test" + alias: "test" + } +} +counters { + preamble { + id: 314114784 + name: "ingress.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 318473483 + name: "ingress.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 313911423 + name: "ingress.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txt deleted file mode 100644 index b8a233a0a8b..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txt +++ /dev/null @@ -1,125 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ipv4.hdrChecksum[4:0]" - bitwidth: 5 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ipv4.version" - bitwidth: 4 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -actions { - preamble { - id: 30967736 - name: "ingress.test" - alias: "test" - } -} -counters { - preamble { - id: 314114784 - name: "ingress.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 318473483 - name: "ingress.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 313911423 - name: "ingress.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb new file mode 100644 index 00000000000..ad34f0d5599 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_3.p4.p4info.txtpb @@ -0,0 +1,126 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ipv4.hdrChecksum[4:0]" + bitwidth: 5 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ipv4.version" + bitwidth: 4 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +actions { + preamble { + id: 30967736 + name: "ingress.test" + alias: "test" + } +} +counters { + preamble { + id: 314114784 + name: "ingress.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 318473483 + name: "ingress.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 313911423 + name: "ingress.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4-error b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4-error deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.bfrt.json b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.bfrt.json deleted file mode 100644 index d0b8a980df8..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.bfrt.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.ingress.route", - "id" : 40550280, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ipv4.dstAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "LPM", - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ], - "action_specs" : [ - { - "id" : 26512162, - "name" : "ingress.forward", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "port", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - }, - { - "id" : 2, - "name" : "srcAddr", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 32 - } - } - ] - }, - { - "id" : 33281717, - "name" : "ingress.drop", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "DefaultOnly", - "annotations" : [ - { - "name" : "@defaultonly" - } - ], - "data" : [] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txt deleted file mode 100644 index 5e91a6f6310..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txt +++ /dev/null @@ -1,76 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 40550280 - name: "ingress.route" - alias: "route" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 26512162 - } - action_refs { - id: 33281717 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 33281717 - name: "ingress.drop" - alias: "drop" - } -} -actions { - preamble { - id: 26512162 - name: "ingress.forward" - alias: "forward" - } - params { - id: 1 - name: "port" - bitwidth: 32 - type_name { - name: "PortId_t" - } - } - params { - id: 2 - name: "srcAddr" - bitwidth: 32 - } -} -type_info { - new_types { - key: "PortId_t" - value { - translated_type { - uri: "p4.org/psa/v1/PortId_t" - sdn_bitwidth: 32 - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb new file mode 100644 index 00000000000..77222614921 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.p4info.txtpb @@ -0,0 +1,77 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 40550280 + name: "ingress.route" + alias: "route" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 26512162 + } + action_refs { + id: 33281717 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 33281717 + name: "ingress.drop" + alias: "drop" + } +} +actions { + preamble { + id: 26512162 + name: "ingress.forward" + alias: "forward" + } + params { + id: 1 + name: "port" + bitwidth: 32 + type_name { + name: "PortId_t" + } + } + params { + id: 2 + name: "srcAddr" + bitwidth: 32 + } +} +type_info { + new_types { + key: "PortId_t" + value { + translated_type { + uri: "p4.org/psa/v1/PortId_t" + sdn_bitwidth: 32 + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.spec b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.spec deleted file mode 100644 index 0e4de98c81b..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_4.p4.spec +++ /dev/null @@ -1,190 +0,0 @@ - - -struct ethernet_t { - bit<48> dstAddr - bit<48> srcAddr - bit<16> etherType -} - -struct ipv4_t { - bit<8> version_ihl - bit<8> diffserv - bit<16> totalLen - bit<16> identification - bit<16> flags_fragOffset - bit<8> ttl - bit<8> protocol - bit<16> hdrChecksum - bit<32> srcAddr - bit<32> dstAddr -} - -struct tcp_t { - bit<16> srcPort - bit<16> dstPort - bit<32> seqNo - bit<32> ackNo - bit<16> dataOffset_res_ecn_ctrl - bit<16> window - bit<16> checksum - bit<16> urgentPtr -} - -struct dpdk_pseudo_header_t { - bit<4> pseudo - bit<4> pseudo_0 - bit<3> pseudo_1 - bit<13> pseudo_2 - bit<32> pseudo_3 -} - -struct cksum_state_t { - bit<16> state_0 -} - -struct psa_ingress_output_metadata_t { - bit<8> class_of_service - bit<8> clone - bit<16> clone_session_id - bit<8> drop - bit<8> resubmit - bit<32> multicast_group - bit<32> egress_port -} - -struct psa_egress_output_metadata_t { - bit<8> clone - bit<16> clone_session_id - bit<8> drop -} - -struct psa_egress_deparser_input_metadata_t { - bit<32> egress_port -} - -struct forward_arg_t { - bit<32> port - bit<32> srcAddr -} - -struct metadata { - bit<32> psa_ingress_input_metadata_ingress_port - bit<8> psa_ingress_output_metadata_drop - bit<32> psa_ingress_output_metadata_multicast_group - bit<32> psa_ingress_output_metadata_egress_port - bit<32> local_metadata__fwd_metadata_old_srcAddr0 - bit<8> IngressDeparser_deparser_tmp - bit<8> IngressDeparser_deparser_tmp_0 - bit<8> IngressDeparser_deparser_tmp_1 - bit<8> IngressDeparser_deparser_tmp_2 - bit<8> IngressDeparser_deparser_tmp_3 - bit<16> IngressDeparser_deparser_tmp_4 - bit<16> IngressDeparser_deparser_tmp_5 - bit<16> IngressDeparser_deparser_tmp_6 - bit<16> IngressDeparser_deparser_tmp_7 - bit<16> IngressDeparser_deparser_tmp_8 -} -metadata instanceof metadata - -header ethernet instanceof ethernet_t -header ipv4 instanceof ipv4_t -header tcp instanceof tcp_t -header dpdk_pseudo_header instanceof dpdk_pseudo_header_t -header cksum_state instanceof cksum_state_t - -action NoAction args none { - return -} - -action drop_1 args none { - mov m.psa_ingress_output_metadata_drop 1 - return -} - -action forward args instanceof forward_arg_t { - mov m.local_metadata__fwd_metadata_old_srcAddr0 h.ipv4.srcAddr - mov h.ipv4.srcAddr t.srcAddr - mov m.psa_ingress_output_metadata_drop 0 - mov m.psa_ingress_output_metadata_multicast_group 0x0 - mov m.psa_ingress_output_metadata_egress_port t.port - return -} - -table route { - key { - h.ipv4.dstAddr lpm - } - actions { - forward - drop_1 - NoAction - } - default_action NoAction args none - size 0x10000 -} - - -apply { - rx m.psa_ingress_input_metadata_ingress_port - mov m.psa_ingress_output_metadata_drop 0x1 - extract h.ethernet - jmpeq INGRESSPARSERIMPL_PARSE_IPV4 h.ethernet.etherType 0x800 - jmp INGRESSPARSERIMPL_ACCEPT - INGRESSPARSERIMPL_PARSE_IPV4 : extract h.ipv4 - jmpeq INGRESSPARSERIMPL_PARSE_TCP h.ipv4.protocol 0x6 - jmp INGRESSPARSERIMPL_ACCEPT - INGRESSPARSERIMPL_PARSE_TCP : extract h.tcp - INGRESSPARSERIMPL_ACCEPT : jmpnv LABEL_END h.ipv4 - table route - LABEL_END : jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0 - mov h.cksum_state.state_0 0x0 - mov m.IngressDeparser_deparser_tmp h.ipv4.version_ihl - and m.IngressDeparser_deparser_tmp 0xF - mov m.IngressDeparser_deparser_tmp_0 m.IngressDeparser_deparser_tmp - and m.IngressDeparser_deparser_tmp_0 0xF - mov h.dpdk_pseudo_header.pseudo m.IngressDeparser_deparser_tmp_0 - mov m.IngressDeparser_deparser_tmp_1 h.ipv4.version_ihl - shr m.IngressDeparser_deparser_tmp_1 0x4 - mov m.IngressDeparser_deparser_tmp_2 m.IngressDeparser_deparser_tmp_1 - and m.IngressDeparser_deparser_tmp_2 0xF - mov m.IngressDeparser_deparser_tmp_3 m.IngressDeparser_deparser_tmp_2 - and m.IngressDeparser_deparser_tmp_3 0xF - mov h.dpdk_pseudo_header.pseudo_0 m.IngressDeparser_deparser_tmp_3 - mov m.IngressDeparser_deparser_tmp_4 h.ipv4.flags_fragOffset - and m.IngressDeparser_deparser_tmp_4 0x7 - mov m.IngressDeparser_deparser_tmp_5 m.IngressDeparser_deparser_tmp_4 - and m.IngressDeparser_deparser_tmp_5 0x7 - mov h.dpdk_pseudo_header.pseudo_1 m.IngressDeparser_deparser_tmp_5 - mov m.IngressDeparser_deparser_tmp_6 h.ipv4.flags_fragOffset - shr m.IngressDeparser_deparser_tmp_6 0x3 - mov m.IngressDeparser_deparser_tmp_7 m.IngressDeparser_deparser_tmp_6 - and m.IngressDeparser_deparser_tmp_7 0x1FFF - mov m.IngressDeparser_deparser_tmp_8 m.IngressDeparser_deparser_tmp_7 - and m.IngressDeparser_deparser_tmp_8 0x1FFF - mov h.dpdk_pseudo_header.pseudo_2 m.IngressDeparser_deparser_tmp_8 - ckadd h.cksum_state.state_0 h.dpdk_pseudo_header.pseudo - ckadd h.cksum_state.state_0 h.dpdk_pseudo_header.pseudo_0 - ckadd h.cksum_state.state_0 h.ipv4.diffserv - ckadd h.cksum_state.state_0 h.ipv4.totalLen - ckadd h.cksum_state.state_0 h.ipv4.identification - ckadd h.cksum_state.state_0 h.dpdk_pseudo_header.pseudo_1 - ckadd h.cksum_state.state_0 h.dpdk_pseudo_header.pseudo_2 - ckadd h.cksum_state.state_0 h.ipv4.ttl - ckadd h.cksum_state.state_0 h.ipv4.protocol - ckadd h.cksum_state.state_0 h.ipv4.srcAddr - ckadd h.cksum_state.state_0 h.ipv4.dstAddr - mov h.ipv4.hdrChecksum h.cksum_state.state_0 - mov h.cksum_state.state_0 0x0 - cksub h.cksum_state.state_0 h.tcp.checksum - mov h.dpdk_pseudo_header.pseudo_3 m.local_metadata__fwd_metadata_old_srcAddr0 - cksub h.cksum_state.state_0 h.dpdk_pseudo_header.pseudo_3 - ckadd h.cksum_state.state_0 h.ipv4.srcAddr - mov h.tcp.checksum h.cksum_state.state_0 - emit h.ethernet - emit h.ipv4 - emit h.tcp - tx m.psa_ingress_output_metadata_egress_port - LABEL_DROP : drop -} - - diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txt deleted file mode 100644 index afe98ef2fbe..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txt +++ /dev/null @@ -1,113 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -actions { - preamble { - id: 30967736 - name: "ingress.test" - alias: "test" - } -} -counters { - preamble { - id: 314114784 - name: "ingress.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 318473483 - name: "ingress.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 313911423 - name: "ingress.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb new file mode 100644 index 00000000000..56dae4ad817 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_5.p4.p4info.txtpb @@ -0,0 +1,114 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +actions { + preamble { + id: 30967736 + name: "ingress.test" + alias: "test" + } +} +counters { + preamble { + id: 314114784 + name: "ingress.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 318473483 + name: "ingress.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 313911423 + name: "ingress.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txt deleted file mode 100644 index afe98ef2fbe..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txt +++ /dev/null @@ -1,113 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -actions { - preamble { - id: 30967736 - name: "ingress.test" - alias: "test" - } -} -counters { - preamble { - id: 314114784 - name: "ingress.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 318473483 - name: "ingress.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 313911423 - name: "ingress.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb new file mode 100644 index 00000000000..56dae4ad817 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_6.p4.p4info.txtpb @@ -0,0 +1,114 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +actions { + preamble { + id: 30967736 + name: "ingress.test" + alias: "test" + } +} +counters { + preamble { + id: 314114784 + name: "ingress.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 318473483 + name: "ingress.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 313911423 + name: "ingress.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txt deleted file mode 100644 index afe98ef2fbe..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txt +++ /dev/null @@ -1,113 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -actions { - preamble { - id: 30967736 - name: "ingress.test" - alias: "test" - } -} -counters { - preamble { - id: 314114784 - name: "ingress.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 318473483 - name: "ingress.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 313911423 - name: "ingress.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb new file mode 100644 index 00000000000..56dae4ad817 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_7.p4.p4info.txtpb @@ -0,0 +1,114 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +actions { + preamble { + id: 30967736 + name: "ingress.test" + alias: "test" + } +} +counters { + preamble { + id: 314114784 + name: "ingress.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 318473483 + name: "ingress.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 313911423 + name: "ingress.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txt deleted file mode 100644 index afe98ef2fbe..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txt +++ /dev/null @@ -1,113 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -actions { - preamble { - id: 30967736 - name: "ingress.test" - alias: "test" - } -} -counters { - preamble { - id: 314114784 - name: "ingress.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 318473483 - name: "ingress.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 313911423 - name: "ingress.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb new file mode 100644 index 00000000000..56dae4ad817 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_8.p4.p4info.txtpb @@ -0,0 +1,114 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +actions { + preamble { + id: 30967736 + name: "ingress.test" + alias: "test" + } +} +counters { + preamble { + id: 314114784 + name: "ingress.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 318473483 + name: "ingress.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 313911423 + name: "ingress.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txt deleted file mode 100644 index e007563ca40..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txt +++ /dev/null @@ -1,125 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.ipv4.hdrChecksum" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 3 - name: "hdr.ipv4.version" - bitwidth: 4 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -actions { - preamble { - id: 30967736 - name: "ingress.test" - alias: "test" - } -} -counters { - preamble { - id: 314114784 - name: "ingress.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 318473483 - name: "ingress.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 313911423 - name: "ingress.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb new file mode 100644 index 00000000000..1724d0a1d4e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-byte-alignment_9.p4.p4info.txtpb @@ -0,0 +1,126 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.ipv4.hdrChecksum" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 3 + name: "hdr.ipv4.version" + bitwidth: 4 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +actions { + preamble { + id: 30967736 + name: "ingress.test" + alias: "test" + } +} +counters { + preamble { + id: 314114784 + name: "ingress.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 318473483 + name: "ingress.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 313911423 + name: "ingress.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.p4info.txt deleted file mode 100644 index ad8e62885b7..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.p4info.txt +++ /dev/null @@ -1,40 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -counters { - preamble { - id: 303203245 - name: "MyIC.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 305966593 - name: "MyIC.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 318550906 - name: "MyIC.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.p4info.txtpb new file mode 100644 index 00000000000..6cda856f522 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.p4info.txtpb @@ -0,0 +1,41 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +counters { + preamble { + id: 303203245 + name: "MyIC.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 305966593 + name: "MyIC.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 318550906 + name: "MyIC.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txt deleted file mode 100644 index 12c8d62cb37..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 18579058 - } - direct_resource_ids: 368068636 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 18579058 - name: "MyIC.execute_meter" - alias: "execute_meter" - } -} -direct_meters { - preamble { - id: 368068636 - name: "MyIC.meter0" - alias: "meter0" - } - spec { - unit: PACKETS - } - direct_table_id: 39967501 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb new file mode 100644 index 00000000000..0c406d853b7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 18579058 + } + direct_resource_ids: 368068636 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 18579058 + name: "MyIC.execute_meter" + alias: "execute_meter" + } +} +direct_meters { + preamble { + id: 368068636 + name: "MyIC.meter0" + alias: "meter0" + } + spec { + unit: PACKETS + } + direct_table_id: 39967501 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txt deleted file mode 100644 index d15bf80e43a..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txt +++ /dev/null @@ -1,106 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -counters { - preamble { - id: 314114784 - name: "ingress.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 318473483 - name: "ingress.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 313911423 - name: "ingress.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb new file mode 100644 index 00000000000..505b55555b1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.p4info.txtpb @@ -0,0 +1,107 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +counters { + preamble { + id: 314114784 + name: "ingress.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 318473483 + name: "ingress.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 313911423 + name: "ingress.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.p4info.txt deleted file mode 100644 index ed28782f7ef..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.p4info.txtpb new file mode 100644 index 00000000000..cfbdc3d692a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txt deleted file mode 100644 index afe98ef2fbe..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txt +++ /dev/null @@ -1,113 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -actions { - preamble { - id: 30967736 - name: "ingress.test" - alias: "test" - } -} -counters { - preamble { - id: 314114784 - name: "ingress.counter0" - alias: "counter0" - } - spec { - unit: BOTH - } - size: 1024 -} -counters { - preamble { - id: 318473483 - name: "ingress.counter1" - alias: "counter1" - } - spec { - unit: PACKETS - } - size: 1024 -} -counters { - preamble { - id: 313911423 - name: "ingress.counter2" - alias: "counter2" - } - spec { - unit: BYTES - } - size: 1024 -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb new file mode 100644 index 00000000000..56dae4ad817 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter-execute-err.p4.p4info.txtpb @@ -0,0 +1,114 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +actions { + preamble { + id: 30967736 + name: "ingress.test" + alias: "test" + } +} +counters { + preamble { + id: 314114784 + name: "ingress.counter0" + alias: "counter0" + } + spec { + unit: BOTH + } + size: 1024 +} +counters { + preamble { + id: 318473483 + name: "ingress.counter1" + alias: "counter1" + } + spec { + unit: PACKETS + } + size: 1024 +} +counters { + preamble { + id: 313911423 + name: "ingress.counter2" + alias: "counter2" + } + spec { + unit: BYTES + } + size: 1024 +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txt deleted file mode 100644 index 39d0c70a78f..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txt +++ /dev/null @@ -1,58 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: BYTES - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb new file mode 100644 index 00000000000..c4b75a7c0a4 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.p4info.txtpb @@ -0,0 +1,59 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: BYTES + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txt deleted file mode 100644 index 0a1f2da7a45..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txt +++ /dev/null @@ -1,58 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } -} -meters { - preamble { - id: 344514043 - name: "ingress.meter0" - alias: "meter0" - } - spec { - unit: PACKETS - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb new file mode 100644 index 00000000000..c79b9282c89 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.p4info.txtpb @@ -0,0 +1,59 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } +} +meters { + preamble { + id: 344514043 + name: "ingress.meter0" + alias: "meter0" + } + spec { + unit: PACKETS + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txt deleted file mode 100644 index 34d6bea4acb..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txt +++ /dev/null @@ -1,99 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 23466264 - } - implementation_id: 298015716 - size: 1024 -} -tables { - preamble { - id: 47318070 - name: "MyIC.tbl2" - alias: "tbl2" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - implementation_id: 298015716 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -action_profiles { - preamble { - id: 298015716 - name: "MyIC.ap" - alias: "ap" - } - table_ids: 39967501 - table_ids: 47318070 - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..aec60b621d7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.p4info.txtpb @@ -0,0 +1,100 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 23466264 + } + implementation_id: 298015716 + size: 1024 +} +tables { + preamble { + id: 47318070 + name: "MyIC.tbl2" + alias: "tbl2" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + implementation_id: 298015716 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +action_profiles { + preamble { + id: 298015716 + name: "MyIC.ap" + alias: "ap" + } + table_ids: 39967501 + table_ids: 47318070 + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txt deleted file mode 100644 index 5e91a6f6310..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txt +++ /dev/null @@ -1,76 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 40550280 - name: "ingress.route" - alias: "route" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 26512162 - } - action_refs { - id: 33281717 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 33281717 - name: "ingress.drop" - alias: "drop" - } -} -actions { - preamble { - id: 26512162 - name: "ingress.forward" - alias: "forward" - } - params { - id: 1 - name: "port" - bitwidth: 32 - type_name { - name: "PortId_t" - } - } - params { - id: 2 - name: "srcAddr" - bitwidth: 32 - } -} -type_info { - new_types { - key: "PortId_t" - value { - translated_type { - uri: "p4.org/psa/v1/PortId_t" - sdn_bitwidth: 32 - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb new file mode 100644 index 00000000000..77222614921 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.p4info.txtpb @@ -0,0 +1,77 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 40550280 + name: "ingress.route" + alias: "route" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 26512162 + } + action_refs { + id: 33281717 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 33281717 + name: "ingress.drop" + alias: "drop" + } +} +actions { + preamble { + id: 26512162 + name: "ingress.forward" + alias: "forward" + } + params { + id: 1 + name: "port" + bitwidth: 32 + type_name { + name: "PortId_t" + } + } + params { + id: 2 + name: "srcAddr" + bitwidth: 32 + } +} +type_info { + new_types { + key: "PortId_t" + value { + translated_type { + uri: "p4.org/psa/v1/PortId_t" + sdn_bitwidth: 32 + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txt deleted file mode 100644 index e9d7e988b2e..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "a.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 25756908 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 25756908 - name: "MyIC.forward" - alias: "forward" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb new file mode 100644 index 00000000000..0da67b1427e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "a.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 25756908 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 25756908 + name: "MyIC.forward" + alias: "forward" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txt deleted file mode 100644 index 8fed7d742f5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: TERNARY - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb new file mode 100644 index 00000000000..4d8217e326e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txt deleted file mode 100644 index 8fed7d742f5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: TERNARY - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb new file mode 100644 index 00000000000..4d8217e326e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txt deleted file mode 100644 index 9a3912b7727..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: OPTIONAL - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb new file mode 100644 index 00000000000..84b170de324 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-optional-match.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: OPTIONAL + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-range-match.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-range-match.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-range-match.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-range-match.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-range-match.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-range-match.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txt deleted file mode 100644 index 88a9f786693..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: RANGE - } - match_fields { - id: 2 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb new file mode 100644 index 00000000000..c8318f04900 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-range-match.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: RANGE + } + match_fields { + id: 2 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.p4info.txt deleted file mode 100644 index b612480f168..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,41 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 25103689 - name: "update_pkt_ip_byte_count" - alias: "update_pkt_ip_byte_count" - } -} -registers { - preamble { - id: 383813656 - name: "ingress.port_pkt_ip_bytes_in" - alias: "port_pkt_ip_bytes_in" - } - type_spec { - bitstring { - bit { - bitwidth: 64 - } - } - } - size: 512 - index_type_name { - name: "PortId_t" - } -} -type_info { - new_types { - key: "PortId_t" - value { - translated_type { - uri: "p4.org/psa/v1/PortId_t" - sdn_bitwidth: 32 - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..e0c2e4933e2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.p4info.txtpb @@ -0,0 +1,42 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 25103689 + name: "update_pkt_ip_byte_count" + alias: "update_pkt_ip_byte_count" + } +} +registers { + preamble { + id: 383813656 + name: "ingress.port_pkt_ip_bytes_in" + alias: "port_pkt_ip_bytes_in" + } + type_spec { + bitstring { + bit { + bitwidth: 64 + } + } + } + size: 512 + index_type_name { + name: "PortId_t" + } +} +type_info { + new_types { + key: "PortId_t" + value { + translated_type { + uri: "p4.org/psa/v1/PortId_t" + sdn_bitwidth: 32 + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txt deleted file mode 100644 index 8fed7d742f5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: TERNARY - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb new file mode 100644 index 00000000000..4d8217e326e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txt deleted file mode 100644 index 8fed7d742f5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: TERNARY - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb new file mode 100644 index 00000000000..4d8217e326e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txt deleted file mode 100644 index 8fed7d742f5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: TERNARY - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb new file mode 100644 index 00000000000..4d8217e326e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txt deleted file mode 100644 index 8fed7d742f5..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 44506256 - name: "ingress.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: TERNARY - } - action_refs { - id: 21257015 - } - action_refs { - id: 29480552 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29480552 - name: "ingress.execute" - alias: "execute" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb new file mode 100644 index 00000000000..4d8217e326e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 44506256 + name: "ingress.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: TERNARY + } + action_refs { + id: 21257015 + } + action_refs { + id: 29480552 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29480552 + name: "ingress.execute" + alias: "execute" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txt deleted file mode 100644 index 810cf7e165b..00000000000 --- a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txt +++ /dev/null @@ -1,32 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "a.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb new file mode 100644 index 00000000000..39765ee4796 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.p4info.txtpb @@ -0,0 +1,33 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "a.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.p4info.txt deleted file mode 100644 index ed28782f7ef..00000000000 --- a/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} diff --git a/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..cfbdc3d692a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} diff --git a/testdata/p4_16_samples_outputs/psa-hash-02.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-hash-02.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-02.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-hash-02.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-hash-02.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-02.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txt deleted file mode 100644 index 63fcb435350..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb new file mode 100644 index 00000000000..1bac5d60713 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-02.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-hash-03.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-hash-03.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-03.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-hash-03.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-hash-03.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-03.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txt deleted file mode 100644 index 63fcb435350..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb new file mode 100644 index 00000000000..1bac5d60713 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-03.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-hash-04.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-hash-04.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-04.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-hash-04.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-hash-04.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-04.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txt deleted file mode 100644 index 63fcb435350..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb new file mode 100644 index 00000000000..1bac5d60713 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-04.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-hash-05.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-hash-05.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-05.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-hash-05.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-hash-05.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-05.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txt deleted file mode 100644 index 63fcb435350..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb new file mode 100644 index 00000000000..1bac5d60713 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-05.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-hash-06.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-hash-06.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-06.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-hash-06.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-hash-06.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-06.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txt deleted file mode 100644 index d2e77d3b475..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb new file mode 100644 index 00000000000..28172e0b6fd --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-06.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-hash-07.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-hash-07.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-07.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-hash-07.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-hash-07.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-07.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txt deleted file mode 100644 index 63fcb435350..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb new file mode 100644 index 00000000000..1bac5d60713 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-07.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-hash-08.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-hash-08.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-08.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-hash-08.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-hash-08.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-08.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txt deleted file mode 100644 index d2e77d3b475..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb new file mode 100644 index 00000000000..28172e0b6fd --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-08.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-hash-09.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-hash-09.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-09.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-hash-09.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-hash-09.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-09.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txt deleted file mode 100644 index 63fcb435350..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb new file mode 100644 index 00000000000..1bac5d60713 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-09.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-hash-10.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-hash-10.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-10.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-hash-10.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-hash-10.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-10.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txt deleted file mode 100644 index 63fcb435350..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb new file mode 100644 index 00000000000..1bac5d60713 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash-10.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-hash.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-hash.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-hash.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-hash.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txt deleted file mode 100644 index 63fcb435350..00000000000 --- a/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb new file mode 100644 index 00000000000..1bac5d60713 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-hash.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-header-stack.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-header-stack.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-header-stack.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-header-stack.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-header-stack.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-header-stack.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txt deleted file mode 100644 index 980f43a6a79..00000000000 --- a/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txt +++ /dev/null @@ -1,58 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "a.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "a.vlan_tag[0].ether_type" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { - serializable_enums { - key: "ether_type_t" - value { - underlying_type { - bitwidth: 16 - } - members { - name: "TPID" - value: "\201\000" - } - members { - name: "IPV4" - value: "\010\000" - } - members { - name: "IPV6" - value: "\206\335" - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb new file mode 100644 index 00000000000..f49cf68d40c --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-header-stack.p4.p4info.txtpb @@ -0,0 +1,59 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "a.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "a.vlan_tag[0].ether_type" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { + serializable_enums { + key: "ether_type_t" + value { + underlying_type { + bitwidth: 16 + } + members { + name: "TPID" + value: "\201\000" + } + members { + name: "IPV4" + value: "\010\000" + } + members { + name: "IPV6" + value: "\206\335" + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.p4info.txt deleted file mode 100644 index ce39ee8d800..00000000000 --- a/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.p4info.txt +++ /dev/null @@ -1,28 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 30788783 - name: "ingress_drop" - alias: "ingress_drop" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 31300039 - name: "cIngress.clone" - alias: "clone" - } -} diff --git a/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..6ecb6911f28 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.p4info.txtpb @@ -0,0 +1,29 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 30788783 + name: "ingress_drop" + alias: "ingress_drop" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 31300039 + name: "cIngress.clone" + alias: "clone" + } +} diff --git a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txt deleted file mode 100644 index ff32e080943..00000000000 --- a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txt +++ /dev/null @@ -1,109 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 38763260 - name: "MyIC.tbl_idle_timeout" - alias: "tbl_idle_timeout" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - size: 1024 - idle_timeout_behavior: NOTIFY_CONTROL -} -tables { - preamble { - id: 46250950 - name: "MyIC.tbl_no_idle_timeout" - alias: "tbl_no_idle_timeout" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr2" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - size: 1024 -} -tables { - preamble { - id: 43498864 - name: "MyIC.tbl_no_idle_timeout_prop" - alias: "tbl_no_idle_timeout_prop" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr2" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb new file mode 100644 index 00000000000..3aa21217e0c --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.p4info.txtpb @@ -0,0 +1,110 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 38763260 + name: "MyIC.tbl_idle_timeout" + alias: "tbl_idle_timeout" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + size: 1024 + idle_timeout_behavior: NOTIFY_CONTROL +} +tables { + preamble { + id: 46250950 + name: "MyIC.tbl_no_idle_timeout" + alias: "tbl_no_idle_timeout" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr2" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + size: 1024 +} +tables { + preamble { + id: 43498864 + name: "MyIC.tbl_no_idle_timeout_prop" + alias: "tbl_no_idle_timeout_prop" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr2" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-isvalid.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-isvalid.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-isvalid.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-isvalid.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-isvalid.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-isvalid.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txt deleted file mode 100644 index e227f065990..00000000000 --- a/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txt +++ /dev/null @@ -1,32 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb new file mode 100644 index 00000000000..65e4717c1fb --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-isvalid.p4.p4info.txtpb @@ -0,0 +1,33 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-meter1.p4-error b/testdata/p4_16_samples_outputs/psa-meter1.p4-error deleted file mode 100644 index b1884ccaa65..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter1.p4-error +++ /dev/null @@ -1,3 +0,0 @@ -psa-meter1.p4(51): [--Wwarn=unsupported] warning: MyIC.meter0: Packet metering is not supported. Falling back to byte metering. - Meter>(1024, PSA_MeterType_t.PACKETS) meter0; - ^^^^^^ diff --git a/testdata/p4_16_samples_outputs/psa-meter1.p4.bfrt.json b/testdata/p4_16_samples_outputs/psa-meter1.p4.bfrt.json deleted file mode 100644 index 43fdff45153..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter1.p4.bfrt.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "schema_version" : "1.0.0", - "tables" : [ - { - "name" : "ip.MyIC.tbl", - "id" : 39967501, - "table_type" : "MatchAction_Direct", - "size" : 1024, - "annotations" : [], - "depends_on" : [], - "has_const_default_action" : false, - "key" : [ - { - "id" : 1, - "name" : "hdr.ethernet.srcAddr", - "repeated" : false, - "annotations" : [], - "mandatory" : false, - "match_type" : "Exact", - "type" : { - "type" : "bytes", - "width" : 48 - } - } - ], - "action_specs" : [ - { - "id" : 21257015, - "name" : "NoAction", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [] - }, - { - "id" : 22078320, - "name" : "MyIC.execute", - "action_scope" : "TableAndDefault", - "annotations" : [], - "data" : [ - { - "id" : 1, - "name" : "index", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "bytes", - "width" : 12 - } - }, - { - "id" : 2, - "name" : "color", - "repeated" : false, - "mandatory" : true, - "read_only" : false, - "annotations" : [], - "type" : { - "type" : "string", - "choices" : ["RED", "GREEN", "YELLOW"] - } - } - ] - } - ], - "data" : [], - "supported_operations" : [], - "attributes" : ["EntryScope"] - }, - { - "name" : "ip.MyIC.meter0", - "id" : 351291420, - "table_type" : "Meter", - "size" : 1024, - "depends_on" : [], - "key" : [ - { - "id" : 65555, - "name" : "$METER_INDEX", - "repeated" : false, - "annotations" : [], - "mandatory" : true, - "match_type" : "Exact", - "type" : { - "type" : "uint32" - } - } - ], - "data" : [ - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65549, - "name" : "$METER_SPEC_CIR_PPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65550, - "name" : "$METER_SPEC_PIR_PPS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65551, - "name" : "$METER_SPEC_CBS_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - }, - { - "mandatory" : false, - "read_only" : false, - "singleton" : { - "id" : 65552, - "name" : "$METER_SPEC_PBS_PKTS", - "repeated" : false, - "annotations" : [], - "type" : { - "type" : "uint64", - "default_value" : 18446744073709551615 - } - } - } - ], - "supported_operations" : [], - "attributes" : ["MeterByteCountAdjust"] - } - ], - "learn_filters" : [] -} \ No newline at end of file diff --git a/testdata/p4_16_samples_outputs/psa-meter1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-meter1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-meter1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-meter1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-meter1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txt deleted file mode 100644 index 196b4221d9e..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txt +++ /dev/null @@ -1,79 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 22078320 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 22078320 - name: "MyIC.execute" - alias: "execute" - } - params { - id: 1 - name: "index" - bitwidth: 12 - } - params { - id: 2 - name: "color" - type_name { - name: "PSA_MeterColor_t" - } - } -} -meters { - preamble { - id: 351291420 - name: "MyIC.meter0" - alias: "meter0" - } - spec { - unit: PACKETS - } - size: 1024 -} -type_info { - enums { - key: "PSA_MeterColor_t" - value { - members { - name: "RED" - } - members { - name: "GREEN" - } - members { - name: "YELLOW" - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb new file mode 100644 index 00000000000..ed9d74c242c --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-meter1.p4.p4info.txtpb @@ -0,0 +1,80 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 22078320 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 22078320 + name: "MyIC.execute" + alias: "execute" + } + params { + id: 1 + name: "index" + bitwidth: 12 + } + params { + id: 2 + name: "color" + type_name { + name: "PSA_MeterColor_t" + } + } +} +meters { + preamble { + id: 351291420 + name: "MyIC.meter0" + alias: "meter0" + } + spec { + unit: PACKETS + } + size: 1024 +} +type_info { + enums { + key: "PSA_MeterColor_t" + value { + members { + name: "RED" + } + members { + name: "GREEN" + } + members { + name: "YELLOW" + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/psa-meter1.p4.spec b/testdata/p4_16_samples_outputs/psa-meter1.p4.spec deleted file mode 100644 index ea6f9c41da3..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter1.p4.spec +++ /dev/null @@ -1,77 +0,0 @@ - - -struct ethernet_t { - bit<48> dstAddr - bit<48> srcAddr - bit<16> etherType -} - -struct psa_ingress_output_metadata_t { - bit<8> class_of_service - bit<8> clone - bit<16> clone_session_id - bit<8> drop - bit<8> resubmit - bit<32> multicast_group - bit<32> egress_port -} - -struct psa_egress_output_metadata_t { - bit<8> clone - bit<16> clone_session_id - bit<8> drop -} - -struct psa_egress_deparser_input_metadata_t { - bit<32> egress_port -} - -struct execute_1_arg_t { - bit<32> index - bit<32> color -} - -struct EMPTY { - bit<32> psa_ingress_input_metadata_ingress_port - bit<8> psa_ingress_output_metadata_drop - bit<32> psa_ingress_output_metadata_egress_port -} -metadata instanceof EMPTY - -header ethernet instanceof ethernet_t - -metarray meter0_0 size 0x400 - -;oldname:NoAction_1 -action NoAction args none { - return -} - -action execute_1 args instanceof execute_1_arg_t { - return -} - -table tbl { - key { - h.ethernet.srcAddr exact - } - actions { - NoAction - execute_1 - } - default_action NoAction args none - size 0x10000 -} - - -apply { - rx m.psa_ingress_input_metadata_ingress_port - mov m.psa_ingress_output_metadata_drop 0x1 - extract h.ethernet - table tbl - jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0 - tx m.psa_ingress_output_metadata_egress_port - LABEL_DROP : drop -} - - diff --git a/testdata/p4_16_samples_outputs/psa-meter3.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-meter3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-meter3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-meter3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-meter3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txt deleted file mode 100644 index b2fd6312563..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txt +++ /dev/null @@ -1,43 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -meters { - preamble { - id: 351291420 - name: "MyIC.meter0" - alias: "meter0" - } - spec { - unit: PACKETS - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb new file mode 100644 index 00000000000..b96cb9212b7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-meter3.p4.p4info.txtpb @@ -0,0 +1,44 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +meters { + preamble { + id: 351291420 + name: "MyIC.meter0" + alias: "meter0" + } + spec { + unit: PACKETS + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-meter4.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-meter4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-meter4.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-meter4.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-meter4.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txt deleted file mode 100644 index 7d21cca76e9..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - direct_resource_ids: 368068636 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -direct_meters { - preamble { - id: 368068636 - name: "MyIC.meter0" - alias: "meter0" - } - spec { - unit: PACKETS - } - direct_table_id: 39967501 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb new file mode 100644 index 00000000000..ac49d6ee797 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-meter4.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + direct_resource_ids: 368068636 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +direct_meters { + preamble { + id: 368068636 + name: "MyIC.meter0" + alias: "meter0" + } + spec { + unit: PACKETS + } + direct_table_id: 39967501 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-meter5.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-meter5.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter5.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-meter5.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-meter5.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-meter5.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txt deleted file mode 100644 index 7d21cca76e9..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - direct_resource_ids: 368068636 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -direct_meters { - preamble { - id: 368068636 - name: "MyIC.meter0" - alias: "meter0" - } - spec { - unit: PACKETS - } - direct_table_id: 39967501 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb new file mode 100644 index 00000000000..ac49d6ee797 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-meter5.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + direct_resource_ids: 368068636 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +direct_meters { + preamble { + id: 368068636 + name: "MyIC.meter0" + alias: "meter0" + } + spec { + unit: PACKETS + } + direct_table_id: 39967501 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.p4info.txt deleted file mode 100644 index 44886e723f7..00000000000 --- a/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -meters { - preamble { - id: 345354539 - name: "cIngress.meter0" - alias: "meter0" - } - spec { - unit: PACKETS - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..dbb1754b1c4 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-meter7-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +meters { + preamble { + id: 345354539 + name: "cIngress.meter0" + alias: "meter0" + } + spec { + unit: PACKETS + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.p4info.txt deleted file mode 100644 index a9ef5f61b8a..00000000000 --- a/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,13 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 32077379 - name: "multicast" - alias: "multicast" - annotations: "@noWarn(\"unused\")" - } -} diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..92c82f9a999 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,14 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 32077379 + name: "multicast" + alias: "multicast" + annotations: "@noWarn(\"unused\")" + } +} diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.p4info.txt deleted file mode 100644 index a9ef5f61b8a..00000000000 --- a/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.p4info.txt +++ /dev/null @@ -1,13 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 32077379 - name: "multicast" - alias: "multicast" - annotations: "@noWarn(\"unused\")" - } -} diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..92c82f9a999 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.p4info.txtpb @@ -0,0 +1,14 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 32077379 + name: "multicast" + alias: "multicast" + annotations: "@noWarn(\"unused\")" + } +} diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.p4info.txt deleted file mode 100644 index a9ef5f61b8a..00000000000 --- a/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.p4info.txt +++ /dev/null @@ -1,13 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 32077379 - name: "multicast" - alias: "multicast" - annotations: "@noWarn(\"unused\")" - } -} diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..92c82f9a999 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.p4info.txtpb @@ -0,0 +1,14 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 32077379 + name: "multicast" + alias: "multicast" + annotations: "@noWarn(\"unused\")" + } +} diff --git a/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.p4info.txt deleted file mode 100644 index cb4c431092d..00000000000 --- a/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.p4info.txt +++ /dev/null @@ -1,13 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} diff --git a/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..7ffd45be299 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-parser-error-test-bmv2.p4.p4info.txtpb @@ -0,0 +1,14 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} diff --git a/testdata/p4_16_samples_outputs/psa-random.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-random.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-random.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-random.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-random.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-random.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txt deleted file mode 100644 index 41bf20001a9..00000000000 --- a/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 18493089 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 18493089 - name: "MyIC.execute_random" - alias: "execute_random" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb new file mode 100644 index 00000000000..314edf21bb5 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-random.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 18493089 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 18493089 + name: "MyIC.execute_random" + alias: "execute_random" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txt deleted file mode 100644 index acabadf2016..00000000000 --- a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txt +++ /dev/null @@ -1,40 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43367957 - name: "cEgress.e" - alias: "e" - } - action_refs { - id: 25218586 - } - size: 1024 -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 20711895 - name: "cIngress.record_ingress_ports_in_pkt" - alias: "record_ingress_ports_in_pkt" - } -} -actions { - preamble { - id: 25218586 - name: "cEgress.add" - alias: "add" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..3d7cd41ac85 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.p4info.txtpb @@ -0,0 +1,41 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43367957 + name: "cEgress.e" + alias: "e" + } + action_refs { + id: 25218586 + } + size: 1024 +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 20711895 + name: "cIngress.record_ingress_ports_in_pkt" + alias: "record_ingress_ports_in_pkt" + } +} +actions { + preamble { + id: 25218586 + name: "cEgress.add" + alias: "add" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.p4info.txt deleted file mode 100644 index 868afa395ae..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.p4info.txt +++ /dev/null @@ -1,30 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -registers { - preamble { - id: 376043845 - name: "cIngress.regfile" - alias: "regfile" - } - type_spec { - bitstring { - bit { - bitwidth: 48 - } - } - } - size: 128 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..5eaf66fcde1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.p4info.txtpb @@ -0,0 +1,31 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +registers { + preamble { + id: 376043845 + name: "cIngress.regfile" + alias: "regfile" + } + type_spec { + bitstring { + bit { + bitwidth: 48 + } + } + } + size: 128 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.p4info.txt deleted file mode 100644 index 9bacad9f6ad..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,30 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -registers { - preamble { - id: 369588800 - name: "MyIC.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - size: 6 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..0b68d4ef722 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,31 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +registers { + preamble { + id: 369588800 + name: "MyIC.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + size: 6 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.p4info.txt deleted file mode 100644 index 0e239eb895e..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.p4info.txt +++ /dev/null @@ -1,38 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 30788783 - name: "ingress_drop" - alias: "ingress_drop" - annotations: "@noWarn(\"unused\")" - } -} -registers { - preamble { - id: 376043845 - name: "cIngress.regfile" - alias: "regfile" - } - type_spec { - bitstring { - bit { - bitwidth: 48 - } - } - } - size: 128 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..19e232b087c --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.p4info.txtpb @@ -0,0 +1,39 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 30788783 + name: "ingress_drop" + alias: "ingress_drop" + annotations: "@noWarn(\"unused\")" + } +} +registers { + preamble { + id: 376043845 + name: "cIngress.regfile" + alias: "regfile" + } + type_spec { + bitstring { + bit { + bitwidth: 48 + } + } + } + size: 128 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-register1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-register1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-register1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-register1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txt deleted file mode 100644 index 0d3cf41fac1..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txt +++ /dev/null @@ -1,62 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 23115527 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 23115527 - name: "MyIC.execute_register" - alias: "execute_register" - } - params { - id: 1 - name: "idx" - bitwidth: 10 - } -} -registers { - preamble { - id: 369588800 - name: "MyIC.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb new file mode 100644 index 00000000000..439bfee0bde --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register1.p4.p4info.txtpb @@ -0,0 +1,63 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 23115527 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23115527 + name: "MyIC.execute_register" + alias: "execute_register" + } + params { + id: 1 + name: "idx" + bitwidth: 10 + } +} +registers { + preamble { + id: 369588800 + name: "MyIC.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-register2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-register2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-register2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-register2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txt deleted file mode 100644 index 0d3cf41fac1..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txt +++ /dev/null @@ -1,62 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 23115527 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 23115527 - name: "MyIC.execute_register" - alias: "execute_register" - } - params { - id: 1 - name: "idx" - bitwidth: 10 - } -} -registers { - preamble { - id: 369588800 - name: "MyIC.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - size: 1024 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb new file mode 100644 index 00000000000..439bfee0bde --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register2.p4.p4info.txtpb @@ -0,0 +1,63 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 23115527 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23115527 + name: "MyIC.execute_register" + alias: "execute_register" + } + params { + id: 1 + name: "idx" + bitwidth: 10 + } +} +registers { + preamble { + id: 369588800 + name: "MyIC.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + size: 1024 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-register3.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-register3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-register3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-register3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txt deleted file mode 100644 index c44fb39468a..00000000000 --- a/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txt +++ /dev/null @@ -1,62 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 23115527 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 23115527 - name: "MyIC.execute_register" - alias: "execute_register" - } - params { - id: 1 - name: "idx" - bitwidth: 10 - } -} -registers { - preamble { - id: 369588800 - name: "MyIC.reg" - alias: "reg" - } - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - size: 512 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb new file mode 100644 index 00000000000..0b8fdf17d58 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-register3.p4.p4info.txtpb @@ -0,0 +1,63 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 23115527 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 23115527 + name: "MyIC.execute_register" + alias: "execute_register" + } + params { + id: 1 + name: "idx" + bitwidth: 10 + } +} +registers { + preamble { + id: 369588800 + name: "MyIC.reg" + alias: "reg" + } + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + size: 512 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-remove-action-param.p4.spec b/testdata/p4_16_samples_outputs/psa-remove-action-param.p4.spec deleted file mode 100644 index faacc6fd6ed..00000000000 --- a/testdata/p4_16_samples_outputs/psa-remove-action-param.p4.spec +++ /dev/null @@ -1,68 +0,0 @@ - -struct EMPTY_M { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path - bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<8> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id - bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group - bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<8> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop -} -metadata instanceof EMPTY_M - -struct psa_ingress_output_metadata_t { - bit<8> class_of_service - bit<8> clone - bit<16> clone_session_id - bit<8> drop - bit<8> resubmit - bit<32> multicast_group - bit<32> egress_port -} - -struct psa_egress_output_metadata_t { - bit<8> clone - bit<16> clone_session_id - bit<8> drop -} - -struct psa_egress_deparser_input_metadata_t { - bit<32> egress_port -} - -apply { - rx m.psa_ingress_input_metadata_ingress_port - mov m.psa_ingress_output_metadata_drop 0x0 - extract h - jmpv LABEL_0FALSE h - mov m.psa_ingress_output_metadata_drop 0 - mov m.psa_ingress_output_metadata_multicast_group 0x0 - mov m.psa_ingress_output_metadata_egress_port 0xfffffffa - jmp LABEL_0END - LABEL_0FALSE : mov m.psa_ingress_output_metadata_drop 0 - mov m.psa_ingress_output_metadata_multicast_group 0x0 - mov m.psa_ingress_output_metadata_egress_port 0xfffffffd - LABEL_0END : jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0 - tx m.psa_ingress_output_metadata_egress_port - LABEL_DROP : drop -} - - diff --git a/testdata/p4_16_samples_outputs/psa-remove-header.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-remove-header.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-remove-header.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-remove-header.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-remove-header.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-remove-header.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txt deleted file mode 100644 index e96505fdcf0..00000000000 --- a/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txt +++ /dev/null @@ -1,42 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21620615 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21620615 - name: "MyIC.remove_header" - alias: "remove_header" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb new file mode 100644 index 00000000000..3d9852d8302 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-remove-header.p4.p4info.txtpb @@ -0,0 +1,43 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21620615 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21620615 + name: "MyIC.remove_header" + alias: "remove_header" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.p4info.txt deleted file mode 100644 index cb4c431092d..00000000000 --- a/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.p4info.txt +++ /dev/null @@ -1,13 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} diff --git a/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..7ffd45be299 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.p4info.txtpb @@ -0,0 +1,14 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} diff --git a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txt deleted file mode 100644 index b5d6652e42f..00000000000 --- a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 43002152 - name: "MyIngressControl.stub" - alias: "stub" - } - action_refs { - id: 29027610 - } - const_default_action_id: 29027610 - size: 1000000 -} -actions { - preamble { - id: 29027610 - name: "MyIngressControl.nonDefAct" - alias: "nonDefAct" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb new file mode 100644 index 00000000000..7803495564f --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-subtract-inst1.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 43002152 + name: "MyIngressControl.stub" + alias: "stub" + } + action_refs { + id: 29027610 + } + const_default_action_id: 29027610 + size: 1000000 +} +actions { + preamble { + id: 29027610 + name: "MyIngressControl.nonDefAct" + alias: "nonDefAct" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txt deleted file mode 100644 index e6f3b22de0c..00000000000 --- a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txt +++ /dev/null @@ -1,90 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "b.data" - bitwidth: 16 - match_type: LPM - } - action_refs { - id: 21257015 - } - action_refs { - id: 21832421 - } - action_refs { - id: 23466264 - } - size: 1024 -} -tables { - preamble { - id: 49266188 - name: "MyIC.foo" - alias: "foo" - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 49390123 - name: "MyIC.bar" - alias: "bar" - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21832421 - name: "MyIC.a1" - alias: "a1" - } - params { - id: 1 - name: "param" - bitwidth: 48 - } -} -actions { - preamble { - id: 23466264 - name: "MyIC.a2" - alias: "a2" - } - params { - id: 1 - name: "param" - bitwidth: 16 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb new file mode 100644 index 00000000000..dcdf86beca4 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.p4info.txtpb @@ -0,0 +1,91 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "b.data" + bitwidth: 16 + match_type: LPM + } + action_refs { + id: 21257015 + } + action_refs { + id: 21832421 + } + action_refs { + id: 23466264 + } + size: 1024 +} +tables { + preamble { + id: 49266188 + name: "MyIC.foo" + alias: "foo" + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 49390123 + name: "MyIC.bar" + alias: "bar" + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21832421 + name: "MyIC.a1" + alias: "a1" + } + params { + id: 1 + name: "param" + bitwidth: 48 + } +} +actions { + preamble { + id: 23466264 + name: "MyIC.a2" + alias: "a2" + } + params { + id: 1 + name: "param" + bitwidth: 16 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txt deleted file mode 100644 index 76c39fa459c..00000000000 --- a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txt +++ /dev/null @@ -1,56 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "hdr.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - action_refs { - id: 21620615 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 21620615 - name: "MyIC.remove_header" - alias: "remove_header" - } -} -actions { - preamble { - id: 33059780 - name: "MyIC.ifHit" - alias: "ifHit" - } -} -actions { - preamble { - id: 28875613 - name: "MyIC.ifMiss" - alias: "ifMiss" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb new file mode 100644 index 00000000000..d20ace0ae39 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.p4info.txtpb @@ -0,0 +1,57 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "hdr.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + action_refs { + id: 21620615 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 21620615 + name: "MyIC.remove_header" + alias: "remove_header" + } +} +actions { + preamble { + id: 33059780 + name: "MyIC.ifHit" + alias: "ifHit" + } +} +actions { + preamble { + id: 28875613 + name: "MyIC.ifMiss" + alias: "ifMiss" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/psa-test.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-test.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-test.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-test.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-test.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-test.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-test.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-test.p4.p4info.txt deleted file mode 100644 index bfdc1b10278..00000000000 --- a/testdata/p4_16_samples_outputs/psa-test.p4.p4info.txt +++ /dev/null @@ -1,18 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -value_sets { - preamble { - id: 53184931 - name: "MyIP.pvs" - alias: "pvs" - } - match { - id: 1 - bitwidth: 16 - match_type: EXACT - } - size: 4 -} diff --git a/testdata/p4_16_samples_outputs/psa-test.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-test.p4.p4info.txtpb new file mode 100644 index 00000000000..4b117e3537e --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-test.p4.p4info.txtpb @@ -0,0 +1,19 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +value_sets { + preamble { + id: 53184931 + name: "MyIP.pvs" + alias: "pvs" + } + match { + id: 1 + bitwidth: 16 + match_type: EXACT + } + size: 4 +} diff --git a/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.p4info.txt deleted file mode 100644 index ed28782f7ef..00000000000 --- a/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} diff --git a/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..cfbdc3d692a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} diff --git a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.p4info.txt deleted file mode 100644 index 18108b36e35..00000000000 --- a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.p4info.txt +++ /dev/null @@ -1,21 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 30788783 - name: "ingress_drop" - alias: "ingress_drop" - annotations: "@noWarn(\"unused\")" - } -} diff --git a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..6ac2dbacfee --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.p4info.txtpb @@ -0,0 +1,22 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 30788783 + name: "ingress_drop" + alias: "ingress_drop" + annotations: "@noWarn(\"unused\")" + } +} diff --git a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.p4info.txt deleted file mode 100644 index 18108b36e35..00000000000 --- a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.p4info.txt +++ /dev/null @@ -1,21 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -actions { - preamble { - id: 27646489 - name: "send_to_port" - alias: "send_to_port" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 30788783 - name: "ingress_drop" - alias: "ingress_drop" - annotations: "@noWarn(\"unused\")" - } -} diff --git a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..6ac2dbacfee --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.p4info.txtpb @@ -0,0 +1,22 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +actions { + preamble { + id: 27646489 + name: "send_to_port" + alias: "send_to_port" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 30788783 + name: "ingress_drop" + alias: "ingress_drop" + annotations: "@noWarn(\"unused\")" + } +} diff --git a/testdata/p4_16_samples_outputs/psa-variable-index.p4.entries.txt b/testdata/p4_16_samples_outputs/psa-variable-index.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/psa-variable-index.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/psa-variable-index.p4.entries.txtpb b/testdata/p4_16_samples_outputs/psa-variable-index.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-variable-index.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txt b/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txt deleted file mode 100644 index 5103177b251..00000000000 --- a/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txt +++ /dev/null @@ -1,32 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "psa" -} -tables { - preamble { - id: 39967501 - name: "MyIC.tbl" - alias: "tbl" - } - match_fields { - id: 1 - name: "a.ethernet.srcAddr" - bitwidth: 48 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb new file mode 100644 index 00000000000..c31e25dffa7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/psa-variable-index.p4.p4info.txtpb @@ -0,0 +1,33 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "psa" +} +tables { + preamble { + id: 39967501 + name: "MyIC.tbl" + alias: "tbl" + } + match_fields { + id: 1 + name: "a.ethernet.srcAddr" + bitwidth: 48 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txt deleted file mode 100644 index 67de8e43efb..00000000000 --- a/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txt +++ /dev/null @@ -1,57 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44621953 - name: "MyIngress.t" - alias: "t" - } - match_fields { - id: 1 - name: "meta.data[0].da" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 29884806 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29884806 - name: "MyIngress.set_data" - alias: "set_data" - } -} -value_sets { - preamble { - id: 56033750 - name: "MyParser.pvs" - alias: "pvs" - } - match { - id: 1 - bitwidth: 32 - match_type: EXACT - } - size: 4 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..51220445cf2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/pvs-bitstring-bmv2.p4.p4info.txtpb @@ -0,0 +1,58 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44621953 + name: "MyIngress.t" + alias: "t" + } + match_fields { + id: 1 + name: "meta.data[0].da" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 29884806 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29884806 + name: "MyIngress.set_data" + alias: "set_data" + } +} +value_sets { + preamble { + id: 56033750 + name: "MyParser.pvs" + alias: "pvs" + } + match { + id: 1 + bitwidth: 32 + match_type: EXACT + } + size: 4 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txt deleted file mode 100644 index b2a03cd66f7..00000000000 --- a/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,58 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44621953 - name: "MyIngress.t" - alias: "t" - } - match_fields { - id: 1 - name: "meta.data[0].da" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 29884806 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29884806 - name: "MyIngress.set_data" - alias: "set_data" - } -} -value_sets { - preamble { - id: 56033750 - name: "MyParser.pvs" - alias: "pvs" - } - match { - id: 1 - name: "field" - bitwidth: 32 - match_type: EXACT - } - size: 4 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..089dd093472 --- /dev/null +++ b/testdata/p4_16_samples_outputs/pvs-struct-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,59 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44621953 + name: "MyIngress.t" + alias: "t" + } + match_fields { + id: 1 + name: "meta.data[0].da" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 29884806 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29884806 + name: "MyIngress.set_data" + alias: "set_data" + } +} +value_sets { + preamble { + id: 56033750 + name: "MyParser.pvs" + alias: "pvs" + } + match { + id: 1 + name: "field" + bitwidth: 32 + match_type: EXACT + } + size: 4 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txt deleted file mode 100644 index ed88328ccb1..00000000000 --- a/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,64 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44621953 - name: "MyIngress.t" - alias: "t" - } - match_fields { - id: 1 - name: "meta.data[0].da" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 29884806 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29884806 - name: "MyIngress.set_data" - alias: "set_data" - } -} -value_sets { - preamble { - id: 56033750 - name: "MyParser.pvs" - alias: "pvs" - } - match { - id: 1 - name: "field" - bitwidth: 16 - match_type: EXACT - } - match { - id: 2 - name: "field2" - bitwidth: 3 - match_type: EXACT - } - size: 4 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..37a50337c7f --- /dev/null +++ b/testdata/p4_16_samples_outputs/pvs-struct-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,65 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44621953 + name: "MyIngress.t" + alias: "t" + } + match_fields { + id: 1 + name: "meta.data[0].da" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 29884806 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29884806 + name: "MyIngress.set_data" + alias: "set_data" + } +} +value_sets { + preamble { + id: 56033750 + name: "MyParser.pvs" + alias: "pvs" + } + match { + id: 1 + name: "field" + bitwidth: 16 + match_type: EXACT + } + match { + id: 2 + name: "field2" + bitwidth: 3 + match_type: EXACT + } + size: 4 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txt deleted file mode 100644 index ddc1f9b567e..00000000000 --- a/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,76 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44621953 - name: "MyIngress.t" - alias: "t" - } - match_fields { - id: 1 - name: "meta.data[0].da" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 29884806 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29884806 - name: "MyIngress.set_data" - alias: "set_data" - } -} -value_sets { - preamble { - id: 56033750 - name: "MyParser.pvs" - alias: "pvs" - } - match { - id: 1 - name: "field1" - bitwidth: 16 - match_type: TERNARY - } - match { - id: 2 - name: "field2" - bitwidth: 3 - match_type: LPM - } - match { - id: 3 - name: "field3" - bitwidth: 6 - match_type: EXACT - } - match { - id: 4 - name: "field4" - bitwidth: 5 - match_type: RANGE - } - size: 4 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..82d5e1bcea7 --- /dev/null +++ b/testdata/p4_16_samples_outputs/pvs-struct-3-bmv2.p4.p4info.txtpb @@ -0,0 +1,77 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44621953 + name: "MyIngress.t" + alias: "t" + } + match_fields { + id: 1 + name: "meta.data[0].da" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 29884806 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29884806 + name: "MyIngress.set_data" + alias: "set_data" + } +} +value_sets { + preamble { + id: 56033750 + name: "MyParser.pvs" + alias: "pvs" + } + match { + id: 1 + name: "field1" + bitwidth: 16 + match_type: TERNARY + } + match { + id: 2 + name: "field2" + bitwidth: 3 + match_type: LPM + } + match { + id: 3 + name: "field3" + bitwidth: 6 + match_type: EXACT + } + match { + id: 4 + name: "field4" + bitwidth: 5 + match_type: RANGE + } + size: 4 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.p4info.txt deleted file mode 100644 index ebce7965547..00000000000 --- a/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.p4info.txt +++ /dev/null @@ -1,56 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -registers { - preamble { - id: 382856063 - name: "ingress.reg" - alias: "reg" - } - type_spec { - serializable_enum { - name: "EthTypes" - } - } - size: 1 -} -type_info { - serializable_enums { - key: "EthTypes" - value { - underlying_type { - bitwidth: 16 - } - members { - name: "IPv4" - value: "\010\000" - } - members { - name: "ARP" - value: "\010\006" - } - members { - name: "RARP" - value: "\2005" - } - members { - name: "EtherTalk" - value: "\200\233" - } - members { - name: "VLAN" - value: "\201\000" - } - members { - name: "IPX" - value: "\2017" - } - members { - name: "IPv6" - value: "\206\335" - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..6ef9a69e52e --- /dev/null +++ b/testdata/p4_16_samples_outputs/register-serenum-bmv2.p4.p4info.txtpb @@ -0,0 +1,57 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +registers { + preamble { + id: 382856063 + name: "ingress.reg" + alias: "reg" + } + type_spec { + serializable_enum { + name: "EthTypes" + } + } + size: 1 +} +type_info { + serializable_enums { + key: "EthTypes" + value { + underlying_type { + bitwidth: 16 + } + members { + name: "IPv4" + value: "\010\000" + } + members { + name: "ARP" + value: "\010\006" + } + members { + name: "RARP" + value: "\2005" + } + members { + name: "EtherTalk" + value: "\200\233" + } + members { + name: "VLAN" + value: "\201\000" + } + members { + name: "IPX" + value: "\2017" + } + members { + name: "IPv6" + value: "\206\335" + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/runtime-index-2-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/runtime-index-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.entries.txt b/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.entries.txtpb b/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txt b/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txt deleted file mode 100644 index fc3277cf333..00000000000 --- a/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txt +++ /dev/null @@ -1,43 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46322784 - name: "IngressI.do_something" - alias: "do_something" - } - match_fields { - id: 1 - name: "smeta.ingress_port" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 29545568 - } - action_refs { - id: 21257015 - } - const_default_action_id: 21257015 - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 29545568 - name: "IngressI.do_something" - alias: "do_something" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb new file mode 100644 index 00000000000..4e5eebfd067 --- /dev/null +++ b/testdata/p4_16_samples_outputs/same_name_for_table_and_action.p4.p4info.txtpb @@ -0,0 +1,44 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46322784 + name: "IngressI.do_something" + alias: "do_something" + } + match_fields { + id: 1 + name: "smeta.ingress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 29545568 + } + action_refs { + id: 21257015 + } + const_default_action_id: 21257015 + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 29545568 + name: "IngressI.do_something" + alias: "do_something" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/saturated-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/saturated-bmv2.p4.entries.txt deleted file mode 100644 index 2970cb2cd98..00000000000 --- a/testdata/p4_16_samples_outputs/saturated-bmv2.p4.entries.txt +++ /dev/null @@ -1,82 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 34728461 - match { - field_id: 1 - exact { - value: "\001" - } - } - action { - action { - action_id: 20896217 - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 34728461 - match { - field_id: 1 - exact { - value: "\002" - } - } - action { - action { - action_id: 28347782 - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 34728461 - match { - field_id: 1 - exact { - value: "\003" - } - } - action { - action { - action_id: 30797801 - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 34728461 - match { - field_id: 1 - exact { - value: "\004" - } - } - action { - action { - action_id: 18945827 - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/saturated-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/saturated-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..f3ab8d20ff8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/saturated-bmv2.p4.entries.txtpb @@ -0,0 +1,83 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 34728461 + match { + field_id: 1 + exact { + value: "\001" + } + } + action { + action { + action_id: 20896217 + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 34728461 + match { + field_id: 1 + exact { + value: "\002" + } + } + action { + action { + action_id: 28347782 + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 34728461 + match { + field_id: 1 + exact { + value: "\003" + } + } + action { + action { + action_id: 30797801 + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 34728461 + match { + field_id: 1 + exact { + value: "\004" + } + } + action { + action { + action_id: 18945827 + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txt deleted file mode 100644 index a724bfb34e0..00000000000 --- a/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txt +++ /dev/null @@ -1,73 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - match_fields { - id: 1 - name: "h.h.op" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 20896217 - } - action_refs { - id: 28347782 - } - action_refs { - id: 30797801 - } - action_refs { - id: 18945827 - } - action_refs { - id: 33281717 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 20896217 - name: "ingress.usat_plus" - alias: "usat_plus" - } -} -actions { - preamble { - id: 28347782 - name: "ingress.usat_minus" - alias: "usat_minus" - } -} -actions { - preamble { - id: 30797801 - name: "ingress.sat_plus" - alias: "sat_plus" - } -} -actions { - preamble { - id: 18945827 - name: "ingress.sat_minus" - alias: "sat_minus" - } -} -actions { - preamble { - id: 33281717 - name: "ingress.drop" - alias: "drop" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..5df64c64875 --- /dev/null +++ b/testdata/p4_16_samples_outputs/saturated-bmv2.p4.p4info.txtpb @@ -0,0 +1,74 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + match_fields { + id: 1 + name: "h.h.op" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 20896217 + } + action_refs { + id: 28347782 + } + action_refs { + id: 30797801 + } + action_refs { + id: 18945827 + } + action_refs { + id: 33281717 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 20896217 + name: "ingress.usat_plus" + alias: "usat_plus" + } +} +actions { + preamble { + id: 28347782 + name: "ingress.usat_minus" + alias: "usat_minus" + } +} +actions { + preamble { + id: 30797801 + name: "ingress.sat_plus" + alias: "sat_plus" + } +} +actions { + preamble { + id: 18945827 + name: "ingress.sat_minus" + alias: "sat_minus" + } +} +actions { + preamble { + id: 33281717 + name: "ingress.drop" + alias: "drop" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/scalarmeta-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txt deleted file mode 100644 index 444cdf6e82f..00000000000 --- a/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txt +++ /dev/null @@ -1,167 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -tables { - preamble { - id: 34660133 - name: "pipe.filter_tbl" - alias: "filter_tbl" - } - match_fields { - id: 1 - name: "headers.ipv4.dstAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 31869674 - } - action_refs { - id: 32844369 - } - action_refs { - id: 28817955 - } - action_refs { - id: 26081392 - } - action_refs { - id: 24110354 - } - action_refs { - id: 22326558 - } - action_refs { - id: 22960889 - } - action_refs { - id: 19769736 - } - action_refs { - id: 31212927 - } - action_refs { - id: 18876683 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 31212927 - name: "pipe.ip_modify_saddr" - alias: "ip_modify_saddr" - } - params { - id: 1 - name: "srcAddr" - bitwidth: 32 - } -} -actions { - preamble { - id: 26081392 - name: "pipe.mpls_modify_tc" - alias: "mpls_modify_tc" - } - params { - id: 1 - name: "tc" - bitwidth: 3 - } -} -actions { - preamble { - id: 32844369 - name: "pipe.mpls_set_label" - alias: "mpls_set_label" - } - params { - id: 1 - name: "label" - bitwidth: 20 - } -} -actions { - preamble { - id: 24110354 - name: "pipe.mpls_set_label_tc" - alias: "mpls_set_label_tc" - } - params { - id: 1 - name: "label" - bitwidth: 20 - } - params { - id: 2 - name: "tc" - bitwidth: 3 - } -} -actions { - preamble { - id: 31869674 - name: "pipe.mpls_decrement_ttl" - alias: "mpls_decrement_ttl" - } -} -actions { - preamble { - id: 28817955 - name: "pipe.mpls_set_label_decrement_ttl" - alias: "mpls_set_label_decrement_ttl" - } - params { - id: 1 - name: "label" - bitwidth: 20 - } -} -actions { - preamble { - id: 22326558 - name: "pipe.mpls_modify_stack" - alias: "mpls_modify_stack" - } - params { - id: 1 - name: "stack" - bitwidth: 1 - } -} -actions { - preamble { - id: 22960889 - name: "pipe.change_ip_ver" - alias: "change_ip_ver" - } -} -actions { - preamble { - id: 19769736 - name: "pipe.ip_swap_addrs" - alias: "ip_swap_addrs" - } -} -actions { - preamble { - id: 18876683 - name: "pipe.Reject" - alias: "Reject" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..1cb229f9da2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/simple-actions_ubpf.p4.p4info.txtpb @@ -0,0 +1,168 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +tables { + preamble { + id: 34660133 + name: "pipe.filter_tbl" + alias: "filter_tbl" + } + match_fields { + id: 1 + name: "headers.ipv4.dstAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 31869674 + } + action_refs { + id: 32844369 + } + action_refs { + id: 28817955 + } + action_refs { + id: 26081392 + } + action_refs { + id: 24110354 + } + action_refs { + id: 22326558 + } + action_refs { + id: 22960889 + } + action_refs { + id: 19769736 + } + action_refs { + id: 31212927 + } + action_refs { + id: 18876683 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 31212927 + name: "pipe.ip_modify_saddr" + alias: "ip_modify_saddr" + } + params { + id: 1 + name: "srcAddr" + bitwidth: 32 + } +} +actions { + preamble { + id: 26081392 + name: "pipe.mpls_modify_tc" + alias: "mpls_modify_tc" + } + params { + id: 1 + name: "tc" + bitwidth: 3 + } +} +actions { + preamble { + id: 32844369 + name: "pipe.mpls_set_label" + alias: "mpls_set_label" + } + params { + id: 1 + name: "label" + bitwidth: 20 + } +} +actions { + preamble { + id: 24110354 + name: "pipe.mpls_set_label_tc" + alias: "mpls_set_label_tc" + } + params { + id: 1 + name: "label" + bitwidth: 20 + } + params { + id: 2 + name: "tc" + bitwidth: 3 + } +} +actions { + preamble { + id: 31869674 + name: "pipe.mpls_decrement_ttl" + alias: "mpls_decrement_ttl" + } +} +actions { + preamble { + id: 28817955 + name: "pipe.mpls_set_label_decrement_ttl" + alias: "mpls_set_label_decrement_ttl" + } + params { + id: 1 + name: "label" + bitwidth: 20 + } +} +actions { + preamble { + id: 22326558 + name: "pipe.mpls_modify_stack" + alias: "mpls_modify_stack" + } + params { + id: 1 + name: "stack" + bitwidth: 1 + } +} +actions { + preamble { + id: 22960889 + name: "pipe.change_ip_ver" + alias: "change_ip_ver" + } +} +actions { + preamble { + id: 19769736 + name: "pipe.ip_swap_addrs" + alias: "ip_swap_addrs" + } +} +actions { + preamble { + id: 18876683 + name: "pipe.Reject" + alias: "Reject" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.p4info.txt deleted file mode 100644 index 75ac12ec6a6..00000000000 --- a/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.p4info.txt +++ /dev/null @@ -1,58 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -actions { - preamble { - id: 28069536 - name: "pipe.update_conn_state" - alias: "update_conn_state" - } -} -actions { - preamble { - id: 21918628 - name: "pipe.update_conn_info" - alias: "update_conn_info" - } -} -actions { - preamble { - id: 30647342 - name: "pipe._drop" - alias: "_drop" - } -} -registers { - preamble { - id: 371662957 - name: "pipe.conn_state" - alias: "conn_state" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 65536 -} -registers { - preamble { - id: 371315315 - name: "pipe.conn_srv_addr" - alias: "conn_srv_addr" - } - type_spec { - bitstring { - bit { - bitwidth: 32 - } - } - } - size: 65536 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..61b5183b858 --- /dev/null +++ b/testdata/p4_16_samples_outputs/simple-firewall_ubpf.p4.p4info.txtpb @@ -0,0 +1,59 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +actions { + preamble { + id: 28069536 + name: "pipe.update_conn_state" + alias: "update_conn_state" + } +} +actions { + preamble { + id: 21918628 + name: "pipe.update_conn_info" + alias: "update_conn_info" + } +} +actions { + preamble { + id: 30647342 + name: "pipe._drop" + alias: "_drop" + } +} +registers { + preamble { + id: 371662957 + name: "pipe.conn_state" + alias: "conn_state" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 65536 +} +registers { + preamble { + id: 371315315 + name: "pipe.conn_srv_addr" + alias: "conn_srv_addr" + } + type_spec { + bitstring { + bit { + bitwidth: 32 + } + } + } + size: 65536 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/simplify_slice.p4.entries.txt b/testdata/p4_16_samples_outputs/simplify_slice.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/simplify_slice.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/simplify_slice.p4.entries.txtpb b/testdata/p4_16_samples_outputs/simplify_slice.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/simplify_slice.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/simplify_slice.p4.p4info.txt b/testdata/p4_16_samples_outputs/simplify_slice.p4.p4info.txt deleted file mode 100644 index a005e79475a..00000000000 --- a/testdata/p4_16_samples_outputs/simplify_slice.p4.p4info.txt +++ /dev/null @@ -1,22 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -registers { - preamble { - id: 376440781 - name: "Ing.debug" - alias: "debug" - } - type_spec { - bitstring { - bit { - bitwidth: 8 - } - } - } - size: 2 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/simplify_slice.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/simplify_slice.p4.p4info.txtpb new file mode 100644 index 00000000000..c66dd1cf3b2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/simplify_slice.p4.p4info.txtpb @@ -0,0 +1,23 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +registers { + preamble { + id: 376440781 + name: "Ing.debug" + alias: "debug" + } + type_spec { + bitstring { + bit { + bitwidth: 8 + } + } + } + size: 2 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/slice-def-use.p4.entries.txt b/testdata/p4_16_samples_outputs/slice-def-use.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/slice-def-use.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/slice-def-use.p4.entries.txtpb b/testdata/p4_16_samples_outputs/slice-def-use.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/slice-def-use.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/slice-def-use.p4.p4info.txt b/testdata/p4_16_samples_outputs/slice-def-use.p4.p4info.txt deleted file mode 100644 index a005e79475a..00000000000 --- a/testdata/p4_16_samples_outputs/slice-def-use.p4.p4info.txt +++ /dev/null @@ -1,22 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -registers { - preamble { - id: 376440781 - name: "Ing.debug" - alias: "debug" - } - type_spec { - bitstring { - bit { - bitwidth: 8 - } - } - } - size: 2 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/slice-def-use.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/slice-def-use.p4.p4info.txtpb new file mode 100644 index 00000000000..c66dd1cf3b2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/slice-def-use.p4.p4info.txtpb @@ -0,0 +1,23 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +registers { + preamble { + id: 376440781 + name: "Ing.debug" + alias: "debug" + } + type_spec { + bitstring { + bit { + bitwidth: 8 + } + } + } + size: 2 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/slice-def-use1.p4.entries.txt b/testdata/p4_16_samples_outputs/slice-def-use1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/slice-def-use1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/slice-def-use1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/slice-def-use1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/slice-def-use1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txt b/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txt deleted file mode 100644 index acd1d0a1e26..00000000000 --- a/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txt +++ /dev/null @@ -1,41 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 35196712 - name: "Ing.tbl_act" - alias: "tbl_act" - } - action_refs { - id: 30218393 - } - const_default_action_id: 30218393 - size: 1024 -} -actions { - preamble { - id: 30218393 - name: "Ing.act" - alias: "act" - } -} -registers { - preamble { - id: 376440781 - name: "Ing.debug" - alias: "debug" - } - type_spec { - bitstring { - bit { - bitwidth: 8 - } - } - } - size: 2 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb new file mode 100644 index 00000000000..564f0106992 --- /dev/null +++ b/testdata/p4_16_samples_outputs/slice-def-use1.p4.p4info.txtpb @@ -0,0 +1,42 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 35196712 + name: "Ing.tbl_act" + alias: "tbl_act" + } + action_refs { + id: 30218393 + } + const_default_action_id: 30218393 + size: 1024 +} +actions { + preamble { + id: 30218393 + name: "Ing.act" + alias: "act" + } +} +registers { + preamble { + id: 376440781 + name: "Ing.debug" + alias: "debug" + } + type_spec { + bitstring { + bit { + bitwidth: 8 + } + } + } + size: 2 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/stack-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/stack-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/stack-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/stack-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/stack-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/stack-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/stack-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/stack-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/stack-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/stack-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/stack-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/stack-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/stack-bvec-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txt deleted file mode 100644 index 23c3ae8b0a3..00000000000 --- a/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txt +++ /dev/null @@ -1,26 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 29666769 - } - const_default_action_id: 29666769 - size: 1024 -} -actions { - preamble { - id: 29666769 - name: "ingress.set_port" - alias: "set_port" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..b48fd73166a --- /dev/null +++ b/testdata/p4_16_samples_outputs/stack_complex-bmv2.p4.p4info.txtpb @@ -0,0 +1,27 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 29666769 + } + const_default_action_id: 29666769 + size: 1024 +} +actions { + preamble { + id: 29666769 + name: "ingress.set_port" + alias: "set_port" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/std_meta_inlining.p4.entries.txt b/testdata/p4_16_samples_outputs/std_meta_inlining.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/std_meta_inlining.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/std_meta_inlining.p4.entries.txtpb b/testdata/p4_16_samples_outputs/std_meta_inlining.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/std_meta_inlining.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txt b/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txt deleted file mode 100644 index edb4d576912..00000000000 --- a/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txt +++ /dev/null @@ -1,44 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 35959751 - name: "ingress.t0" - alias: "t0" - } - match_fields { - id: 1 - name: "standard_metadata.ingress_port" - bitwidth: 9 - match_type: TERNARY - } - action_refs { - id: 24562328 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -actions { - preamble { - id: 24562328 - name: "send_to_cpu" - alias: "send_to_cpu" - } -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb new file mode 100644 index 00000000000..caa9c6b17b5 --- /dev/null +++ b/testdata/p4_16_samples_outputs/std_meta_inlining.p4.p4info.txtpb @@ -0,0 +1,45 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 35959751 + name: "ingress.t0" + alias: "t0" + } + match_fields { + id: 1 + name: "standard_metadata.ingress_port" + bitwidth: 9 + match_type: TERNARY + } + action_refs { + id: 24562328 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +actions { + preamble { + id: 24562328 + name: "send_to_cpu" + alias: "send_to_cpu" + } +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/strength3.p4.entries.txt b/testdata/p4_16_samples_outputs/strength3.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/strength3.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/strength3.p4.entries.txtpb b/testdata/p4_16_samples_outputs/strength3.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/strength3.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/strength3.p4.p4info.txt b/testdata/p4_16_samples_outputs/strength3.p4.p4info.txt deleted file mode 100644 index 83cd716baa3..00000000000 --- a/testdata/p4_16_samples_outputs/strength3.p4.p4info.txt +++ /dev/null @@ -1,96 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 25451019 - } - action_refs { - id: 22181799 - } - action_refs { - id: 23335884 - } - action_refs { - id: 27086398 - } - action_refs { - id: 32959729 - } - action_refs { - id: 21235605 - } - action_refs { - id: 23635422 - } - action_refs { - id: 19874155 - } - const_default_action_id: 25451019 - size: 1024 -} -actions { - preamble { - id: 25451019 - name: "ingress.case0" - alias: "case0" - } -} -actions { - preamble { - id: 22181799 - name: "ingress.case1" - alias: "case1" - } -} -actions { - preamble { - id: 23335884 - name: "ingress.case2" - alias: "case2" - } -} -actions { - preamble { - id: 27086398 - name: "ingress.case3" - alias: "case3" - } -} -actions { - preamble { - id: 32959729 - name: "ingress.case4" - alias: "case4" - } -} -actions { - preamble { - id: 21235605 - name: "ingress.case5" - alias: "case5" - } -} -actions { - preamble { - id: 23635422 - name: "ingress.case6" - alias: "case6" - } -} -actions { - preamble { - id: 19874155 - name: "ingress.case7" - alias: "case7" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb new file mode 100644 index 00000000000..7c8f03dc221 --- /dev/null +++ b/testdata/p4_16_samples_outputs/strength3.p4.p4info.txtpb @@ -0,0 +1,97 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 25451019 + } + action_refs { + id: 22181799 + } + action_refs { + id: 23335884 + } + action_refs { + id: 27086398 + } + action_refs { + id: 32959729 + } + action_refs { + id: 21235605 + } + action_refs { + id: 23635422 + } + action_refs { + id: 19874155 + } + const_default_action_id: 25451019 + size: 1024 +} +actions { + preamble { + id: 25451019 + name: "ingress.case0" + alias: "case0" + } +} +actions { + preamble { + id: 22181799 + name: "ingress.case1" + alias: "case1" + } +} +actions { + preamble { + id: 23335884 + name: "ingress.case2" + alias: "case2" + } +} +actions { + preamble { + id: 27086398 + name: "ingress.case3" + alias: "case3" + } +} +actions { + preamble { + id: 32959729 + name: "ingress.case4" + alias: "case4" + } +} +actions { + preamble { + id: 21235605 + name: "ingress.case5" + alias: "case5" + } +} +actions { + preamble { + id: 23635422 + name: "ingress.case6" + alias: "case6" + } +} +actions { + preamble { + id: 19874155 + name: "ingress.case7" + alias: "case7" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/strength4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/strength4-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/strength4-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/strength4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/strength4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/strength4-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/strength4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/strength4-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/strength4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/strength4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/strength4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/strength4-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/strength6.p4.entries.txt b/testdata/p4_16_samples_outputs/strength6.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/strength6.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/strength6.p4.entries.txtpb b/testdata/p4_16_samples_outputs/strength6.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/strength6.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/strength6.p4.p4info.txt b/testdata/p4_16_samples_outputs/strength6.p4.p4info.txt deleted file mode 100644 index 8b9275ab9b7..00000000000 --- a/testdata/p4_16_samples_outputs/strength6.p4.p4info.txt +++ /dev/null @@ -1,66 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 25451019 - } - action_refs { - id: 22181799 - } - action_refs { - id: 23335884 - } - action_refs { - id: 27086398 - } - action_refs { - id: 32959729 - } - const_default_action_id: 25451019 - size: 1024 -} -actions { - preamble { - id: 25451019 - name: "ingress.case0" - alias: "case0" - } -} -actions { - preamble { - id: 22181799 - name: "ingress.case1" - alias: "case1" - } -} -actions { - preamble { - id: 23335884 - name: "ingress.case2" - alias: "case2" - } -} -actions { - preamble { - id: 27086398 - name: "ingress.case3" - alias: "case3" - } -} -actions { - preamble { - id: 32959729 - name: "ingress.case4" - alias: "case4" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb new file mode 100644 index 00000000000..c6640a95c50 --- /dev/null +++ b/testdata/p4_16_samples_outputs/strength6.p4.p4info.txtpb @@ -0,0 +1,67 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 25451019 + } + action_refs { + id: 22181799 + } + action_refs { + id: 23335884 + } + action_refs { + id: 27086398 + } + action_refs { + id: 32959729 + } + const_default_action_id: 25451019 + size: 1024 +} +actions { + preamble { + id: 25451019 + name: "ingress.case0" + alias: "case0" + } +} +actions { + preamble { + id: 22181799 + name: "ingress.case1" + alias: "case1" + } +} +actions { + preamble { + id: 23335884 + name: "ingress.case2" + alias: "case2" + } +} +actions { + preamble { + id: 27086398 + name: "ingress.case3" + alias: "case3" + } +} +actions { + preamble { + id: 32959729 + name: "ingress.case4" + alias: "case4" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.entries.txt b/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.entries.txtpb b/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.p4info.txt b/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.p4info.txt deleted file mode 100644 index 93126eea536..00000000000 --- a/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.p4info.txt +++ /dev/null @@ -1,12 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -actions { - preamble { - id: 18843410 - name: "ingress.pointless_action" - alias: "pointless_action" - } -} diff --git a/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.p4info.txtpb new file mode 100644 index 00000000000..0bfcefe7cfc --- /dev/null +++ b/testdata/p4_16_samples_outputs/struct_assignment_optimization.p4.p4info.txtpb @@ -0,0 +1,13 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +actions { + preamble { + id: 18843410 + name: "ingress.pointless_action" + alias: "pointless_action" + } +} diff --git a/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/structure-valued-expr-ok-1-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/structured_annotations.p4.entries.txt b/testdata/p4_16_samples_outputs/structured_annotations.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/structured_annotations.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/structured_annotations.p4.entries.txtpb b/testdata/p4_16_samples_outputs/structured_annotations.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/structured_annotations.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txt b/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txt deleted file mode 100644 index f544fe52aa6..00000000000 --- a/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txt +++ /dev/null @@ -1,105 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48995541 - name: "ingressImpl.t" - alias: "t" - structured_annotations { - name: "MixedExprList" - expression_list { - expressions { - int64_value: 1 - } - expressions { - string_value: "hello" - } - expressions { - bool_value: true - } - expressions { - bool_value: false - } - expressions { - int64_value: 11 - } - } - } - structured_annotations { - name: "MixedKV" - kv_pair_list { - kv_pairs { - key: "label" - value { - string_value: "text" - } - } - kv_pairs { - key: "my_bool" - value { - bool_value: true - } - } - kv_pairs { - key: "int_val" - value { - int64_value: 6 - } - } - } - } - } - action_refs { - id: 30646950 - structured_annotations { - name: "myid" - expression_list { - expressions { - int64_value: 1 - } - } - } - } - action_refs { - id: 32254556 - structured_annotations { - name: "myid" - expression_list { - expressions { - int64_value: 2 - } - } - } - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 32254556 - name: "ingressImpl.my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 30646950 - name: "ingressImpl.redirect" - alias: "redirect" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb new file mode 100644 index 00000000000..9a23f101f32 --- /dev/null +++ b/testdata/p4_16_samples_outputs/structured_annotations.p4.p4info.txtpb @@ -0,0 +1,106 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48995541 + name: "ingressImpl.t" + alias: "t" + structured_annotations { + name: "MixedExprList" + expression_list { + expressions { + int64_value: 1 + } + expressions { + string_value: "hello" + } + expressions { + bool_value: true + } + expressions { + bool_value: false + } + expressions { + int64_value: 11 + } + } + } + structured_annotations { + name: "MixedKV" + kv_pair_list { + kv_pairs { + key: "label" + value { + string_value: "text" + } + } + kv_pairs { + key: "my_bool" + value { + bool_value: true + } + } + kv_pairs { + key: "int_val" + value { + int64_value: 6 + } + } + } + } + } + action_refs { + id: 30646950 + structured_annotations { + name: "myid" + expression_list { + expressions { + int64_value: 1 + } + } + } + } + action_refs { + id: 32254556 + structured_annotations { + name: "myid" + expression_list { + expressions { + int64_value: 2 + } + } + } + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 32254556 + name: "ingressImpl.my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 30646950 + name: "ingressImpl.redirect" + alias: "redirect" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/subparser-with-header-stack-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.entries.txt deleted file mode 100644 index 2fcaa29e47d..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.entries.txt +++ /dev/null @@ -1,50 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 40116169 - match { - field_id: 1 - exact { - value: "\001" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\001" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 40116169 - match { - field_id: 1 - exact { - value: "\002" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\002" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..8f373c34c71 --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.entries.txtpb @@ -0,0 +1,51 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 40116169 + match { + field_id: 1 + exact { + value: "\001" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\001" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 40116169 + match { + field_id: 1 + exact { + value: "\002" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\002" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txt deleted file mode 100644 index b447c0d7407..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 40116169 - name: "ingress.t_exact" - alias: "t_exact" - } - match_fields { - id: 1 - name: "h.h.e" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ecb1485917c --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-exact-bmv2.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40116169 + name: "ingress.t_exact" + alias: "t_exact" + } + match_fields { + id: 1 + name: "h.h.e" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.entries.txt deleted file mode 100644 index 341954e6fdd..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.entries.txt +++ /dev/null @@ -1,123 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 44168292 - match { - field_id: 1 - exact { - value: "\001" - } - } - match { - field_id: 2 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\001" - } - } - } - priority: 4 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44168292 - match { - field_id: 1 - exact { - value: "\002" - } - } - match { - field_id: 2 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\002" - } - } - } - priority: 3 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44168292 - match { - field_id: 1 - exact { - value: "\003" - } - } - match { - field_id: 2 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\003" - } - } - } - priority: 2 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44168292 - match { - field_id: 1 - exact { - value: "\004" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\004" - } - } - } - priority: 1 - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..226f8646d3d --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.entries.txtpb @@ -0,0 +1,124 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 44168292 + match { + field_id: 1 + exact { + value: "\001" + } + } + match { + field_id: 2 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\001" + } + } + } + priority: 4 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44168292 + match { + field_id: 1 + exact { + value: "\002" + } + } + match { + field_id: 2 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\002" + } + } + } + priority: 3 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44168292 + match { + field_id: 1 + exact { + value: "\003" + } + } + match { + field_id: 2 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\003" + } + } + } + priority: 2 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44168292 + match { + field_id: 1 + exact { + value: "\004" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\004" + } + } + } + priority: 1 + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txt deleted file mode 100644 index 03377561193..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44168292 - name: "ingress.t_exact_ternary" - alias: "t_exact_ternary" - } - match_fields { - id: 1 - name: "h.h.e" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "h.h.t" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..99083cba15a --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-exact-ternary-bmv2.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44168292 + name: "ingress.t_exact_ternary" + alias: "t_exact_ternary" + } + match_fields { + id: 1 + name: "h.h.e" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "h.h.t" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.entries.txt deleted file mode 100644 index 1fca7ad926d..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.entries.txt +++ /dev/null @@ -1,70 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 42140569 - match { - field_id: 1 - lpm { - value: "\020" - prefix_len: 4 - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\013" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 42140569 - match { - field_id: 1 - lpm { - value: "\022" - prefix_len: 8 - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\014" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 42140569 - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\r" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..4f5dec87906 --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.entries.txtpb @@ -0,0 +1,71 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 42140569 + match { + field_id: 1 + lpm { + value: "\020" + prefix_len: 4 + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\013" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 42140569 + match { + field_id: 1 + lpm { + value: "\022" + prefix_len: 8 + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\014" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 42140569 + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\r" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txt deleted file mode 100644 index 1150ac4eed9..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 42140569 - name: "ingress.t_lpm" - alias: "t_lpm" - } - match_fields { - id: 1 - name: "h.h.l" - bitwidth: 8 - match_type: LPM - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..1693608bd91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-lpm-bmv2.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 42140569 + name: "ingress.t_lpm" + alias: "t_lpm" + } + match_fields { + id: 1 + name: "h.h.l" + bitwidth: 8 + match_type: LPM + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.entries.txt deleted file mode 100644 index 7d6d5a20df4..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.entries.txt +++ /dev/null @@ -1,102 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 38131002 - match { - field_id: 1 - optional { - value: "\252" - } - } - match { - field_id: 2 - optional { - value: "\021\021" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\001" - } - } - } - priority: 4 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 38131002 - match { - field_id: 2 - optional { - value: "\021\021" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\002" - } - } - } - priority: 3 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 38131002 - match { - field_id: 1 - optional { - value: "\252" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\003" - } - } - } - priority: 2 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 38131002 - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\004" - } - } - } - priority: 1 - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..62e23149437 --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.entries.txtpb @@ -0,0 +1,103 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 38131002 + match { + field_id: 1 + optional { + value: "\252" + } + } + match { + field_id: 2 + optional { + value: "\021\021" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\001" + } + } + } + priority: 4 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38131002 + match { + field_id: 2 + optional { + value: "\021\021" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\002" + } + } + } + priority: 3 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38131002 + match { + field_id: 1 + optional { + value: "\252" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\003" + } + } + } + priority: 2 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 38131002 + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\004" + } + } + } + priority: 1 + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txt deleted file mode 100644 index 31eec7fbbc6..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 38131002 - name: "ingress.t_optional" - alias: "t_optional" - } - match_fields { - id: 1 - name: "h.h.e" - bitwidth: 8 - match_type: OPTIONAL - } - match_fields { - id: 2 - name: "h.h.t" - bitwidth: 16 - match_type: OPTIONAL - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..16fea8f083b --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-optional-bmv2.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 38131002 + name: "ingress.t_optional" + alias: "t_optional" + } + match_fields { + id: 1 + name: "h.h.e" + bitwidth: 8 + match_type: OPTIONAL + } + match_fields { + id: 2 + name: "h.h.t" + bitwidth: 16 + match_type: OPTIONAL + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.entries.txt deleted file mode 100644 index b8bb555be56..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.entries.txt +++ /dev/null @@ -1,80 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 44370079 - match { - field_id: 1 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\001" - } - } - } - priority: 3 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44370079 - match { - field_id: 1 - ternary { - value: "\021\201" - mask: "\377\377" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\002" - } - } - } - priority: 2 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44370079 - match { - field_id: 1 - ternary { - value: "\020\001" - mask: "\360\017" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\003" - } - } - } - priority: 1 - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..d570fd63769 --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.entries.txtpb @@ -0,0 +1,81 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 44370079 + match { + field_id: 1 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\001" + } + } + } + priority: 3 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44370079 + match { + field_id: 1 + ternary { + value: "\021\201" + mask: "\377\377" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\002" + } + } + } + priority: 2 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44370079 + match { + field_id: 1 + ternary { + value: "\020\001" + mask: "\360\017" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\003" + } + } + } + priority: 1 + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txt deleted file mode 100644 index 5ebdf7710b6..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44370079 - name: "ingress.t_ternary" - alias: "t_ternary" - } - match_fields { - id: 1 - name: "h.h.t" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..654c254029a --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-priority-bmv2.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44370079 + name: "ingress.t_ternary" + alias: "t_ternary" + } + match_fields { + id: 1 + name: "h.h.t" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.entries.txt deleted file mode 100644 index 485481e5eb1..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.entries.txt +++ /dev/null @@ -1,99 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 34184941 - match { - field_id: 1 - range { - low: "\001" - high: "\010" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\025" - } - } - } - priority: 4 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 34184941 - match { - field_id: 1 - range { - low: "\006" - high: "\014" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\026" - } - } - } - priority: 3 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 34184941 - match { - field_id: 1 - range { - low: "\017" - high: "\017" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\030" - } - } - } - priority: 2 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 34184941 - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\027" - } - } - } - priority: 1 - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..e309cfd6770 --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.entries.txtpb @@ -0,0 +1,100 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 34184941 + match { + field_id: 1 + range { + low: "\001" + high: "\010" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\025" + } + } + } + priority: 4 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 34184941 + match { + field_id: 1 + range { + low: "\006" + high: "\014" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\026" + } + } + } + priority: 3 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 34184941 + match { + field_id: 1 + range { + low: "\017" + high: "\017" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\030" + } + } + } + priority: 2 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 34184941 + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\027" + } + } + } + priority: 1 + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txt deleted file mode 100644 index b6343748aba..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34184941 - name: "ingress.t_range" - alias: "t_range" - } - match_fields { - id: 1 - name: "h.h.r" - bitwidth: 8 - match_type: RANGE - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..14f99e39995 --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-range-bmv2.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34184941 + name: "ingress.t_range" + alias: "t_range" + } + match_fields { + id: 1 + name: "h.h.r" + bitwidth: 8 + match_type: RANGE + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.entries.txt deleted file mode 100644 index b50844e962b..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.entries.txt +++ /dev/null @@ -1,84 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 44370079 - match { - field_id: 1 - exact { - value: "\000" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\001" - } - } - } - priority: 3 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44370079 - match { - field_id: 1 - exact { - value: "\377" - } - } - match { - field_id: 2 - ternary { - value: "\253\000" - mask: "\377\000" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\002" - } - } - } - priority: 2 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44370079 - match { - field_id: 1 - exact { - value: "\377" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\003" - } - } - } - priority: 1 - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..cddfbee4b0b --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.entries.txtpb @@ -0,0 +1,85 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 44370079 + match { + field_id: 1 + exact { + value: "\000" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\001" + } + } + } + priority: 3 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44370079 + match { + field_id: 1 + exact { + value: "\377" + } + } + match { + field_id: 2 + ternary { + value: "\253\000" + mask: "\377\000" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\002" + } + } + } + priority: 2 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44370079 + match { + field_id: 1 + exact { + value: "\377" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\003" + } + } + } + priority: 1 + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txt deleted file mode 100644 index be587631f08..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txt +++ /dev/null @@ -1,87 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44370079 - name: "ingress.t_ternary" - alias: "t_ternary" - } - match_fields { - id: 1 - name: "h.h.f1" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 2 - name: "h.h.f2" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - const_default_action_id: 21186165 - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { - serializable_enums { - key: "MyEnum1B" - value { - underlying_type { - bitwidth: 8 - } - members { - name: "MBR1" - value: "\000" - } - members { - name: "MBR2" - value: "\377" - } - } - } - serializable_enums { - key: "MyEnum2B" - value { - underlying_type { - bitwidth: 16 - } - members { - name: "MBR1" - value: "\000\n" - } - members { - name: "MBR2" - value: "\253\000" - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..a57bdd471fe --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-ser-enum-bmv2.p4.p4info.txtpb @@ -0,0 +1,88 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44370079 + name: "ingress.t_ternary" + alias: "t_ternary" + } + match_fields { + id: 1 + name: "h.h.f1" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 2 + name: "h.h.f2" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + const_default_action_id: 21186165 + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { + serializable_enums { + key: "MyEnum1B" + value { + underlying_type { + bitwidth: 8 + } + members { + name: "MBR1" + value: "\000" + } + members { + name: "MBR2" + value: "\377" + } + } + } + serializable_enums { + key: "MyEnum2B" + value { + underlying_type { + bitwidth: 16 + } + members { + name: "MBR1" + value: "\000\n" + } + members { + name: "MBR2" + value: "\253\000" + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.entries.txt deleted file mode 100644 index 9668ff61ca8..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.entries.txt +++ /dev/null @@ -1,99 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 44370079 - match { - field_id: 1 - ternary { - value: "\000\001" - mask: "\000\017" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\001" - } - } - } - priority: 4 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44370079 - match { - field_id: 1 - ternary { - value: "\021\207" - mask: "\377\377" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\002" - } - } - } - priority: 3 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44370079 - match { - field_id: 1 - ternary { - value: "\020\000" - mask: "\360\000" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\003" - } - } - } - priority: 2 - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 44370079 - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\004" - } - } - } - priority: 1 - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..078e6b55cb8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.entries.txtpb @@ -0,0 +1,100 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 44370079 + match { + field_id: 1 + ternary { + value: "\000\001" + mask: "\000\017" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\001" + } + } + } + priority: 4 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44370079 + match { + field_id: 1 + ternary { + value: "\021\207" + mask: "\377\377" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\002" + } + } + } + priority: 3 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44370079 + match { + field_id: 1 + ternary { + value: "\020\000" + mask: "\360\000" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\003" + } + } + } + priority: 2 + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 44370079 + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\004" + } + } + } + priority: 1 + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txt deleted file mode 100644 index 5ebdf7710b6..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txt +++ /dev/null @@ -1,48 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44370079 - name: "ingress.t_ternary" - alias: "t_ternary" - } - match_fields { - id: 1 - name: "h.h.t" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..654c254029a --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-ternary-bmv2.p4.p4info.txtpb @@ -0,0 +1,49 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44370079 + name: "ingress.t_ternary" + alias: "t_ternary" + } + match_fields { + id: 1 + name: "h.h.t" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.entries.txt deleted file mode 100644 index d107448e95f..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.entries.txt +++ /dev/null @@ -1,62 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 40847808 - match { - field_id: 1 - exact { - value: "\001" - } - } - match { - field_id: 2 - exact { - value: "\001" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\001" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 40847808 - match { - field_id: 1 - exact { - value: "\000" - } - } - match { - field_id: 2 - exact { - value: "\002" - } - } - action { - action { - action_id: 17165658 - params { - param_id: 1 - value: "\000\002" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..b97da0766d9 --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.entries.txtpb @@ -0,0 +1,63 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 40847808 + match { + field_id: 1 + exact { + value: "\001" + } + } + match { + field_id: 2 + exact { + value: "\001" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\001" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 40847808 + match { + field_id: 1 + exact { + value: "\000" + } + } + match { + field_id: 2 + exact { + value: "\002" + } + } + action { + action { + action_id: 17165658 + params { + param_id: 1 + value: "\000\002" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txt deleted file mode 100644 index 89f4c0b0438..00000000000 --- a/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txt +++ /dev/null @@ -1,54 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 40847808 - name: "ingress.t_valid" - alias: "t_valid" - } - match_fields { - id: 1 - name: "h.h.$valid$" - bitwidth: 1 - match_type: EXACT - } - match_fields { - id: 2 - name: "h.h.e" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 21186165 - } - action_refs { - id: 17165658 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -actions { - preamble { - id: 17165658 - name: "ingress.a_with_control_params" - alias: "a_with_control_params" - } - params { - id: 1 - name: "x" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..ca0b6b5a5ad --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-entries-valid-bmv2.p4.p4info.txtpb @@ -0,0 +1,55 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 40847808 + name: "ingress.t_valid" + alias: "t_valid" + } + match_fields { + id: 1 + name: "h.h.$valid$" + bitwidth: 1 + match_type: EXACT + } + match_fields { + id: 2 + name: "h.h.e" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 21186165 + } + action_refs { + id: 17165658 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +actions { + preamble { + id: 17165658 + name: "ingress.a_with_control_params" + alias: "a_with_control_params" + } + params { + id: 1 + name: "x" + bitwidth: 9 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.entries.txt deleted file mode 100644 index 6813b1bdb49..00000000000 --- a/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.entries.txt +++ /dev/null @@ -1,50 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 46138463 - match { - field_id: 1 - exact { - value: "\010\000" - } - } - action { - action { - action_id: 22708368 - params { - param_id: 1 - value: "\000\000\010\000" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 46138463 - match { - field_id: 1 - exact { - value: "\201\000" - } - } - action { - action { - action_id: 22708368 - params { - param_id: 1 - value: "\000\000\201\000" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..8fd25a25390 --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.entries.txtpb @@ -0,0 +1,51 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 46138463 + match { + field_id: 1 + exact { + value: "\010\000" + } + } + action { + action { + action_id: 22708368 + params { + param_id: 1 + value: "\000\000\010\000" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 46138463 + match { + field_id: 1 + exact { + value: "\201\000" + } + } + action { + action { + action_id: 22708368 + params { + param_id: 1 + value: "\000\000\201\000" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txt deleted file mode 100644 index 918fc468c60..00000000000 --- a/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txt +++ /dev/null @@ -1,87 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46138463 - name: "ingress.tns" - alias: "tns" - } - match_fields { - id: 1 - name: "h.eth_hdr.eth_type" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 22708368 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 22708368 - name: "ingress.do_act" - alias: "do_act" - } - params { - id: 1 - name: "type" - bitwidth: 32 - } -} -type_info { - serializable_enums { - key: "EthTypes" - value { - underlying_type { - bitwidth: 16 - } - members { - name: "IPv4" - value: "\010\000" - } - members { - name: "ARP" - value: "\010\006" - } - members { - name: "RARP" - value: "\2005" - } - members { - name: "EtherTalk" - value: "\200\233" - } - members { - name: "VLAN" - value: "\201\000" - } - members { - name: "IPX" - value: "\2017" - } - members { - name: "IPv6" - value: "\206\335" - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..31fb3a2a65e --- /dev/null +++ b/testdata/p4_16_samples_outputs/table-key-serenum-bmv2.p4.p4info.txtpb @@ -0,0 +1,88 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46138463 + name: "ingress.tns" + alias: "tns" + } + match_fields { + id: 1 + name: "h.eth_hdr.eth_type" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 22708368 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 22708368 + name: "ingress.do_act" + alias: "do_act" + } + params { + id: 1 + name: "type" + bitwidth: 32 + } +} +type_info { + serializable_enums { + key: "EthTypes" + value { + underlying_type { + bitwidth: 16 + } + members { + name: "IPv4" + value: "\010\000" + } + members { + name: "ARP" + value: "\010\006" + } + members { + name: "RARP" + value: "\2005" + } + members { + name: "EtherTalk" + value: "\200\233" + } + members { + name: "VLAN" + value: "\201\000" + } + members { + name: "IPX" + value: "\2017" + } + members { + name: "IPv6" + value: "\206\335" + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txt deleted file mode 100644 index 53ad3ae4c85..00000000000 --- a/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,188 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 36962230 - name: "ingress.test1" - alias: "test1" - } - match_fields { - id: 1 - name: "hdrs.data.f1" - bitwidth: 32 - match_type: TERNARY - } - action_refs { - id: 28312989 - } - action_refs { - id: 27489497 - } - size: 1024 -} -tables { - preamble { - id: 38325502 - name: "ingress.ex1" - alias: "ex1" - } - match_fields { - id: 1 - name: "hdrs.extra[0].h" - bitwidth: 16 - match_type: TERNARY - } - action_refs { - id: 23207676 - } - action_refs { - id: 17753546 - } - action_refs { - id: 29844785 - } - action_refs { - id: 17613244 - } - action_refs { - id: 27489497 - } - size: 1024 -} -tables { - preamble { - id: 33873526 - name: "ingress.tbl1" - alias: "tbl1" - } - match_fields { - id: 1 - name: "hdrs.data.f2" - bitwidth: 32 - match_type: TERNARY - } - action_refs { - id: 23207676 - } - action_refs { - id: 27489497 - } - size: 1024 -} -tables { - preamble { - id: 36715213 - name: "ingress.tbl2" - alias: "tbl2" - } - match_fields { - id: 1 - name: "hdrs.data.f2" - bitwidth: 32 - match_type: TERNARY - } - action_refs { - id: 23207676 - } - action_refs { - id: 27489497 - } - size: 1024 -} -tables { - preamble { - id: 41523041 - name: "ingress.tbl3" - alias: "tbl3" - } - match_fields { - id: 1 - name: "hdrs.data.f2" - bitwidth: 32 - match_type: TERNARY - } - action_refs { - id: 23207676 - } - action_refs { - id: 27489497 - } - size: 1024 -} -actions { - preamble { - id: 28312989 - name: "ingress.setb1" - alias: "setb1" - } - params { - id: 1 - name: "port" - bitwidth: 9 - } - params { - id: 2 - name: "val" - bitwidth: 8 - } -} -actions { - preamble { - id: 27489497 - name: "ingress.noop" - alias: "noop" - } -} -actions { - preamble { - id: 23207676 - name: "ingress.setbyte" - alias: "setbyte" - } - params { - id: 1 - name: "val" - bitwidth: 8 - } -} -actions { - preamble { - id: 17753546 - name: "ingress.act1" - alias: "act1" - } - params { - id: 1 - name: "val" - bitwidth: 8 - } -} -actions { - preamble { - id: 29844785 - name: "ingress.act2" - alias: "act2" - } - params { - id: 1 - name: "val" - bitwidth: 8 - } -} -actions { - preamble { - id: 17613244 - name: "ingress.act3" - alias: "act3" - } - params { - id: 1 - name: "val" - bitwidth: 8 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..6b38e3a88ea --- /dev/null +++ b/testdata/p4_16_samples_outputs/ternary2-bmv2.p4.p4info.txtpb @@ -0,0 +1,189 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 36962230 + name: "ingress.test1" + alias: "test1" + } + match_fields { + id: 1 + name: "hdrs.data.f1" + bitwidth: 32 + match_type: TERNARY + } + action_refs { + id: 28312989 + } + action_refs { + id: 27489497 + } + size: 1024 +} +tables { + preamble { + id: 38325502 + name: "ingress.ex1" + alias: "ex1" + } + match_fields { + id: 1 + name: "hdrs.extra[0].h" + bitwidth: 16 + match_type: TERNARY + } + action_refs { + id: 23207676 + } + action_refs { + id: 17753546 + } + action_refs { + id: 29844785 + } + action_refs { + id: 17613244 + } + action_refs { + id: 27489497 + } + size: 1024 +} +tables { + preamble { + id: 33873526 + name: "ingress.tbl1" + alias: "tbl1" + } + match_fields { + id: 1 + name: "hdrs.data.f2" + bitwidth: 32 + match_type: TERNARY + } + action_refs { + id: 23207676 + } + action_refs { + id: 27489497 + } + size: 1024 +} +tables { + preamble { + id: 36715213 + name: "ingress.tbl2" + alias: "tbl2" + } + match_fields { + id: 1 + name: "hdrs.data.f2" + bitwidth: 32 + match_type: TERNARY + } + action_refs { + id: 23207676 + } + action_refs { + id: 27489497 + } + size: 1024 +} +tables { + preamble { + id: 41523041 + name: "ingress.tbl3" + alias: "tbl3" + } + match_fields { + id: 1 + name: "hdrs.data.f2" + bitwidth: 32 + match_type: TERNARY + } + action_refs { + id: 23207676 + } + action_refs { + id: 27489497 + } + size: 1024 +} +actions { + preamble { + id: 28312989 + name: "ingress.setb1" + alias: "setb1" + } + params { + id: 1 + name: "port" + bitwidth: 9 + } + params { + id: 2 + name: "val" + bitwidth: 8 + } +} +actions { + preamble { + id: 27489497 + name: "ingress.noop" + alias: "noop" + } +} +actions { + preamble { + id: 23207676 + name: "ingress.setbyte" + alias: "setbyte" + } + params { + id: 1 + name: "val" + bitwidth: 8 + } +} +actions { + preamble { + id: 17753546 + name: "ingress.act1" + alias: "act1" + } + params { + id: 1 + name: "val" + bitwidth: 8 + } +} +actions { + preamble { + id: 29844785 + name: "ingress.act2" + alias: "act2" + } + params { + id: 1 + name: "val" + bitwidth: 8 + } +} +actions { + preamble { + id: 17613244 + name: "ingress.act3" + alias: "act3" + } + params { + id: 1 + name: "val" + bitwidth: 8 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/test-parserinvalidargument-error-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/truncate_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/truncate_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/truncate_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/truncate_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/truncate_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/truncate_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/truncate_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/truncate_ubpf.p4.p4info.txt deleted file mode 100644 index bc49a28559e..00000000000 --- a/testdata/p4_16_samples_outputs/truncate_ubpf.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} diff --git a/testdata/p4_16_samples_outputs/truncate_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/truncate_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..3eb7a5ed325 --- /dev/null +++ b/testdata/p4_16_samples_outputs/truncate_ubpf.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} diff --git a/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.entries.txt b/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.entries.txtpb b/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txt b/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txt deleted file mode 100644 index 9765e34c4cd..00000000000 --- a/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txt +++ /dev/null @@ -1,69 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} -tables { - preamble { - id: 40786579 - name: "pipe.upstream_tbl" - alias: "upstream_tbl" - } - match_fields { - id: 1 - name: "headers.mpls.label" - bitwidth: 20 - match_type: EXACT - } - action_refs { - id: 29015996 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 42073487 - name: "pipe.downstream_tbl" - alias: "downstream_tbl" - } - match_fields { - id: 1 - name: "headers.ipv4.dstAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 28213423 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 28213423 - name: "pipe.mpls_encap" - alias: "mpls_encap" - } -} -actions { - preamble { - id: 29015996 - name: "pipe.mpls_decap" - alias: "mpls_decap" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb new file mode 100644 index 00000000000..8588efe5e00 --- /dev/null +++ b/testdata/p4_16_samples_outputs/tunneling_ubpf.p4.p4info.txtpb @@ -0,0 +1,70 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} +tables { + preamble { + id: 40786579 + name: "pipe.upstream_tbl" + alias: "upstream_tbl" + } + match_fields { + id: 1 + name: "headers.mpls.label" + bitwidth: 20 + match_type: EXACT + } + action_refs { + id: 29015996 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 42073487 + name: "pipe.downstream_tbl" + alias: "downstream_tbl" + } + match_fields { + id: 1 + name: "headers.ipv4.dstAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 28213423 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 28213423 + name: "pipe.mpls_encap" + alias: "mpls_encap" + } +} +actions { + preamble { + id: 29015996 + name: "pipe.mpls_decap" + alias: "mpls_decap" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.entries.txt b/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.entries.txtpb b/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.p4info.txt b/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.p4info.txt deleted file mode 100644 index bc49a28559e..00000000000 --- a/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} diff --git a/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.p4info.txtpb new file mode 100644 index 00000000000..3eb7a5ed325 --- /dev/null +++ b/testdata/p4_16_samples_outputs/ubpf_checksum_extern.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} diff --git a/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.entries.txt b/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.entries.txtpb b/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.p4info.txt b/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.p4info.txt deleted file mode 100644 index bc49a28559e..00000000000 --- a/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "ubpf" -} diff --git a/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.p4info.txtpb new file mode 100644 index 00000000000..3eb7a5ed325 --- /dev/null +++ b/testdata/p4_16_samples_outputs/ubpf_hash_extern.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "ubpf" +} diff --git a/testdata/p4_16_samples_outputs/union-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/union-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/union-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/union-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/union-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/union-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/union-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/union-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/union-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/union-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/union-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/union-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txt deleted file mode 100644 index 0745f753259..00000000000 --- a/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txt +++ /dev/null @@ -1,31 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - match_fields { - id: 1 - name: "h.u.$valid$" - bitwidth: 1 - match_type: EXACT - } - action_refs { - id: 21186165 - } - size: 1024 -} -actions { - preamble { - id: 21186165 - name: "ingress.a" - alias: "a" - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..20348e1c0a8 --- /dev/null +++ b/testdata/p4_16_samples_outputs/union-valid-bmv2.p4.p4info.txtpb @@ -0,0 +1,32 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + match_fields { + id: 1 + name: "h.u.$valid$" + bitwidth: 1 + match_type: EXACT + } + action_refs { + id: 21186165 + } + size: 1024 +} +actions { + preamble { + id: 21186165 + name: "ingress.a" + alias: "a" + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/union1-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/union1-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/union1-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/union1-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/union1-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/union1-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/union1-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/union1-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/union1-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/union1-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/union1-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/union1-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/union2-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/union2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/union2-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/union2-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/union2-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/union2-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/union2-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/union2-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/union2-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/union2-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/union2-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/union2-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/union3-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/union3-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/union3-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/union3-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/union3-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/union3-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/union3-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/union3-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/union3-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/union3-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/union3-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/union3-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/union4-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/union4-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/union4-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/union4-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/union4-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/union4-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/union4-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/union4-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/union4-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/union4-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/union4-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/union4-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txt deleted file mode 100644 index 6ba595753f4..00000000000 --- a/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txt +++ /dev/null @@ -1,43 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 34728461 - name: "ingress.t" - alias: "t" - } - action_refs { - id: 32530319 - } - const_default_action_id: 32530319 - direct_resource_ids: 330698586 - size: 1024 -} -actions { - preamble { - id: 32530319 - name: "ingress.my_action" - alias: "my_action" - } - params { - id: 1 - name: "a" - bitwidth: 9 - } -} -direct_counters { - preamble { - id: 330698586 - name: "ingress.c" - alias: "c" - } - spec { - unit: PACKETS - } - direct_table_id: 34728461 -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..5b7beb2db3b --- /dev/null +++ b/testdata/p4_16_samples_outputs/unused-counter-bmv2.p4.p4info.txtpb @@ -0,0 +1,44 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 34728461 + name: "ingress.t" + alias: "t" + } + action_refs { + id: 32530319 + } + const_default_action_id: 32530319 + direct_resource_ids: 330698586 + size: 1024 +} +actions { + preamble { + id: 32530319 + name: "ingress.my_action" + alias: "my_action" + } + params { + id: 1 + name: "a" + bitwidth: 9 + } +} +direct_counters { + preamble { + id: 330698586 + name: "ingress.c" + alias: "c" + } + spec { + unit: PACKETS + } + direct_table_id: 34728461 +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/use-priority-as-name.p4.entries.txt b/testdata/p4_16_samples_outputs/use-priority-as-name.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/use-priority-as-name.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/use-priority-as-name.p4.entries.txtpb b/testdata/p4_16_samples_outputs/use-priority-as-name.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/use-priority-as-name.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txt b/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txt deleted file mode 100644 index d4626266fab..00000000000 --- a/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txt +++ /dev/null @@ -1,132 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 44029711 - name: "ingressImpl.ipv4_da_lpm" - alias: "ipv4_da_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 23772637 - } - action_refs { - id: 32254556 - } - size: 1024 -} -tables { - preamble { - id: 43802445 - name: "ingressImpl.mac_da" - alias: "mac_da" - } - match_fields { - id: 1 - name: "meta.fwd_metadata.l2ptr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 17437768 - } - action_refs { - id: 32254556 - } - size: 1024 -} -tables { - preamble { - id: 45287883 - name: "egressImpl.send_frame" - alias: "send_frame" - } - match_fields { - id: 1 - name: "meta.fwd_metadata.out_bd" - bitwidth: 24 - match_type: EXACT - } - action_refs { - id: 22897391 - } - action_refs { - id: 27859478 - } - size: 1024 -} -actions { - preamble { - id: 32254556 - name: "ingressImpl.my_drop" - alias: "ingressImpl.my_drop" - } -} -actions { - preamble { - id: 23772637 - name: "ingressImpl.set_l2ptr_and_prio" - alias: "set_l2ptr_and_prio" - } - params { - id: 1 - name: "l2ptr" - bitwidth: 32 - } - params { - id: 2 - name: "priority" - bitwidth: 8 - } -} -actions { - preamble { - id: 17437768 - name: "ingressImpl.set_bd_dmac_intf" - alias: "set_bd_dmac_intf" - } - params { - id: 1 - name: "bd" - bitwidth: 24 - } - params { - id: 2 - name: "dmac" - bitwidth: 48 - } - params { - id: 3 - name: "intf" - bitwidth: 9 - } -} -actions { - preamble { - id: 27859478 - name: "egressImpl.my_drop" - alias: "egressImpl.my_drop" - } -} -actions { - preamble { - id: 22897391 - name: "egressImpl.rewrite_mac" - alias: "rewrite_mac" - } - params { - id: 1 - name: "smac" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb new file mode 100644 index 00000000000..1d875662069 --- /dev/null +++ b/testdata/p4_16_samples_outputs/use-priority-as-name.p4.p4info.txtpb @@ -0,0 +1,133 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 44029711 + name: "ingressImpl.ipv4_da_lpm" + alias: "ipv4_da_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 23772637 + } + action_refs { + id: 32254556 + } + size: 1024 +} +tables { + preamble { + id: 43802445 + name: "ingressImpl.mac_da" + alias: "mac_da" + } + match_fields { + id: 1 + name: "meta.fwd_metadata.l2ptr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 17437768 + } + action_refs { + id: 32254556 + } + size: 1024 +} +tables { + preamble { + id: 45287883 + name: "egressImpl.send_frame" + alias: "send_frame" + } + match_fields { + id: 1 + name: "meta.fwd_metadata.out_bd" + bitwidth: 24 + match_type: EXACT + } + action_refs { + id: 22897391 + } + action_refs { + id: 27859478 + } + size: 1024 +} +actions { + preamble { + id: 32254556 + name: "ingressImpl.my_drop" + alias: "ingressImpl.my_drop" + } +} +actions { + preamble { + id: 23772637 + name: "ingressImpl.set_l2ptr_and_prio" + alias: "set_l2ptr_and_prio" + } + params { + id: 1 + name: "l2ptr" + bitwidth: 32 + } + params { + id: 2 + name: "priority" + bitwidth: 8 + } +} +actions { + preamble { + id: 17437768 + name: "ingressImpl.set_bd_dmac_intf" + alias: "set_bd_dmac_intf" + } + params { + id: 1 + name: "bd" + bitwidth: 24 + } + params { + id: 2 + name: "dmac" + bitwidth: 48 + } + params { + id: 3 + name: "intf" + bitwidth: 9 + } +} +actions { + preamble { + id: 27859478 + name: "egressImpl.my_drop" + alias: "egressImpl.my_drop" + } +} +actions { + preamble { + id: 22897391 + name: "egressImpl.rewrite_mac" + alias: "rewrite_mac" + } + params { + id: 1 + name: "smac" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.entries.txt deleted file mode 100644 index 7fac63a36a5..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.entries.txt +++ /dev/null @@ -1,70 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 48301431 - match { - field_id: 1 - lpm { - value: "\n\001\002\003\000\000" - prefix_len: 48 - } - } - action { - action { - action_id: 28447573 - params { - param_id: 1 - value: "\000\000\000\000\000\001" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 48301431 - match { - field_id: 1 - lpm { - value: "\n\000\000\000\000\000" - prefix_len: 8 - } - } - action { - action { - action_id: 28447573 - params { - param_id: 1 - value: "\000\000\000\000\000\002" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 48301431 - action { - action { - action_id: 28447573 - params { - param_id: 1 - value: "\000\000\000\000\000\003" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..d104349e050 --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.entries.txtpb @@ -0,0 +1,71 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 48301431 + match { + field_id: 1 + lpm { + value: "\n\001\002\003\000\000" + prefix_len: 48 + } + } + action { + action { + action_id: 28447573 + params { + param_id: 1 + value: "\000\000\000\000\000\001" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 48301431 + match { + field_id: 1 + lpm { + value: "\n\000\000\000\000\000" + prefix_len: 8 + } + } + action { + action { + action_id: 28447573 + params { + param_id: 1 + value: "\000\000\000\000\000\002" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 48301431 + action { + action { + action_id: 28447573 + params { + param_id: 1 + value: "\000\000\000\000\000\003" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txt deleted file mode 100644 index c73b7c2da8a..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txt +++ /dev/null @@ -1,49 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 48301431 - name: "ingressImpl.lpm1" - alias: "lpm1" - } - match_fields { - id: 1 - name: "hdr.ethernet.dstAddr" - bitwidth: 48 - match_type: LPM - } - action_refs { - id: 30352513 - } - action_refs { - id: 28447573 - } - const_default_action_id: 30352513 - size: 1024 - is_const_table: true - has_initial_entries: true -} -actions { - preamble { - id: 30352513 - name: "ingressImpl.act_miss" - alias: "act_miss" - } -} -actions { - preamble { - id: 28447573 - name: "ingressImpl.act_hit" - alias: "act_hit" - } - params { - id: 1 - name: "x" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..be3e316af74 --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-const-entries-bmv2.p4.p4info.txtpb @@ -0,0 +1,50 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 48301431 + name: "ingressImpl.lpm1" + alias: "lpm1" + } + match_fields { + id: 1 + name: "hdr.ethernet.dstAddr" + bitwidth: 48 + match_type: LPM + } + action_refs { + id: 30352513 + } + action_refs { + id: 28447573 + } + const_default_action_id: 30352513 + size: 1024 + is_const_table: true + has_initial_entries: true +} +actions { + preamble { + id: 30352513 + name: "ingressImpl.act_miss" + alias: "act_miss" + } +} +actions { + preamble { + id: 28447573 + name: "ingressImpl.act_hit" + alias: "act_hit" + } + params { + id: 1 + name: "x" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.entries.txt b/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.entries.txtpb b/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txt b/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txt deleted file mode 100644 index 77a3792f283..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txt +++ /dev/null @@ -1,281 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46460945 - name: "MyIngress.forward" - alias: "forward" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 33025127 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 37375156 - name: "MyIngress.ipv4_lpm" - alias: "ipv4_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 24952588 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 49202009 - name: "MyEgress.send_frame" - alias: "send_frame" - } - match_fields { - id: 1 - name: "standard_metadata.egress_port" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 22398708 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 33025127 - name: "MyIngress.set_dmac" - alias: "set_dmac" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 48 - } -} -actions { - preamble { - id: 25652968 - name: "MyIngress.drop" - alias: "drop" - } -} -actions { - preamble { - id: 24952588 - name: "MyIngress.set_nhop" - alias: "set_nhop" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 32 - } - params { - id: 2 - name: "port" - bitwidth: 9 - } -} -actions { - preamble { - id: 23592486 - name: "MyIngress.send_digest" - alias: "send_digest" - } -} -actions { - preamble { - id: 22398708 - name: "MyEgress.rewrite_mac" - alias: "rewrite_mac" - } - params { - id: 1 - name: "srcAddr" - bitwidth: 48 - } -} -digests { - preamble { - id: 387015589 - name: "test_digest_t" - alias: "test_digest_t" - } - type_spec { - struct { - name: "test_digest_t" - } - } -} -digests { - preamble { - id: 392468736 - name: "test_digest2_t" - alias: "test_digest2_t" - } - type_spec { - struct { - name: "test_digest2_t" - } - } -} -digests { - preamble { - id: 399106899 - name: "test_digest3_t" - alias: "test_digest3_t" - } - type_spec { - struct { - name: "test_digest3_t" - } - } -} -type_info { - structs { - key: "test_digest2_t" - value { - members { - name: "in_mac_dstAddr" - type_spec { - bitstring { - bit { - bitwidth: 48 - } - } - } - } - members { - name: "my_thing" - type_spec { - serializable_enum { - name: "MySerEnum1" - } - } - } - } - } - structs { - key: "test_digest3_t" - value { - members { - name: "in_mac_etherType" - type_spec { - bitstring { - bit { - bitwidth: 16 - } - } - } - } - } - } - structs { - key: "test_digest_t" - value { - members { - name: "in_mac_srcAddr" - type_spec { - bitstring { - bit { - bitwidth: 48 - } - } - } - } - members { - name: "my_parser_error" - type_spec { - error { - } - } - } - members { - name: "pkt_type" - type_spec { - enum { - name: "MyPacketTypes" - } - } - } - } - } - enums { - key: "MyPacketTypes" - value { - members { - name: "IPv4" - } - members { - name: "Other" - } - } - } - error { - members: "NoError" - members: "PacketTooShort" - members: "NoMatch" - members: "StackOutOfBounds" - members: "HeaderTooShort" - members: "ParserTimeout" - members: "ParserInvalidArgument" - members: "UnreachableState" - } - serializable_enums { - key: "MySerEnum1" - value { - underlying_type { - bitwidth: 8 - } - members { - name: "foo" - value: "\034" - } - members { - name: "bar" - value: "\021" - } - members { - name: "gah" - value: "*" - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb new file mode 100644 index 00000000000..809e574c4c0 --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-digest-containing-ser-enum.p4.p4info.txtpb @@ -0,0 +1,282 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46460945 + name: "MyIngress.forward" + alias: "forward" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 33025127 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 37375156 + name: "MyIngress.ipv4_lpm" + alias: "ipv4_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 24952588 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 49202009 + name: "MyEgress.send_frame" + alias: "send_frame" + } + match_fields { + id: 1 + name: "standard_metadata.egress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 22398708 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 33025127 + name: "MyIngress.set_dmac" + alias: "set_dmac" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 48 + } +} +actions { + preamble { + id: 25652968 + name: "MyIngress.drop" + alias: "drop" + } +} +actions { + preamble { + id: 24952588 + name: "MyIngress.set_nhop" + alias: "set_nhop" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 32 + } + params { + id: 2 + name: "port" + bitwidth: 9 + } +} +actions { + preamble { + id: 23592486 + name: "MyIngress.send_digest" + alias: "send_digest" + } +} +actions { + preamble { + id: 22398708 + name: "MyEgress.rewrite_mac" + alias: "rewrite_mac" + } + params { + id: 1 + name: "srcAddr" + bitwidth: 48 + } +} +digests { + preamble { + id: 387015589 + name: "test_digest_t" + alias: "test_digest_t" + } + type_spec { + struct { + name: "test_digest_t" + } + } +} +digests { + preamble { + id: 392468736 + name: "test_digest2_t" + alias: "test_digest2_t" + } + type_spec { + struct { + name: "test_digest2_t" + } + } +} +digests { + preamble { + id: 399106899 + name: "test_digest3_t" + alias: "test_digest3_t" + } + type_spec { + struct { + name: "test_digest3_t" + } + } +} +type_info { + structs { + key: "test_digest2_t" + value { + members { + name: "in_mac_dstAddr" + type_spec { + bitstring { + bit { + bitwidth: 48 + } + } + } + } + members { + name: "my_thing" + type_spec { + serializable_enum { + name: "MySerEnum1" + } + } + } + } + } + structs { + key: "test_digest3_t" + value { + members { + name: "in_mac_etherType" + type_spec { + bitstring { + bit { + bitwidth: 16 + } + } + } + } + } + } + structs { + key: "test_digest_t" + value { + members { + name: "in_mac_srcAddr" + type_spec { + bitstring { + bit { + bitwidth: 48 + } + } + } + } + members { + name: "my_parser_error" + type_spec { + error { + } + } + } + members { + name: "pkt_type" + type_spec { + enum { + name: "MyPacketTypes" + } + } + } + } + } + enums { + key: "MyPacketTypes" + value { + members { + name: "IPv4" + } + members { + name: "Other" + } + } + } + error { + members: "NoError" + members: "PacketTooShort" + members: "NoMatch" + members: "StackOutOfBounds" + members: "HeaderTooShort" + members: "ParserTimeout" + members: "ParserInvalidArgument" + members: "UnreachableState" + } + serializable_enums { + key: "MySerEnum1" + value { + underlying_type { + bitwidth: 8 + } + members { + name: "foo" + value: "\034" + } + members { + name: "bar" + value: "\021" + } + members { + name: "gah" + value: "*" + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.entries.txt b/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.entries.txtpb b/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txt b/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txt deleted file mode 100644 index e5ea6ca664e..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txt +++ /dev/null @@ -1,249 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 46460945 - name: "MyIngress.forward" - alias: "forward" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: EXACT - type_name { - name: "IPv4Addr_t" - } - } - action_refs { - id: 33025127 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 37375156 - name: "MyIngress.ipv4_lpm" - alias: "ipv4_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - type_name { - name: "IPv4Addr_t" - } - } - action_refs { - id: 24952588 - } - action_refs { - id: 25652968 - } - action_refs { - id: 21257015 - } - size: 1024 -} -tables { - preamble { - id: 49202009 - name: "MyEgress.send_frame" - alias: "send_frame" - } - match_fields { - id: 1 - name: "standard_metadata.egress_port" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 22398708 - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 33025127 - name: "MyIngress.set_dmac" - alias: "set_dmac" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 32 - type_name { - name: "EthernetAddr_t" - } - } -} -actions { - preamble { - id: 25652968 - name: "MyIngress.drop" - alias: "drop" - } -} -actions { - preamble { - id: 24952588 - name: "MyIngress.set_nhop" - alias: "set_nhop" - } - params { - id: 1 - name: "dstAddr" - bitwidth: 32 - type_name { - name: "IPv4Addr_t" - } - } - params { - id: 2 - name: "port" - bitwidth: 9 - } -} -actions { - preamble { - id: 23592486 - name: "MyIngress.send_digest" - alias: "send_digest" - } -} -actions { - preamble { - id: 22398708 - name: "MyEgress.rewrite_mac" - alias: "rewrite_mac" - } - params { - id: 1 - name: "srcAddr" - bitwidth: 32 - type_name { - name: "EthernetAddr_t" - } - } -} -digests { - preamble { - id: 387015589 - name: "test_digest_t" - alias: "test_digest_t" - } - type_spec { - struct { - name: "test_digest_t" - } - } -} -type_info { - structs { - key: "test_digest_t" - value { - members { - name: "in_mac_srcAddr" - type_spec { - new_type { - name: "EthernetAddr_t" - } - } - } - members { - name: "my_parser_error" - type_spec { - error { - } - } - } - members { - name: "pkt_type" - type_spec { - enum { - name: "MyPacketTypes" - } - } - } - members { - name: "bar" - type_spec { - new_type { - name: "bar_t" - } - } - } - } - } - enums { - key: "MyPacketTypes" - value { - members { - name: "IPv4" - } - members { - name: "Other" - } - } - } - error { - members: "NoError" - members: "PacketTooShort" - members: "NoMatch" - members: "StackOutOfBounds" - members: "HeaderTooShort" - members: "ParserTimeout" - members: "ParserInvalidArgument" - } - new_types { - key: "EthernetAddr_t" - value { - translated_type { - uri: "com.fingerhutpress/andysp4arch/v1/EthernetAddr_t" - sdn_bitwidth: 32 - } - } - } - new_types { - key: "IPv4Addr_t" - value { - translated_type { - uri: "com.fingerhutpress/andysp4arch/v1/IPv4Addr_t" - sdn_bitwidth: 32 - } - } - } - new_types { - key: "bar_t" - value { - original_type { - bitstring { - bit { - bitwidth: 32 - } - } - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb new file mode 100644 index 00000000000..f10ad8453e2 --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-digest-custom-type.p4.p4info.txtpb @@ -0,0 +1,250 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 46460945 + name: "MyIngress.forward" + alias: "forward" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: EXACT + type_name { + name: "IPv4Addr_t" + } + } + action_refs { + id: 33025127 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 37375156 + name: "MyIngress.ipv4_lpm" + alias: "ipv4_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + type_name { + name: "IPv4Addr_t" + } + } + action_refs { + id: 24952588 + } + action_refs { + id: 25652968 + } + action_refs { + id: 21257015 + } + size: 1024 +} +tables { + preamble { + id: 49202009 + name: "MyEgress.send_frame" + alias: "send_frame" + } + match_fields { + id: 1 + name: "standard_metadata.egress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 22398708 + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 33025127 + name: "MyIngress.set_dmac" + alias: "set_dmac" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 32 + type_name { + name: "EthernetAddr_t" + } + } +} +actions { + preamble { + id: 25652968 + name: "MyIngress.drop" + alias: "drop" + } +} +actions { + preamble { + id: 24952588 + name: "MyIngress.set_nhop" + alias: "set_nhop" + } + params { + id: 1 + name: "dstAddr" + bitwidth: 32 + type_name { + name: "IPv4Addr_t" + } + } + params { + id: 2 + name: "port" + bitwidth: 9 + } +} +actions { + preamble { + id: 23592486 + name: "MyIngress.send_digest" + alias: "send_digest" + } +} +actions { + preamble { + id: 22398708 + name: "MyEgress.rewrite_mac" + alias: "rewrite_mac" + } + params { + id: 1 + name: "srcAddr" + bitwidth: 32 + type_name { + name: "EthernetAddr_t" + } + } +} +digests { + preamble { + id: 387015589 + name: "test_digest_t" + alias: "test_digest_t" + } + type_spec { + struct { + name: "test_digest_t" + } + } +} +type_info { + structs { + key: "test_digest_t" + value { + members { + name: "in_mac_srcAddr" + type_spec { + new_type { + name: "EthernetAddr_t" + } + } + } + members { + name: "my_parser_error" + type_spec { + error { + } + } + } + members { + name: "pkt_type" + type_spec { + enum { + name: "MyPacketTypes" + } + } + } + members { + name: "bar" + type_spec { + new_type { + name: "bar_t" + } + } + } + } + } + enums { + key: "MyPacketTypes" + value { + members { + name: "IPv4" + } + members { + name: "Other" + } + } + } + error { + members: "NoError" + members: "PacketTooShort" + members: "NoMatch" + members: "StackOutOfBounds" + members: "HeaderTooShort" + members: "ParserTimeout" + members: "ParserInvalidArgument" + } + new_types { + key: "EthernetAddr_t" + value { + translated_type { + uri: "com.fingerhutpress/andysp4arch/v1/EthernetAddr_t" + sdn_bitwidth: 32 + } + } + } + new_types { + key: "IPv4Addr_t" + value { + translated_type { + uri: "com.fingerhutpress/andysp4arch/v1/IPv4Addr_t" + sdn_bitwidth: 32 + } + } + } + new_types { + key: "bar_t" + value { + original_type { + bitstring { + bit { + bitwidth: 32 + } + } + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.entries.txt b/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txt b/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txt deleted file mode 100644 index 3abf6185929..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txt +++ /dev/null @@ -1,908 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 42499711 - name: "ingress.custom_table" - alias: "custom_table" - } - match_fields { - id: 1 - name: "hdr.custom.addr0" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.custom.addr1" - bitwidth: 48 - match_type: EXACT - type_name { - name: "Eth1_t" - } - } - match_fields { - id: 3 - name: "hdr.custom.addr2" - bitwidth: 49 - match_type: EXACT - type_name { - name: "Eth2_t" - } - } - match_fields { - id: 4 - name: "hdr.custom.e" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 5 - name: "hdr.custom.e0" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 6 - name: "hdr.custom.e1" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom1_t" - } - } - match_fields { - id: 7 - name: "hdr.custom.e2" - bitwidth: 12 - match_type: EXACT - type_name { - name: "Custom2_t" - } - } - match_fields { - id: 8 - name: "hdr.custom.e00" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 9 - name: "hdr.custom.e01" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom01_t" - } - } - match_fields { - id: 10 - name: "hdr.custom.e02" - bitwidth: 13 - match_type: EXACT - type_name { - name: "Custom02_t" - } - } - match_fields { - id: 11 - name: "hdr.custom.e10" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom1_t" - } - } - match_fields { - id: 12 - name: "hdr.custom.e11" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom11_t" - } - } - match_fields { - id: 13 - name: "hdr.custom.e12" - bitwidth: 14 - match_type: EXACT - type_name { - name: "Custom12_t" - } - } - match_fields { - id: 14 - name: "hdr.custom.e20" - bitwidth: 12 - match_type: EXACT - type_name { - name: "Custom2_t" - } - } - match_fields { - id: 15 - name: "hdr.custom.e21" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom21_t" - } - } - match_fields { - id: 16 - name: "hdr.custom.e22" - bitwidth: 15 - match_type: EXACT - type_name { - name: "Custom22_t" - } - } - match_fields { - id: 17 - name: "hdr.custom.e001" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom001_t" - } - } - match_fields { - id: 18 - name: "hdr.custom.e002" - bitwidth: 16 - match_type: EXACT - type_name { - name: "Custom002_t" - } - } - match_fields { - id: 19 - name: "hdr.custom.e101" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom101_t" - } - } - match_fields { - id: 20 - name: "hdr.custom.e102" - bitwidth: 17 - match_type: EXACT - type_name { - name: "Custom102_t" - } - } - match_fields { - id: 21 - name: "hdr.custom.e201" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom201_t" - } - } - match_fields { - id: 22 - name: "hdr.custom.e202" - bitwidth: 18 - match_type: EXACT - type_name { - name: "Custom202_t" - } - } - match_fields { - id: 23 - name: "hdr.custom.e220" - bitwidth: 15 - match_type: EXACT - type_name { - name: "Custom22_t" - } - } - match_fields { - id: 24 - name: "hdr.custom.e0020010" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom002001_t" - } - } - match_fields { - id: 25 - name: "hdr.custom.e0020020" - bitwidth: 19 - match_type: EXACT - type_name { - name: "Custom002002_t" - } - } - match_fields { - id: 26 - name: "hdr.custom.s0" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 28429210 - } - action_refs { - id: 21844022 - } - action_refs { - id: 21580947 - } - size: 1024 -} -actions { - preamble { - id: 28429210 - name: "ingress.set_output" - alias: "set_output" - } - params { - id: 1 - name: "out_port" - bitwidth: 9 - } -} -actions { - preamble { - id: 21844022 - name: "ingress.set_headers" - alias: "set_headers" - } - params { - id: 1 - name: "addr0" - bitwidth: 48 - } - params { - id: 2 - name: "addr1" - bitwidth: 48 - type_name { - name: "Eth1_t" - } - } - params { - id: 3 - name: "addr2" - bitwidth: 49 - type_name { - name: "Eth2_t" - } - } - params { - id: 4 - name: "e" - bitwidth: 8 - } - params { - id: 5 - name: "e0" - bitwidth: 8 - } - params { - id: 6 - name: "e1" - bitwidth: 8 - type_name { - name: "Custom1_t" - } - } - params { - id: 7 - name: "e2" - bitwidth: 12 - type_name { - name: "Custom2_t" - } - } - params { - id: 8 - name: "e00" - bitwidth: 8 - } - params { - id: 9 - name: "e01" - bitwidth: 8 - type_name { - name: "Custom01_t" - } - } - params { - id: 10 - name: "e02" - bitwidth: 13 - type_name { - name: "Custom02_t" - } - } - params { - id: 11 - name: "e10" - bitwidth: 8 - type_name { - name: "Custom1_t" - } - } - params { - id: 12 - name: "e11" - bitwidth: 8 - type_name { - name: "Custom11_t" - } - } - params { - id: 13 - name: "e12" - bitwidth: 14 - type_name { - name: "Custom12_t" - } - } - params { - id: 14 - name: "e20" - bitwidth: 12 - type_name { - name: "Custom2_t" - } - } - params { - id: 15 - name: "e21" - bitwidth: 8 - type_name { - name: "Custom21_t" - } - } - params { - id: 16 - name: "e22" - bitwidth: 15 - type_name { - name: "Custom22_t" - } - } - params { - id: 17 - name: "e001" - bitwidth: 8 - type_name { - name: "Custom001_t" - } - } - params { - id: 18 - name: "e002" - bitwidth: 16 - type_name { - name: "Custom002_t" - } - } - params { - id: 19 - name: "e101" - bitwidth: 8 - type_name { - name: "Custom101_t" - } - } - params { - id: 20 - name: "e102" - bitwidth: 17 - type_name { - name: "Custom102_t" - } - } - params { - id: 21 - name: "e201" - bitwidth: 8 - type_name { - name: "Custom201_t" - } - } - params { - id: 22 - name: "e202" - bitwidth: 18 - type_name { - name: "Custom202_t" - } - } - params { - id: 23 - name: "e220" - bitwidth: 15 - type_name { - name: "Custom22_t" - } - } - params { - id: 24 - name: "e0020010" - bitwidth: 8 - type_name { - name: "Custom002001_t" - } - } - params { - id: 25 - name: "e0020020" - bitwidth: 19 - type_name { - name: "Custom002002_t" - } - } - params { - id: 26 - name: "s0" - bitwidth: 8 - } -} -actions { - preamble { - id: 21580947 - name: "ingress.my_drop" - alias: "my_drop" - } -} -controller_packet_metadata { - preamble { - id: 81826293 - name: "packet_in" - alias: "packet_in" - annotations: "@controller_header(\"packet_in\")" - } - metadata { - id: 1 - name: "punt_reason" - bitwidth: 8 - } -} -controller_packet_metadata { - preamble { - id: 76689799 - name: "packet_out" - alias: "packet_out" - annotations: "@controller_header(\"packet_out\")" - } - metadata { - id: 1 - name: "addr0" - bitwidth: 48 - } - metadata { - id: 2 - name: "addr1" - bitwidth: 48 - type_name { - name: "Eth1_t" - } - } - metadata { - id: 3 - name: "addr2" - bitwidth: 49 - type_name { - name: "Eth2_t" - } - } - metadata { - id: 4 - name: "e" - bitwidth: 8 - } - metadata { - id: 5 - name: "e0" - bitwidth: 8 - } - metadata { - id: 6 - name: "e1" - bitwidth: 8 - type_name { - name: "Custom1_t" - } - } - metadata { - id: 7 - name: "e2" - bitwidth: 12 - type_name { - name: "Custom2_t" - } - } - metadata { - id: 8 - name: "e00" - bitwidth: 8 - } - metadata { - id: 9 - name: "e01" - bitwidth: 8 - type_name { - name: "Custom01_t" - } - } - metadata { - id: 10 - name: "e02" - bitwidth: 13 - type_name { - name: "Custom02_t" - } - } - metadata { - id: 11 - name: "e10" - bitwidth: 8 - type_name { - name: "Custom1_t" - } - } - metadata { - id: 12 - name: "e11" - bitwidth: 8 - type_name { - name: "Custom11_t" - } - } - metadata { - id: 13 - name: "e12" - bitwidth: 14 - type_name { - name: "Custom12_t" - } - } - metadata { - id: 14 - name: "e20" - bitwidth: 12 - type_name { - name: "Custom2_t" - } - } - metadata { - id: 15 - name: "e21" - bitwidth: 8 - type_name { - name: "Custom21_t" - } - } - metadata { - id: 16 - name: "e22" - bitwidth: 15 - type_name { - name: "Custom22_t" - } - } - metadata { - id: 17 - name: "e001" - bitwidth: 8 - type_name { - name: "Custom001_t" - } - } - metadata { - id: 18 - name: "e002" - bitwidth: 16 - type_name { - name: "Custom002_t" - } - } - metadata { - id: 19 - name: "e101" - bitwidth: 8 - type_name { - name: "Custom101_t" - } - } - metadata { - id: 20 - name: "e102" - bitwidth: 17 - type_name { - name: "Custom102_t" - } - } - metadata { - id: 21 - name: "e201" - bitwidth: 8 - type_name { - name: "Custom201_t" - } - } - metadata { - id: 22 - name: "e202" - bitwidth: 18 - type_name { - name: "Custom202_t" - } - } - metadata { - id: 23 - name: "e220" - bitwidth: 15 - type_name { - name: "Custom22_t" - } - } - metadata { - id: 24 - name: "e0020010" - bitwidth: 8 - type_name { - name: "Custom002001_t" - } - } - metadata { - id: 25 - name: "e0020020" - bitwidth: 19 - type_name { - name: "Custom002002_t" - } - } -} -value_sets { - preamble { - id: 63713645 - name: "ParserImpl.valueset1" - alias: "valueset1" - } - match { - id: 1 - name: "addr0" - bitwidth: 48 - match_type: EXACT - } - match { - id: 2 - name: "e" - bitwidth: 8 - match_type: EXACT - } - match { - id: 3 - name: "e0" - bitwidth: 8 - match_type: EXACT - } - match { - id: 4 - name: "e00" - bitwidth: 8 - match_type: EXACT - } - size: 4 -} -type_info { - serializable_enums { - key: "serenum_t" - value { - underlying_type { - bitwidth: 8 - } - members { - name: "A" - value: "\001" - } - members { - name: "B" - value: "\003" - } - } - } - new_types { - key: "Custom001_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom002001_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom002002_t" - value { - translated_type { - uri: "mycompany.com/My_Byte9" - sdn_bitwidth: 19 - } - } - } - new_types { - key: "Custom002_t" - value { - translated_type { - uri: "mycompany.com/My_Byte6" - sdn_bitwidth: 16 - } - } - } - new_types { - key: "Custom01_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom02_t" - value { - translated_type { - uri: "mycompany.com/My_Byte3" - sdn_bitwidth: 13 - } - } - } - new_types { - key: "Custom101_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom102_t" - value { - translated_type { - uri: "mycompany.com/My_Byte7" - sdn_bitwidth: 17 - } - } - } - new_types { - key: "Custom11_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom12_t" - value { - translated_type { - uri: "mycompany.com/My_Byte4" - sdn_bitwidth: 14 - } - } - } - new_types { - key: "Custom1_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom201_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom202_t" - value { - translated_type { - uri: "mycompany.com/My_Byte8" - sdn_bitwidth: 18 - } - } - } - new_types { - key: "Custom21_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom22_t" - value { - translated_type { - uri: "mycompany.com/My_Byte5" - sdn_bitwidth: 15 - } - } - } - new_types { - key: "Custom2_t" - value { - translated_type { - uri: "mycompany.com/My_Byte2" - sdn_bitwidth: 12 - } - } - } - new_types { - key: "Eth1_t" - value { - original_type { - bitstring { - bit { - bitwidth: 48 - } - } - } - } - } - new_types { - key: "Eth2_t" - value { - translated_type { - uri: "mycompany.com/EthernetAddress" - sdn_bitwidth: 49 - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb new file mode 100644 index 00000000000..a5570779506 --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-p4runtime-enumint-types1.p4.p4info.txtpb @@ -0,0 +1,909 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 42499711 + name: "ingress.custom_table" + alias: "custom_table" + } + match_fields { + id: 1 + name: "hdr.custom.addr0" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.custom.addr1" + bitwidth: 48 + match_type: EXACT + type_name { + name: "Eth1_t" + } + } + match_fields { + id: 3 + name: "hdr.custom.addr2" + bitwidth: 49 + match_type: EXACT + type_name { + name: "Eth2_t" + } + } + match_fields { + id: 4 + name: "hdr.custom.e" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 5 + name: "hdr.custom.e0" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 6 + name: "hdr.custom.e1" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom1_t" + } + } + match_fields { + id: 7 + name: "hdr.custom.e2" + bitwidth: 12 + match_type: EXACT + type_name { + name: "Custom2_t" + } + } + match_fields { + id: 8 + name: "hdr.custom.e00" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 9 + name: "hdr.custom.e01" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom01_t" + } + } + match_fields { + id: 10 + name: "hdr.custom.e02" + bitwidth: 13 + match_type: EXACT + type_name { + name: "Custom02_t" + } + } + match_fields { + id: 11 + name: "hdr.custom.e10" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom1_t" + } + } + match_fields { + id: 12 + name: "hdr.custom.e11" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom11_t" + } + } + match_fields { + id: 13 + name: "hdr.custom.e12" + bitwidth: 14 + match_type: EXACT + type_name { + name: "Custom12_t" + } + } + match_fields { + id: 14 + name: "hdr.custom.e20" + bitwidth: 12 + match_type: EXACT + type_name { + name: "Custom2_t" + } + } + match_fields { + id: 15 + name: "hdr.custom.e21" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom21_t" + } + } + match_fields { + id: 16 + name: "hdr.custom.e22" + bitwidth: 15 + match_type: EXACT + type_name { + name: "Custom22_t" + } + } + match_fields { + id: 17 + name: "hdr.custom.e001" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom001_t" + } + } + match_fields { + id: 18 + name: "hdr.custom.e002" + bitwidth: 16 + match_type: EXACT + type_name { + name: "Custom002_t" + } + } + match_fields { + id: 19 + name: "hdr.custom.e101" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom101_t" + } + } + match_fields { + id: 20 + name: "hdr.custom.e102" + bitwidth: 17 + match_type: EXACT + type_name { + name: "Custom102_t" + } + } + match_fields { + id: 21 + name: "hdr.custom.e201" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom201_t" + } + } + match_fields { + id: 22 + name: "hdr.custom.e202" + bitwidth: 18 + match_type: EXACT + type_name { + name: "Custom202_t" + } + } + match_fields { + id: 23 + name: "hdr.custom.e220" + bitwidth: 15 + match_type: EXACT + type_name { + name: "Custom22_t" + } + } + match_fields { + id: 24 + name: "hdr.custom.e0020010" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom002001_t" + } + } + match_fields { + id: 25 + name: "hdr.custom.e0020020" + bitwidth: 19 + match_type: EXACT + type_name { + name: "Custom002002_t" + } + } + match_fields { + id: 26 + name: "hdr.custom.s0" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 28429210 + } + action_refs { + id: 21844022 + } + action_refs { + id: 21580947 + } + size: 1024 +} +actions { + preamble { + id: 28429210 + name: "ingress.set_output" + alias: "set_output" + } + params { + id: 1 + name: "out_port" + bitwidth: 9 + } +} +actions { + preamble { + id: 21844022 + name: "ingress.set_headers" + alias: "set_headers" + } + params { + id: 1 + name: "addr0" + bitwidth: 48 + } + params { + id: 2 + name: "addr1" + bitwidth: 48 + type_name { + name: "Eth1_t" + } + } + params { + id: 3 + name: "addr2" + bitwidth: 49 + type_name { + name: "Eth2_t" + } + } + params { + id: 4 + name: "e" + bitwidth: 8 + } + params { + id: 5 + name: "e0" + bitwidth: 8 + } + params { + id: 6 + name: "e1" + bitwidth: 8 + type_name { + name: "Custom1_t" + } + } + params { + id: 7 + name: "e2" + bitwidth: 12 + type_name { + name: "Custom2_t" + } + } + params { + id: 8 + name: "e00" + bitwidth: 8 + } + params { + id: 9 + name: "e01" + bitwidth: 8 + type_name { + name: "Custom01_t" + } + } + params { + id: 10 + name: "e02" + bitwidth: 13 + type_name { + name: "Custom02_t" + } + } + params { + id: 11 + name: "e10" + bitwidth: 8 + type_name { + name: "Custom1_t" + } + } + params { + id: 12 + name: "e11" + bitwidth: 8 + type_name { + name: "Custom11_t" + } + } + params { + id: 13 + name: "e12" + bitwidth: 14 + type_name { + name: "Custom12_t" + } + } + params { + id: 14 + name: "e20" + bitwidth: 12 + type_name { + name: "Custom2_t" + } + } + params { + id: 15 + name: "e21" + bitwidth: 8 + type_name { + name: "Custom21_t" + } + } + params { + id: 16 + name: "e22" + bitwidth: 15 + type_name { + name: "Custom22_t" + } + } + params { + id: 17 + name: "e001" + bitwidth: 8 + type_name { + name: "Custom001_t" + } + } + params { + id: 18 + name: "e002" + bitwidth: 16 + type_name { + name: "Custom002_t" + } + } + params { + id: 19 + name: "e101" + bitwidth: 8 + type_name { + name: "Custom101_t" + } + } + params { + id: 20 + name: "e102" + bitwidth: 17 + type_name { + name: "Custom102_t" + } + } + params { + id: 21 + name: "e201" + bitwidth: 8 + type_name { + name: "Custom201_t" + } + } + params { + id: 22 + name: "e202" + bitwidth: 18 + type_name { + name: "Custom202_t" + } + } + params { + id: 23 + name: "e220" + bitwidth: 15 + type_name { + name: "Custom22_t" + } + } + params { + id: 24 + name: "e0020010" + bitwidth: 8 + type_name { + name: "Custom002001_t" + } + } + params { + id: 25 + name: "e0020020" + bitwidth: 19 + type_name { + name: "Custom002002_t" + } + } + params { + id: 26 + name: "s0" + bitwidth: 8 + } +} +actions { + preamble { + id: 21580947 + name: "ingress.my_drop" + alias: "my_drop" + } +} +controller_packet_metadata { + preamble { + id: 81826293 + name: "packet_in" + alias: "packet_in" + annotations: "@controller_header(\"packet_in\")" + } + metadata { + id: 1 + name: "punt_reason" + bitwidth: 8 + } +} +controller_packet_metadata { + preamble { + id: 76689799 + name: "packet_out" + alias: "packet_out" + annotations: "@controller_header(\"packet_out\")" + } + metadata { + id: 1 + name: "addr0" + bitwidth: 48 + } + metadata { + id: 2 + name: "addr1" + bitwidth: 48 + type_name { + name: "Eth1_t" + } + } + metadata { + id: 3 + name: "addr2" + bitwidth: 49 + type_name { + name: "Eth2_t" + } + } + metadata { + id: 4 + name: "e" + bitwidth: 8 + } + metadata { + id: 5 + name: "e0" + bitwidth: 8 + } + metadata { + id: 6 + name: "e1" + bitwidth: 8 + type_name { + name: "Custom1_t" + } + } + metadata { + id: 7 + name: "e2" + bitwidth: 12 + type_name { + name: "Custom2_t" + } + } + metadata { + id: 8 + name: "e00" + bitwidth: 8 + } + metadata { + id: 9 + name: "e01" + bitwidth: 8 + type_name { + name: "Custom01_t" + } + } + metadata { + id: 10 + name: "e02" + bitwidth: 13 + type_name { + name: "Custom02_t" + } + } + metadata { + id: 11 + name: "e10" + bitwidth: 8 + type_name { + name: "Custom1_t" + } + } + metadata { + id: 12 + name: "e11" + bitwidth: 8 + type_name { + name: "Custom11_t" + } + } + metadata { + id: 13 + name: "e12" + bitwidth: 14 + type_name { + name: "Custom12_t" + } + } + metadata { + id: 14 + name: "e20" + bitwidth: 12 + type_name { + name: "Custom2_t" + } + } + metadata { + id: 15 + name: "e21" + bitwidth: 8 + type_name { + name: "Custom21_t" + } + } + metadata { + id: 16 + name: "e22" + bitwidth: 15 + type_name { + name: "Custom22_t" + } + } + metadata { + id: 17 + name: "e001" + bitwidth: 8 + type_name { + name: "Custom001_t" + } + } + metadata { + id: 18 + name: "e002" + bitwidth: 16 + type_name { + name: "Custom002_t" + } + } + metadata { + id: 19 + name: "e101" + bitwidth: 8 + type_name { + name: "Custom101_t" + } + } + metadata { + id: 20 + name: "e102" + bitwidth: 17 + type_name { + name: "Custom102_t" + } + } + metadata { + id: 21 + name: "e201" + bitwidth: 8 + type_name { + name: "Custom201_t" + } + } + metadata { + id: 22 + name: "e202" + bitwidth: 18 + type_name { + name: "Custom202_t" + } + } + metadata { + id: 23 + name: "e220" + bitwidth: 15 + type_name { + name: "Custom22_t" + } + } + metadata { + id: 24 + name: "e0020010" + bitwidth: 8 + type_name { + name: "Custom002001_t" + } + } + metadata { + id: 25 + name: "e0020020" + bitwidth: 19 + type_name { + name: "Custom002002_t" + } + } +} +value_sets { + preamble { + id: 63713645 + name: "ParserImpl.valueset1" + alias: "valueset1" + } + match { + id: 1 + name: "addr0" + bitwidth: 48 + match_type: EXACT + } + match { + id: 2 + name: "e" + bitwidth: 8 + match_type: EXACT + } + match { + id: 3 + name: "e0" + bitwidth: 8 + match_type: EXACT + } + match { + id: 4 + name: "e00" + bitwidth: 8 + match_type: EXACT + } + size: 4 +} +type_info { + serializable_enums { + key: "serenum_t" + value { + underlying_type { + bitwidth: 8 + } + members { + name: "A" + value: "\001" + } + members { + name: "B" + value: "\003" + } + } + } + new_types { + key: "Custom001_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom002001_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom002002_t" + value { + translated_type { + uri: "mycompany.com/My_Byte9" + sdn_bitwidth: 19 + } + } + } + new_types { + key: "Custom002_t" + value { + translated_type { + uri: "mycompany.com/My_Byte6" + sdn_bitwidth: 16 + } + } + } + new_types { + key: "Custom01_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom02_t" + value { + translated_type { + uri: "mycompany.com/My_Byte3" + sdn_bitwidth: 13 + } + } + } + new_types { + key: "Custom101_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom102_t" + value { + translated_type { + uri: "mycompany.com/My_Byte7" + sdn_bitwidth: 17 + } + } + } + new_types { + key: "Custom11_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom12_t" + value { + translated_type { + uri: "mycompany.com/My_Byte4" + sdn_bitwidth: 14 + } + } + } + new_types { + key: "Custom1_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom201_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom202_t" + value { + translated_type { + uri: "mycompany.com/My_Byte8" + sdn_bitwidth: 18 + } + } + } + new_types { + key: "Custom21_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom22_t" + value { + translated_type { + uri: "mycompany.com/My_Byte5" + sdn_bitwidth: 15 + } + } + } + new_types { + key: "Custom2_t" + value { + translated_type { + uri: "mycompany.com/My_Byte2" + sdn_bitwidth: 12 + } + } + } + new_types { + key: "Eth1_t" + value { + original_type { + bitstring { + bit { + bitwidth: 48 + } + } + } + } + } + new_types { + key: "Eth2_t" + value { + translated_type { + uri: "mycompany.com/EthernetAddress" + sdn_bitwidth: 49 + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.entries.txt b/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.entries.txtpb b/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txt b/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txt deleted file mode 100644 index 3abf6185929..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txt +++ /dev/null @@ -1,908 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 42499711 - name: "ingress.custom_table" - alias: "custom_table" - } - match_fields { - id: 1 - name: "hdr.custom.addr0" - bitwidth: 48 - match_type: EXACT - } - match_fields { - id: 2 - name: "hdr.custom.addr1" - bitwidth: 48 - match_type: EXACT - type_name { - name: "Eth1_t" - } - } - match_fields { - id: 3 - name: "hdr.custom.addr2" - bitwidth: 49 - match_type: EXACT - type_name { - name: "Eth2_t" - } - } - match_fields { - id: 4 - name: "hdr.custom.e" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 5 - name: "hdr.custom.e0" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 6 - name: "hdr.custom.e1" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom1_t" - } - } - match_fields { - id: 7 - name: "hdr.custom.e2" - bitwidth: 12 - match_type: EXACT - type_name { - name: "Custom2_t" - } - } - match_fields { - id: 8 - name: "hdr.custom.e00" - bitwidth: 8 - match_type: EXACT - } - match_fields { - id: 9 - name: "hdr.custom.e01" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom01_t" - } - } - match_fields { - id: 10 - name: "hdr.custom.e02" - bitwidth: 13 - match_type: EXACT - type_name { - name: "Custom02_t" - } - } - match_fields { - id: 11 - name: "hdr.custom.e10" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom1_t" - } - } - match_fields { - id: 12 - name: "hdr.custom.e11" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom11_t" - } - } - match_fields { - id: 13 - name: "hdr.custom.e12" - bitwidth: 14 - match_type: EXACT - type_name { - name: "Custom12_t" - } - } - match_fields { - id: 14 - name: "hdr.custom.e20" - bitwidth: 12 - match_type: EXACT - type_name { - name: "Custom2_t" - } - } - match_fields { - id: 15 - name: "hdr.custom.e21" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom21_t" - } - } - match_fields { - id: 16 - name: "hdr.custom.e22" - bitwidth: 15 - match_type: EXACT - type_name { - name: "Custom22_t" - } - } - match_fields { - id: 17 - name: "hdr.custom.e001" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom001_t" - } - } - match_fields { - id: 18 - name: "hdr.custom.e002" - bitwidth: 16 - match_type: EXACT - type_name { - name: "Custom002_t" - } - } - match_fields { - id: 19 - name: "hdr.custom.e101" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom101_t" - } - } - match_fields { - id: 20 - name: "hdr.custom.e102" - bitwidth: 17 - match_type: EXACT - type_name { - name: "Custom102_t" - } - } - match_fields { - id: 21 - name: "hdr.custom.e201" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom201_t" - } - } - match_fields { - id: 22 - name: "hdr.custom.e202" - bitwidth: 18 - match_type: EXACT - type_name { - name: "Custom202_t" - } - } - match_fields { - id: 23 - name: "hdr.custom.e220" - bitwidth: 15 - match_type: EXACT - type_name { - name: "Custom22_t" - } - } - match_fields { - id: 24 - name: "hdr.custom.e0020010" - bitwidth: 8 - match_type: EXACT - type_name { - name: "Custom002001_t" - } - } - match_fields { - id: 25 - name: "hdr.custom.e0020020" - bitwidth: 19 - match_type: EXACT - type_name { - name: "Custom002002_t" - } - } - match_fields { - id: 26 - name: "hdr.custom.s0" - bitwidth: 8 - match_type: EXACT - } - action_refs { - id: 28429210 - } - action_refs { - id: 21844022 - } - action_refs { - id: 21580947 - } - size: 1024 -} -actions { - preamble { - id: 28429210 - name: "ingress.set_output" - alias: "set_output" - } - params { - id: 1 - name: "out_port" - bitwidth: 9 - } -} -actions { - preamble { - id: 21844022 - name: "ingress.set_headers" - alias: "set_headers" - } - params { - id: 1 - name: "addr0" - bitwidth: 48 - } - params { - id: 2 - name: "addr1" - bitwidth: 48 - type_name { - name: "Eth1_t" - } - } - params { - id: 3 - name: "addr2" - bitwidth: 49 - type_name { - name: "Eth2_t" - } - } - params { - id: 4 - name: "e" - bitwidth: 8 - } - params { - id: 5 - name: "e0" - bitwidth: 8 - } - params { - id: 6 - name: "e1" - bitwidth: 8 - type_name { - name: "Custom1_t" - } - } - params { - id: 7 - name: "e2" - bitwidth: 12 - type_name { - name: "Custom2_t" - } - } - params { - id: 8 - name: "e00" - bitwidth: 8 - } - params { - id: 9 - name: "e01" - bitwidth: 8 - type_name { - name: "Custom01_t" - } - } - params { - id: 10 - name: "e02" - bitwidth: 13 - type_name { - name: "Custom02_t" - } - } - params { - id: 11 - name: "e10" - bitwidth: 8 - type_name { - name: "Custom1_t" - } - } - params { - id: 12 - name: "e11" - bitwidth: 8 - type_name { - name: "Custom11_t" - } - } - params { - id: 13 - name: "e12" - bitwidth: 14 - type_name { - name: "Custom12_t" - } - } - params { - id: 14 - name: "e20" - bitwidth: 12 - type_name { - name: "Custom2_t" - } - } - params { - id: 15 - name: "e21" - bitwidth: 8 - type_name { - name: "Custom21_t" - } - } - params { - id: 16 - name: "e22" - bitwidth: 15 - type_name { - name: "Custom22_t" - } - } - params { - id: 17 - name: "e001" - bitwidth: 8 - type_name { - name: "Custom001_t" - } - } - params { - id: 18 - name: "e002" - bitwidth: 16 - type_name { - name: "Custom002_t" - } - } - params { - id: 19 - name: "e101" - bitwidth: 8 - type_name { - name: "Custom101_t" - } - } - params { - id: 20 - name: "e102" - bitwidth: 17 - type_name { - name: "Custom102_t" - } - } - params { - id: 21 - name: "e201" - bitwidth: 8 - type_name { - name: "Custom201_t" - } - } - params { - id: 22 - name: "e202" - bitwidth: 18 - type_name { - name: "Custom202_t" - } - } - params { - id: 23 - name: "e220" - bitwidth: 15 - type_name { - name: "Custom22_t" - } - } - params { - id: 24 - name: "e0020010" - bitwidth: 8 - type_name { - name: "Custom002001_t" - } - } - params { - id: 25 - name: "e0020020" - bitwidth: 19 - type_name { - name: "Custom002002_t" - } - } - params { - id: 26 - name: "s0" - bitwidth: 8 - } -} -actions { - preamble { - id: 21580947 - name: "ingress.my_drop" - alias: "my_drop" - } -} -controller_packet_metadata { - preamble { - id: 81826293 - name: "packet_in" - alias: "packet_in" - annotations: "@controller_header(\"packet_in\")" - } - metadata { - id: 1 - name: "punt_reason" - bitwidth: 8 - } -} -controller_packet_metadata { - preamble { - id: 76689799 - name: "packet_out" - alias: "packet_out" - annotations: "@controller_header(\"packet_out\")" - } - metadata { - id: 1 - name: "addr0" - bitwidth: 48 - } - metadata { - id: 2 - name: "addr1" - bitwidth: 48 - type_name { - name: "Eth1_t" - } - } - metadata { - id: 3 - name: "addr2" - bitwidth: 49 - type_name { - name: "Eth2_t" - } - } - metadata { - id: 4 - name: "e" - bitwidth: 8 - } - metadata { - id: 5 - name: "e0" - bitwidth: 8 - } - metadata { - id: 6 - name: "e1" - bitwidth: 8 - type_name { - name: "Custom1_t" - } - } - metadata { - id: 7 - name: "e2" - bitwidth: 12 - type_name { - name: "Custom2_t" - } - } - metadata { - id: 8 - name: "e00" - bitwidth: 8 - } - metadata { - id: 9 - name: "e01" - bitwidth: 8 - type_name { - name: "Custom01_t" - } - } - metadata { - id: 10 - name: "e02" - bitwidth: 13 - type_name { - name: "Custom02_t" - } - } - metadata { - id: 11 - name: "e10" - bitwidth: 8 - type_name { - name: "Custom1_t" - } - } - metadata { - id: 12 - name: "e11" - bitwidth: 8 - type_name { - name: "Custom11_t" - } - } - metadata { - id: 13 - name: "e12" - bitwidth: 14 - type_name { - name: "Custom12_t" - } - } - metadata { - id: 14 - name: "e20" - bitwidth: 12 - type_name { - name: "Custom2_t" - } - } - metadata { - id: 15 - name: "e21" - bitwidth: 8 - type_name { - name: "Custom21_t" - } - } - metadata { - id: 16 - name: "e22" - bitwidth: 15 - type_name { - name: "Custom22_t" - } - } - metadata { - id: 17 - name: "e001" - bitwidth: 8 - type_name { - name: "Custom001_t" - } - } - metadata { - id: 18 - name: "e002" - bitwidth: 16 - type_name { - name: "Custom002_t" - } - } - metadata { - id: 19 - name: "e101" - bitwidth: 8 - type_name { - name: "Custom101_t" - } - } - metadata { - id: 20 - name: "e102" - bitwidth: 17 - type_name { - name: "Custom102_t" - } - } - metadata { - id: 21 - name: "e201" - bitwidth: 8 - type_name { - name: "Custom201_t" - } - } - metadata { - id: 22 - name: "e202" - bitwidth: 18 - type_name { - name: "Custom202_t" - } - } - metadata { - id: 23 - name: "e220" - bitwidth: 15 - type_name { - name: "Custom22_t" - } - } - metadata { - id: 24 - name: "e0020010" - bitwidth: 8 - type_name { - name: "Custom002001_t" - } - } - metadata { - id: 25 - name: "e0020020" - bitwidth: 19 - type_name { - name: "Custom002002_t" - } - } -} -value_sets { - preamble { - id: 63713645 - name: "ParserImpl.valueset1" - alias: "valueset1" - } - match { - id: 1 - name: "addr0" - bitwidth: 48 - match_type: EXACT - } - match { - id: 2 - name: "e" - bitwidth: 8 - match_type: EXACT - } - match { - id: 3 - name: "e0" - bitwidth: 8 - match_type: EXACT - } - match { - id: 4 - name: "e00" - bitwidth: 8 - match_type: EXACT - } - size: 4 -} -type_info { - serializable_enums { - key: "serenum_t" - value { - underlying_type { - bitwidth: 8 - } - members { - name: "A" - value: "\001" - } - members { - name: "B" - value: "\003" - } - } - } - new_types { - key: "Custom001_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom002001_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom002002_t" - value { - translated_type { - uri: "mycompany.com/My_Byte9" - sdn_bitwidth: 19 - } - } - } - new_types { - key: "Custom002_t" - value { - translated_type { - uri: "mycompany.com/My_Byte6" - sdn_bitwidth: 16 - } - } - } - new_types { - key: "Custom01_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom02_t" - value { - translated_type { - uri: "mycompany.com/My_Byte3" - sdn_bitwidth: 13 - } - } - } - new_types { - key: "Custom101_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom102_t" - value { - translated_type { - uri: "mycompany.com/My_Byte7" - sdn_bitwidth: 17 - } - } - } - new_types { - key: "Custom11_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom12_t" - value { - translated_type { - uri: "mycompany.com/My_Byte4" - sdn_bitwidth: 14 - } - } - } - new_types { - key: "Custom1_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom201_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom202_t" - value { - translated_type { - uri: "mycompany.com/My_Byte8" - sdn_bitwidth: 18 - } - } - } - new_types { - key: "Custom21_t" - value { - original_type { - bitstring { - bit { - bitwidth: 8 - } - } - } - } - } - new_types { - key: "Custom22_t" - value { - translated_type { - uri: "mycompany.com/My_Byte5" - sdn_bitwidth: 15 - } - } - } - new_types { - key: "Custom2_t" - value { - translated_type { - uri: "mycompany.com/My_Byte2" - sdn_bitwidth: 12 - } - } - } - new_types { - key: "Eth1_t" - value { - original_type { - bitstring { - bit { - bitwidth: 48 - } - } - } - } - } - new_types { - key: "Eth2_t" - value { - translated_type { - uri: "mycompany.com/EthernetAddress" - sdn_bitwidth: 49 - } - } - } -} diff --git a/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb new file mode 100644 index 00000000000..a5570779506 --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-p4runtime-most-types1.p4.p4info.txtpb @@ -0,0 +1,909 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 42499711 + name: "ingress.custom_table" + alias: "custom_table" + } + match_fields { + id: 1 + name: "hdr.custom.addr0" + bitwidth: 48 + match_type: EXACT + } + match_fields { + id: 2 + name: "hdr.custom.addr1" + bitwidth: 48 + match_type: EXACT + type_name { + name: "Eth1_t" + } + } + match_fields { + id: 3 + name: "hdr.custom.addr2" + bitwidth: 49 + match_type: EXACT + type_name { + name: "Eth2_t" + } + } + match_fields { + id: 4 + name: "hdr.custom.e" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 5 + name: "hdr.custom.e0" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 6 + name: "hdr.custom.e1" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom1_t" + } + } + match_fields { + id: 7 + name: "hdr.custom.e2" + bitwidth: 12 + match_type: EXACT + type_name { + name: "Custom2_t" + } + } + match_fields { + id: 8 + name: "hdr.custom.e00" + bitwidth: 8 + match_type: EXACT + } + match_fields { + id: 9 + name: "hdr.custom.e01" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom01_t" + } + } + match_fields { + id: 10 + name: "hdr.custom.e02" + bitwidth: 13 + match_type: EXACT + type_name { + name: "Custom02_t" + } + } + match_fields { + id: 11 + name: "hdr.custom.e10" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom1_t" + } + } + match_fields { + id: 12 + name: "hdr.custom.e11" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom11_t" + } + } + match_fields { + id: 13 + name: "hdr.custom.e12" + bitwidth: 14 + match_type: EXACT + type_name { + name: "Custom12_t" + } + } + match_fields { + id: 14 + name: "hdr.custom.e20" + bitwidth: 12 + match_type: EXACT + type_name { + name: "Custom2_t" + } + } + match_fields { + id: 15 + name: "hdr.custom.e21" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom21_t" + } + } + match_fields { + id: 16 + name: "hdr.custom.e22" + bitwidth: 15 + match_type: EXACT + type_name { + name: "Custom22_t" + } + } + match_fields { + id: 17 + name: "hdr.custom.e001" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom001_t" + } + } + match_fields { + id: 18 + name: "hdr.custom.e002" + bitwidth: 16 + match_type: EXACT + type_name { + name: "Custom002_t" + } + } + match_fields { + id: 19 + name: "hdr.custom.e101" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom101_t" + } + } + match_fields { + id: 20 + name: "hdr.custom.e102" + bitwidth: 17 + match_type: EXACT + type_name { + name: "Custom102_t" + } + } + match_fields { + id: 21 + name: "hdr.custom.e201" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom201_t" + } + } + match_fields { + id: 22 + name: "hdr.custom.e202" + bitwidth: 18 + match_type: EXACT + type_name { + name: "Custom202_t" + } + } + match_fields { + id: 23 + name: "hdr.custom.e220" + bitwidth: 15 + match_type: EXACT + type_name { + name: "Custom22_t" + } + } + match_fields { + id: 24 + name: "hdr.custom.e0020010" + bitwidth: 8 + match_type: EXACT + type_name { + name: "Custom002001_t" + } + } + match_fields { + id: 25 + name: "hdr.custom.e0020020" + bitwidth: 19 + match_type: EXACT + type_name { + name: "Custom002002_t" + } + } + match_fields { + id: 26 + name: "hdr.custom.s0" + bitwidth: 8 + match_type: EXACT + } + action_refs { + id: 28429210 + } + action_refs { + id: 21844022 + } + action_refs { + id: 21580947 + } + size: 1024 +} +actions { + preamble { + id: 28429210 + name: "ingress.set_output" + alias: "set_output" + } + params { + id: 1 + name: "out_port" + bitwidth: 9 + } +} +actions { + preamble { + id: 21844022 + name: "ingress.set_headers" + alias: "set_headers" + } + params { + id: 1 + name: "addr0" + bitwidth: 48 + } + params { + id: 2 + name: "addr1" + bitwidth: 48 + type_name { + name: "Eth1_t" + } + } + params { + id: 3 + name: "addr2" + bitwidth: 49 + type_name { + name: "Eth2_t" + } + } + params { + id: 4 + name: "e" + bitwidth: 8 + } + params { + id: 5 + name: "e0" + bitwidth: 8 + } + params { + id: 6 + name: "e1" + bitwidth: 8 + type_name { + name: "Custom1_t" + } + } + params { + id: 7 + name: "e2" + bitwidth: 12 + type_name { + name: "Custom2_t" + } + } + params { + id: 8 + name: "e00" + bitwidth: 8 + } + params { + id: 9 + name: "e01" + bitwidth: 8 + type_name { + name: "Custom01_t" + } + } + params { + id: 10 + name: "e02" + bitwidth: 13 + type_name { + name: "Custom02_t" + } + } + params { + id: 11 + name: "e10" + bitwidth: 8 + type_name { + name: "Custom1_t" + } + } + params { + id: 12 + name: "e11" + bitwidth: 8 + type_name { + name: "Custom11_t" + } + } + params { + id: 13 + name: "e12" + bitwidth: 14 + type_name { + name: "Custom12_t" + } + } + params { + id: 14 + name: "e20" + bitwidth: 12 + type_name { + name: "Custom2_t" + } + } + params { + id: 15 + name: "e21" + bitwidth: 8 + type_name { + name: "Custom21_t" + } + } + params { + id: 16 + name: "e22" + bitwidth: 15 + type_name { + name: "Custom22_t" + } + } + params { + id: 17 + name: "e001" + bitwidth: 8 + type_name { + name: "Custom001_t" + } + } + params { + id: 18 + name: "e002" + bitwidth: 16 + type_name { + name: "Custom002_t" + } + } + params { + id: 19 + name: "e101" + bitwidth: 8 + type_name { + name: "Custom101_t" + } + } + params { + id: 20 + name: "e102" + bitwidth: 17 + type_name { + name: "Custom102_t" + } + } + params { + id: 21 + name: "e201" + bitwidth: 8 + type_name { + name: "Custom201_t" + } + } + params { + id: 22 + name: "e202" + bitwidth: 18 + type_name { + name: "Custom202_t" + } + } + params { + id: 23 + name: "e220" + bitwidth: 15 + type_name { + name: "Custom22_t" + } + } + params { + id: 24 + name: "e0020010" + bitwidth: 8 + type_name { + name: "Custom002001_t" + } + } + params { + id: 25 + name: "e0020020" + bitwidth: 19 + type_name { + name: "Custom002002_t" + } + } + params { + id: 26 + name: "s0" + bitwidth: 8 + } +} +actions { + preamble { + id: 21580947 + name: "ingress.my_drop" + alias: "my_drop" + } +} +controller_packet_metadata { + preamble { + id: 81826293 + name: "packet_in" + alias: "packet_in" + annotations: "@controller_header(\"packet_in\")" + } + metadata { + id: 1 + name: "punt_reason" + bitwidth: 8 + } +} +controller_packet_metadata { + preamble { + id: 76689799 + name: "packet_out" + alias: "packet_out" + annotations: "@controller_header(\"packet_out\")" + } + metadata { + id: 1 + name: "addr0" + bitwidth: 48 + } + metadata { + id: 2 + name: "addr1" + bitwidth: 48 + type_name { + name: "Eth1_t" + } + } + metadata { + id: 3 + name: "addr2" + bitwidth: 49 + type_name { + name: "Eth2_t" + } + } + metadata { + id: 4 + name: "e" + bitwidth: 8 + } + metadata { + id: 5 + name: "e0" + bitwidth: 8 + } + metadata { + id: 6 + name: "e1" + bitwidth: 8 + type_name { + name: "Custom1_t" + } + } + metadata { + id: 7 + name: "e2" + bitwidth: 12 + type_name { + name: "Custom2_t" + } + } + metadata { + id: 8 + name: "e00" + bitwidth: 8 + } + metadata { + id: 9 + name: "e01" + bitwidth: 8 + type_name { + name: "Custom01_t" + } + } + metadata { + id: 10 + name: "e02" + bitwidth: 13 + type_name { + name: "Custom02_t" + } + } + metadata { + id: 11 + name: "e10" + bitwidth: 8 + type_name { + name: "Custom1_t" + } + } + metadata { + id: 12 + name: "e11" + bitwidth: 8 + type_name { + name: "Custom11_t" + } + } + metadata { + id: 13 + name: "e12" + bitwidth: 14 + type_name { + name: "Custom12_t" + } + } + metadata { + id: 14 + name: "e20" + bitwidth: 12 + type_name { + name: "Custom2_t" + } + } + metadata { + id: 15 + name: "e21" + bitwidth: 8 + type_name { + name: "Custom21_t" + } + } + metadata { + id: 16 + name: "e22" + bitwidth: 15 + type_name { + name: "Custom22_t" + } + } + metadata { + id: 17 + name: "e001" + bitwidth: 8 + type_name { + name: "Custom001_t" + } + } + metadata { + id: 18 + name: "e002" + bitwidth: 16 + type_name { + name: "Custom002_t" + } + } + metadata { + id: 19 + name: "e101" + bitwidth: 8 + type_name { + name: "Custom101_t" + } + } + metadata { + id: 20 + name: "e102" + bitwidth: 17 + type_name { + name: "Custom102_t" + } + } + metadata { + id: 21 + name: "e201" + bitwidth: 8 + type_name { + name: "Custom201_t" + } + } + metadata { + id: 22 + name: "e202" + bitwidth: 18 + type_name { + name: "Custom202_t" + } + } + metadata { + id: 23 + name: "e220" + bitwidth: 15 + type_name { + name: "Custom22_t" + } + } + metadata { + id: 24 + name: "e0020010" + bitwidth: 8 + type_name { + name: "Custom002001_t" + } + } + metadata { + id: 25 + name: "e0020020" + bitwidth: 19 + type_name { + name: "Custom002002_t" + } + } +} +value_sets { + preamble { + id: 63713645 + name: "ParserImpl.valueset1" + alias: "valueset1" + } + match { + id: 1 + name: "addr0" + bitwidth: 48 + match_type: EXACT + } + match { + id: 2 + name: "e" + bitwidth: 8 + match_type: EXACT + } + match { + id: 3 + name: "e0" + bitwidth: 8 + match_type: EXACT + } + match { + id: 4 + name: "e00" + bitwidth: 8 + match_type: EXACT + } + size: 4 +} +type_info { + serializable_enums { + key: "serenum_t" + value { + underlying_type { + bitwidth: 8 + } + members { + name: "A" + value: "\001" + } + members { + name: "B" + value: "\003" + } + } + } + new_types { + key: "Custom001_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom002001_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom002002_t" + value { + translated_type { + uri: "mycompany.com/My_Byte9" + sdn_bitwidth: 19 + } + } + } + new_types { + key: "Custom002_t" + value { + translated_type { + uri: "mycompany.com/My_Byte6" + sdn_bitwidth: 16 + } + } + } + new_types { + key: "Custom01_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom02_t" + value { + translated_type { + uri: "mycompany.com/My_Byte3" + sdn_bitwidth: 13 + } + } + } + new_types { + key: "Custom101_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom102_t" + value { + translated_type { + uri: "mycompany.com/My_Byte7" + sdn_bitwidth: 17 + } + } + } + new_types { + key: "Custom11_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom12_t" + value { + translated_type { + uri: "mycompany.com/My_Byte4" + sdn_bitwidth: 14 + } + } + } + new_types { + key: "Custom1_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom201_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom202_t" + value { + translated_type { + uri: "mycompany.com/My_Byte8" + sdn_bitwidth: 18 + } + } + } + new_types { + key: "Custom21_t" + value { + original_type { + bitstring { + bit { + bitwidth: 8 + } + } + } + } + } + new_types { + key: "Custom22_t" + value { + translated_type { + uri: "mycompany.com/My_Byte5" + sdn_bitwidth: 15 + } + } + } + new_types { + key: "Custom2_t" + value { + translated_type { + uri: "mycompany.com/My_Byte2" + sdn_bitwidth: 12 + } + } + } + new_types { + key: "Eth1_t" + value { + original_type { + bitstring { + bit { + bitwidth: 48 + } + } + } + } + } + new_types { + key: "Eth2_t" + value { + translated_type { + uri: "mycompany.com/EthernetAddress" + sdn_bitwidth: 49 + } + } + } +} diff --git a/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txt deleted file mode 100644 index 7730bea3ab4..00000000000 --- a/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txt +++ /dev/null @@ -1,243 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 35996228 - name: "ingress.ipv4_da_lpm" - alias: "ipv4_da_lpm" - } - match_fields { - id: 1 - name: "hdr.ipv4.dstAddr" - bitwidth: 32 - match_type: LPM - } - action_refs { - id: 26563711 - } - action_refs { - id: 21164525 - } - action_refs { - id: 20843950 - } - action_refs { - id: 30804111 - } - action_refs { - id: 32609675 - } - size: 1024 -} -tables { - preamble { - id: 43424410 - name: "ingress.mac_da" - alias: "mac_da" - } - match_fields { - id: 1 - name: "meta.fwd.l2ptr" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 28039253 - } - action_refs { - id: 32609675 - } - size: 1024 -} -tables { - preamble { - id: 34324521 - name: "egress.get_multicast_copy_out_bd" - alias: "get_multicast_copy_out_bd" - } - match_fields { - id: 1 - name: "standard_metadata.mcast_grp" - bitwidth: 16 - match_type: EXACT - } - match_fields { - id: 2 - name: "standard_metadata.egress_rid" - bitwidth: 16 - match_type: EXACT - } - action_refs { - id: 22004009 - } - action_refs { - id: 21257015 - annotations: "@defaultonly" - scope: DEFAULT_ONLY - } - size: 1024 -} -tables { - preamble { - id: 49367184 - name: "egress.send_frame" - alias: "send_frame" - } - match_fields { - id: 1 - name: "meta.fwd.out_bd" - bitwidth: 24 - match_type: EXACT - } - action_refs { - id: 23531945 - } - action_refs { - id: 22048663 - } - action_refs { - id: 31081147 - } - action_refs { - id: 32609675 - } - size: 1024 -} -actions { - preamble { - id: 32609675 - name: "my_drop" - alias: "my_drop" - } -} -actions { - preamble { - id: 26563711 - name: "ingress.set_l2ptr" - alias: "set_l2ptr" - } - params { - id: 1 - name: "l2ptr" - bitwidth: 32 - } -} -actions { - preamble { - id: 21164525 - name: "ingress.set_mcast_grp" - alias: "set_mcast_grp" - } - params { - id: 1 - name: "mcast_grp" - bitwidth: 16 - } -} -actions { - preamble { - id: 20843950 - name: "ingress.do_resubmit" - alias: "do_resubmit" - } - params { - id: 1 - name: "new_ipv4_dstAddr" - bitwidth: 32 - } -} -actions { - preamble { - id: 30804111 - name: "ingress.do_clone_i2e" - alias: "do_clone_i2e" - } - params { - id: 1 - name: "l2ptr" - bitwidth: 32 - } -} -actions { - preamble { - id: 28039253 - name: "ingress.set_bd_dmac_intf" - alias: "set_bd_dmac_intf" - } - params { - id: 1 - name: "bd" - bitwidth: 24 - } - params { - id: 2 - name: "dmac" - bitwidth: 48 - } - params { - id: 3 - name: "intf" - bitwidth: 9 - } -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 22004009 - name: "egress.set_out_bd" - alias: "set_out_bd" - } - params { - id: 1 - name: "bd" - bitwidth: 24 - } -} -actions { - preamble { - id: 23531945 - name: "egress.rewrite_mac" - alias: "rewrite_mac" - } - params { - id: 1 - name: "smac" - bitwidth: 48 - } -} -actions { - preamble { - id: 22048663 - name: "egress.do_recirculate" - alias: "do_recirculate" - } - params { - id: 1 - name: "new_ipv4_dstAddr" - bitwidth: 32 - } -} -actions { - preamble { - id: 31081147 - name: "egress.do_clone_e2e" - alias: "do_clone_e2e" - } - params { - id: 1 - name: "smac" - bitwidth: 48 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..23eac0411d1 --- /dev/null +++ b/testdata/p4_16_samples_outputs/v1model-special-ops-bmv2.p4.p4info.txtpb @@ -0,0 +1,244 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 35996228 + name: "ingress.ipv4_da_lpm" + alias: "ipv4_da_lpm" + } + match_fields { + id: 1 + name: "hdr.ipv4.dstAddr" + bitwidth: 32 + match_type: LPM + } + action_refs { + id: 26563711 + } + action_refs { + id: 21164525 + } + action_refs { + id: 20843950 + } + action_refs { + id: 30804111 + } + action_refs { + id: 32609675 + } + size: 1024 +} +tables { + preamble { + id: 43424410 + name: "ingress.mac_da" + alias: "mac_da" + } + match_fields { + id: 1 + name: "meta.fwd.l2ptr" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 28039253 + } + action_refs { + id: 32609675 + } + size: 1024 +} +tables { + preamble { + id: 34324521 + name: "egress.get_multicast_copy_out_bd" + alias: "get_multicast_copy_out_bd" + } + match_fields { + id: 1 + name: "standard_metadata.mcast_grp" + bitwidth: 16 + match_type: EXACT + } + match_fields { + id: 2 + name: "standard_metadata.egress_rid" + bitwidth: 16 + match_type: EXACT + } + action_refs { + id: 22004009 + } + action_refs { + id: 21257015 + annotations: "@defaultonly" + scope: DEFAULT_ONLY + } + size: 1024 +} +tables { + preamble { + id: 49367184 + name: "egress.send_frame" + alias: "send_frame" + } + match_fields { + id: 1 + name: "meta.fwd.out_bd" + bitwidth: 24 + match_type: EXACT + } + action_refs { + id: 23531945 + } + action_refs { + id: 22048663 + } + action_refs { + id: 31081147 + } + action_refs { + id: 32609675 + } + size: 1024 +} +actions { + preamble { + id: 32609675 + name: "my_drop" + alias: "my_drop" + } +} +actions { + preamble { + id: 26563711 + name: "ingress.set_l2ptr" + alias: "set_l2ptr" + } + params { + id: 1 + name: "l2ptr" + bitwidth: 32 + } +} +actions { + preamble { + id: 21164525 + name: "ingress.set_mcast_grp" + alias: "set_mcast_grp" + } + params { + id: 1 + name: "mcast_grp" + bitwidth: 16 + } +} +actions { + preamble { + id: 20843950 + name: "ingress.do_resubmit" + alias: "do_resubmit" + } + params { + id: 1 + name: "new_ipv4_dstAddr" + bitwidth: 32 + } +} +actions { + preamble { + id: 30804111 + name: "ingress.do_clone_i2e" + alias: "do_clone_i2e" + } + params { + id: 1 + name: "l2ptr" + bitwidth: 32 + } +} +actions { + preamble { + id: 28039253 + name: "ingress.set_bd_dmac_intf" + alias: "set_bd_dmac_intf" + } + params { + id: 1 + name: "bd" + bitwidth: 24 + } + params { + id: 2 + name: "dmac" + bitwidth: 48 + } + params { + id: 3 + name: "intf" + bitwidth: 9 + } +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 22004009 + name: "egress.set_out_bd" + alias: "set_out_bd" + } + params { + id: 1 + name: "bd" + bitwidth: 24 + } +} +actions { + preamble { + id: 23531945 + name: "egress.rewrite_mac" + alias: "rewrite_mac" + } + params { + id: 1 + name: "smac" + bitwidth: 48 + } +} +actions { + preamble { + id: 22048663 + name: "egress.do_recirculate" + alias: "do_recirculate" + } + params { + id: 1 + name: "new_ipv4_dstAddr" + bitwidth: 32 + } +} +actions { + preamble { + id: 31081147 + name: "egress.do_clone_e2e" + alias: "do_clone_e2e" + } + params { + id: 1 + name: "smac" + bitwidth: 48 + } +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/verify-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/verify-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/verify-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/verify-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/verify-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/verify-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/verify-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/verify-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/verify-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/verify-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/verify-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/verify-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/verify_disjunction.p4.entries.txt b/testdata/p4_16_samples_outputs/verify_disjunction.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/verify_disjunction.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/verify_disjunction.p4.entries.txtpb b/testdata/p4_16_samples_outputs/verify_disjunction.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/verify_disjunction.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/verify_disjunction.p4.p4info.txt b/testdata/p4_16_samples_outputs/verify_disjunction.p4.p4info.txt deleted file mode 100644 index f714f0d2f4f..00000000000 --- a/testdata/p4_16_samples_outputs/verify_disjunction.p4.p4info.txt +++ /dev/null @@ -1,7 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/verify_disjunction.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/verify_disjunction.p4.p4info.txtpb new file mode 100644 index 00000000000..31954416023 --- /dev/null +++ b/testdata/p4_16_samples_outputs/verify_disjunction.p4.p4info.txtpb @@ -0,0 +1,8 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +type_info { +} diff --git a/testdata/p4_16_samples_outputs/wrong-warning.p4.entries.txt b/testdata/p4_16_samples_outputs/wrong-warning.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/wrong-warning.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/wrong-warning.p4.entries.txtpb b/testdata/p4_16_samples_outputs/wrong-warning.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/wrong-warning.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/wrong-warning.p4.p4info.txt b/testdata/p4_16_samples_outputs/wrong-warning.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/wrong-warning.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/wrong-warning.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/wrong-warning.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/wrong-warning.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/x-bmv2.p4.entries.txt b/testdata/p4_16_samples_outputs/x-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/x-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/x-bmv2.p4.entries.txtpb b/testdata/p4_16_samples_outputs/x-bmv2.p4.entries.txtpb new file mode 100644 index 00000000000..5cb9652623a --- /dev/null +++ b/testdata/p4_16_samples_outputs/x-bmv2.p4.entries.txtpb @@ -0,0 +1,3 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + diff --git a/testdata/p4_16_samples_outputs/x-bmv2.p4.p4info.txt b/testdata/p4_16_samples_outputs/x-bmv2.p4.p4info.txt deleted file mode 100644 index 178bd375cce..00000000000 --- a/testdata/p4_16_samples_outputs/x-bmv2.p4.p4info.txt +++ /dev/null @@ -1,5 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} diff --git a/testdata/p4_16_samples_outputs/x-bmv2.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/x-bmv2.p4.p4info.txtpb new file mode 100644 index 00000000000..fdf16790b91 --- /dev/null +++ b/testdata/p4_16_samples_outputs/x-bmv2.p4.p4info.txtpb @@ -0,0 +1,6 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} diff --git a/testdata/p4_16_samples_outputs/xor_test.p4.entries.txt b/testdata/p4_16_samples_outputs/xor_test.p4.entries.txt deleted file mode 100644 index 3e4091eb62c..00000000000 --- a/testdata/p4_16_samples_outputs/xor_test.p4.entries.txt +++ /dev/null @@ -1,50 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest -updates { - type: INSERT - entity { - table_entry { - table_id: 37375156 - match { - field_id: 1 - exact { - value: "\000\001" - } - } - action { - action { - action_id: 26257079 - params { - param_id: 1 - value: "\000\002" - } - } - } - is_const: true - } - } -} -updates { - type: INSERT - entity { - table_entry { - table_id: 37375156 - match { - field_id: 1 - exact { - value: "\000\002" - } - } - action { - action { - action_id: 26257079 - params { - param_id: 1 - value: "\000\001" - } - } - } - is_const: true - } - } -} diff --git a/testdata/p4_16_samples_outputs/xor_test.p4.entries.txtpb b/testdata/p4_16_samples_outputs/xor_test.p4.entries.txtpb new file mode 100644 index 00000000000..f0526b693ff --- /dev/null +++ b/testdata/p4_16_samples_outputs/xor_test.p4.entries.txtpb @@ -0,0 +1,51 @@ +# proto-file: p4/v1/p4runtime.proto +# proto-message: p4.v1.WriteRequest + +updates { + type: INSERT + entity { + table_entry { + table_id: 37375156 + match { + field_id: 1 + exact { + value: "\000\001" + } + } + action { + action { + action_id: 26257079 + params { + param_id: 1 + value: "\000\002" + } + } + } + is_const: true + } + } +} +updates { + type: INSERT + entity { + table_entry { + table_id: 37375156 + match { + field_id: 1 + exact { + value: "\000\002" + } + } + action { + action { + action_id: 26257079 + params { + param_id: 1 + value: "\000\001" + } + } + } + is_const: true + } + } +} diff --git a/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txt b/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txt deleted file mode 100644 index 3f301fa4530..00000000000 --- a/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txt +++ /dev/null @@ -1,108 +0,0 @@ -# proto-file: p4/config/v1/p4info.proto -# proto-message: p4.config.v1.P4Info -pkg_info { - arch: "v1model" -} -tables { - preamble { - id: 37375156 - name: "MyIngress.ipv4_lpm" - alias: "ipv4_lpm" - } - match_fields { - id: 1 - name: "standard_metadata.ingress_port" - bitwidth: 9 - match_type: EXACT - } - action_refs { - id: 26257079 - } - action_refs { - id: 21257015 - } - size: 1024 - is_const_table: true - has_initial_entries: true -} -tables { - preamble { - id: 36846071 - name: "MyIngress.debug" - alias: "debug" - } - match_fields { - id: 1 - name: "meta.before1" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 2 - name: "meta.after1" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 3 - name: "meta.before2" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 4 - name: "meta.after2" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 5 - name: "meta.before3" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 6 - name: "meta.after3" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 7 - name: "meta.before4" - bitwidth: 32 - match_type: EXACT - } - match_fields { - id: 8 - name: "meta.after4" - bitwidth: 32 - match_type: EXACT - } - action_refs { - id: 21257015 - } - size: 1024 -} -actions { - preamble { - id: 21257015 - name: "NoAction" - alias: "NoAction" - annotations: "@noWarn(\"unused\")" - } -} -actions { - preamble { - id: 26257079 - name: "MyIngress.forward_and_do_something" - alias: "forward_and_do_something" - } - params { - id: 1 - name: "port" - bitwidth: 9 - } -} -type_info { -} diff --git a/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb b/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb new file mode 100644 index 00000000000..5e34fe562f0 --- /dev/null +++ b/testdata/p4_16_samples_outputs/xor_test.p4.p4info.txtpb @@ -0,0 +1,109 @@ +# proto-file: p4/config/v1/p4info.proto +# proto-message: p4.config.v1.P4Info + +pkg_info { + arch: "v1model" +} +tables { + preamble { + id: 37375156 + name: "MyIngress.ipv4_lpm" + alias: "ipv4_lpm" + } + match_fields { + id: 1 + name: "standard_metadata.ingress_port" + bitwidth: 9 + match_type: EXACT + } + action_refs { + id: 26257079 + } + action_refs { + id: 21257015 + } + size: 1024 + is_const_table: true + has_initial_entries: true +} +tables { + preamble { + id: 36846071 + name: "MyIngress.debug" + alias: "debug" + } + match_fields { + id: 1 + name: "meta.before1" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 2 + name: "meta.after1" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 3 + name: "meta.before2" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 4 + name: "meta.after2" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 5 + name: "meta.before3" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 6 + name: "meta.after3" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 7 + name: "meta.before4" + bitwidth: 32 + match_type: EXACT + } + match_fields { + id: 8 + name: "meta.after4" + bitwidth: 32 + match_type: EXACT + } + action_refs { + id: 21257015 + } + size: 1024 +} +actions { + preamble { + id: 21257015 + name: "NoAction" + alias: "NoAction" + annotations: "@noWarn(\"unused\")" + } +} +actions { + preamble { + id: 26257079 + name: "MyIngress.forward_and_do_something" + alias: "forward_and_do_something" + } + params { + id: 1 + name: "port" + bitwidth: 9 + } +} +type_info { +}