Bump mac static initializer count to 4 to work around bug.

It looks like when we're computing the number of static
initializers on mac we're still assuming a 32-bit word and not the
64-bit words that we actually use, and so we mis-report the
number of initializers as twice what they actually are.

All of this perf expectation code needs to be ripped out and
replaced with some dumb static checks, but for now, this CL
just updates the expected number from 2 (the correct number) to
4, and updates the checksums in the json file to get the presubmit
to pass.

BUG=831951, 832854
TBR=avi@chromium.org, wolenetz@chromium.org, thakis@chromium.org
NOTRY=true
NOTREECHECKS=true

Change-Id: Ie6de49af3cc1443b8acc36ce80946ea50e5a76ab
Reviewed-on: https://chromium-review.googlesource.com/1013205
Commit-Queue: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550768}

tools/perf_expectations/make_expectations.py

@@ -188,6 +188,8 @@ def Main(args):
       OutputMessage('checksum matches, skipping')
       continue
     elif options.checksum:
+      OutputMessage('checksum mismatch, original = %s, computed = %s' %
+                    (original_checksum, computed_checksum))
       found_checksum_mismatch = True
       continue
 

tools/perf_expectations/perf_expectations.json

-{"linux-release-64/sizes/chrome-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 8, "regress": 8, "tolerance": 0, "sha1": "de779422"},
- "linux-release-64/sizes/nacl_helper-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 6, "regress": 8, "sha1": "f29296a1"},
+{"linux-release-64/sizes/chrome-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 8, "regress": 8, "tolerance": 0, "sha1": "3c815259"},
+ "linux-release-64/sizes/nacl_helper-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 6, "regress": 8, "sha1": "8416f450"},
  "linux-release-64/sizes/nacl_helper_bootstrap-si/initializers": {"reva": 114822, "revb": 115019, "type": "absolute", "better": "lower", "improve": 0, "regress": 0, "sha1": "228221af"},
- "linux-release/sizes/chrome-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 9, "regress": 9, "tolerance": 0, "sha1": "b639bbc4"},
- "linux-release/sizes/nacl_helper-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 7, "regress": 9, "sha1": "3394be7f"},
+ "linux-release/sizes/chrome-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 9, "regress": 9, "tolerance": 0, "sha1": "03dc3cfd"},
+ "linux-release/sizes/nacl_helper-si/initializers": {"reva": 480969, "revb": 480969, "type": "absolute", "better": "lower", "improve": 7, "regress": 9, "sha1": "1a3c5b2b"},
  "linux-release/sizes/nacl_helper_bootstrap-si/initializers": {"reva": 114822, "revb": 115019, "type": "absolute", "better": "lower", "improve": 0, "regress": 0, "sha1": "dd908f29"},
- "mac-release/sizes/chrome-si/initializers": {"reva": 281731, "revb": 281731, "type": "absolute", "better": "lower", "improve": 0, "regress": 2, "tolerance": 0, "sha1": "01759b7f"},
+ "mac-release/sizes/chrome-si/initializers": {"reva": 281731, "revb": 281731, "type": "absolute", "better": "lower", "improve": 0, "regress": 4, "tolerance": 0, "sha1": "b45b7911"},
  "load": true
 }