macos: add --optimized argument to control PGO/LTO

And make non-PGO the default.

This matches the behavior of Linux.

Author: indygreg

build-macos.py

@@ -3,6 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+import argparse
 import datetime
 import os
 import pathlib
@@ -22,6 +23,11 @@
 
 
 def bootstrap():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--optimized', action='store_true')
+
+    args = parser.parse_args()
+
     BUILD.mkdir(exist_ok=True)
     DIST.mkdir(exist_ok=True)
 
@@ -33,6 +39,10 @@ def bootstrap():
     os.environ['PYBUILD_BOOTSTRAPPED'] = '1'
     os.environ['PATH'] = '%s:%s' % (str(VENV / 'bin'), os.environ['PATH'])
     os.environ['PYTHONPATH'] = str(ROOT)
+
+    if args.optimized:
+        os.environ['PYBUILD_OPTIMIZED'] = '1'
+
     subprocess.run([str(PYTHON), __file__], check=True)
 
 
@@ -45,10 +55,20 @@ def run():
     subprocess.run(['make'],
                    cwd=str(MAKE_DIR), check=True)
 
-    source_path = BUILD / 'cpython-macos.tar'
+    basename = 'cpython-macos'
+    extra = ''
+
+    if 'PYBUILD_OPTIMIZED' in os.environ:
+        basename += '-pgo'
+        extra = '-pgo'
+
+    basename += '.tar'
+
+    source_path = BUILD / basename
 
-    compress_python_archive(source_path, DIST, 'cpython-%s-macos-%s' % (
-        DOWNLOADS['cpython-3.7']['version'], now.strftime('%Y%m%dT%H%M')))
+    compress_python_archive(source_path, DIST, 'cpython-%s-macos%s-%s' % (
+        DOWNLOADS['cpython-3.7']['version'], extra,
+        now.strftime('%Y%m%dT%H%M')))
 
 
 if __name__ == '__main__':

cpython-macos/Makefile

@@ -9,7 +9,7 @@ PLATFORM := macos
 
 TOOLCHAIN_DEPENDENCIES := $(OUTDIR)/clang-macos.tar
 
-default: $(OUTDIR)/cpython-macos.tar
+default: $(OUTDIR)/cpython-macos$(if $(PYBUILD_OPTIMIZED),-pgo,).tar
 
 $(OUTDIR)/clang-macos.tar: $(HERE)/build-clang.sh
 	$(BUILD) clang
@@ -63,3 +63,6 @@ PYTHON_DEPENDS := \
 
 $(OUTDIR)/cpython-macos.tar: $(PYTHON_DEPENDS)
 	$(BUILD) cpython
+
+$(OUTDIR)/cpython-macos-pgo.tar: $(PYTHON_DEPENDS)
+	$(BUILD) --optimized cpython

cpython-macos/build.py

@@ -285,7 +285,7 @@ def process_setup_line(line):
     return bi
 
 
-def build_cpython():
+def build_cpython(optimized=False):
     python_archive = download_entry('cpython-3.7', BUILD)
     python_version = DOWNLOADS['cpython-3.7']['version']
 
@@ -343,7 +343,8 @@ def build_cpython():
         env['MACOSX_DEPLOYMENT_TARGET'] = MACOSX_DEPLOYMENT_TARGET
         env['NUM_CPUS'] = '%s' % multiprocessing.cpu_count()
 
-        env['CPYTHON_OPTIMIZED'] = '1'
+        if optimized:
+            env['CPYTHON_OPTIMIZED'] = '1'
 
         exec_and_log([SUPPORT / 'build-cpython.sh'], td, env)
 
@@ -367,7 +368,14 @@ def build_cpython():
         with (td / 'out' / 'python' / 'PYTHON.json').open('w') as fh:
             json.dump(python_info, fh, sort_keys=True, indent=4)
 
-        dest_path = BUILD / 'cpython-macos.tar'
+        basename = 'cpython-macos'
+
+        if optimized:
+            basename += '-pgo'
+
+        basename += '.tar'
+
+        dest_path = BUILD / basename
 
         with dest_path.open('wb') as fh:
             create_tar_from_directory(fh, td / 'out')
@@ -377,6 +385,7 @@ def main():
     BUILD.mkdir(exist_ok=True)
 
     parser = argparse.ArgumentParser()
+    parser.add_argument('--optimized', action='store_true')
     parser.add_argument('action')
 
     args = parser.parse_args()
@@ -396,7 +405,7 @@ def main():
             build_clang()
 
         elif action == 'cpython':
-            build_cpython()
+            build_cpython(optimized=args.optimized)
 
         else:
             print('unknown build action: %s' % action)