Make chromium.perf waterfall use official builds on Win.

masters/master.chromium.perf/master.cfg

Index: masters/master.chromium.perf/master.cfg
===================================================================
--- masters/master.chromium.perf/master.cfg	(revision 234817)
+++ masters/master.chromium.perf/master.cfg	(working copy)
@@ -230,40 +230,35 @@
 # The identifier of the factory is the build configuration. If two factories
 # are using the same build configuration, they should have the same identifier.
 
-FFMPEG_GYP_DEFINES_WIN = (
-  'fastbuild=1 '
-  'ffmpeg_branding=Chrome '

[ghost stip (do not use), 2013/11/13 19:57:17]

do we not need this, as the chromium.chrome builds don't have it either?

[tonyg, 2013/11/13 20:15:51]

An official build implies these codecs, so they can be removed.

-  'proprietary_codecs=1 '
-)
-
 # BuilderTesters using a custom build configuration.
-f_cr_rel_builder = F_WIN(slave_type='Builder',
-                         options=[
-                             '--build-tool=ninja', 'chromium_builder_perf'],
-                         factory_properties={
-                            'create_profiles': True,
-                            'trigger': 'winrel',
-                            'gclient_env': {
-                                'GYP_DEFINES': FFMPEG_GYP_DEFINES_WIN,
-                                'GYP_GENERATORS': 'ninja'},
-                            'build_url': chromium_perf_archive,},
-                         )
+f_cr_rel_builder = F_WIN(
+    slave_type='Builder',
+    mode='google_chrome',
+    compile_timeout=4800,
+    project='all.sln;chromium_builder_perf',
+    factory_properties={
+      'create_profiles': True,
+      'trigger': 'winrel',
+      'gclient_env': {
+        'GYP_DEFINES': 'branding=Chrome component=static_library'},
+      'build_url': chromium_perf_archive,},
+    )
 
-f_cr_rel_x64_builder = F_WIN(slave_type='Builder',
-                             options=[
-                                 '--build-tool=ninja', 'chromium_builder_perf'],
-                             target='Release_x64',
-                             factory_properties={
-                                'create_profiles': True,
-                                'trigger': 'winrel_x64',
-                                'gclient_env': {
-                                    'GYP_DEFINES': (FFMPEG_GYP_DEFINES_WIN +
-                                        'component=shared_library '

[tonyg, 2013/11/13 16:16:25]

I'm not sure why this was a shared_library before. If we ship 64 bit chromes on
win, would they be static or shared?

[jschuh, 2013/11/13 18:15:50]

They should be static for performance tests. We were just trying to cut cycle
times since the link is slow.

[tonyg, 2013/11/13 20:15:51]

Great, thanks for confirming.

-                                        'target_arch=x64'),
-                                    'GYP_GENERATORS': 'ninja'},
-                                    'GYP_MSVS_VERSION': '2012',

[tonyg, 2013/11/13 16:16:25]

I assume this is necessary for 64 bit builds and shipping 64-bit chromes would
use 2012?

[jschuh, 2013/11/13 18:15:50]

Oddly enough, early versions of VS can't even build x64 Chrome with WPO. They
either crash or have codegen errors.

[jschuh, 2013/11/13 18:17:28]

Sorry, that should have been "earlier". Point being that only VS 2012 update 3
can actually build x64 Chrome at all.

[tonyg, 2013/11/13 20:15:51]

OK

-                                'build_url': chromium_perf_x64_archive,},
-                             )
+f_cr_rel_x64_builder = F_WIN(
+    slave_type='Builder',
+    mode='google_chrome',
+    compile_timeout=4800,
+    project='all.sln;chromium_builder_perf',
+    target='Release_x64',
+    factory_properties={
+      'create_profiles': True,
+      'trigger': 'winrel_x64',
+      'gclient_env': {
+        'GYP_DEFINES':
+          'branding=Chrome component=static_library target_arch=x64',

[jschuh, 2013/11/13 18:15:50]

Dumb question from me. Is it branding=Chrome or buildtype=Official that triggers
WPO?

[tonyg, 2013/11/13 20:15:51]

Good question. From common.gypi, it seems like you need both. But I thought I
was copying this from the right place. Is there another, more canonical
master.cfg I should copy from?

[tonyg, 2013/11/14 02:35:29]

James or Scott, do you guys know?

+        'GYP_MSVS_VERSION': '2012',},
+      'build_url': chromium_perf_x64_archive,},
+    )
 
 f_cr_rel_perf_xp_1 = F_WIN(slave_type='Tester',
                            build_url=chromium_rel_archive,