Fixing packet_io and regenerating default.p4 for tofino

Change-Id: I5c2c6565f71a13b375a8ec8da864e9157b8e56ed
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.characterize.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.characterize.log
index ea74364..37c2fe6 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.characterize.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.characterize.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.characterize.log                                     |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Thu Sep  7 14:48:49 2017                               |
+|  Created on: Fri Sep  8 08:25:15 2017                               |
 +---------------------------------------------------------------------+
 
 Match+Action Resource Usage
@@ -16,19 +16,16 @@
 |                          |         |       |         |      |                 |       |                    |               | ver/vld |       |                     |            |               |               |        |             |    Units     |    Units     |               |               |                 |
 |                          |         |       |         |      |                 |       |                    |               |         |       |                     |            |               |               |        |             |    (bits)    |    (bits)    |               |               |                 |
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-|       ingress_pkt        | ingress |   0   |         |  -   |  0 (0/0/0/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
-|        egress_pkt        |  egress |   0   |         |  -   |  0 (0/0/0/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
-|      stage 0 totals      |    -    |   -   |    -    |  -   |  0 (0/0/0/0/0)  |   0   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
+|          table0          | ingress |   0   | ternary | tcam |  4 (0/1/2/0/1)  |   3   |   512 / 512 (0)    | 121 / 121 (0) |    4    |   5   |   1/4/0/0/0/0/0/0   | 0 / 0 (0)  | 125 / 132 (7) |   5 / 8 (3)   |   16   | 16 / 16 (0) | 1 in 3 (132) | 1 in 3 (132) | 91.7% / 91.7% |     - / -     | 100.0% / 100.0% |
+| process_packet_out_table | ingress |   0   |         |  -   |  0 (0/0/0/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
+|      stage 0 totals      |    -    |   -   |    -    |  -   |  4 (0/1/2/0/1)  |   3   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
 |                          |         |       |         |      |                 |       |                    |               |         |       |                     |            |               |               |        |             |              |              |               |               |                 |
-|          table0          | ingress |   1   | ternary | tcam |  4 (0/1/2/0/1)  |   3   |   512 / 512 (0)    | 121 / 121 (0) |    4    |   5   |   1/4/0/0/0/0/0/0   | 0 / 0 (0)  | 125 / 132 (7) |   5 / 8 (3)   |   16   | 16 / 16 (0) | 1 in 3 (132) | 1 in 3 (132) | 91.7% / 91.7% |     - / -     | 100.0% / 100.0% |
-|      stage 1 totals      |    -    |   -   |    -    |  -   |  4 (0/1/2/0/1)  |   3   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
+|     ecmp_group_table     | ingress |   1   |  exact  | sram |  5 (3/0/2/0/0)  |   0   | 1024 / 3072 (2048) | 32 / 22 (-10) |    0    |   20  |   0/0/0/0/0/0/4/16  | 9 / 16 (7) |   0 / 0 (0)   | 52 / 42 (-10) |   9    |  0 / 0 (0)  | 3 in 1 (128) | 1 in 1 (128) |     - / -     | 96.1% / 29.7% |      - / -      |
+|      stage 1 totals      |    -    |   -   |    -    |  -   |  5 (3/0/2/0/0)  |   0   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
 |                          |         |       |         |      |                 |       |                    |               |         |       |                     |            |               |               |        |             |              |              |               |               |                 |
-|     ecmp_group_table     | ingress |   2   |  exact  | sram |  5 (3/0/2/0/0)  |   0   | 1024 / 3072 (2048) | 32 / 22 (-10) |    0    |   20  |   0/0/0/0/0/0/4/16  | 9 / 16 (7) |   0 / 0 (0)   | 52 / 42 (-10) |   9    |  0 / 0 (0)  | 3 in 1 (128) | 1 in 1 (128) |     - / -     | 96.1% / 29.7% |      - / -      |
-|      stage 2 totals      |    -    |   -   |    -    |  -   |  5 (3/0/2/0/0)  |   0   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
-|                          |         |       |         |      |                 |       |                    |               |         |       |                     |            |               |               |        |             |              |              |               |               |                 |
-| ingress_port_count_table | ingress |   3   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
-| egress_port_count_table  | ingress |   3   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
-|      stage 3 totals      |    -    |   -   |    -    |  -   |  4 (0/0/4/0/0)  |   0   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
+| ingress_port_count_table | ingress |   2   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
+| egress_port_count_table  | ingress |   2   |         |  -   |  2 (0/0/2/0/0)  |   0   |  1024 / 1 (-1023)  |   0 / 0 (0)   |    0    |   0   |   0/0/0/0/0/0/0/0   | 0 / 0 (0)  |   0 / 0 (0)   |   0 / 0 (0)   |   0    |  0 / 0 (0)  |  0 in 0 (0)  |  1 in 0 (0)  |     - / -     |     - / -     |      - / -      |
+|      stage 2 totals      |    -    |   -   |    -    |  -   |  4 (0/0/4/0/0)  |   0   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
 |                          |         |       |         |      |                 |       |                    |               |         |       |                     |            |               |               |        |             |              |              |               |               |                 |
 |      overall totals      |    -    |   -   |    -    |  -   |  13 (3/1/8/0/1) |   3   |         -          |       -       |    -    |   -   |          -          |     -      |       -       |       -       |   -    |      -      |      -       |      -       |       -       |       -       |        -        |
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -77,19 +74,11 @@
 
   Total bits: 20
 +----------------------------------------------------------------+
-   ingress_pkt
+   process_packet_out_table
 +----------------------------------------------------------------+
 Match Overhead:
-  Field --instruction_address-- [1:0] (2 bits)
 
-  Total bits: 2
-+----------------------------------------------------------------+
-   egress_pkt
-+----------------------------------------------------------------+
-Match Overhead:
-  Field --instruction_address-- [1:0] (2 bits)
-
-  Total bits: 2
+  Total bits: 0
 +----------------------------------------------------------------+
    table0
 +----------------------------------------------------------------+
@@ -148,28 +137,10 @@
 ]
 
 +----------------------------------------------------------------+
-   ingress_pkt__action__:
+   process_packet_out_table__action__:
 +----------------------------------------------------------------+
 
-Action _packet_out:
----------------------------
-Pack Format:
-  table_word_width: 128
-  memory_word_width: 128
-  entries_per_table_word: 1
-  number_memory_units_per_table_word: 1
-  entry_list: [
-  entry_number : 0
-  field_list : [
-    ]
-       Field --padding-- is 0 bits   : in bits [127:0]
-]
-
-+----------------------------------------------------------------+
-   egress_pkt__action__:
-+----------------------------------------------------------------+
-
-Action add_packet_in_hdr:
+Action _process_packet_out:
 ---------------------------
 Pack Format:
   table_word_width: 128
@@ -292,35 +263,43 @@
   entry_number : 7
   field_list : [
     ]
-       Field --padding-- [15:0]   : in bits [127:112]
+       Field --padding-- [6:0]      : in bits [127:121]
+       Field --constant-0-- [8:0]   : in bits [120:112]
   entry_number : 6
   field_list : [
     ]
-       Field --padding-- [15:0]   : in bits [111:96]
+       Field --padding-- [6:0]      : in bits [111:105]
+       Field --constant-0-- [8:0]   : in bits [104:96]
   entry_number : 5
   field_list : [
     ]
-       Field --padding-- [15:0]   : in bits [95:80]
+       Field --padding-- [6:0]      : in bits [95:89]
+       Field --constant-0-- [8:0]   : in bits [88:80]
   entry_number : 4
   field_list : [
     ]
-       Field --padding-- [15:0]   : in bits [79:64]
+       Field --padding-- [6:0]      : in bits [79:73]
+       Field --constant-0-- [8:0]   : in bits [72:64]
   entry_number : 3
   field_list : [
     ]
-       Field --padding-- [15:0]   : in bits [63:48]
+       Field --padding-- [6:0]      : in bits [63:57]
+       Field --constant-0-- [8:0]   : in bits [56:48]
   entry_number : 2
   field_list : [
     ]
-       Field --padding-- [15:0]   : in bits [47:32]
+       Field --padding-- [6:0]      : in bits [47:41]
+       Field --constant-0-- [8:0]   : in bits [40:32]
   entry_number : 1
   field_list : [
     ]
-       Field --padding-- [15:0]   : in bits [31:16]
+       Field --padding-- [6:0]      : in bits [31:25]
+       Field --constant-0-- [8:0]   : in bits [24:16]
   entry_number : 0
   field_list : [
     ]
-       Field --padding-- [15:0]   : in bits [15:0]
+       Field --padding-- [6:0]      : in bits [15:9]
+       Field --constant-0-- [8:0]   : in bits [8:0]
 ]