Fixed PGO builds

The intermediate PG instrument build now lands in Platform-pgi and the final optimized build in Platform-pgo.

diff --git a/PCbuild9/build_pgo.bat b/PCbuild9/build_pgo.bat
index 22de99753e6eb23e518ea669ad72da5db47a17c8..0c0a473b2c45ad7e873d96f6409942964eeba114 100644 (file)
--- a/PCbuild9/build_pgo.bat
+++ b/PCbuild9/build_pgo.bat
@@ -23,18 +23,19 @@ set clrpath=%path1%
 if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
 if "%1"=="-2" (set job=%job2%) & (set clrpath=%path2%) & shift & goto CheckOpts
 
-set folder=%platf%-pgo
-
+set PGI=%platf%-pgi
+set PGO=%platf%-pgo
 
 @echo on
 rem build the instrumented version
-call build -r -p %platf% -c PGInstrument
+call build -p %platf% -c PGInstrument
 
 rem remove .pyc files, .pgc files and execute the job
-%folder%\python.exe rmpyc.py %clrpath%
-del %folder%\*.pgc
-%folder%\python.exe %job%
+%PGI%\python.exe rmpyc.py %clrpath%
+del %PGI%\*.pgc
+%PGI%\python.exe %job%
 
 rem finally build the optimized version
-call build -r -p %platf% -c PGUpdate
+if exist %PGO% del /s /q %PGO%
+call build -p %platf% -c PGUpdate
 

diff --git a/PCbuild9/bz2.vcproj b/PCbuild9/bz2.vcproj
index fc7d76f124a6465b25399dcde1ed04e4bb892771..3a15a81240ae772215bbad470f7773b65eaba519 100644 (file)
--- a/PCbuild9/bz2.vcproj
+++ b/PCbuild9/bz2.vcproj
@@ -311,6 +311,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               ImportLibrary="$(OutDirPGI)\$(TargetName).lib"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -375,6 +376,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               ImportLibrary="$(OutDirPGI)\$(TargetName).lib"
                                TargetMachine="17"
                        />
                        <Tool
@@ -439,6 +441,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               ImportLibrary="$(OutDirPGI)\$(TargetName).lib"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -503,6 +506,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalDependencies="$(bz2Dir)\$(PlatformName)-Release\libbz2.lib"
+                               ImportLibrary="$(OutDirPGI)\$(TargetName).lib"
                                TargetMachine="17"
                        />
                        <Tool

diff --git a/PCbuild9/make_versioninfo.vcproj b/PCbuild9/make_versioninfo.vcproj
index 5bbf21ef44fd58e5b9a398bacfcdcfcb1dff717b..61feabb880316c11cf227b5ec647b7d89e589665 100644 (file)
--- a/PCbuild9/make_versioninfo.vcproj
+++ b/PCbuild9/make_versioninfo.vcproj
@@ -164,8 +164,6 @@
                </Configuration>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                       IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="1"
                        InheritedPropertySheets=".\pyproject.vsprops"
                        UseOfMFC="0"

diff --git a/PCbuild9/pginstrument.vsprops b/PCbuild9/pginstrument.vsprops
index e1211148ddbdf02e51d8209cbd21d9f990730045..1b08c5d5527b6b4634cdcd6028aa51c9101dfea2 100644 (file)
--- a/PCbuild9/pginstrument.vsprops
+++ b/PCbuild9/pginstrument.vsprops
@@ -3,8 +3,8 @@
        ProjectType="Visual C++"
        Version="8.00"
        Name="pginstrument"
-       OutputDirectory="$(SolutionDir)$(PlatformName)-pgo\"
-       IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-pgo\$(ProjectName)\"
+       OutputDirectory="$(OutDirPGI)"
+       IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-pgi\$(ProjectName)\"
        >
        <Tool
                Name="VCCLCompilerTool"
@@ -13,5 +13,11 @@
        <Tool
                Name="VCLinkerTool"
                LinkTimeCodeGeneration="2"
+               ProfileGuidedDatabase="$(SolutionDir)$(PlatformName)-pgi\$(TargetName).pgd"
+               ImportLibrary="$(OutDirPGI)\$(TargetName).lib"
+       />
+       <UserMacro
+               Name="OutDirPGI"
+               Value="$(SolutionDir)$(PlatformName)-pgi\"
        />
 </VisualStudioPropertySheet>

diff --git a/PCbuild9/pgupdate.vsprops b/PCbuild9/pgupdate.vsprops
index 826242df6841cd8ab8559cd9bcfa03a9c54f1cf6..30ab891f223dcc8c49115bad90153378227f13fb 100644 (file)
--- a/PCbuild9/pgupdate.vsprops
+++ b/PCbuild9/pgupdate.vsprops
@@ -3,10 +3,12 @@
        ProjectType="Visual C++"
        Version="8.00"
        Name="pgoptimize"
+       OutputDirectory="$(SolutionDir)$(PlatformName)-pgo\"
        InheritedPropertySheets="$(SolutionDir)\pginstrument.vsprops"
        >
        <Tool
                Name="VCLinkerTool"
+               AdditionalManifestDependencies=""
                LinkTimeCodeGeneration="4"
        />
 </VisualStudioPropertySheet>

diff --git a/PCbuild9/python.vcproj b/PCbuild9/python.vcproj
index f362f05f03bf9084288fca56d8b205b95b786795..8381dcfe2e8c647e59886b7497a5d5220d53157e 100644 (file)
--- a/PCbuild9/python.vcproj
+++ b/PCbuild9/python.vcproj
@@ -365,6 +365,7 @@
                                SubSystem="1"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
+                               ImportLibrary=""
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -439,6 +440,7 @@
                                SubSystem="1"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
+                               ImportLibrary=""
                                TargetMachine="17"
                        />
                        <Tool
@@ -513,6 +515,7 @@
                                SubSystem="1"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
+                               ImportLibrary=""
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -587,6 +590,7 @@
                                SubSystem="1"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
+                               ImportLibrary=""
                                TargetMachine="17"
                        />
                        <Tool

diff --git a/PCbuild9/pythoncore.vcproj b/PCbuild9/pythoncore.vcproj
index a09c6246d1dc7ebee904e004cb4a8671a7eb6403..878d39128487c6ab5b53ce1db7e703419f2f51df 100644 (file)
--- a/PCbuild9/pythoncore.vcproj
+++ b/PCbuild9/pythoncore.vcproj
@@ -373,7 +373,7 @@
                                IgnoreDefaultLibraryNames="libc"
                                ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
                                BaseAddress="0x1e000000"
-                               ImportLibrary="$(OutDir)$(PyDllName).lib"
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -448,7 +448,7 @@
                                IgnoreDefaultLibraryNames="libc"
                                ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
                                BaseAddress="0x1e000000"
-                               ImportLibrary="$(OutDir)$(PyDllName).lib"
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
                                TargetMachine="17"
                        />
                        <Tool
@@ -523,7 +523,7 @@
                                IgnoreDefaultLibraryNames="libc"
                                ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
                                BaseAddress="0x1e000000"
-                               ImportLibrary="$(OutDir)$(PyDllName).lib"
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -598,7 +598,7 @@
                                IgnoreDefaultLibraryNames="libc"
                                ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
                                BaseAddress="0x1e000000"
-                               ImportLibrary="$(OutDir)$(PyDllName).lib"
+                               ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
                                TargetMachine="17"
                        />
                        <Tool

diff --git a/PCbuild9/pythonw.vcproj b/PCbuild9/pythonw.vcproj
index 4497ea63258ec5f7cc9a3754e0b62253165c104f..1bc1dad0ff747c2e96f18dd5f7874bb8dcb54d4c 100644 (file)
--- a/PCbuild9/pythonw.vcproj
+++ b/PCbuild9/pythonw.vcproj
@@ -349,6 +349,7 @@
                                OutputFile="$(OutDir)\pythonw.exe"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
+                               ImportLibrary=""
                                TargetMachine="1"
                        />
                        <Tool
@@ -421,6 +422,7 @@
                                OutputFile="$(OutDir)\pythonw.exe"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
+                               ImportLibrary=""
                                TargetMachine="17"
                        />
                        <Tool
@@ -492,6 +494,7 @@
                                OutputFile="$(OutDir)\pythonw.exe"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
+                               ImportLibrary=""
                                TargetMachine="1"
                        />
                        <Tool
@@ -564,6 +567,7 @@
                                OutputFile="$(OutDir)\pythonw.exe"
                                StackReserveSize="2000000"
                                BaseAddress="0x1d000000"
+                               ImportLibrary=""
                                TargetMachine="17"
                        />
                        <Tool

diff --git a/PCbuild9/w9xpopen.vcproj b/PCbuild9/w9xpopen.vcproj
index 8d4dbe8a461a001c516f04390035989ba38511f4..d00cef4def8bd133b12e5122329214971cd6f814 100644 (file)
--- a/PCbuild9/w9xpopen.vcproj
+++ b/PCbuild9/w9xpopen.vcproj
@@ -331,6 +331,7 @@
                                Name="VCLinkerTool"
                                GenerateDebugInformation="false"
                                SubSystem="1"
+                               ImportLibrary=""
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -400,6 +401,7 @@
                                Name="VCLinkerTool"
                                GenerateDebugInformation="false"
                                SubSystem="1"
+                               ImportLibrary=""
                                TargetMachine="17"
                        />
                        <Tool
@@ -469,6 +471,7 @@
                                Name="VCLinkerTool"
                                GenerateDebugInformation="false"
                                SubSystem="1"
+                               ImportLibrary=""
                        />
                        <Tool
                                Name="VCALinkTool"
@@ -538,6 +541,7 @@
                                Name="VCLinkerTool"
                                GenerateDebugInformation="false"
                                SubSystem="1"
+                               ImportLibrary=""
                                TargetMachine="17"
                        />
                        <Tool