Use the x64 version of pgosweep for the x64 PGO builds.

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 42 matching lines @@
     self.m.file.rmwildcard('*.pg[cd]', str(self.m.chromium.output_dir))
     self.m.chromium.compile(name='Compile: Instrumentation phase.',
                             force_clobber=bot_config.get('clobber', False))
 
   def _run_pgo_benchmarks(self):
     """
     Run a suite of telemetry benchmarks to generate some profiling data.
     """
     pgosweep_path = self.m.path['depot_tools'].join(
         'win_toolchain', 'vs_files', 'VC', 'bin')
+    # Make sure that we're using the x64 version of pgosweep for the x64 builds.
+    if self.m.chromium.c.TARGET_BITS == 64:
+      pgosweep_path = pgosweep_path.join('amd64')
     pgo_env = {
         'PATH': '%s;%s;%s' % (
             pgosweep_path, self.m.chromium.output_dir, '%(PATH)s'),
         'PogoSafeMode': 1
     }
     pgo_args = ['--profiler=win_pgo_profiler']
 
     for benchmark in _BENCHMARKS_TO_RUN:
       try:
         self.m.chromium.run_telemetry_benchmark(benchmark_name=benchmark,
@@ skipping 34 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)