Bumped supported revisions of P4 tools
Includes:
- Use new P4Runtime "v1" package names
- Removed VALID match
- New table entry priority spec (1 is min priority, not 0)
- Fixed p4c-bm2-ss to include arch flag
- Re-compiled P4 programs with more recent p4c (with updated p4info)
Change-Id: I05908f40eda0f0c755009268fd261fb8bcc9be35
diff --git a/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric.p4info b/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric.p4info
index b4e460a..bae8224 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric.p4info
+++ b/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric.p4info
@@ -35,8 +35,9 @@
id: 16798734
}
const_default_action_id: 16819938
- direct_resource_ids: 302038285
+ direct_resource_ids: 318815501
size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
}
tables {
preamble {
@@ -66,8 +67,9 @@
id: 16840921
}
const_default_action_id: 16840921
- direct_resource_ids: 302050110
+ direct_resource_ids: 318827326
size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
}
tables {
preamble {
@@ -94,8 +96,9 @@
id: 16800567
annotations: "@defaultonly()"
}
- direct_resource_ids: 301993073
+ direct_resource_ids: 318770289
size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
}
tables {
preamble {
@@ -116,8 +119,9 @@
id: 16800567
annotations: "@defaultonly()"
}
- direct_resource_ids: 302053291
+ direct_resource_ids: 318830507
size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
}
tables {
preamble {
@@ -138,86 +142,9 @@
id: 16800567
annotations: "@defaultonly()"
}
- direct_resource_ids: 301991276
+ direct_resource_ids: 318768492
size: 1024
-}
-tables {
- preamble {
- id: 33578363
- name: "FabricIngress.forwarding.multicast_v4"
- alias: "multicast_v4"
- }
- match_fields {
- id: 1
- name: "hdr.vlan_tag.vlan_id"
- bitwidth: 12
- match_type: EXACT
- }
- match_fields {
- id: 2
- name: "hdr.ipv4.dst_addr"
- bitwidth: 32
- match_type: LPM
- }
- action_refs {
- id: 16839692
- }
- action_refs {
- id: 16800567
- annotations: "@defaultonly()"
- }
- direct_resource_ids: 302020680
- size: 1024
-}
-tables {
- preamble {
- id: 33568751
- name: "FabricIngress.forwarding.unicast_v6"
- alias: "unicast_v6"
- }
- match_fields {
- id: 1
- name: "hdr.ipv6.dst_addr"
- bitwidth: 128
- match_type: LPM
- }
- action_refs {
- id: 16839692
- }
- action_refs {
- id: 16800567
- annotations: "@defaultonly()"
- }
- direct_resource_ids: 302043649
- size: 1024
-}
-tables {
- preamble {
- id: 33581295
- name: "FabricIngress.forwarding.multicast_v6"
- alias: "multicast_v6"
- }
- match_fields {
- id: 1
- name: "hdr.vlan_tag.vlan_id"
- bitwidth: 12
- match_type: EXACT
- }
- match_fields {
- id: 2
- name: "hdr.ipv6.dst_addr"
- bitwidth: 128
- match_type: LPM
- }
- action_refs {
- id: 16839692
- }
- action_refs {
- id: 16800567
- annotations: "@defaultonly()"
- }
- direct_resource_ids: 302038094
- size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
}
tables {
preamble {
@@ -310,8 +237,9 @@
id: 16819938
}
const_default_action_id: 16819938
- direct_resource_ids: 301995056
+ direct_resource_ids: 318772272
size: 256
+ idle_timeout_behavior: NO_TIMEOUT
}
tables {
preamble {
@@ -331,8 +259,9 @@
action_refs {
id: 16819938
}
- direct_resource_ids: 302008112
+ direct_resource_ids: 318785328
size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
}
tables {
preamble {
@@ -365,8 +294,9 @@
id: 16800567
annotations: "@defaultonly()"
}
- direct_resource_ids: 301991880
+ direct_resource_ids: 318769096
size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
}
tables {
preamble {
@@ -394,30 +324,9 @@
annotations: "@defaultonly()"
}
implementation_id: 285233747
- direct_resource_ids: 302023316
+ direct_resource_ids: 318800532
size: 1024
-}
-tables {
- preamble {
- id: 33606828
- name: "FabricIngress.next.multicast"
- alias: "multicast"
- }
- match_fields {
- id: 1
- name: "fabric_metadata.next_id"
- bitwidth: 32
- match_type: EXACT
- }
- action_refs {
- id: 16789575
- }
- action_refs {
- id: 16800567
- annotations: "@defaultonly()"
- }
- direct_resource_ids: 302024536
- size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
}
tables {
preamble {
@@ -444,6 +353,7 @@
id: 16819938
}
size: 1024
+ idle_timeout_behavior: NO_TIMEOUT
}
actions {
preamble {
@@ -686,23 +596,6 @@
}
actions {
preamble {
- id: 16789575
- name: "FabricIngress.next.set_mcast_group"
- alias: "set_mcast_group"
- }
- params {
- id: 1
- name: "gid"
- bitwidth: 16
- }
- params {
- id: 2
- name: "smac"
- bitwidth: 48
- }
-}
-actions {
- preamble {
id: 16801047
name: "FabricEgress.pkt_io_egress.pop_vlan"
alias: "pkt_io_egress.pop_vlan"
@@ -749,7 +642,7 @@
}
direct_counters {
preamble {
- id: 302038285
+ id: 318815501
name: "FabricIngress.filtering.ingress_port_vlan_counter"
alias: "ingress_port_vlan_counter"
}
@@ -760,7 +653,7 @@
}
direct_counters {
preamble {
- id: 302050110
+ id: 318827326
name: "FabricIngress.filtering.fwd_classifier_counter"
alias: "fwd_classifier_counter"
}
@@ -771,7 +664,7 @@
}
direct_counters {
preamble {
- id: 301993073
+ id: 318770289
name: "FabricIngress.forwarding.bridging_counter"
alias: "bridging_counter"
}
@@ -782,7 +675,7 @@
}
direct_counters {
preamble {
- id: 302053291
+ id: 318830507
name: "FabricIngress.forwarding.mpls_counter"
alias: "mpls_counter"
}
@@ -793,7 +686,7 @@
}
direct_counters {
preamble {
- id: 301991276
+ id: 318768492
name: "FabricIngress.forwarding.unicast_v4_counter"
alias: "unicast_v4_counter"
}
@@ -804,40 +697,7 @@
}
direct_counters {
preamble {
- id: 302020680
- name: "FabricIngress.forwarding.multicast_v4_counter"
- alias: "multicast_v4_counter"
- }
- spec {
- unit: BOTH
- }
- direct_table_id: 33578363
-}
-direct_counters {
- preamble {
- id: 302043649
- name: "FabricIngress.forwarding.unicast_v6_counter"
- alias: "unicast_v6_counter"
- }
- spec {
- unit: BOTH
- }
- direct_table_id: 33568751
-}
-direct_counters {
- preamble {
- id: 302038094
- name: "FabricIngress.forwarding.multicast_v6_counter"
- alias: "multicast_v6_counter"
- }
- spec {
- unit: BOTH
- }
- direct_table_id: 33581295
-}
-direct_counters {
- preamble {
- id: 301995056
+ id: 318772272
name: "FabricIngress.forwarding.acl_counter"
alias: "acl_counter"
}
@@ -848,7 +708,7 @@
}
direct_counters {
preamble {
- id: 302008112
+ id: 318785328
name: "FabricIngress.next.vlan_meta_counter"
alias: "vlan_meta_counter"
}
@@ -859,7 +719,7 @@
}
direct_counters {
preamble {
- id: 301991880
+ id: 318769096
name: "FabricIngress.next.simple_counter"
alias: "simple_counter"
}
@@ -870,7 +730,7 @@
}
direct_counters {
preamble {
- id: 302023316
+ id: 318800532
name: "FabricIngress.next.hashed_counter"
alias: "hashed_counter"
}
@@ -879,20 +739,9 @@
}
direct_table_id: 33608588
}
-direct_counters {
- preamble {
- id: 302024536
- name: "FabricIngress.next.multicast_counter"
- alias: "multicast_counter"
- }
- spec {
- unit: BOTH
- }
- direct_table_id: 33606828
-}
controller_packet_metadata {
preamble {
- id: 2868941301
+ id: 67146229
name: "packet_in"
annotations: "@controller_header(\"packet_in\")"
}
@@ -909,7 +758,7 @@
}
controller_packet_metadata {
preamble {
- id: 2868916615
+ id: 67121543
name: "packet_out"
annotations: "@controller_header(\"packet_out\")"
}
@@ -924,3 +773,5 @@
bitwidth: 7
}
}
+type_info {
+}