Skip to content

[LoongArch64] Add memory barriers to native AOT asm helpers. #106252

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

Merged
merged 2 commits into from
Aug 13, 2024
Merged

[LoongArch64] Add memory barriers to native AOT asm helpers. #106252

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
3a6e5bc
[LoongArch64] Add memory barriers to native AOT asm helpers.
shushanhf Aug 12, 2024
ae6b64f
rename `EmitDMB` to `EmitDBAR`.
shushanhf Aug 13, 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
6 changes: 6 additions & 0 deletions ...coreclr/tools/Common/Compiler/DependencyAnalysis/Target_LoongArch64/LoongArch64Emitter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,5 +144,11 @@ public void EmitJE(Register regSrc, ISymbolNode symbol)

EmitJMP(symbol);
}

// dbar
public void EmitDBAR()
{
Builder.EmitUInt(0x38720000);
}
}
}
2 changes: 2 additions & 0 deletions .../Compiler/DependencyAnalysis/Target_LoongArch64/LoongArch64ReadyToRunGenericHelperNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ protected sealed override void EmitCode(NodeFactory factory, ref LoongArch64Emit
// We need to trigger the cctor before returning the base. It is stored at the beginning of the non-GC statics region.
encoder.EmitADD(encoder.TargetRegister.Arg3, encoder.TargetRegister.Arg0, -NonGCStaticsNode.GetClassConstructorContextSize(factory.Target));
encoder.EmitLD(encoder.TargetRegister.Arg2, encoder.TargetRegister.Arg3, 0);
encoder.EmitDBAR();
encoder.EmitXOR(encoder.TargetRegister.IntraProcedureCallScratch1, encoder.TargetRegister.Arg2, 0);
encoder.EmitRETIfEqual(Register.R21);

Expand Down Expand Up @@ -108,6 +109,7 @@ protected sealed override void EmitCode(NodeFactory factory, ref LoongArch64Emit

encoder.EmitADD(encoder.TargetRegister.Arg2, encoder.TargetRegister.Arg2, -NonGCStaticsNode.GetClassConstructorContextSize(factory.Target));
encoder.EmitLD(encoder.TargetRegister.Arg3, encoder.TargetRegister.Arg2, factory.Target.PointerSize);
encoder.EmitDBAR();
encoder.EmitXOR(encoder.TargetRegister.IntraProcedureCallScratch1, encoder.TargetRegister.Arg3, 1);
encoder.EmitRETIfEqual(Register.R21);

Expand Down
2 changes: 2 additions & 0 deletions ...ompiler/Compiler/DependencyAnalysis/Target_LoongArch64/LoongArch64ReadyToRunHelperNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ protected override void EmitCode(NodeFactory factory, ref LoongArch64Emitter enc
// We need to trigger the cctor before returning the base. It is stored at the beginning of the non-GC statics region.
encoder.EmitADD(encoder.TargetRegister.Arg3, encoder.TargetRegister.Result, -NonGCStaticsNode.GetClassConstructorContextSize(factory.Target));
encoder.EmitLD(encoder.TargetRegister.Arg2, encoder.TargetRegister.Arg3, factory.Target.PointerSize);
encoder.EmitDBAR();
encoder.EmitXOR(encoder.TargetRegister.IntraProcedureCallScratch1, encoder.TargetRegister.Arg2, 1);
encoder.EmitRETIfEqual(encoder.TargetRegister.IntraProcedureCallScratch1);

Expand Down Expand Up @@ -94,6 +95,7 @@ protected override void EmitCode(NodeFactory factory, ref LoongArch64Emitter enc
encoder.EmitMOV(encoder.TargetRegister.Arg2, factory.TypeNonGCStaticsSymbol(target));
encoder.EmitADD(encoder.TargetRegister.Arg2, encoder.TargetRegister.Arg2, -NonGCStaticsNode.GetClassConstructorContextSize(factory.Target));
encoder.EmitLD(encoder.TargetRegister.Arg3, encoder.TargetRegister.Arg2, 0);
encoder.EmitDBAR();
encoder.EmitXOR(encoder.TargetRegister.IntraProcedureCallScratch1, encoder.TargetRegister.Arg3, 0);
encoder.EmitRETIfEqual(Register.R21);

Expand Down