Adds uploading picture benchmark JSON data

Adds uploading picture benchmark JSON data

BUG=skia:

Committed: https://skia.googlesource.com/buildbot/+/a3f08be531ef07ae4bf725cd6c0abd8dfc14b209

[kelvinly, 2014-05-29 21:06:40]

Combines all the picture bench data into a single JSON file, which is then
uploaded to gs://chromium-skia-gm/pics-json/year/mo/dy/hr/....

[benchen, 2014-05-29 22:20:09]

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/run...
File slave/skia_slave_scripts/run_bench.py (right):

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/run...
slave/skia_slave_scripts/run_bench.py:13: from utils import misc  # Looks like
this is removable?
Yes, it seems unused. Please remove. Thanks.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
File slave/skia_slave_scripts/upload_bench_results.py (right):

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:22: # Modified from Skia repo
code
Please add the original file name/location to the comment.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:38: # bench_entry:
[<Bench_BmpConfig_TimeType>,<Platform-Alg>]
This and the comment below were legacy codes with non-good style. Please add
descriptions of expectations dictionary to the method docstring.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:133: json_write_name =
'pictures_{}_{}.json'.format(self._got_revision,
To be consistent, please use file name skpbench_*.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:155: # Find and open JSON file
to add in additional fields, then upload.
This part is now microbench only. Should update the comment, and probably rename
json_file_name to something like microbench_json_file.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/uti...
File slave/skia_slave_scripts/utils/sync_bucket_subdir.py (right):

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/uti...
slave/skia_slave_scripts/utils/sync_bucket_subdir.py:33: exclude_json=True,
Do we upload json files somewhere else, like gm?
A safe way would be to make it False by default, and use True where needed.

[kelvinly, 2014-05-30 00:44:51]

Fixed style problems

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/run...
File slave/skia_slave_scripts/run_bench.py (right):

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/run...
slave/skia_slave_scripts/run_bench.py:13: from utils import misc  # Looks like
this is removable?
On 2014/05/29 22:20:09, benchen wrote:
> Yes, it seems unused. Please remove. Thanks.

Done.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
File slave/skia_slave_scripts/upload_bench_results.py (right):

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:22: # Modified from Skia repo
code
On 2014/05/29 22:20:09, benchen wrote:
> Please add the original file name/location to the comment.

Done.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:22: # Modified from Skia repo
code
On 2014/05/29 22:20:09, benchen wrote:
> Please add the original file name/location to the comment.

Done.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:38: # bench_entry:
[<Bench_BmpConfig_TimeType>,<Platform-Alg>]
On 2014/05/29 22:20:09, benchen wrote:
> This and the comment below were legacy codes with non-good style. Please add
> descriptions of expectations dictionary to the method docstring.

I find the last comment fairly helpful though, what's wrong with it?

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:133: json_write_name =
'pictures_{}_{}.json'.format(self._got_revision,
On 2014/05/29 22:20:09, benchen wrote:
> To be consistent, please use file name skpbench_*.

Done.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:155: # Find and open JSON file
to add in additional fields, then upload.
On 2014/05/29 22:20:09, benchen wrote:
> This part is now microbench only. Should update the comment, and probably
rename
> json_file_name to something like microbench_json_file.

Done.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/uti...
File slave/skia_slave_scripts/utils/sync_bucket_subdir.py (right):

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/uti...
slave/skia_slave_scripts/utils/sync_bucket_subdir.py:33: exclude_json=True,
On 2014/05/29 22:20:09, benchen wrote:
> Do we upload json files somewhere else, like gm?
> A safe way would be to make it False by default, and use True where needed.
Ah, good catch. Fixed

[benchen, 2014-05-30 00:57:23]

LGTM with minor suggestions.

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
File slave/skia_slave_scripts/upload_bench_results.py (right):

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:38: # bench_entry:
[<Bench_BmpConfig_TimeType>,<Platform-Alg>]
Just that it's not recommended style.. the format of the return value (the
expectations dictionary) is better documented in the docstring. But I see you're
trying to keep the existing style, which is also fine..
I was wrong that this comment for bench_entry should stay somewhere, maybe above
Line 34.
On 2014/05/30 00:44:51, kelvinly wrote:
> On 2014/05/29 22:20:09, benchen wrote:
> > This and the comment below were legacy codes with non-good style. Please add
> > descriptions of expectations dictionary to the method docstring.
> 
> I find the last comment fairly helpful though, what's wrong with it?

https://codereview.chromium.org/304393002/diff/20001/slave/skia_slave_scripts...
File slave/skia_slave_scripts/upload_bench_results.py (right):

https://codereview.chromium.org/304393002/diff/20001/slave/skia_slave_scripts...
slave/skia_slave_scripts/upload_bench_results.py:23: #
github.com/google/skia/blob/795905562d1bd8bbedcf47f6a00efb220ec8bbe0/bench/check_bench_regressions.py
just bench/check_bench_regressions.py will be sufficient, no need to add github
link.

[kelvinly, 2014-05-30 02:15:31]

Will commit now

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
File slave/skia_slave_scripts/upload_bench_results.py (right):

https://codereview.chromium.org/304393002/diff/1/slave/skia_slave_scripts/upl...
slave/skia_slave_scripts/upload_bench_results.py:38: # bench_entry:
[<Bench_BmpConfig_TimeType>,<Platform-Alg>]
On 2014/05/30 00:57:23, benchen wrote:
> Just that it's not recommended style.. the format of the return value (the
> expectations dictionary) is better documented in the docstring. But I see
you're
> trying to keep the existing style, which is also fine..
> I was wrong that this comment for bench_entry should stay somewhere, maybe
above
> Line 34.
> On 2014/05/30 00:44:51, kelvinly wrote:
> > On 2014/05/29 22:20:09, benchen wrote:
> > > This and the comment below were legacy codes with non-good style. Please
add
> > > descriptions of expectations dictionary to the method docstring.
> > 
> > I find the last comment fairly helpful though, what's wrong with it?
> 

Done.

https://codereview.chromium.org/304393002/diff/20001/slave/skia_slave_scripts...
File slave/skia_slave_scripts/upload_bench_results.py (right):

https://codereview.chromium.org/304393002/diff/20001/slave/skia_slave_scripts...
slave/skia_slave_scripts/upload_bench_results.py:23: #
github.com/google/skia/blob/795905562d1bd8bbedcf47f6a00efb220ec8bbe0/bench/check_bench_regressions.py
On 2014/05/30 00:57:23, benchen wrote:
> just bench/check_bench_regressions.py will be sufficient, no need to add
github
> link.

Done.

[kelvinly, 2014-05-30 02:15:45]

The CQ bit was checked by kelvinly@google.com

[commit-bot: I haz the power, 2014-05-30 02:16:42]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/kelvinly@google.com/304393002/40001

[commit-bot: I haz the power, 2014-05-30 02:16:58]

Change committed as a3f08be531ef07ae4bf725cd6c0abd8dfc14b209

[epoger, 2014-05-30 14:25:41]

A revert of this CL has been created in
https://codereview.chromium.org/311433002/ by epoger@google.com.

The reason for reverting is: http://skbug.com/2628 ('UploadBenchResults failing
on all Perf-* bots').