Update pgo_build.bat to use --pgo flag for regrtest

[brettcannon]

BPO	25348
Nosy	@brettcannon, @pfmoore, @tjguk, @zware, @zooba
Files	windows_pgo.diff

^{Note: these values reflect the state of the issue at the time it was migrated and might not reflect the current state.}

Show more details

GitHub fields:

assignee = 'https://github.com/zware'
closed_at = <Date 2016-01-12.07:32:04.501>
created_at = <Date 2015-10-08.23:17:24.976>
labels = ['OS-windows']
title = 'Update pgo_build.bat to use --pgo flag for regrtest'
updated_at = <Date 2016-01-12.07:32:40.305>
user = 'https://github.com/brettcannon'

bugs.python.org fields:

activity = <Date 2016-01-12.07:32:40.305>
actor = 'zach.ware'
assignee = 'zach.ware'
closed = True
closed_date = <Date 2016-01-12.07:32:04.501>
closer = 'python-dev'
components = ['Windows']
creation = <Date 2015-10-08.23:17:24.976>
creator = 'brett.cannon'
dependencies = []
files = ['41478']
hgrepos = []
issue_num = 25348
keywords = ['patch']
message_count = 5.0
messages = ['252572', '257393', '257972', '258070', '258071']
nosy_count = 6.0
nosy_names = ['brett.cannon', 'paul.moore', 'tim.golden', 'python-dev', 'zach.ware', 'steve.dower']
pr_nums = []
priority = 'normal'
resolution = 'fixed'
stage = 'resolved'
status = 'closed'
superseder = None
type = None
url = 'https://bugs.python.org/issue25348'
versions = ['Python 2.7', 'Python 3.5', 'Python 3.6']

[brettcannon]

Should upgrade the command to do what is already occurring in the Makefile for consistency.

[zware]

Here's a patch that folds PGO into PCbuild\build.bat (removing PCbuild\build_pgo.bat) and defaults to using "python -m test --pgo" for training. This should apply to all branches, but will need some slight adjustment for 2.7 (namely, s/-m test/-m test.regrtest/). It might also be nice to leave a stub build_pgo.bat on 2.7 and 3.5 in case anyone actually uses it.

This patch also switches the default build environment to 'amd64' rather than 'x86_amd64' for -p x64 when it looks like it's running on a 64 bit OS. PGO requires 'amd64' for 64 bit builds, and if x86_amd64 is available, 'amd64' should be as well. 'x86_amd64' is still used for non-PGO builds when -p x64 is specified and it looks like a 32 bit OS. I considered switching the default platform target to x64 when running on 64 bit, but that's a separate issue. It uses "%ProgramFiles(x86)"=="" to detect 32-bit, and gives a helpful message in the case of a false positive on that check.

[zooba]

LGTM

[python-dev]

New changeset 113c524aed93 by Zachary Ware in branch '2.7':
Issue bpo-25348: Add --pgo and --pgo-job flags to PCbuild\build.bat
https://hg.python.org/cpython/rev/113c524aed93

New changeset 01ab138f4133 by Zachary Ware in branch '3.5':
Issue bpo-25348: Add --pgo and --pgo-job flags to PCbuild\build.bat
https://hg.python.org/cpython/rev/01ab138f4133

New changeset 9442b4a60379 by Zachary Ware in branch 'default':
Closes bpo-25348: Merge with 3.5
https://hg.python.org/cpython/rev/9442b4a60379

[zware]

Thanks for the review, Steve.