Double Builds for Blimp Integration Test Infrastructure on FYI bot

scripts/slave/recipe_modules/pgo/api.py

 # Copyright 2014 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.
 
 from recipe_engine import recipe_api
 
 
 # List of the benchmark that we run during the profiling step.
 #
 # TODO(sebmarchand): Move this into a BenchmarkSuite in telemetry, this way
@@ skipping 38 matching lines @@
     """
     Generates the instrumented version of the binaries.
     """
     self.m.chromium.set_config(bot_config['chromium_config_instrument'],
                                **bot_config.get('chromium_config_kwargs'))
     self.m.chromium.runhooks(name='Runhooks: Instrumentation phase.')
     self.m.chromium.run_mb(
         self.m.properties['mastername'],
         self.m.properties['buildername'],
         use_goma=False,
-        phase=1)
+        phase=0)

[shenghuazhang, 2016/10/08 00:21:08]

The 'win_pgo' config keys are set to be '0', '1'. And the phase type defaults to
be 'str'. So set the phase '0', '1' instead of '1', '2'. 
Does this correct?

[Dirk Pranke, 2016/10/11 00:18:23]

Nope; this'd break the old branches, i.e., this module needs to not change at
all. 

Fix this client-side instead as I noted in my comments on the other CL just now.

(And sorry for the back-and-forth on this).

[shenghuazhang, 2016/10/12 22:42:04]

Oh yeah I see. This is very clear, I will change it back to the initial way.
Thanks for the explanation :)

     # Remove the profile files from the previous builds.
     self.m.file.rmwildcard('*.pg[cd]', str(self.m.chromium.output_dir))
     self.m.chromium.compile(name='Compile: Instrumentation phase.')
 
   def _run_pgo_benchmarks(self):
     """
     Run a suite of telemetry benchmarks to generate some profiling data.
     """
     for benchmark in _BENCHMARKS_TO_RUN:
       try:
@@ skipping 18 matching lines @@
     """
     Generates the optimized version of the binaries.
     """
     self.m.chromium.set_config(bot_config['chromium_config_optimize'],
                                **bot_config.get('chromium_config_kwargs'))
     self.m.chromium.runhooks(name='Runhooks: Optimization phase.')
     self.m.chromium.run_mb(
         self.m.properties['mastername'],
         self.m.properties['buildername'],
         use_goma=False,
-        phase=2)
+        phase=1)

[shenghuazhang, 2016/10/08 00:21:08]

Relates here

[Dirk Pranke, 2016/10/11 00:18:23]

same answer :).

[shenghuazhang, 2016/10/12 22:42:04]

Done.

     self.m.chromium.compile(name='Compile: Optimization phase.')
 
   def compile_pgo(self, bot_config):
     """
     Do a PGO build. This takes care of building an instrumented image, profiling
     it and then compiling the optimized version of it.
     """
     self.m.gclient.set_config(bot_config['gclient_config'])
 
     # Augment the DEPS path if needed.
@@ skipping 11 matching lines @@
 
     # First step: compilation of the instrumented build.
     self._compile_instrumented_image(bot_config)
 
     # Second step: profiling of the instrumented build.
     self._run_pgo_benchmarks()
 
     # Third step: Compilation of the optimized build, this will use the
     #     profile data files produced by the previous step.
     self._compile_optimized_image(bot_config)