Make expectations script fixes and perf expectations updates.

Output missing json data message by default.

Fixed a bug with improve == regress case for negative numbers.

Reran all data, 5 keys had their improve values change by 1% due to
code changes in make_expectations.

TBR=nsylvain@chromium.org

Review URL: http://codereview.chromium.org/8210002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104664 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 9 deletions

diff --git a/tools/perf_expectations/make_expectations.py b/tools/perf_expectations/make_expectations.py
index f73383d..b5adf68 100755
--- a/tools/perf_expectations/make_expectations.py
+++ b/tools/perf_expectations/make_expectations.py
@@ -202,8 +202,9 @@ def Main(args):
     summary_url = '%s/%s/%s/%s-summary.dat' % (base_url, system, test, graph)
     summaryjson = FetchUrlContents(summary_url)
     if not summaryjson:
-      OutputMessage('missing json data, skipping')
-      continue
+      OutputMessage('ERROR: cannot find json data, please verify',
+                    verbose_message=False)
+      return 0
 
     # Set value's type to 'relative' by default.
     value_type = value.get('type', 'relative')
@@ -271,7 +272,7 @@ def Main(args):
     # improve so it is just a little less than regress.  I'm picking on improve
     # so we keep the sizes assumptions in place for now.
     if regress == improve:
-      improve = float(regress * 0.99)
+      improve = float(improve - abs(regress * 0.01))
 
     # If the existing values assume regressions are low deltas relative to
     # improvements, swap our regress and improve.  This value must be a
diff --git a/tools/perf_expectations/perf_expectations.json b/tools/perf_expectations/perf_expectations.json
index 71ef600..7ac1fd9 100644
--- a/tools/perf_expectations/perf_expectations.json
+++ b/tools/perf_expectations/perf_expectations.json
@@ -2,13 +2,13 @@
  "linux-release-64/sizes/chrome-data/data": {"reva": 91119, "revb": 91326, "type": "absolute", "improve": 2309480, "regress": 2557742, "sha1": "fd84a9d2"},
  "linux-release-64/sizes/chrome-si/initializers": {"reva": 104463, "revb": 104463, "type": "absolute", "improve": 288, "regress": 291, "tolerance": 0, "sha1": "63f3ea9c"},
  "linux-release-64/sizes/chrome-text/text": {"reva": 104463, "revb": 104463, "type": "absolute", "improve": 60823945, "regress": 67905522, "sha1": "6887f46b"},
- "linux-release-64/sizes/chrome.pak/chrome.pak": {"reva": 93584, "revb": 93660, "type": "absolute", "improve": 2922846, "regress": 3230516, "sha1": "a32b48c6"},
+ "linux-release-64/sizes/chrome.pak/chrome.pak": {"reva": 93584, "revb": 93660, "type": "absolute", "improve": 2893618, "regress": 3230516, "sha1": "ddcb764c"},
  "linux-release-64/sizes/chrome/chrome": {"reva": 99734, "revb": 100028, "type": "absolute", "improve": 78759552, "regress": 87104926, "sha1": "48bce0e1"},
  "linux-release-hardy/dhtml/commit_charge/cc": {"reva": 63231, "revb": 64325, "improve": -6947, "regress": 25528, "sha1": "0e22e67a"},
  "linux-release-hardy/dhtml/processes/proc_": {"improve": 0, "regress": 0, "sha1": "696fcb0f"},
  "linux-release-hardy/dhtml/times/t": {"reva": 99393, "revb": 100034, "improve": -68, "regress": 21, "sha1": "9c13cabb"},
  "linux-release-hardy/dhtml/total_byte_b/IO_b": {"reva": 85983, "revb": 88209, "improve": 4132, "regress": 6013, "sha1": "b7cb3bfb"},
- "linux-release-hardy/dhtml/total_byte_r/IO_r": {"reva": 71820, "revb": 73091, "improve": -42, "regress": -38, "sha1": "2fa955ce"},
+ "linux-release-hardy/dhtml/total_byte_r/IO_r": {"reva": 71820, "revb": 73091, "improve": -43, "regress": -38, "sha1": "9a4533d7"},
  "linux-release-hardy/dhtml/total_op_b/IO_op_b": {"reva": 70127, "revb": 76230, "improve": 26261, "regress": 40613, "sha1": "1658213e"},
  "linux-release-hardy/dhtml/total_op_r/IO_op_r": {"reva": 80853, "revb": 81211, "improve": 60, "regress": 698, "sha1": "17890f30"},
  "linux-release-hardy/dhtml/vm_rss_final_b/vm_rss_f_b": {"reva": 78369, "revb": 79175, "improve": 11101593, "regress": 12855092, "sha1": "46e5fb4d"},
@@ -47,10 +47,10 @@
  "linux-release/morejs/times/t": {"reva": 102913, "revb": 104239, "improve": 26, "regress": 128, "sha1": "3d7de2e6"},
  "linux-release/moz/times/t": {"reva": 99393, "revb": 100034, "improve": -40, "regress": 172, "sha1": "2cf4039f"},
  "linux-release/sizes/chrome-bss/bss": {"reva": 91085, "revb": 91326, "type": "absolute", "improve": 328321, "regress": 362950, "sha1": "6718b4cc"},
- "linux-release/sizes/chrome-data/data": {"reva": 98413, "revb": 98423, "type": "absolute", "improve": 1199515, "regress": 1325781, "sha1": "e8545530"},
+ "linux-release/sizes/chrome-data/data": {"reva": 98413, "revb": 98423, "type": "absolute", "improve": 1187520, "regress": 1325781, "sha1": "6c95adae"},
  "linux-release/sizes/chrome-si/initializers": {"reva": 104386, "revb": 104390, "type": "absolute", "improve": 290, "regress": 293, "tolerance": 0, "sha1": "917bb173"},
  "linux-release/sizes/chrome-text/text": {"reva": 91010, "revb": 101959, "type": "absolute", "improve": 50917816, "regress": 59260180, "sha1": "d50aeb06"},
- "linux-release/sizes/chrome.pak/chrome.pak": {"reva": 93584, "revb": 93660, "type": "absolute", "improve": 2922846, "regress": 3230516, "sha1": "71901043"},
+ "linux-release/sizes/chrome.pak/chrome.pak": {"reva": 93584, "revb": 93660, "type": "absolute", "improve": 2893618, "regress": 3230516, "sha1": "d1047e17"},
  "linux-release/sizes/chrome/chrome": {"reva": 99734, "revb": 100028, "type": "absolute", "improve": 68631100, "regress": 75912682, "sha1": "62b2e7be"},
  "linux-release/startup/times/t": {"improve": -15, "regress": 15, "sha1": "c8f06f81"},
  "mac-release-10.5/dhtml/times/t": {"reva": 102949, "revb": 104239, "improve": -153, "regress": 218, "sha1": "4f4b0e51"},
@@ -113,8 +113,8 @@
  "xp-release-single-core/moz/times/t": {"reva": 75758, "revb": 76221, "improve": -1705, "regress": 3304, "sha1": "b615a416"},
  "xp-release-single-core/startup/times/t": {"improve": -9, "regress": 9, "sha1": "b1bf03da"},
  "xp-release/sizes/chrome.dll/chrome.dll": {"reva": 100820, "revb": 100961, "type": "absolute", "improve": 35191526, "regress": 38926004, "sha1": "94524a77"},
- "xp-release/sizes/chrome.exe/chrome.exe": {"reva": 81814, "revb": 82805, "type": "absolute", "improve": 1068134, "regress": 1180570, "sha1": "e56118d2"},
+ "xp-release/sizes/chrome.exe/chrome.exe": {"reva": 81814, "revb": 82805, "type": "absolute", "improve": 1057453, "regress": 1180570, "sha1": "24fe20f6"},
  "xp-release/sizes/mini_installer.exe/mini_installer.exe": {"reva": 84829, "revb": 85049, "type": "absolute", "improve": 18061977, "regress": 20016999, "sha1": "aca62812"},
- "xp-release/sizes/setup.exe/setup.exe": {"reva": 81852, "revb": 82805, "type": "absolute", "improve": 1138662, "regress": 1258522, "sha1": "f1de9ae7"},
+ "xp-release/sizes/setup.exe/setup.exe": {"reva": 81852, "revb": 82805, "type": "absolute", "improve": 1127275, "regress": 1258522, "sha1": "13bbca59"},
  "load": true
 }