diff --git a/testdata/p4_14_samples_outputs/wide_action2-midend.p4 b/testdata/p4_14_samples_outputs/wide_action2-midend.p4 deleted file mode 100644 index 0a3dad30563..00000000000 --- a/testdata/p4_14_samples_outputs/wide_action2-midend.p4 +++ /dev/null @@ -1,124 +0,0 @@ -#include -#include - -struct ingress_metadata_t { - bit<16> bd; - bit<12> vrf; - bit<1> ipv4_unicast_enabled; - bit<1> ipv6_unicast_enabled; - bit<2> ipv4_multicast_mode; - bit<2> ipv6_multicast_mode; - bit<1> igmp_snooping_enabled; - bit<1> mld_snooping_enabled; - bit<2> ipv4_urpf_mode; - bit<2> ipv6_urpf_mode; - bit<10> rmac_group; - bit<16> bd_mrpf_group; - bit<16> uuc_mc_index; - bit<16> umc_mc_index; - bit<16> bcast_mc_index; - bit<16> bd_label; -} - -struct intrinsic_metadata_t { - bit<16> exclusion_id1; -} - -header data_t { - bit<16> f1; - bit<16> f2; -} - -struct metadata { - bit<16> _ingress_metadata_bd0; - bit<12> _ingress_metadata_vrf1; - bit<1> _ingress_metadata_ipv4_unicast_enabled2; - bit<1> _ingress_metadata_ipv6_unicast_enabled3; - bit<2> _ingress_metadata_ipv4_multicast_mode4; - bit<2> _ingress_metadata_ipv6_multicast_mode5; - bit<1> _ingress_metadata_igmp_snooping_enabled6; - bit<1> _ingress_metadata_mld_snooping_enabled7; - bit<2> _ingress_metadata_ipv4_urpf_mode8; - bit<2> _ingress_metadata_ipv6_urpf_mode9; - bit<10> _ingress_metadata_rmac_group10; - bit<16> _ingress_metadata_bd_mrpf_group11; - bit<16> _ingress_metadata_uuc_mc_index12; - bit<16> _ingress_metadata_umc_mc_index13; - bit<16> _ingress_metadata_bcast_mc_index14; - bit<16> _ingress_metadata_bd_label15; - bit<16> _intrinsic_metadata_exclusion_id116; -} - -struct headers { - @name(".data") - data_t data; -} - -parser ParserImpl(packet_in packet, out headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - @name(".start") state start { - packet.extract(hdr.data); - meta._ingress_metadata_bd0 = hdr.data.f2; - transition accept; - } -} - -control ingress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - @name(".NoAction") action NoAction_0() { - } - @name(".set_bd_info") action set_bd_info(bit<12> vrf, bit<10> rmac_group, bit<16> mrpf_group, bit<16> bd_label, bit<16> uuc_mc_index, bit<16> bcast_mc_index, bit<16> umc_mc_index, bit<1> ipv4_unicast_enabled, bit<1> ipv6_unicast_enabled, bit<2> ipv4_multicast_mode, bit<2> ipv6_multicast_mode, bit<1> igmp_snooping_enabled, bit<1> mld_snooping_enabled, bit<2> ipv4_urpf_mode, bit<2> ipv6_urpf_mode, bit<16> exclusion_id) { - meta._ingress_metadata_vrf1 = vrf; - meta._ingress_metadata_ipv4_unicast_enabled2 = ipv4_unicast_enabled; - meta._ingress_metadata_ipv6_unicast_enabled3 = ipv6_unicast_enabled; - meta._ingress_metadata_ipv4_multicast_mode4 = ipv4_multicast_mode; - meta._ingress_metadata_ipv6_multicast_mode5 = ipv6_multicast_mode; - meta._ingress_metadata_igmp_snooping_enabled6 = igmp_snooping_enabled; - meta._ingress_metadata_mld_snooping_enabled7 = mld_snooping_enabled; - meta._ingress_metadata_ipv4_urpf_mode8 = ipv4_urpf_mode; - meta._ingress_metadata_ipv6_urpf_mode9 = ipv6_urpf_mode; - meta._ingress_metadata_rmac_group10 = rmac_group; - meta._ingress_metadata_bd_mrpf_group11 = mrpf_group; - meta._ingress_metadata_uuc_mc_index12 = uuc_mc_index; - meta._ingress_metadata_umc_mc_index13 = umc_mc_index; - meta._ingress_metadata_bcast_mc_index14 = bcast_mc_index; - meta._ingress_metadata_bd_label15 = bd_label; - meta._intrinsic_metadata_exclusion_id116 = exclusion_id; - } - @name(".bd") table bd_0 { - actions = { - set_bd_info(); - @defaultonly NoAction_0(); - } - key = { - meta._ingress_metadata_bd0: exact @name("ingress_metadata.bd") ; - } - size = 16384; - default_action = NoAction_0(); - } - apply { - bd_0.apply(); - } -} - -control egress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) { - apply { - } -} - -control DeparserImpl(packet_out packet, in headers hdr) { - apply { - packet.emit(hdr.data); - } -} - -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_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_errors/constructor3_e.s b/testdata/p4_16_errors/constructor3_e.s deleted file mode 100644 index 566865ef681..00000000000 --- a/testdata/p4_16_errors/constructor3_e.s +++ /dev/null @@ -1 +0,0 @@ - .file "constructor3_e.p4" diff --git a/testdata/p4_16_errors_outputs/issue-2123_e.p4.entries.txt b/testdata/p4_16_errors_outputs/issue-2123_e.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_errors_outputs/issue-2123_e.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_errors_outputs/issue1777-bmv2.p4.entries.txt b/testdata/p4_16_errors_outputs/issue1777-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_errors_outputs/issue1777-bmv2.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.entries.txt b/testdata/p4_16_errors_outputs/issue1803_same_table_name.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_errors_outputs/issue1803_same_table_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_errors_outputs/issue2283_2-bmv2.p4.entries.txt b/testdata/p4_16_errors_outputs/issue2283_2-bmv2.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_errors_outputs/issue2283_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_errors_outputs/issue3299.p4.entries.txt b/testdata/p4_16_errors_outputs/issue3299.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_errors_outputs/issue3299.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_errors_outputs/issue532.p4.entries.txt b/testdata/p4_16_errors_outputs/issue532.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_errors_outputs/issue532.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.entries.txt b/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.entries.txt deleted file mode 100644 index 5abc37fc41d..00000000000 --- a/testdata/p4_16_errors_outputs/table-entries-lpm-2.p4.entries.txt +++ /dev/null @@ -1,113 +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: "\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-optional-2-bmv2.p4.entries.txt b/testdata/p4_16_errors_outputs/table-entries-optional-2-bmv2.p4.entries.txt deleted file mode 100644 index e4e16d3200d..00000000000 --- a/testdata/p4_16_errors_outputs/table-entries-optional-2-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: 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_samples_outputs/fabric_20190420/fabric.p4.entries.txt b/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/fabric_20190420/fabric.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/omec/up4.p4.entries.txt b/testdata/p4_16_samples_outputs/omec/up4.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/omec/up4.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.entries.txt b/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/pins/pins_fabric.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.entries.txt b/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/pins/pins_middleblock.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.entries.txt b/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.entries.txt deleted file mode 100644 index 64fb579c6a4..00000000000 --- a/testdata/p4_16_samples_outputs/pins/pins_wbb.p4.entries.txt +++ /dev/null @@ -1,2 +0,0 @@ -# proto-file: p4/v1/p4runtime.proto -# proto-message: p4.v1.WriteRequest diff --git a/testdata/p4tc_samples_outputs/default_action_example_parser.o b/testdata/p4tc_samples_outputs/default_action_example_parser.o deleted file mode 100644 index f6ec18bc124..00000000000 Binary files a/testdata/p4tc_samples_outputs/default_action_example_parser.o and /dev/null differ