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 22de997..0c0a473 100644
--- a/PCbuild9/build_pgo.bat
+++ b/PCbuild9/build_pgo.bat
@@ -23,18 +23,19 @@
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 fc7d76f..3a15a81 100644
--- 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 5bbf21e..61feabb 100644
--- 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 e121114..1b08c5d 100644
--- 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 826242d..30ab891 100644
--- 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 f362f05..8381dcf 100644
--- 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 a09c624..878d391 100644
--- 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 4497ea6..1bc1dad 100644
--- 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 8d4dbe8..d00cef4 100644
--- 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