Fix builder name references

bench/gen_skp_ranges.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be found
 # in the LICENSE file.
 
 """ Analyze recent SkPicture bench data, and output suggested ranges.
 
 The outputs can be edited and pasted to bench_expectations.txt to trigger
 buildbot alerts if the actual benches are out of range. Details are documented
 in the .txt file.
@@ skipping 22 matching lines @@
 
 # Ratios for calculating suggested picture bench upper and lower bounds.
 BENCH_UB = 1.1  # Allow for 10% room for normal variance on the up side.
 BENCH_LB = 0.9
 
 # Further allow for a fixed amount of noise. This is especially useful for
 # benches of smaller absolute value. Keeping this value small will not affect
 # performance tunings.
 BENCH_ALLOWED_NOISE = 10
 
+# Name prefix for benchmark builders.
+BENCH_BUILDER_PREFIX = 'Perf-'
+
 # List of platforms to track. Feel free to change it to meet your needs.
-PLATFORMS = ['MacMini_10_8_Float_Bench_32',
-             'Nexus7_4-1_Float_Bench_32',
-             'Shuttle_Ubuntu12_ATI5770_Float_Bench_32',
-             'Shuttle_Win7_Intel_Float_Bench_32',
+PLATFORMS = ['Perf-Mac10.8-MacMini4.1-GeForce320M-x86-Release',
+             'Perf-Android-Nexus7-Tegra3-Arm7-Release',
+             'Perf-Ubuntu12-ShuttleA-ATI5770-x86-Release',
+             'Perf-Win7-ShuttleA-HD2000-x86-Release',
             ]
 
 # Filter for configs of no interest. They are old config names replaced by more
 # specific ones.
 CONFIGS_TO_FILTER = ['gpu', 'raster']
 
 # Template for gsutil uri.
 GOOGLE_STORAGE_URI_SCHEME = 'gs'
 URI_BUCKET = 'chromium-skia-gm'
 
@@ skipping 29 matching lines @@
 
   Ignores data with revisions outside [rev_min, rev_max] integer range. For
   bench data with multiple revisions, we use higher revisions to calculate
   expected bench values.
   Uses the provided representation_alg for calculating bench representations.
   """
   expectation_dic = {}
   uri = boto.storage_uri(URI_BUCKET, GOOGLE_STORAGE_URI_SCHEME)
   for obj in uri.get_bucket():
     # Filters out non-skp-bench files.
-    if ((not obj.name.startswith('perfdata/Skia_') and
-         not obj.name.startswith('playback/perfdata/Skia_')) or
+    if ((not obj.name.startswith('perfdata/%s' % BENCH_BUILDER_PREFIX) and
+         not obj.name.startswith(
+             'playback/perfdata/%s' % BENCH_BUILDER_PREFIX)) or
         obj.name.find('_data_skp_') < 0):
       continue
     # Ignores uninterested platforms.
     platform = obj.name.split('/')[1]
-    if not platform.startswith('Skia_'):
+    if not platform.startswith(BENCH_BUILDER_PREFIX):
       platform = obj.name.split('/')[2]
-    if not platform.startswith('Skia_'):
+    if not platform.startswith(BENCH_BUILDER_PREFIX):
       continue  # Ignores non-platform object
-    platform = platform[5:]  # Removes "Skia_" prefix.

[rmistry, 2013/04/29 20:44:31]

Food for thought:
The advantage of this step which can be improved with:
platform = platform[len(BENCH_BUILDER_PREFIX)]
is that you do not have to specify the prefix in the above PLATFORMS list.

However, the advantage of specifying the prefixes in the PLATFORMS list is we
can then get it from master/json/perfplatforms which is how we can remove the
above hardcoding.

[borenet, 2013/04/29 20:54:09]

I don't like having builder names modified anywhere.  If we have to assume that
they have a common prefix, I think it's okay (if suboptimal) to list that, but I
don't want to remove it.  To me, saving five characters isn't worth the
potential confusion.

     if platform not in PLATFORMS:
       continue
     # Filters by revision.
     to_filter = True
     for rev in range(rev_min, rev_max + 1):
       if '_r%s_' % rev in obj.name:
         to_filter = False
         break
     if to_filter:
       continue
@@ skipping 36 matching lines @@
     else:
       rev_min = int(range_match.group(1))
       rev_max = int(range_match.group(2))
       OutputSkpBenchExpectations(rev_min, rev_max, options.alg)
   else:
     parser.error('Please provide mandatory flag %s' % OPTION_REVISION_RANGE)
 
 
 if '__main__' == __name__:
   main()