Update P4 programs to compile with most recent p4c
Change-Id: Iced2e9af53dca2dcfd4e6a5de22a45241c264886
(cherry picked from commit 040d6d8c748b6399b74b56abde5894d254eb6383)
diff --git a/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json b/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json
index ee0c37f..038ad74 100644
--- a/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json
+++ b/pipelines/basic/src/main/resources/p4c-out/bmv2/int.json
@@ -46,10 +46,11 @@
["mcast_grp", 16, false],
["resubmit_flag", 32, false],
["egress_rid", 16, false],
- ["checksum_error", 1, false],
["recirculate_flag", 32, false],
+ ["checksum_error", 1, false],
["parser_error", 32, false],
- ["_padding_0", 5, false]
+ ["priority", 3, false],
+ ["_padding_0", 2, false]
]
},
{
@@ -547,26 +548,31 @@
},
{
"type" : "field",
- "value" : ["standard_metadata", "checksum_error"]
- },
- {
- "type" : "field",
"value" : ["standard_metadata", "recirculate_flag"]
},
{
"type" : "field",
+ "value" : ["standard_metadata", "checksum_error"]
+ },
+ {
+ "type" : "field",
"value" : ["standard_metadata", "parser_error"]
+ },
+ {
+ "type" : "field",
+ "value" : ["standard_metadata", "priority"]
}
]
}
],
"errors" : [
- ["NoError", 1],
- ["PacketTooShort", 2],
- ["NoMatch", 3],
- ["StackOutOfBounds", 4],
- ["HeaderTooShort", 5],
- ["ParserTimeout", 6]
+ ["NoError", 0],
+ ["PacketTooShort", 1],
+ ["NoMatch", 2],
+ ["StackOutOfBounds", 3],
+ ["HeaderTooShort", 4],
+ ["ParserTimeout", 5],
+ ["ParserInvalidArgument", 6]
],
"enums" : [],
"parsers" : [
@@ -1163,21 +1169,10 @@
"learn_lists" : [],
"actions" : [
{
- "name" : "_drop",
+ "name" : "nop",
"id" : 0,
"runtime_data" : [],
- "primitives" : [
- {
- "op" : "drop",
- "parameters" : [],
- "source_info" : {
- "filename" : "include/actions.p4",
- "line" : 24,
- "column" : 4,
- "source_fragment" : "mark_to_drop()"
- }
- }
- ]
+ "primitives" : []
},
{
"name" : "nop",
@@ -1192,14 +1187,8 @@
"primitives" : []
},
{
- "name" : "nop",
- "id" : 3,
- "runtime_data" : [],
- "primitives" : []
- },
- {
"name" : "ingress.table0_control.set_next_hop_id",
- "id" : 4,
+ "id" : 3,
"runtime_data" : [
{
"name" : "next_hop_id",
@@ -1230,7 +1219,7 @@
},
{
"name" : "ingress.table0_control.send_to_cpu",
- "id" : 5,
+ "id" : 4,
"runtime_data" : [],
"primitives" : [
{
@@ -1256,7 +1245,7 @@
},
{
"name" : "ingress.table0_control.set_egress_port",
- "id" : 6,
+ "id" : 5,
"runtime_data" : [
{
"name" : "port",
@@ -1286,6 +1275,28 @@
]
},
{
+ "name" : "ingress.table0_control.drop",
+ "id" : 6,
+ "runtime_data" : [],
+ "primitives" : [
+ {
+ "op" : "mark_to_drop",
+ "parameters" : [
+ {
+ "type" : "header",
+ "value" : "standard_metadata"
+ }
+ ],
+ "source_info" : {
+ "filename" : "include/table0.p4",
+ "line" : 42,
+ "column" : 8,
+ "source_fragment" : "mark_to_drop(standard_metadata)"
+ }
+ }
+ ]
+ },
+ {
"name" : "ingress.process_int_source_sink.int_set_source",
"id" : 7,
"runtime_data" : [],
@@ -1896,6 +1907,16 @@
"column" : 12,
"source_fragment" : "hdr.packet_out.setInvalid()"
}
+ },
+ {
+ "op" : "exit",
+ "parameters" : [],
+ "source_info" : {
+ "filename" : "include/packet_io.p4",
+ "line" : 29,
+ "column" : 12,
+ "source_fragment" : "exit"
+ }
}
]
},
@@ -10142,6 +10163,12 @@
{
"name" : "tbl_act",
"id" : 0,
+ "source_info" : {
+ "filename" : "include/port_counters.p4",
+ "line" : 29,
+ "column" : 8,
+ "source_fragment" : "ingress_port_counter.count((bit<32>) standard_metadata.ingress_port)"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -10165,6 +10192,12 @@
{
"name" : "tbl_act_0",
"id" : 1,
+ "source_info" : {
+ "filename" : "include/packet_io.p4",
+ "line" : 27,
+ "column" : 42,
+ "source_fragment" : "= hdr.packet_out.egress_port; ..."
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -10174,9 +10207,9 @@
"direct_meters" : null,
"action_ids" : [10],
"actions" : ["act"],
- "base_default_next" : null,
+ "base_default_next" : "ingress.table0_control.table0",
"next_tables" : {
- "act" : null
+ "act" : "ingress.table0_control.table0"
},
"default_entry" : {
"action_id" : 10,
@@ -10190,7 +10223,7 @@
"id" : 2,
"source_info" : {
"filename" : "include/table0.p4",
- "line" : 41,
+ "line" : 45,
"column" : 10,
"source_fragment" : "table0"
},
@@ -10256,17 +10289,17 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [6, 5, 4, 0],
- "actions" : ["ingress.table0_control.set_egress_port", "ingress.table0_control.send_to_cpu", "ingress.table0_control.set_next_hop_id", "_drop"],
+ "action_ids" : [5, 4, 3, 6],
+ "actions" : ["ingress.table0_control.set_egress_port", "ingress.table0_control.send_to_cpu", "ingress.table0_control.set_next_hop_id", "ingress.table0_control.drop"],
"base_default_next" : "ingress.process_int_source_sink.tb_set_source",
"next_tables" : {
"ingress.table0_control.set_egress_port" : "ingress.process_int_source_sink.tb_set_source",
"ingress.table0_control.send_to_cpu" : "ingress.process_int_source_sink.tb_set_source",
"ingress.table0_control.set_next_hop_id" : "ingress.process_int_source_sink.tb_set_source",
- "_drop" : "ingress.process_int_source_sink.tb_set_source"
+ "ingress.table0_control.drop" : "ingress.process_int_source_sink.tb_set_source"
},
"default_entry" : {
- "action_id" : 0,
+ "action_id" : 6,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -10295,7 +10328,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [7, 1],
+ "action_ids" : [7, 0],
"actions" : ["ingress.process_int_source_sink.int_set_source", "nop"],
"base_default_next" : "ingress.process_int_source_sink.tb_set_sink",
"next_tables" : {
@@ -10303,7 +10336,7 @@
"nop" : "ingress.process_int_source_sink.tb_set_sink"
},
"default_entry" : {
- "action_id" : 1,
+ "action_id" : 0,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -10332,7 +10365,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [8, 2],
+ "action_ids" : [8, 1],
"actions" : ["ingress.process_int_source_sink.int_set_sink", "nop"],
"base_default_next" : "node_8",
"next_tables" : {
@@ -10340,7 +10373,7 @@
"nop" : "node_8"
},
"default_entry" : {
- "action_id" : 2,
+ "action_id" : 1,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -10387,7 +10420,7 @@
"with_counters" : true,
"support_timeout" : false,
"direct_meters" : null,
- "action_ids" : [9, 3],
+ "action_ids" : [9, 2],
"actions" : ["ingress.process_int_source.int_source_dscp", "nop"],
"base_default_next" : "node_10",
"next_tables" : {
@@ -10395,7 +10428,7 @@
"nop" : "node_10"
},
"default_entry" : {
- "action_id" : 3,
+ "action_id" : 2,
"action_const" : true,
"action_data" : [],
"action_entry_const" : true
@@ -10404,6 +10437,12 @@
{
"name" : "tbl_act_1",
"id" : 6,
+ "source_info" : {
+ "filename" : "int.p4",
+ "line" : 56,
+ "column" : 12,
+ "source_fragment" : "clone3(CloneType.I2E, REPORT_MIRROR_SESSION_ID, standard_metadata)"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -10612,6 +10651,12 @@
{
"name" : "tbl_act_3",
"id" : 9,
+ "source_info" : {
+ "filename" : "include/int_transit.p4",
+ "line" : 416,
+ "column" : 12,
+ "source_fragment" : "return"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11351,6 +11396,12 @@
{
"name" : "tbl_act_4",
"id" : 12,
+ "source_info" : {
+ "filename" : "include/int_transit.p4",
+ "line" : 422,
+ "column" : 41,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11374,6 +11425,12 @@
{
"name" : "tbl_act_5",
"id" : 13,
+ "source_info" : {
+ "filename" : "include/int_transit.p4",
+ "line" : 426,
+ "column" : 25,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11397,6 +11454,12 @@
{
"name" : "tbl_act_6",
"id" : 14,
+ "source_info" : {
+ "filename" : "include/int_transit.p4",
+ "line" : 429,
+ "column" : 28,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11420,6 +11483,12 @@
{
"name" : "tbl_act_7",
"id" : 15,
+ "source_info" : {
+ "filename" : "include/int_transit.p4",
+ "line" : 432,
+ "column" : 31,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11480,6 +11549,12 @@
{
"name" : "tbl_process_int_sink_restore_header",
"id" : 17,
+ "source_info" : {
+ "filename" : "include/int_sink.p4",
+ "line" : 51,
+ "column" : 8,
+ "source_fragment" : "restore_header()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11503,6 +11578,12 @@
{
"name" : "tbl_process_int_sink_int_sink",
"id" : 18,
+ "source_info" : {
+ "filename" : "include/int_sink.p4",
+ "line" : 52,
+ "column" : 8,
+ "source_fragment" : "int_sink()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11526,6 +11607,12 @@
{
"name" : "tbl_act_8",
"id" : 19,
+ "source_info" : {
+ "filename" : "include/port_counters.p4",
+ "line" : 39,
+ "column" : 8,
+ "source_fragment" : "egress_port_counter.count((bit<32>) standard_metadata.egress_port)"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11549,6 +11636,12 @@
{
"name" : "tbl_act_9",
"id" : 20,
+ "source_info" : {
+ "filename" : "include/packet_io.p4",
+ "line" : 38,
+ "column" : 12,
+ "source_fragment" : "hdr.packet_in.setValid(); ..."
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11929,6 +12022,10 @@
[
"intrinsic_metadata.recirculate_flag",
["standard_metadata", "recirculate_flag"]
+ ],
+ [
+ "intrinsic_metadata.priority",
+ ["standard_metadata", "priority"]
]
],
"program" : "int.p4",