Fixed p4-14 ecmp program and compiler outputs
Change-Id: Ib0201f0574ee1d1f69abb9a961fae021a388cdba
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html
index 9f5f96b..dcd8955 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/deparser.html
@@ -569,7 +569,7 @@
</div></div><br><br>
</td></tr>
</table>
-<br><i>Created on Fri Sep 8 08:26:25 2017</i>
+<br><i>Created on Tue Sep 12 11:17:02 2017</i>
<br><i>Compiler version: 5.1.0 (fca32d1)</i>
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html
index 5d4d87a..8f091ce 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/mau.html
@@ -3495,11 +3495,11 @@
</title></rect>
<rect x="16" y="48" width="8" height="8" style="stroke:black; stroke-width:1; fill:chartreuse""><title>Crossbar Byte 2 in exact Group 0 (parity group 0)
contains:
- {ecmp_metadata.groupId[7:0]} for table ecmp_group_table
+ {ecmp_metadata.group_id[7:0]} for table ecmp_group_table
</title></rect>
<rect x="16" y="56" width="8" height="8" style="stroke:black; stroke-width:1; fill:chartreuse""><title>Crossbar Byte 3 in exact Group 0 (parity group 0)
contains:
- {ecmp_metadata.groupId[15:8]} for table ecmp_group_table
+ {ecmp_metadata.group_id[15:8]} for table ecmp_group_table
</title></rect>
<rect x="24" y="32" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 4 in exact Group 0 (parity group 0)</title></rect>
<rect x="24" y="40" width="8" height="8" style="stroke:black; stroke-width:1; fill:white""><title>Crossbar Byte 5 in exact Group 0 (parity group 0)</title></rect>
@@ -32224,7 +32224,7 @@
</svg><br>
-<br><i>Created on Fri Sep 8 08:26:21 2017</i>
+<br><i>Created on Tue Sep 12 11:16:59 2017</i>
<br><i>Compiler version: 5.1.0 (fca32d1)</i>
</div>
</body>
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
index 17ab0ca..a344e7b 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.egress.html
@@ -6639,7 +6639,7 @@
<br></td></tr>
</table>
-<br><i>Created on Fri Sep 8 08:26:25 2017</i>
+<br><i>Created on Tue Sep 12 11:17:02 2017</i>
<br><i>Compiler version: 5.1.0 (fca32d1)</i>
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html
index 2fd6341..ebd9d26 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/parser.ingress.html
@@ -7420,7 +7420,7 @@
<br></td></tr>
</table>
-<br><i>Created on Fri Sep 8 08:26:25 2017</i>
+<br><i>Created on Tue Sep 12 11:17:02 2017</i>
<br><i>Compiler version: 5.1.0 (fca32d1)</i>
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html
index 61154ef..c257013 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/phv_allocation.html
@@ -1197,18 +1197,18 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
-Field ecmp_metadata.groupId written by table table0's action ecmp_group
+Field ecmp_metadata.group_id written by table table0's action ecmp_group
</title></rect>
<text x="371" y="133" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">W<title>PHV Group: 8
Assigned to Ingress
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
-Field ecmp_metadata.groupId written by table table0's action ecmp_group
+Field ecmp_metadata.group_id written by table table0's action ecmp_group
</title></text>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
Assigned to Ingress
@@ -3820,18 +3820,18 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
-Field ecmp_metadata.groupId read by table ecmp_group_table for a match key
+Field ecmp_metadata.group_id read by table ecmp_group_table for a match key
</title></rect>
<text x="371" y="133" textLength="11" lengthAdjust="spacingAndGlyphs" textHeight="11" heightAdjust="spacingAndGlyphs" style="fill:black;">R<title>PHV Group: 8
Assigned to Ingress
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
-Field ecmp_metadata.groupId read by table ecmp_group_table for a match key
+Field ecmp_metadata.group_id read by table ecmp_group_table for a match key
</title></text>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
Assigned to Ingress
@@ -6459,7 +6459,7 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
</title></rect>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -9052,7 +9052,7 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
</title></rect>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -11645,7 +11645,7 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
</title></rect>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -14238,7 +14238,7 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
</title></rect>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -16831,7 +16831,7 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
</title></rect>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -19424,7 +19424,7 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
</title></rect>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -22017,7 +22017,7 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
</title></rect>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -24610,7 +24610,7 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
</title></rect>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -27203,7 +27203,7 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
</title></rect>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -29796,7 +29796,7 @@
Container Bit Width: 16
Container Address: 134
-ecmp_metadata.groupId[15:0] in container bits [15:0]
+ecmp_metadata.group_id[15:0] in container bits [15:0]
</title></rect>
<rect x="369" y="135" width="18" height="18" style="stroke:black; stroke-width:1; fill:goldenrod""><title>PHV Group: 8
@@ -31405,7 +31405,7 @@
<text x="1010" y="178" textLength="16" lengthAdjust="spacingAndGlyphs" textHeight="16" heightAdjust="spacingAndGlyphs" style="fill:black;">16</text>
<rect x="0" y="0" width="1053" height="198" style="stroke:black; stroke-width:2; fill:none""></rect>
</svg><br>
-<br><i>Created on Fri Sep 8 08:26:22 2017</i>
+<br><i>Created on Tue Sep 12 11:16:59 2017</i>
<br><i>Compiler version: 5.1.0 (fca32d1)</i>
</body>
</html>
\ No newline at end of file
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html
index 9ea46b3..003fc71 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/montara/visualization/table_placement.html
@@ -1501,7 +1501,7 @@
<td align="center">0</td>
</tr>
</table>
-<br><i>Created on Fri Sep 8 08:26:21 2017</i>
+<br><i>Created on Tue Sep 12 11:16:59 2017</i>
<br><i>Compiler version: 5.1.0 (fca32d1)</i>
</body>
</html>
\ No newline at end of file