From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 12 Jan 2016 07:31:21 +0000 (-0600)
Subject: Closes #25348: Merge with 3.5
X-Git-Tag: v3.6.0a1~788
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e2c9adb03baabc10096461ba658e728c51694660;p=python

Closes #25348: Merge with 3.5
---

e2c9adb03baabc10096461ba658e728c51694660
diff --cc Misc/NEWS
index 6590842664,cc0c799d1c..54c70fced9
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -581,6 -151,11 +581,10 @@@ Test
  Build
  -----
  
+ - Issue #25348: Added ``--pgo`` and ``--pgo-job`` arguments to
+   ``PCbuild\build.bat`` for building with Profile-Guided Optimization.  The
 -  old ``PCbuild\build_pgo.bat`` script is now deprecated, and simply calls
 -  ``PCbuild\build.bat --pgo %*``.
++  old ``PCbuild\build_pgo.bat`` script is removed.
+ 
  - Issue #25827: Add support for building with ICC to ``configure``, including
    a new ``--with-icc`` flag.
  
diff --cc PCbuild/build_pgo.bat
index 79ec2670b0,872c3822ec..0000000000
deleted file mode 100644,100644
--- a/PCbuild/build_pgo.bat
+++ /dev/null
@@@ -1,48 -1,6 +1,0 @@@
--@echo off
- rem A batch program to build PGO (Profile guided optimization) by first
- rem building instrumented binaries, then running the testsuite, and
- rem finally building the optimized code.
- rem Note, after the first instrumented run, one can just keep on
- rem building the PGUpdate configuration while developing.
- 
- setlocal
- set platf=Win32
- set parallel=/m
- set dir=%~dp0
- 
- rem use the performance testsuite.  This is quick and simple
- set job1="%dir%..\tools\pybench\pybench.py" -n 1 -C 1 --with-gc
- set path1="%dir%..\tools\pybench"
- 
- rem or the whole testsuite for more thorough testing
- set job2="%dir%..\lib\test\regrtest.py"
- set path2="%dir%..\lib"
- 
- set job=%job1%
- set clrpath=%path1%
- 
- :CheckOpts
- if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
- if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts
- if "%1"=="-M" (set parallel=) & shift & goto CheckOpts
- 
- 
- rem We cannot cross compile PGO builds, as the optimization needs to be run natively
- set vs_platf=x86
- set PGO=%dir%win32-pgo
- 
- if "%platf%"=="x64" (set vs_platf=amd64) & (set PGO=%dir%amd64-pgo)
- rem Setup the environment
- call "%dir%env.bat" %vs_platf%
- 
- 
- rem build the instrumented version
- msbuild "%dir%pcbuild.proj" %parallel% /t:Build /p:Configuration=PGInstrument /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9
- 
- rem remove .pyc files, .pgc files and execute the job
- "%PGO%\python.exe" "%dir%rmpyc.py" %clrpath%
- del "%PGO%\*.pgc"
- "%PGO%\python.exe" %job%
 -echo.DeprecationWarning:
 -echo.    This script is deprecated, use `build.bat --pgo` instead.
 -echo.
--
- rem build optimized version
- msbuild "%dir%pcbuild.proj" %parallel% /t:Build /p:Configuration=PGUpdate /p:Platform=%platf% %1 %2 %3 %4 %5 %6 %7 %8 %9
 -call "%~dp0build.bat" --pgo %*