Add target_build_type flag to bisect-perf-regression tool to enable bisecting of a Debug build with…

tools/bisect-perf-regression.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """Performance Test Bisect Tool
 
 This script bisects a series of changelists using binary search. It starts at
 a bad revision where a performance metric has regressed, and asks for a last
 known-good revision. It will then binary search across this revision range by
@@ skipping 636 matching lines @@
       if IsWindows():
         os.environ['GYP_DEFINES'] = 'component=shared_library '\
             'incremental_chrome_dll=1 disable_nacl=1 fastbuild=1 '\
             'chromium_win_pch=0'
   elif build_system == 'make':
     os.environ['GYP_GENERATORS'] = 'make'
   else:
     raise RuntimeError('%s build not supported.' % build_system)
 
 
-def BuildWithMake(threads, targets):
-  cmd = ['make', 'BUILDTYPE=Release']
+def BuildWithMake(threads, targets, build_type):
+  cmd = ['make', 'BUILDTYPE=%s' % build_type]
 
   if threads:
     cmd.append('-j%d' % threads)
 
   cmd += targets
 
   return_code = RunProcess(cmd)
 
   return not return_code
 
 
-def BuildWithNinja(threads, targets):
-  cmd = ['ninja', '-C', os.path.join('out', 'Release')]
+def BuildWithNinja(threads, targets, build_type):
+  cmd = ['ninja', '-C', os.path.join('out', build_type)]
 
   if threads:
     cmd.append('-j%d' % threads)
 
   cmd += targets
 
   return_code = RunProcess(cmd)
 
   return not return_code
 
 
-def BuildWithVisualStudio(targets):
+def BuildWithVisualStudio(targets, build_type):
   path_to_devenv = os.path.abspath(
       os.path.join(os.environ['VS100COMNTOOLS'], '..', 'IDE', 'devenv.com'))
   path_to_sln = os.path.join(os.getcwd(), 'chrome', 'chrome.sln')
-  cmd = [path_to_devenv, '/build', 'Release', path_to_sln]
+  cmd = [path_to_devenv, '/build', build_type, path_to_sln]
 
   for t in targets:
     cmd.extend(['/Project', t])
 
   return_code = RunProcess(cmd)
 
   return not return_code
 
 
 def WriteStringToFile(text, file_name):
@@ skipping 92 matching lines @@
         True if build was successful.
     """
     targets = ['chromium_builder_perf']
 
     threads = None
     if opts.use_goma:
       threads = 64
 
     build_success = False
     if opts.build_preference == 'make':
-      build_success = BuildWithMake(threads, targets)
+      build_success = BuildWithMake(threads, targets, opts.target_build_type)
     elif opts.build_preference == 'ninja':
-      build_success = BuildWithNinja(threads, targets)
+      build_success = BuildWithNinja(threads, targets, opts.target_build_type)
     elif opts.build_preference == 'msvs':
       assert IsWindows(), 'msvs is only supported on Windows.'
-      build_success = BuildWithVisualStudio(targets)
+      build_success = BuildWithVisualStudio(targets, opts.target_build_type)
     else:
       assert False, 'No build system defined.'
     return build_success
 
   def GetBuildOutputDirectory(self, opts, src_dir=None):
     """Returns the path to the build directory, relative to the checkout root.
 
       Assumes that the current working directory is the checkout root.
     """
     src_dir = src_dir or 'src'
@@ skipping 89 matching lines @@
 
     if depot != 'cros':
       path_to_chrome = os.path.join(os.getcwd(), '..')
       cmd += ['--chrome_root=%s' % path_to_chrome]
 
     cmd += ['--']
 
     if depot != 'cros':
       cmd += ['CHROME_ORIGIN=LOCAL_SOURCE']
 
-    cmd += ['BUILDTYPE=Release', './build_packages',
+    cmd += ['BUILDTYPE=%s' % opts.target_build_type, './build_packages',
         '--board=%s' % opts.cros_board]
     return_code = RunProcess(cmd)
 
     return not return_code
 
   def BuildImage(self, opts, depot):
     """Builds test image for cros.
 
     Args:
         opts: Program options containing cros_board.
         depot: The depot being bisected.
 
     Returns:
         True if successful.
     """
     cmd = [CROS_SDK_PATH]
 
     if depot != 'cros':
       path_to_chrome = os.path.join(os.getcwd(), '..')
       cmd += ['--chrome_root=%s' % path_to_chrome]
 
     cmd += ['--']
 
     if depot != 'cros':
       cmd += ['CHROME_ORIGIN=LOCAL_SOURCE']
 
-    cmd += ['BUILDTYPE=Release', '--', './build_image',
+    cmd += ['BUILDTYPE=%s' % opts.target_build_type, '--', './build_image',
         '--board=%s' % opts.cros_board, 'test']
 
     return_code = RunProcess(cmd)
 
     return not return_code
 
   def Build(self, depot, opts):
     """Builds targets using options passed into the script.
 
     Args:
@@ skipping 2593 matching lines @@
   except OSError, e:
     if e.errno != errno.ENOENT:
       return False
 
   if not skip_makedir:
     return MaybeMakeDirectory(path_to_dir)
 
   return True
 
 
-def RemoveBuildFiles():
+def RemoveBuildFiles(build_type):
   """Removes build files from previous runs."""
-  if RmTreeAndMkDir(os.path.join('out', 'Release')):
-    if RmTreeAndMkDir(os.path.join('build', 'Release')):
+  if RmTreeAndMkDir(os.path.join('out', build_type)):
+    if RmTreeAndMkDir(os.path.join('build', build_type)):
       return True
   return False
 
 
 class BisectOptions(object):
   """Options to be used when running bisection."""
   def __init__(self):
     super(BisectOptions, self).__init__()
 
     self.target_platform = 'chromium'
@@ skipping 10 matching lines @@
     self.command = None
     self.output_buildbot_annotations = None
     self.no_custom_deps = False
     self.working_directory = None
     self.extra_src = None
     self.debug_ignore_build = None
     self.debug_ignore_sync = None
     self.debug_ignore_perf_test = None
     self.gs_bucket = None
     self.target_arch = 'ia32'
+    self.target_build_type = 'Release'
     self.builder_host = None
     self.builder_port = None
     self.bisect_mode = BISECT_MODE_MEAN
 
   def _CreateCommandLineParser(self):
     """Creates a parser with bisect options.
 
     Returns:
       An instance of optparse.OptionParser.
     """
@@ skipping 103 matching lines @@
                      type='str',
                      help=('Name of Google Storage bucket to upload or '
                      'download build. e.g., chrome-perf'))
     group.add_option('--target_arch',
                      type='choice',
                      choices=['ia32', 'x64', 'arm'],
                      default='ia32',
                      dest='target_arch',
                      help=('The target build architecture. Choices are "ia32" '
                      '(default), "x64" or "arm".'))
+    group.add_option('--target_build_type',
+                     type='choice',
+                     choices=['Release', 'Debug'],
+                     default='Release',
+                     help='The target build type. Choices are "Release" '
+                     '(default), or "Debug".')
     group.add_option('--builder_host',
                      dest='builder_host',
                      type='str',
                      help=('Host address of server to produce build by posting'
                            ' try job request.'))
     group.add_option('--builder_port',
                      dest='builder_port',
                      type='int',
                      help=('HTTP port of the server to produce build by posting'
                            ' try job request.'))
@@ skipping 118 matching lines @@
       _AddAdditionalDepotInfo(extra_src.GetAdditionalDepotInfo())
 
     if opts.working_directory:
       custom_deps = bisect_utils.DEFAULT_GCLIENT_CUSTOM_DEPS
       if opts.no_custom_deps:
         custom_deps = None
       bisect_utils.CreateBisectDirectoryAndSetupDepot(opts, custom_deps)
 
       os.chdir(os.path.join(os.getcwd(), 'src'))
 
-      if not RemoveBuildFiles():
+      if not RemoveBuildFiles(opts.target_build_type):
         raise RuntimeError('Something went wrong removing the build files.')
 
     if not IsPlatformSupported(opts):
       raise RuntimeError("Sorry, this platform isn't supported yet.")
 
     # Check what source control method they're using. Only support git workflow
     # at the moment.
     source_control = DetermineAndCreateSourceControl(opts)
 
     if not source_control:
@@ skipping 22 matching lines @@
       # The perf dashboard scrapes the "results" step in order to comment on
       # bugs. If you change this, please update the perf dashboard as well.
       bisect_utils.OutputAnnotationStepStart('Results')
     print 'Error: %s' % e.message
     if opts.output_buildbot_annotations:
       bisect_utils.OutputAnnotationStepClosed()
   return 1
 
 if __name__ == '__main__':
   sys.exit(main())