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

Jump to bottom

Move Win32 resource emission to the compiler #88464

Merged
merged 9 commits into from
Jul 11, 2023
Merged

Move Win32 resource emission to the compiler #88464

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
223e837
Something that works
MichalStrehovsky Jul 6, 2023
92771a8
Put back name table
MichalStrehovsky Jul 6, 2023
fca9d53
Undo padding
MichalStrehovsky Jul 6, 2023
509ace9
Undo rewriting
MichalStrehovsky Jul 6, 2023
9fbac43
Cleanups
MichalStrehovsky Jul 6, 2023
410d0cf
analyzer garbage "for better performance!!!!!11111" in files I'm not …
MichalStrehovsky Jul 6, 2023
9c6a097
Update Microsoft.NETCore.Native.targets
MichalStrehovsky Jul 7, 2023
32c8d5b
Disable for multifile for now
MichalStrehovsky Jul 7, 2023
2a40622
Another attempt
MichalStrehovsky Jul 11, 2023
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
20 changes: 2 additions & 18 deletions src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ The .NET Foundation licenses this file to you under the MIT license.
<IlcArg Condition="$(IlcMaxVectorTBitWidth) != ''" Include="--max-vectort-bitwidth:$(IlcMaxVectorTBitWidth)" />
<IlcArg Condition="$(IlcSingleThreaded) == 'true'" Include="--parallelism:1" />
<IlcArg Condition="$(IlcSystemModule) != ''" Include="--systemmodule:$(IlcSystemModule)" />
<IlcArg Condition="'$(_targetOS)' == 'win' and $(IlcMultiModule) != 'true'" Include="--win32resourcemodule:%(ManagedBinary.Filename)" />
MichalStrehovsky marked this conversation as resolved.
Show resolved Hide resolved
<IlcArg Condition="$(IlcDumpIL) == 'true'" Include="--ildump:$(NativeIntermediateOutputPath)%(ManagedBinary.Filename).il" />
<IlcArg Condition="$(NoWarn) != ''" Include='--nowarn:"$([MSBuild]::Escape($(NoWarn)))"' />
<IlcArg Condition="$(TrimmerSingleWarn) == 'true'" Include="--singlewarn" />
Expand Down Expand Up @@ -311,26 +312,10 @@ The .NET Foundation licenses this file to you under the MIT license.
<Copy SourceFiles="@(NativeObjects)" DestinationFolder="$(NativeOutputPath)" />
</Target>

<PropertyGroup>
<_Win32ResFile>$(NativeIntermediateOutputPath)$(TargetName).res</_Win32ResFile>
</PropertyGroup>

<UsingTask TaskName="DumpNativeResources" AssemblyFile="$(IlcBuildTasksPath)" />
<Target Name="GenerateResFile"
Inputs="$(IntermediateOutputPath)$(TargetName)$(TargetExt)"
Outputs="$(_Win32ResFile)"
Condition="'$(_targetOS)' == 'win'">

<DumpNativeResources
MainAssembly="$(IntermediateOutputPath)$(TargetName)$(TargetExt)"
ResourceFile="$(_Win32ResFile)" />

</Target>

<Target Name="LinkNative"
Inputs="$(NativeObject);@(NativeLibrary)"
Outputs="$(NativeBinary)"
DependsOnTargets="$(LinkNativeDependsOn);GenerateResFile">
DependsOnTargets="$(LinkNativeDependsOn)">

<ItemGroup>
<CustomLinkerArg Include="&quot;$(NativeObject)&quot;" />
Expand All @@ -341,7 +326,6 @@ The .NET Foundation licenses this file to you under the MIT license.
<CustomLinkerArg Include="-exported_symbols_list &quot;$(ExportsFile)&quot;" Condition="'$(_IsApplePlatform)' == 'true' and $(ExportsFile) != ''" />
<CustomLinkerArg Include="-Wl,--version-script=$(ExportsFile)" Condition="'$(_targetOS)' != 'win' and '$(_IsApplePlatform)' != 'true' and $(ExportsFile) != ''" />
<CustomLinkerArg Include="-Wl,--export-dynamic" Condition="'$(_targetOS)' != 'win' and '$(_IsApplePlatform)' != 'true' and '$(IlcExportUnmanagedEntrypoints)' == 'true' and '$(NativeLib)' == ''" />
<CustomLinkerArg Condition="Exists('$(_Win32ResFile)')" Include="&quot;$(_Win32ResFile)&quot;" />
<CustomLinkerArg Include="@(LinkerArg)" />
</ItemGroup>
<ItemGroup Condition="'$(_targetOS)' != 'win' and '$(_IsApplePlatform)' != 'true'">
Expand Down
0 ...Run/Win32Resources/ResourceData.Reader.cs → ...ler/Win32Resources/ResourceData.Reader.cs
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...ources/ResourceData.ResourcesDataModel.cs → ...ources/ResourceData.ResourcesDataModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public unsafe partial class ResourceData
private readonly SortedDictionary<ushort, ResType> _resTypeHeadID = new SortedDictionary<ushort, ResType>();
private readonly SortedDictionary<string, ResType> _resTypeHeadName = new SortedDictionary<string, ResType>(StringComparer.Ordinal);

private class ResLanguage
private sealed class ResLanguage
{
public ResLanguage(byte[] data)
{
Expand All @@ -22,12 +22,12 @@ public ResLanguage(byte[] data)
public byte[] DataEntry;
}

private class ResName
private sealed class ResName
{
public SortedDictionary<ushort, ResLanguage> Languages = new SortedDictionary<ushort, ResLanguage>();
}

private class ResType
private sealed class ResType
{
public SortedDictionary<string, ResName> NameHeadName = new SortedDictionary<string, ResName>(StringComparer.Ordinal);
public SortedDictionary<ushort, ResName> NameHeadID = new SortedDictionary<ushort, ResName>();
Expand Down
0 ...s/ResourceData.UpdateResourceDataModel.cs → ...s/ResourceData.UpdateResourceDataModel.cs
View file
Open in desktop
File renamed without changes.
10 changes: 8 additions & 2 deletions ...n32Resources/ResourceData.Win32Structs.cs → ...n32Resources/ResourceData.Win32Structs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public IMAGE_RESOURCE_DIRECTORY_ENTRY(ref BlobReader blobReader)
OffsetToData = blobReader.ReadUInt32();
}

public static ObjectDataBuilder.Reservation Write(ref ObjectDataBuilder dataBuilder, string name, IDictionary<string, List<ObjectDataBuilder.Reservation>> nameTable)
public static ObjectDataBuilder.Reservation Write(ref ObjectDataBuilder dataBuilder, string name, SortedDictionary<string, List<ObjectDataBuilder.Reservation>> nameTable)
{
List<ObjectDataBuilder.Reservation> relatedNameReferences;
if (!nameTable.TryGetValue(name, out relatedNameReferences))
Expand Down Expand Up @@ -84,7 +84,13 @@ public IMAGE_RESOURCE_DATA_ENTRY(ref BlobReader blobReader)

public static void Write(ref ObjectDataBuilder dataBuilder, ISymbolNode node, int offsetFromSymbol, int sizeOfData)
{
dataBuilder.EmitReloc(node, RelocType.IMAGE_REL_BASED_ADDR32NB, offsetFromSymbol);
dataBuilder.EmitReloc(node,
#if READYTORUN
RelocType.IMAGE_REL_BASED_ADDR32NB,
Copy link
Member

Choose a reason for hiding this comment

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

It looks like we have an arbitrary difference in how these RelocTypes are used between crossgen vs. ilc. Which one is right?

(just asking, not something to fix in this PR)

Copy link
Member Author

Choose a reason for hiding this comment

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

The one crossgen2 is using came from a projectn integration and never meant anything in nativeaot. But it looked like absolute has some meaning to crossgen2 so it's all confusing.

#else
RelocType.IMAGE_REL_BASED_ABSOLUTE,
#endif
offsetFromSymbol);
dataBuilder.EmitInt(sizeOfData);
dataBuilder.EmitInt(1252); // CODEPAGE = DEFAULT_CODEPAGE
dataBuilder.EmitInt(0); // RESERVED
Expand Down
11 changes: 8 additions & 3 deletions ...ReadyToRun/Win32Resources/ResourceData.cs → ...n/Compiler/Win32Resources/ResourceData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ public bool IsEmpty
}

public void WriteResources(ISymbolNode nodeAssociatedWithDataBuilder, ref ObjectDataBuilder dataBuilder)
{
WriteResources(nodeAssociatedWithDataBuilder, ref dataBuilder, ref dataBuilder);
}

public void WriteResources(ISymbolNode nodeAssociatedWithDataBuilder, ref ObjectDataBuilder dataBuilder, ref ObjectDataBuilder contentBuilder)
{
Debug.Assert(dataBuilder.CountBytes == 0);

Expand Down Expand Up @@ -145,9 +150,9 @@ public void WriteResources(ISymbolNode nodeAssociatedWithDataBuilder, ref Object
// Emit byte arrays of resource data, capture the offsets
foreach (Tuple<ResLanguage, ObjectDataBuilder.Reservation> language in resLanguages)
{
dataBuilder.PadAlignment(4); // Data in resource files is 4 byte aligned
dataEntryTable.Add(language.Item1, dataBuilder.CountBytes);
dataBuilder.EmitBytes(language.Item1.DataEntry);
contentBuilder.PadAlignment(4); // Data in resource files is 4 byte aligned
dataEntryTable.Add(language.Item1, contentBuilder.CountBytes);
contentBuilder.EmitBytes(language.Item1.DataEntry);
}

dataBuilder.PadAlignment(4); // resource data entries are 4 byte aligned
Expand Down
255 changes: 0 additions & 255 deletions src/coreclr/tools/aot/ILCompiler.Build.Tasks/DumpNativeResources.cs
View file
Open in desktop

This file was deleted.

Loading
Loading