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

[wasm] Improvements to startup performance of mono_wasm_get_assembly_exports #99924

Merged
merged 4 commits into from
Apr 5, 2024
+34 −13
Merged

[wasm] Improvements to startup performance of mono_wasm_get_assembly_exports #99924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49cce7a
Improvements to performance of mono_wasm_get_assembly_exports
kg Mar 18, 2024
e47a08a
Preserve register method using DynamicDependency
kg Apr 3, 2024
1401aa3
Fix comment
kg Apr 3, 2024
77f918b
Address PR feedback
kg Apr 4, 2024
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
1 change: 1 addition & 0 deletions src/libraries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ internal static class Constants
public const string ModuleInitializerAttributeGlobal = "global::System.Runtime.CompilerServices.ModuleInitializerAttribute";
public const string CompilerGeneratedAttributeGlobal = "global::System.Runtime.CompilerServices.CompilerGeneratedAttribute";
public const string DynamicDependencyAttributeGlobal = "global::System.Diagnostics.CodeAnalysis.DynamicDependencyAttribute";
public const string DynamicallyAccessedMemberTypesGlobal = "global::System.Diagnostics.CodeAnalysis.DynamicallyAccessedMemberTypes";
public const string ThreadStaticGlobal = "global::System.ThreadStaticAttribute";
public const string TaskGlobal = "global::System.Threading.Tasks.Task";
public const string SpanGlobal = "global::System.Span";
Expand Down
46 changes: 33 additions & 13 deletions ...ries/System.Runtime.InteropServices.JavaScript/gen/JSImportGenerator/JSExportGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ private static NamespaceDeclarationSyntax GenerateRegSource(
const string generatedNamespace = "System.Runtime.InteropServices.JavaScript";
const string initializerClass = "__GeneratedInitializer";
const string initializerName = "__Register_";
const string selfInitName = "__Net7SelfInit_";
const string trimmingPreserveName = "__TrimmingPreserve_";

if (methods.IsEmpty) return NamespaceDeclaration(IdentifierName(generatedNamespace));

Expand All @@ -241,22 +241,42 @@ private static NamespaceDeclarationSyntax GenerateRegSource(
.WithModifiers(TokenList(new[] { Token(SyntaxKind.StaticKeyword) }))
.WithBody(Block(registerStatements));

// when we are running code generated by .NET8 on .NET7 runtime we need to auto initialize the assembly, because .NET7 doesn't call the registration from JS
// this also keeps the code protected from trimming
MemberDeclarationSyntax initializerMethod = MethodDeclaration(PredefinedType(Token(SyntaxKind.VoidKeyword)), Identifier(selfInitName))
.WithAttributeLists(List(new[]{
AttributeList(SingletonSeparatedList(Attribute(IdentifierName(Constants.ModuleInitializerAttributeGlobal)))),
}))
// HACK: protect the code from trimming with DynamicDependency attached to a ModuleInitializer
MemberDeclarationSyntax initializerMethod = MethodDeclaration(PredefinedType(Token(SyntaxKind.VoidKeyword)), Identifier(trimmingPreserveName))
.WithAttributeLists(
SingletonList<AttributeListSyntax>(
AttributeList(
SeparatedList<AttributeSyntax>(
new SyntaxNodeOrToken[]{
Attribute(
IdentifierName(Constants.ModuleInitializerAttributeGlobal)),
Token(SyntaxKind.CommaToken),
Attribute(
IdentifierName(Constants.DynamicDependencyAttributeGlobal))
.WithArgumentList(
AttributeArgumentList(
SeparatedList<AttributeArgumentSyntax>(
new SyntaxNodeOrToken[]{
AttributeArgument(
BinaryExpression(
SyntaxKind.BitwiseOrExpression,
MemberAccessExpression(
SyntaxKind.SimpleMemberAccessExpression,
IdentifierName(Constants.DynamicallyAccessedMemberTypesGlobal),
IdentifierName("PublicMethods")),
MemberAccessExpression(
SyntaxKind.SimpleMemberAccessExpression,
IdentifierName(Constants.DynamicallyAccessedMemberTypesGlobal),
IdentifierName("NonPublicMethods")))),
Token(SyntaxKind.CommaToken),
AttributeArgument(
TypeOfExpression(
IdentifierName(initializerClass)))})))}))))
.WithModifiers(TokenList(new[] {
Token(SyntaxKind.StaticKeyword),
Token(SyntaxKind.InternalKeyword)
}))
.WithBody(Block(
IfStatement(BinaryExpression(SyntaxKind.EqualsExpression,
IdentifierName("Environment.Version.Major"),
LiteralExpression(SyntaxKind.NumericLiteralExpression, Literal(7))),
Block(SingletonList<StatementSyntax>(
ExpressionStatement(InvocationExpression(IdentifierName(initializerName))))))));
.WithBody(Block());

var ns = NamespaceDeclaration(IdentifierName(generatedNamespace))
.WithMembers(
Expand Down
Loading