Fix missing IPv6 table size in fabric.p4
Change-Id: Ic5af848958e9692087b873f9248eac093b2b463a
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index 659a31b..c823b48 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -11419,6 +11419,12 @@
{
"name" : "tbl_act",
"id" : 0,
+ "source_info" : {
+ "filename" : "fabric.p4",
+ "line" : 58,
+ "column" : 50,
+ "source_fragment" : "hdr.gtpu_ipv4, hdr.gtpu_udp"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11442,6 +11448,12 @@
{
"name" : "tbl_act_0",
"id" : 1,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 30,
+ "column" : 32,
+ "source_fragment" : "return"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11465,6 +11477,12 @@
{
"name" : "tbl_act_1",
"id" : 2,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 31,
+ "column" : 18,
+ "source_fragment" : "= ipv4; ..."
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11488,6 +11506,12 @@
{
"name" : "tbl_act_2",
"id" : 3,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 35,
+ "column" : 16,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11511,6 +11535,12 @@
{
"name" : "tbl_act_3",
"id" : 4,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 37,
+ "column" : 12,
+ "source_fragment" : "udp.setInvalid()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11534,6 +11564,12 @@
{
"name" : "tbl_act_4",
"id" : 5,
+ "source_info" : {
+ "filename" : "include/control/packetio.p4",
+ "line" : 25,
+ "column" : 42,
+ "source_fragment" : "= hdr.packet_out.egress_port; ..."
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11557,6 +11593,12 @@
{
"name" : "tbl_act_5",
"id" : 6,
+ "source_info" : {
+ "filename" : "include/control/filtering.p4",
+ "line" : 105,
+ "column" : 37,
+ "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11580,6 +11622,12 @@
{
"name" : "tbl_act_6",
"id" : 7,
+ "source_info" : {
+ "filename" : "include/control/filtering.p4",
+ "line" : 115,
+ "column" : 37,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11807,6 +11855,12 @@
{
"name" : "tbl_act_10",
"id" : 14,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 148,
+ "column" : 16,
+ "source_fragment" : "mark_to_drop()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11830,6 +11884,12 @@
{
"name" : "tbl_act_11",
"id" : 15,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 150,
+ "column" : 39,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11853,6 +11913,12 @@
{
"name" : "tbl_spgw_ingress_gtpu_decap",
"id" : 16,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 151,
+ "column" : 12,
+ "source_fragment" : "gtpu_decap()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11959,6 +12025,12 @@
{
"name" : "tbl_act_14",
"id" : 20,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 153,
+ "column" : 39,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -11982,6 +12054,12 @@
{
"name" : "tbl_act_15",
"id" : 21,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 155,
+ "column" : 39,
+ "source_fragment" : "= SPGW_DIR_UNKNOWN; ..."
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -12005,6 +12083,12 @@
{
"name" : "tbl_act_16",
"id" : 22,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 174,
+ "column" : 34,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -12404,6 +12488,12 @@
{
"name" : "tbl_act_17",
"id" : 31,
+ "source_info" : {
+ "filename" : "include/control/port_counter.p4",
+ "line" : 31,
+ "column" : 12,
+ "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -12427,6 +12517,12 @@
{
"name" : "tbl_act_18",
"id" : 32,
+ "source_info" : {
+ "filename" : "include/control/port_counter.p4",
+ "line" : 34,
+ "column" : 12,
+ "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -12983,6 +13079,12 @@
{
"name" : "tbl_act_19",
"id" : 34,
+ "source_info" : {
+ "filename" : "include/control/packetio.p4",
+ "line" : 47,
+ "column" : 16,
+ "source_fragment" : "mark_to_drop()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13006,6 +13108,12 @@
{
"name" : "tbl_act_20",
"id" : 35,
+ "source_info" : {
+ "filename" : "include/control/packetio.p4",
+ "line" : 49,
+ "column" : 12,
+ "source_fragment" : "hdr.packet_in.setValid(); ..."
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13029,6 +13137,12 @@
{
"name" : "tbl_act_21",
"id" : 36,
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 308,
+ "column" : 12,
+ "source_fragment" : "mark_to_drop()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13052,6 +13166,12 @@
{
"name" : "tbl_egress_next_pop_mpls_if_present",
"id" : 37,
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 312,
+ "column" : 36,
+ "source_fragment" : "pop_mpls_if_present()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13075,6 +13195,12 @@
{
"name" : "tbl_egress_next_set_mpls",
"id" : 38,
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 314,
+ "column" : 12,
+ "source_fragment" : "set_mpls()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13187,6 +13313,12 @@
{
"name" : "tbl_egress_next_push_vlan",
"id" : 42,
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 320,
+ "column" : 16,
+ "source_fragment" : "push_vlan()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13210,6 +13342,12 @@
{
"name" : "tbl_act_24",
"id" : 43,
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 326,
+ "column" : 25,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13233,6 +13371,12 @@
{
"name" : "tbl_act_25",
"id" : 44,
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 327,
+ "column" : 35,
+ "source_fragment" : "mark_to_drop()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13256,6 +13400,12 @@
{
"name" : "tbl_act_26",
"id" : 45,
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 330,
+ "column" : 29,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13279,6 +13429,12 @@
{
"name" : "tbl_act_27",
"id" : 46,
+ "source_info" : {
+ "filename" : "include/control/next.p4",
+ "line" : 331,
+ "column" : 39,
+ "source_fragment" : "mark_to_drop()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13302,6 +13458,12 @@
{
"name" : "tbl_spgw_egress_gtpu_encap",
"id" : 47,
+ "source_info" : {
+ "filename" : "include/spgw.p4",
+ "line" : 227,
+ "column" : 12,
+ "source_fragment" : "gtpu_encap()"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -13440,6 +13602,12 @@
{
"name" : "tbl_act_29",
"id" : 51,
+ "source_info" : {
+ "filename" : "include/int/int_transit.p4",
+ "line" : 420,
+ "column" : 12,
+ "source_fragment" : "return"
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -14179,6 +14347,12 @@
{
"name" : "tbl_act_30",
"id" : 54,
+ "source_info" : {
+ "filename" : "include/int/int_transit.p4",
+ "line" : 425,
+ "column" : 37,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -14202,6 +14376,12 @@
{
"name" : "tbl_act_31",
"id" : 55,
+ "source_info" : {
+ "filename" : "include/int/int_transit.p4",
+ "line" : 428,
+ "column" : 31,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -14225,6 +14405,12 @@
{
"name" : "tbl_act_32",
"id" : 56,
+ "source_info" : {
+ "filename" : "include/int/int_transit.p4",
+ "line" : 431,
+ "column" : 24,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
@@ -14248,6 +14434,12 @@
{
"name" : "tbl_act_33",
"id" : 57,
+ "source_info" : {
+ "filename" : "include/int/int_transit.p4",
+ "line" : 434,
+ "column" : 37,
+ "source_fragment" : "="
+ },
"key" : [],
"match_type" : "exact",
"type" : "simple",
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index a42d2e9..ee97871 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -844,11 +844,11 @@
id: 285217164
name: "FabricIngress.next.hashed_selector"
alias: "hashed_selector"
- annotations: "@max_group_size(16)"
}
table_ids: 33608588
with_selector: true
size: 1024
+ max_group_size: 16
}
counters {
preamble {