Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Add IBC support to managed build #10180

Merged
merged 19 commits into from
Mar 16, 2017
Merged

Add IBC support to managed build #10180

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5c64b1d
Add 'ibcinstrument' to build.cmd/build.sh
Mar 8, 2017
2754769
Workaround to enable /Tuning to disable R2R
Mar 9, 2017
e19ba28
Restore BuildTools's optional tooling packages
Mar 9, 2017
4f738ee
Enable IBCmerge during managed build
Mar 10, 2017
6480a69
Don't set OptimizationDataDir when running 'ibcinstrument'
Mar 10, 2017
aadf7c8
Fix 'run build' command when forwarding args to msbuild
Mar 11, 2017
723f206
IBC: pass /p:EnableProfileGuidedOptimization=true to MSbuild
Mar 11, 2017
2b3019b
Add missing targets import to System.Private.Corelib.csproj
Mar 11, 2017
b730768
Merge remote-tracking branch 'upstream/master' into ibc-support
Mar 14, 2017
d38ec07
Remove /FragileNonVersionable workaround
Mar 14, 2017
6bee2c5
Remove some no-longer-needed TODO comments
Mar 14, 2017
5229e38
Always import the root targets file (it's not optional)
Mar 14, 2017
b4a8d94
Clean up comments a bit
Mar 14, 2017
7a8e589
Fix build break: UnprocessedBuildArgs don't go to msbuild
Mar 14, 2017
71e2990
Add script to bootstrap optdata project.json from tests
Mar 15, 2017
f54a566
PR Feedback for py script
Mar 16, 2017
952805c
Feedback: add OptionalToolSource* settings to config.json
Mar 16, 2017
fbd4af4
Plumb IBC msbuild properties properly through config.json
Mar 16, 2017
88becf2
Merge remote-tracking branch 'upstream/master' into ibc-support
Mar 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
IBC: pass /p:EnableProfileGuidedOptimization=true to MSbuild
  • Loading branch information
Daniel Podder committed Mar 11, 2017
commit 723f20691a862aeec4a92ba20e779114c94e4b3d
5 changes: 4 additions & 1 deletion build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,10 @@ if %__BuildCoreLib% EQU 1 (
set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__LogsDir%\System.Private.CoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.err"

set __ExtraMsbuildArgs=
if not defined __IbcTuning set __ExtraMsbuildArgs=!__ExtraMsbuildArgs! /p:OptimizationDataDir="%__PackagesDir%/optimization.%__BuildOS%-%__BuildArch%.IBC.CoreCLR/%__IbcOptDataVersion%/data/"
if not defined __IbcTuning (
set __ExtraMsbuildArgs=!__ExtraMsbuildArgs! /p:OptimizationDataDir="%__PackagesDir%/optimization.%__BuildOS%-%__BuildArch%.IBC.CoreCLR/%__IbcOptDataVersion%/data/"
set __ExtraMsbuildArgs=!__ExtraMsbuildArgs! /p:EnableProfileGuidedOptimization=true
)

if /i "%__BuildArch%" == "arm64" (
set __nugetBuildArgs=-buildNugetPackage=false
Expand Down
1 change: 1 addition & 0 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ build_CoreLib()
__ExtraMsbuildArgs=""
if [ "$__IbcTuning" -eq "" ]; then
__ExtraMsbuildArgs="$__ExtraMsbuildArgs /p:OptimizationDataDir=\"$__PackagesDir/optimization.$__BuildOS-$__BuildArch.IBC.CoreCLR/$__IbcOptDataVersion/data/\""
__ExtraMsbuildArgs="$__ExtraMsbuildArgs /p:EnableProfileGuidedOptimization=true"
fi
$__ProjectRoot/run.sh build -Project=$__ProjectDir/build.proj -MsBuildLog="/flp:Verbosity=normal;LogFile=$__LogsDir/System.Private.CoreLib_$__BuildOS__$__BuildArch__$__BuildType.log" -BuildTarget -__IntermediatesDir=$__IntermediatesDir -__RootBinDir=$__RootBinDir -BuildNugetPackage=false -UseSharedCompilation=false $__RunArgs -- $__ExtraMsbuildArgs $__UnprocessedBuildArgs

Expand Down