Fixed p4-14 ecmp program and compiler outputs
Change-Id: Ib0201f0574ee1d1f69abb9a961fae021a388cdba
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.log
index 7aecfb6..2a7aa5c 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/pa.log
@@ -1,7 +1,7 @@
+---------------------------------------------------------------------+
| Log file: pa.log |
| Compiler version: 5.1.0 (fca32d1) |
-| Created on: Fri Sep 8 08:25:15 2017 |
+| Created on: Tue Sep 12 11:15:53 2017 |
+---------------------------------------------------------------------+
HLIR Version: 0.10.5
@@ -472,7 +472,7 @@
| --validity_check--packet_out_hdr | 1 | ingress | x | x | | x | x |
| --validity_check--tcp | 1 | ingress | x | x | | | |
| --validity_check--udp | 1 | ingress | x | x | | | |
-| ecmp_metadata.groupId | 16 | ingress | | | x | x | x |
+| ecmp_metadata.group_id | 16 | ingress | | | x | x | x |
| ecmp_metadata.selector | 16 | ingress | | | x | x | x |
| ethernet.dstAddr | 48 | ingress | x | x | | x | |
| ethernet.etherType | 16 | ingress | x | x | | x | |
@@ -553,7 +553,7 @@
parse_pkt_in and parse_pkt_out are exclusive parse states
parse_tcp and parse_udp are exclusive parse states
->>Event 'pa_init' at time 1504859117.63
+>>Event 'pa_init' at time 1505214955.36
Took 0.01 seconds
--------------------------------------------
PHV MAU Groups: 92
@@ -696,7 +696,7 @@
udp.checksum <16 bits ingress parsed tagalong>
Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
- ecmp_metadata.groupId <16 bits ingress meta R W>
+ ecmp_metadata.group_id <16 bits ingress meta R W>
Phv Mau Group (ingress) -- 1 instance for total bit width of 16.
ecmp_metadata.selector <16 bits ingress meta R W>
@@ -837,7 +837,7 @@
eg_intr_md.egress_cos <3 bits egress parsed imeta>
->>Event 'pa_resv' at time 1504859117.63
+>>Event 'pa_resv' at time 1505214955.37
Took 0.00 seconds
-----------------------------------------------
@@ -879,7 +879,7 @@
Group 2 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv32
Group 3 32 bits -- avail 16 -- ingress avail 16 and remain 15 and promised 1 and req 1 -- egress avail 16 and remain 12 and promised 0 and req 0 -- as if deparsed True -- container_to_use phv48
Reserving 32-bit container for ingress: phv0
->>Event 'pa_bridge' at time 1504859117.67
+>>Event 'pa_bridge' at time 1505214955.40
Took 0.04 seconds
-----------------------------------------------
@@ -932,7 +932,7 @@
| Overall total | 1 (0.30%) | 32 (0.52%) | 6144 |
---------------------------------------------------------------------------
->>Event 'pa_phase0' at time 1504859117.67
+>>Event 'pa_phase0' at time 1505214955.41
Took 0.00 seconds
-----------------------------------------------
@@ -985,7 +985,7 @@
| Overall total | 1 (0.30%) | 32 (0.52%) | 6144 |
---------------------------------------------------------------------------
->>Event 'pa_critical' at time 1504859117.68
+>>Event 'pa_critical' at time 1505214955.41
Took 0.00 seconds
-----------------------------------------------
@@ -2068,8 +2068,8 @@
| Overall total | 52 (15.48%) | 968 (15.76%) | 6144 |
-----------------------------------------------------------------------------
->>Event 'pa_overlay' at time 1504859126.82
- Took 9.14 seconds
+>>Event 'pa_overlay' at time 1505214964.48
+ Took 9.07 seconds
-----------------------------------------------
Allocating remaining parsed fields
@@ -2685,8 +2685,8 @@
| Overall total | 1 (0.30%) | 32 (0.52%) | 6144 |
---------------------------------------------------------------------------
->>Event 'pa_meta1' at time 1504859130.57
- Took 3.76 seconds
+>>Event 'pa_meta1' at time 1505214968.21
+ Took 3.72 seconds
-----------------------------------------------
Allocating metadata (pass 1)
@@ -2841,7 +2841,7 @@
--------------------------------------------------------------------------
Sorted metadata field instances to allocate: 0 / 0 bits (0 ingress bits and 0 egress bits)
->>Event 'pa_pov' at time 1504859130.68
+>>Event 'pa_pov' at time 1505214968.31
Took 0.10 seconds
-----------------------------------------------
@@ -2998,7 +2998,7 @@
egress
phv81 (8 bits)
>> 8 total bits
->>Event 'pa_meta2' at time 1504859130.80
+>>Event 'pa_meta2' at time 1505214968.43
Took 0.12 seconds
-----------------------------------------------
@@ -3096,13 +3096,13 @@
--------------------------------------------------------------------------
Sorted metadata field instances to allocate: 3 / 35 bits (35 ingress bits and 0 egress bits)
- 0: ecmp_metadata.groupId (ingress) (highly=0, mau_group_size=1, max_overlay=0, best_overlay_pack=0, max_share=1, best_share_pack=0, max_split=16, bit_width=16, initial_usage_read=1, earliest_use=0, latest_use=1)
+ 0: ecmp_metadata.group_id (ingress) (highly=0, mau_group_size=1, max_overlay=0, best_overlay_pack=0, max_share=1, best_share_pack=0, max_split=16, bit_width=16, initial_usage_read=1, earliest_use=0, latest_use=1)
1: ecmp_metadata.selector (ingress) (highly=0, mau_group_size=1, max_overlay=0, best_overlay_pack=0, max_share=1, best_share_pack=0, max_split=16, bit_width=16, initial_usage_read=1, earliest_use=0, latest_use=1)
2: ig_intr_md_for_tm.drop_ctl (ingress) (highly=0, mau_group_size=1, max_overlay=0, best_overlay_pack=0, max_share=2, best_share_pack=0, max_split=1, bit_width=3, initial_usage_read=2, earliest_use=0, latest_use=12)
---------------------------------------
Working on:
-ecmp_metadata.groupId <16 bits ingress meta R W>
+ecmp_metadata.group_id <16 bits ingress meta R W>
max_split = None, adj = None
Of remaining metadata fields to allocate
max_overlay = 0 (0 bits)
@@ -3112,12 +3112,12 @@
min_parse_states = 1
bits_per_state = 16
Parse state 0 (16 bits)
- ecmp_metadata.groupId [15:0]
---------------------------------------------------------------------------------------------
-| Name | BW | Tagalong? | Req | Pref | Not Allow | MaxSplit | Group Size |
---------------------------------------------------------------------------------------------
-| ecmp_metadata.groupId | 16 | False | - | - | - | None | 1 |
---------------------------------------------------------------------------------------------
+ ecmp_metadata.group_id [15:0]
+---------------------------------------------------------------------------------------------
+| Name | BW | Tagalong? | Req | Pref | Not Allow | MaxSplit | Group Size |
+---------------------------------------------------------------------------------------------
+| ecmp_metadata.group_id | 16 | False | - | - | - | None | 1 |
+---------------------------------------------------------------------------------------------
req packing: [None]
disallowed packing: [None]
@@ -3135,11 +3135,11 @@
Group 11 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv176 -- fails False
Group 12 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv192 -- fails False
Group 13 16 bits -- avail 16 and promised 1 -- ingress promised 1 and remain 15 and req 0 -- egress promised 0 and remain 15 and req 0 -- as if deparsed False -- container_to_use phv208 -- fails False
-Metadata instance: ecmp_metadata.groupId <16 bits ingress meta R W>
+Metadata instance: ecmp_metadata.group_id <16 bits ingress meta R W>
>>req_alignment = None
>>allowed_container_start_bits = None
>>req_container = None
-***Allocating phv134[15:0] for ecmp_metadata.groupId[15:0]
+***Allocating phv134[15:0] for ecmp_metadata.group_id[15:0]
---------------------------------------
Working on:
@@ -3225,7 +3225,7 @@
final start_bit = 5
(1) msb_offset = 8
***Allocating phv68[7:5] for ig_intr_md_for_tm.drop_ctl[2:0]
->>Event 'pa_meta_init' at time 1504859130.96
+>>Event 'pa_meta_init' at time 1505214968.59
Took 0.16 seconds
-----------------------------------------------