Workaround to counter-issue as suggested by Antonin
Manually modified via makefile context.json
Change-Id: Ibed9e0691bf1d552db28470da57955e8f3ca802a
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.config.log
index f6b4359..e6fce26 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/parde.config.log
@@ -1,7 +1,7 @@
+---------------------------------------------------------------------+
| Log file: parde.config.log |
| Compiler version: 5.1.0 (fca32d1) |
-| Created on: Tue Sep 12 11:15:53 2017 |
+| Created on: Wed Sep 13 00:59:40 2017 |
+---------------------------------------------------------------------+
Configuring deparser.inp.iim.ii_phv_csum.csum_cfg[0].csum_cfg_entry[0].zero_m_s_b = 1
@@ -15994,9 +15994,9 @@
0 | I g0w0: [POV[31:0]]
1 | I g0w1: [ipv4.protocol, ipv4.hdrChecksum, ipv4.srcAddr[31:24]]
2 | I g0w2: [ipv4.dstAddr]
- 3 | I g0w3: [ethernet.dstAddr[39:8]]
- 4 | I g0w4: [ethernet.srcAddr[31:0]]
- 5 | I g0w5: [udp.srcPort, udp.dstPort]
+ 3 | I g0w3: [tcp.dstPort[7:0], tcp.seqNo[31:8]]
+ 4 | I g0w4: [ethernet.dstAddr[39:8]]
+ 5 | I g0w5: [ethernet.srcAddr[31:0]]
6 | g0w6:
7 | g0w7:
8 | g0w8:
@@ -16060,11 +16060,11 @@
|
8 bits
64 | I g2w0: [ipv4.srcAddr[23:16]]
- 65 | I g2w1: [ethernet.dstAddr[47:40]]
- 66 | I g2w2: [ethernet.srcAddr[39:32]]
- 67 | I g2w3: [POV[39:32]]
- 68 | I g2w4: [ig_intr_md_for_tm.drop_ctl]
- 69 | g2w5:
+ 65 | I g2w1: [tcp.srcPort[15:8], udp.srcPort[7:0]]
+ 66 | I g2w2: [ethernet.dstAddr[47:40]]
+ 67 | I g2w3: [ethernet.srcAddr[39:32]]
+ 68 | I g2w4: [POV[39:32]]
+ 69 | I g2w5: [ig_intr_md_for_tm.drop_ctl]
70 | g2w6:
71 | g2w7:
72 | g2w8:
@@ -16131,11 +16131,11 @@
129 | I g4w1: [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]
130 | I g4w2: [ig_intr_md_for_tm.ucast_egress_port]
131 | I g4w3: [ipv4.srcAddr[15:0]]
- 132 | I g4w4: [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
- 133 | I g4w5: [ethernet.etherType]
- 134 | I g4w6: [ecmp_metadata.group_id]
- 135 | I g4w7: [ecmp_metadata.selector]
- 136 | g4w8:
+ 132 | I g4w4: [tcp.srcPort[7:0], tcp.dstPort[15:8]]
+ 133 | I g4w5: [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
+ 134 | I g4w6: [ethernet.etherType]
+ 135 | I g4w7: [ecmp_metadata.group_id]
+ 136 | I g4w8: [ecmp_metadata.selector]
137 | g4w9:
138 | g4w10:
139 | g4w11:
@@ -16232,21 +16232,21 @@
|
32 bits
256 | I g8w0: [ipv4.identification[7:0], ipv4.flags, ipv4.fragOffset, ipv4.ttl]
- 257 | I g8w1: [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]
+ 257 | I g8w1: [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]
258 | I g8w2: [tcp.checksum, tcp.urgentPtr]
259 | g8w3:
- 260 | g8w4:
- 261 | g8w5:
- 262 | g8w6:
- 263 | g8w7:
- 264 | E g8w8: [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]
- 265 | E g8w9: [ipv4.srcAddr]
- 266 | E g8w10: [ipv4.dstAddr]
- 267 | E g8w11: [tcp.ackNo, udp.length_, udp.checksum]
- 268 | E g8w12: [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]
- 269 | E g8w13: [tcp.checksum, tcp.urgentPtr]
- 270 | E g8w14: [ethernet.dstAddr[39:8]]
- 271 | E g8w15: [ethernet.srcAddr[31:0]]
+ 260 | E g8w4: [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]
+ 261 | E g8w5: [ipv4.srcAddr]
+ 262 | E g8w6: [ipv4.dstAddr]
+ 263 | E g8w7: [tcp.ackNo, udp.length_, udp.checksum]
+ 264 | E g8w8: [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]
+ 265 | E g8w9: [tcp.checksum, tcp.urgentPtr]
+ 266 | E g8w10: [ethernet.dstAddr[39:8]]
+ 267 | E g8w11: [ethernet.srcAddr[31:0]]
+ 268 | g8w12:
+ 269 | g8w13:
+ 270 | g8w14:
+ 271 | g8w15:
272 | g8w16:
273 | g8w17:
274 | g8w18:
@@ -16266,19 +16266,19 @@
|
8 bits
288 | I g9w0: [ipv4.version, ipv4.ihl]
- 289 | I g9w1: [tcp.srcPort[15:8], udp.length_[15:8]]
- 290 | I g9w2: [tcp.srcPort[7:0], udp.length_[7:0]]
- 291 | I g9w3: [tcp.dstPort[15:8]]
- 292 | I g9w4: [tcp.dstPort[7:0]]
- 293 | g9w5:
- 294 | g9w6:
- 295 | g9w7:
- 296 | E g9w8: [ipv4.version, ipv4.ihl]
- 297 | E g9w9: [ipv4.diffserv]
- 298 | E g9w10: [tcp.srcPort[15:8], udp.srcPort[15:8]]
- 299 | E g9w11: [tcp.srcPort[7:0], udp.srcPort[7:0]]
- 300 | E g9w12: [ethernet.dstAddr[47:40]]
- 301 | E g9w13: [ethernet.srcAddr[39:32]]
+ 289 | I g9w1: [tcp.seqNo[7:0], udp.srcPort[15:8]]
+ 290 | g9w2:
+ 291 | g9w3:
+ 292 | E g9w4: [ipv4.version, ipv4.ihl]
+ 293 | E g9w5: [ipv4.diffserv]
+ 294 | E g9w6: [tcp.srcPort[15:8], udp.srcPort[15:8]]
+ 295 | E g9w7: [tcp.srcPort[7:0], udp.srcPort[7:0]]
+ 296 | E g9w8: [ethernet.dstAddr[47:40]]
+ 297 | E g9w9: [ethernet.srcAddr[39:32]]
+ 298 | g9w10:
+ 299 | g9w11:
+ 300 | g9w12:
+ 301 | g9w13:
302 | g9w14:
303 | g9w15:
304 | g9w16:
@@ -16301,25 +16301,25 @@
16 bits
320 | I g10w0: [ipv4.diffserv, ipv4.totalLen[15:8]]
321 | I g10w1: [ipv4.totalLen[7:0], ipv4.identification[15:8]]
- 322 | I g10w2: [tcp.seqNo[31:16], udp.checksum]
- 323 | I g10w3: [tcp.seqNo[15:0]]
- 324 | I g10w4: [tcp.ackNo[31:16]]
- 325 | I g10w5: [tcp.ackNo[15:0]]
- 326 | g10w6:
- 327 | g10w7:
- 328 | g10w8:
- 329 | g10w9:
- 330 | g10w10:
- 331 | g10w11:
- 332 | E g10w12: [ipv4.totalLen]
- 333 | E g10w13: [ipv4.identification]
- 334 | E g10w14: [ipv4.flags, ipv4.fragOffset]
- 335 | E g10w15: [tcp.dstPort]
- 336 | E g10w16: [tcp.seqNo[31:16], udp.dstPort]
- 337 | E g10w17: [tcp.seqNo[15:0]]
- 338 | E g10w18: [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
- 339 | E g10w19: [ethernet.etherType]
- 340 | E g10w20: [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]
+ 322 | I g10w2: [tcp.ackNo[31:16], udp.dstPort]
+ 323 | I g10w3: [tcp.ackNo[15:0]]
+ 324 | g10w4:
+ 325 | g10w5:
+ 326 | E g10w6: [ipv4.totalLen]
+ 327 | E g10w7: [ipv4.identification]
+ 328 | E g10w8: [ipv4.flags, ipv4.fragOffset]
+ 329 | E g10w9: [tcp.dstPort, udp.dstPort]
+ 330 | E g10w10: [tcp.seqNo[31:16]]
+ 331 | E g10w11: [tcp.seqNo[15:0]]
+ 332 | E g10w12: [ethernet.dstAddr[7:0], ethernet.srcAddr[47:40]]
+ 333 | E g10w13: [ethernet.etherType]
+ 334 | E g10w14: [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]
+ 335 | g10w15:
+ 336 | g10w16:
+ 337 | g10w17:
+ 338 | g10w18:
+ 339 | g10w19:
+ 340 | g10w20:
341 | g10w21:
342 | g10w22:
343 | g10w23:
@@ -16363,7 +16363,6 @@
7: parse_pkt_out
8: <POV initialization>_<Ingress intrinsic metadata>_<Phase 0>
9: start
- 10: parse_tcp//spilled
Egress:
0: <Shim start state>
1: parse_ethernet
@@ -16399,5 +16398,5 @@
[None]
---------------
Deparse order:
-Ingress: ['metadata_bridge', '_bridged_intr_md_', 'packet_out_hdr', 'packet_in_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
-Egress: ['packet_out_hdr', 'packet_in_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
+Ingress: ['metadata_bridge', '_bridged_intr_md_', 'packet_in_hdr', 'packet_out_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']
+Egress: ['packet_in_hdr', 'packet_out_hdr', 'ethernet', 'ipv4', 'udp', 'tcp']