Fixing packet_io and regenerating default.p4 for tofino
Change-Id: I5c2c6565f71a13b375a8ec8da864e9157b8e56ed
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.config.log b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.config.log
index 202b8aa..b9b8cae 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.config.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/logs/parde.config.log
@@ -1,7 +1,7 @@
+---------------------------------------------------------------------+
| Log file: parde.config.log |
| Compiler version: 5.1.0 (fca32d1) |
-| Created on: Thu Sep 7 13:56:08 2017 |
+| Created on: Fri Sep 8 08:23:45 2017 |
+---------------------------------------------------------------------+
Configuring deparser.inp.iim.ii_phv_csum.csum_cfg[0].csum_cfg_entry[0].zero_m_s_b = 1
@@ -16059,11 +16059,11 @@
63 | g1w31:
|
8 bits
- 64 | I g2w0: [ig_intr_md_for_tm.copy_to_cpu]
- 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]
+ 64 | I g2w0: [ethernet.dstAddr[47:40]]
+ 65 | I g2w1: [ethernet.srcAddr[39:32]]
+ 66 | I g2w2: [POV[39:32]]
+ 67 | I g2w3: [ig_intr_md_for_tm.drop_ctl]
+ 68 | g2w4:
69 | g2w5:
70 | g2w6:
71 | g2w7:
@@ -16075,9 +16075,9 @@
77 | g2w13:
78 | g2w14:
79 | g2w15:
- 80 | E g2w16: [ig_intr_md_for_tm.copy_to_cpu]
- 81 | E g2w17: [eg_intr_md._pad7, eg_intr_md.egress_cos]
- 82 | E g2w18: [POV[7:0]]
+ 80 | E g2w16: [eg_intr_md._pad7, eg_intr_md.egress_cos]
+ 81 | E g2w17: [POV[7:0]]
+ 82 | g2w18:
83 | g2w19:
84 | g2w20:
85 | g2w21:
@@ -16143,9 +16143,9 @@
141 | g4w13:
142 | g4w14:
143 | g4w15:
- 144 | E g4w16: [ig_intr_md.ingress_port]
- 145 | E g4w17: [packet_in_hdr.ingress_port, packet_in_hdr._padding]
- 146 | E g4w18: [eg_intr_md._pad0, eg_intr_md.egress_port]
+ 144 | E g4w16: [eg_intr_md._pad0, eg_intr_md.egress_port]
+ 145 | g4w17:
+ 146 | g4w18:
147 | g4w19:
148 | g4w20:
149 | g4w21:
@@ -16234,9 +16234,9 @@
256 | I g8w0: [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]
257 | I g8w1: [ipv4.srcAddr]
258 | I g8w2: [ipv4.dstAddr]
- 259 | I g8w3: [tcp.ackNo, udp.length_, udp.checksum]
- 260 | I g8w4: [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window]
- 261 | I g8w5: [tcp.checksum, tcp.urgentPtr]
+ 259 | I g8w3: [tcp.dataOffset, tcp.res, tcp.ecn, tcp.ctrl, tcp.window, udp.length_, udp.checksum]
+ 260 | I g8w4: [tcp.checksum, tcp.urgentPtr]
+ 261 | g8w5:
262 | g8w6:
263 | g8w7:
264 | E g8w8: [ipv4.ttl, ipv4.protocol, ipv4.hdrChecksum]
@@ -16269,8 +16269,8 @@
289 | I g9w1: [ipv4.diffserv]
290 | I g9w2: [tcp.srcPort[15:8], udp.srcPort[15:8]]
291 | I g9w3: [tcp.srcPort[7:0], udp.srcPort[7:0]]
- 292 | g9w4:
- 293 | g9w5:
+ 292 | I g9w4: [tcp.dstPort[15:8]]
+ 293 | I g9w5: [tcp.dstPort[7:0]]
294 | g9w6:
295 | g9w7:
296 | E g9w8: [ipv4.version, ipv4.ihl]
@@ -16302,10 +16302,10 @@
320 | I g10w0: [ipv4.totalLen]
321 | I g10w1: [ipv4.identification]
322 | I g10w2: [ipv4.flags, ipv4.fragOffset]
- 323 | I g10w3: [tcp.dstPort, udp.dstPort]
- 324 | I g10w4: [tcp.seqNo[31:16]]
- 325 | I g10w5: [tcp.seqNo[15:0]]
- 326 | g10w6:
+ 323 | I g10w3: [tcp.seqNo[31:16], udp.dstPort]
+ 324 | I g10w4: [tcp.seqNo[15:0]]
+ 325 | I g10w5: [tcp.ackNo[31:16]]
+ 326 | I g10w6: [tcp.ackNo[15:0]]
327 | g10w7:
328 | g10w8:
329 | g10w9:
@@ -16319,7 +16319,7 @@
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]
+ 340 | E g10w20: [packet_out_hdr.egress_port, packet_out_hdr._padding, packet_in_hdr.ingress_port, packet_in_hdr._padding]
341 | g10w21:
342 | g10w22:
343 | g10w23:
@@ -16363,6 +16363,7 @@
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
@@ -16371,7 +16372,7 @@
4: parse_udp
5: default_parser
6: parse_pkt_out
- 7: <POV initialization>_<Egress intrinsic metadata>_<POV skip>_<Metadata bridge>_<_parse_bridged_ingress_intrinsic_metadata>_start
+ 7: <POV initialization>_<Egress intrinsic metadata>_<POV skip>_<_parse_bridged_ingress_intrinsic_metadata>_start
8: parse_pkt_in
---------------
POV layout:
@@ -16395,11 +16396,8 @@
6-254 | -
---------------
Bridged metadata:
-Ingress:
-[64, 128]
-Egress:
-[80, 144]
+[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']