Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ibc merge failure logging #4678

Merged
merged 2 commits into from
Jan 24, 2020
Merged

Ibc merge failure logging #4678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76489d6
Remove obsolete properties
tmat Jan 24, 2020
86cee2b
Copy IbcMerge input files to log/ngen dir on failure
tmat Jan 24, 2020
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
32 changes: 20 additions & 12 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/OptimizationData.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
EnableNgenOptimizationLogDetails Set to true to enable NGEN method logging output
ApplyNgenOptimization Set to 'partial' or 'full' in a project to embed partial/full NGEN optimization data to the built binary.

Obsolete (https://github.com/dotnet/arcade/issues/2092):
EnablePartialNgenOptimization Set to true to enable Partial NGEN optimization data embedding.
ApplyPartialNgenOptimization Set to true in a project to apply Partial NGEN optimization data to the built binary.

Items:
OptimizeAssembly Set of assemblies to apply Partial NGEN optimization data to.
-->
Expand All @@ -24,12 +20,9 @@
<PropertyGroup>
<PostCompileBinaryModificationSentinelFile>$(IntermediateOutputPath)$(TargetFileName).pcbm</PostCompileBinaryModificationSentinelFile>

<!-- TODO: remove (https://github.com/dotnet/arcade/issues/2092) -->
<EnablePartialNgenOptimization Condition="'$(EnablePartialNgenOptimization)' == '' and '$(Configuration)' == 'Release' and '$(OfficialBuild)' == 'true'">true</EnablePartialNgenOptimization>

<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == ''">$(EnablePartialNgenOptimization)</EnableNgenOptimization>
<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release' and '$(OfficialBuild)' == 'true'">true</EnableNgenOptimization>
<EnableNgenOptimizationLogDetails Condition="'$(EnableNgenOptimizationLogDetails)' == ''">$(UsingToolVisualStudioIbcTraining)</EnableNgenOptimizationLogDetails>
<ApplyNgenOptimization Condition="'$(ApplyPartialNgenOptimization)' == 'true'">partial</ApplyNgenOptimization>

<_IbcMergeXmlOutputDir>$(ArtifactsTmpDir)ibcxml</_IbcMergeXmlOutputDir>
</PropertyGroup>

Expand Down Expand Up @@ -107,10 +100,11 @@
<_IbcFileByAssemblyName Include="@(_IbcFile->'%(AssemblyFileName)')"
IbcFiles="%(_IbcFile.Identity)"
PreviousAssemblyPath="%(_IbcFile.PreviousAssemblyDir)\%(_IbcFile.AssemblyFileName)"
PreviousAssemblyCopyPath="$(ArtifactsTmpDir)OptimizedAssemblies\$([System.Guid]::NewGuid())"
UniqueId="$([System.Guid]::NewGuid())"
PreviousAssemblyCopyPath="$(ArtifactsTmpDir)OptimizedAssemblies\%(_IbcFileByAssemblyName.UniqueId)"
OptimizeAssemblyPath="%(_IbcFile.OptimizeAssemblyPath)"
TargetFramework="%(_IbcFile.TargetFramework)"
XmlOutputPath="$(_IbcMergeXmlOutputDir)\%(_IbcFile.AssemblyFileName).$([System.Guid]::NewGuid()).temp.ibc.xml" />
XmlOutputPath="$(_IbcMergeXmlOutputDir)\%(_IbcFile.AssemblyFileName).%(_IbcFileByAssemblyName.UniqueId).temp.ibc.xml" />
</ItemGroup>

<Error Text="No optimization data found for assemblies: @(_AssemblyWithoutRawIbcData, ', ')"
Expand Down Expand Up @@ -145,6 +139,10 @@
<UnsignFile>%(_AssemblyWithRawIbcData.OptimizeAssemblyPath)</UnsignFile>
<XmlOutputPath Condition="'$(EnableNgenOptimizationLogDetails)' == 'true'">%(_AssemblyWithRawIbcData.XmlOutputPath)</XmlOutputPath>
<TargetFramework>%(_AssemblyWithRawIbcData.TargetFramework)</TargetFramework>

<!-- Files to copy to log dir if IbcMerge fails -->
<LogFilesOnFailure>%(_AssemblyWithRawIbcData.OptimizeAssemblyPath);%(_AssemblyWithRawIbcData.PreviousAssemblyCopyPath)</LogFilesOnFailure>
<LogFilesOnFailureDir>$(ArtifactsLogNgenDir)%(_AssemblyWithRawIbcData.UniqueId)\</LogFilesOnFailureDir>
</_IbcMergeInvocation>

<_IbcMergeInvocation>
Expand Down Expand Up @@ -173,14 +171,24 @@
DestinationFiles="%(_IbcMergeInvocation.CopyFilesDestination)"
Condition="'%(_IbcMergeInvocation.CopyFilesSource)' != ''" />

<Exec Command='"$(DotNetTool)" exec "$(_IbcMergePath)" %(_IbcMergeInvocation.IbcMergeArgs)' ConsoleToMSBuild="true" Condition="'$(_RunIbcMerge)' == 'true'">
<Exec Command='"$(DotNetTool)" exec "$(_IbcMergePath)" %(_IbcMergeInvocation.IbcMergeArgs)' ConsoleToMSBuild="true" Condition="'$(_RunIbcMerge)' == 'true'" IgnoreExitCode="true">
<Output TaskParameter="ConsoleOutput" PropertyName="_IbcMergeOutput" />
<Output TaskParameter="ExitCode" PropertyName="_IbcMergeErrorCode" />
</Exec>

<Message Text="$(_IbcMergeOutput)" Importance="low" />

<!-- Copy IBCMerge input assembly to logs if the tool fails, to allow investigation -->
<Copy SourceFiles="%(_IbcMergeInvocation.LogFilesOnFailure)"
DestinationFolder="%(_IbcMergeInvocation.LogFilesOnFailureDir)"
Condition="'$(_IbcMergeErrorCode)' != '0' and '%(_IbcMergeInvocation.LogFilesOnFailure)' != ''" />

<Error Text="IBCMerge failed with exit code $(_IbcMergeErrorCode)."
Condition="'$(_IbcMergeErrorCode)' != '0'" />

<!-- Remove Authenticode signing record if present. -->
<Microsoft.DotNet.Arcade.Sdk.Unsign FilePath="%(_IbcMergeInvocation.UnsignFile)" Condition="'%(_IbcMergeInvocation.UnsignFile)' != ''" />

<Microsoft.DotNet.Arcade.Sdk.ExtractNgenMethodList
IbcXmlFilePath="%(_IbcMergeInvocation.XmlOutputPath)"
AssemblyFilePath="%(_IbcMergeInvocation.UnsignFile)"
Expand Down
5 changes: 1 addition & 4 deletions src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.AcquireOptimizationData.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
<UsingTask AssemblyFile="$(_VisualStudioBuildTasksAssembly)" TaskName="Microsoft.DotNet.Build.Tasks.VisualStudio.FindLatestDrop"/>

<PropertyGroup>
<!-- TODO: remove (https://github.com/dotnet/arcade/issues/2092) -->
<EnablePartialNgenOptimization Condition="'$(EnablePartialNgenOptimization)' == '' and '$(Configuration)' == 'Release' and '$(OfficialBuild)' == 'true'">true</EnablePartialNgenOptimization>

<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == ''">$(EnablePartialNgenOptimization)</EnableNgenOptimization>
<EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release' and '$(OfficialBuild)' == 'true'">true</EnableNgenOptimization>
</PropertyGroup>

<!--
Expand Down