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

Fix optdata restore functionality #11935

Merged
merged 4 commits into from
Jun 1, 2017
Merged

Fix optdata restore functionality #11935

merged 4 commits into from
Jun 1, 2017

Conversation

dpodder
Copy link

@dpodder dpodder commented May 26, 2017

Bring back optdata restore functionality following the move to 2.0 BuildTools and csproj-based CLI. Disable a harmless warning that broke the Linux build when consuming PGO counts due to -Werr.

Fix #11796 for master. We will need to get this ported to release/2.0.0 as well.

dir.props Outdated
@@ -21,6 +21,13 @@
<RoslynPackageName>Microsoft.Net.ToolsetCompilers</RoslynPackageName>
</PropertyGroup>

<!-- Profile-based optimization data package versions -->
<PropertyGroup>
<!-- TODO: Fill in with actual versions from the right branches -->
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: We are generating counts packages today and I plan to resolve this TODO before merging. If that gets missed, nothing breaks, and it's a trivial follow-up PR to update this.

@dpodder
Copy link
Author

dpodder commented May 26, 2017

@wtgodbe @adiaaida PTAL
/CC: @gkhanna79 @weshaggard

@gkhanna79
Copy link
Member

Please email shiproom to bring this to 2.0.0, assuming this is merged into master.

@dpodder
Copy link
Author

dpodder commented May 30, 2017

@gkhanna79 Definitely, will do.

@dpodder
Copy link
Author

dpodder commented May 31, 2017

@dotnet-bot test windows_nt x86 perf

@dpodder
Copy link
Author

dpodder commented May 31, 2017

@dotnet-bot test windows_nt x64 perf

@dpodder
Copy link
Author

dpodder commented May 31, 2017

@dotnet-bot test Ubuntu14.04 perf

@dpodder
Copy link
Author

dpodder commented May 31, 2017

@dotnet-bot test Ubuntu14.04 perf

@dpodder
Copy link
Author

dpodder commented Jun 1, 2017

@jorive PTAL

@michellemcdaniel
Copy link

LGTM, but do we want to have an option to skip using optdata? Like if we wanted to do a perf comparison of pgo vs non-pgo?

@dpodder
Copy link
Author

dpodder commented Jun 1, 2017

@adiaaida thanks for the review! You're right; we do still have that functionality, skiprestoreoptdata when passed to build.cmd/build.sh. Doing so will skip invoking dotnet restore on optdata.csproj and as a result nothing will see any PGO or IBC counts.

@dpodder dpodder merged commit 8f5d775 into dotnet:master Jun 1, 2017
@dpodder dpodder deleted the restore-optdata-restore branch June 1, 2017 23:44
gkhanna79 pushed a commit that referenced this pull request Jun 2, 2017
* Port [Fix optdata restore functionality (#11935)] from master

* Fixup optdata package version
@karelz karelz modified the milestone: 2.1.0 Aug 28, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants