Use 64 bits counters to mitigate wrapping

Change-Id: I5c1f6a936fcd0d5d38c95a9fe6344fd7bf440e91
diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.log b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.log
index ce12c78..0a05cb3 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.log
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/ecmp/mavericks/logs/mau.log
@@ -1,7 +1,7 @@
 +---------------------------------------------------------------------+
 |  Log file: mau.log                                                  |
 |  Compiler version: 5.1.0 (fca32d1)                                  |
-|  Created on: Wed Sep 13 01:40:42 2017                               |
+|  Created on: Wed Sep 13 12:57:41 2017                               |
 +---------------------------------------------------------------------+
 
 Match Table table0 did not specify the number of entries required. A default value (512) will be used.
@@ -1075,7 +1075,7 @@
     hash_distribution_hash_id = 0
     hash_group_id = 0
     hash_bits_in_units = OrderedDict([(0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9])])
-    address_left_shift = 1
+    address_left_shift = 2
 -------------------
 Allocating Hash Distribution Group 0/0 for table ingress_port_count_table in stage 2.
 Allocating Hash Bit 0 in hash match group 0 for table ingress_port_count_table in stage 2.
@@ -1210,7 +1210,7 @@
     ('ig_intr_md.ingress_port', 6) -> 6
     ('ig_intr_md.ingress_port', 7) -> 7
     ('ig_intr_md.ingress_port', 8) -> 8
-  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7f9400d2a750>)])
+  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7fe01e5e5650>)])
   hash_group_id: 0
   seed: [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, 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]
   table_direction: ingress
@@ -1223,7 +1223,7 @@
   hash_distribution_used_for : Statistics Address
   table_direction : ingress
   bits_to_use : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-  left_shift : 1
+  left_shift : 2
   expanded_lo : False
   expanded_hi : False
   expanded_bit_width : 0
@@ -1324,7 +1324,7 @@
     hash_distribution_hash_id = 1
     hash_group_id = 1
     hash_bits_in_units = OrderedDict([(0, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9])])
-    address_left_shift = 1
+    address_left_shift = 2
 -------------------
 Allocating Hash Distribution Group 1/0 for table egress_port_count_table in stage 2.
 Allocating Hash Bit 0 in hash match group 1 for table egress_port_count_table in stage 2.
@@ -1459,7 +1459,7 @@
     ('ig_intr_md_for_tm.ucast_egress_port', 6) -> 70
     ('ig_intr_md_for_tm.ucast_egress_port', 7) -> 71
     ('ig_intr_md_for_tm.ucast_egress_port', 8) -> 72
-  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7f9400d0a690>)])
+  hash_function_dictionary: OrderedDict([(0, <p4c_tofino.target.tofino.llir.mau.stage.resources.hash_function.HashFunction object at 0x7fe01e5e5ed0>)])
   hash_group_id: 1
   seed: [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, 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]
   table_direction: ingress
@@ -1472,7 +1472,7 @@
   hash_distribution_used_for : Statistics Address
   table_direction : ingress
   bits_to_use : [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
-  left_shift : 1
+  left_shift : 2
   expanded_lo : False
   expanded_hi : False
   expanded_bit_width : 0