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

[mono] Fix passing of valuetypes with a non-8 byte aligned size on arm64+ios/macos. #96079

Merged
merged 3 commits into from
Jan 8, 2024
Merged

[mono] Fix passing of valuetypes with a non-8 byte aligned size on arm64+ios/macos. #96079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ed39d9
[mono] Fix passing of valuetypes with a non-8 byte aligned size on ar…
vargaz Dec 16, 2023
2e138c2
Reenable tests on non-interpreter.
vargaz Dec 16, 2023
4dcaafa
Fix.
vargaz Dec 16, 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
46 changes: 40 additions & 6 deletions src/mono/mono/mini/mini-arm64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1677,7 +1677,8 @@ add_valuetype (CallInfo *cinfo, ArgInfo *ainfo, MonoType *t, gboolean is_return)
} else {
ainfo->nfregs_to_skip = FP_PARAM_REGS > cinfo->fr ? FP_PARAM_REGS - cinfo->fr : 0;
cinfo->fr = FP_PARAM_REGS;
size = ALIGN_TO (size, 8);
if (!(ios_abi && cinfo->pinvoke))
size = ALIGN_TO (size, 8);
ainfo->storage = ArgVtypeOnStack;
cinfo->stack_usage = ALIGN_TO (cinfo->stack_usage, align);
ainfo->offset = cinfo->stack_usage;
Expand Down Expand Up @@ -3240,16 +3241,49 @@ mono_arch_emit_outarg_vt (MonoCompile *cfg, MonoInst *ins, MonoInst *src)
}
break;
}
case ArgVtypeOnStack:
for (i = 0; i < ainfo->size / 8; ++i) {
MONO_INST_NEW (cfg, load, OP_LOADI8_MEMBASE);
case ArgVtypeOnStack: {
int load_opcode = OP_LOADI8_MEMBASE;
int store_opcode = OP_STOREI8_MEMBASE_REG;
int size = 8;
int offset = 0;
while (offset < ainfo->size) {
int left = ainfo->size - offset;
if (left < 8) {
switch (left) {
case 7:
case 6:
case 5:
case 4:
load_opcode = OP_LOADI4_MEMBASE;
store_opcode = OP_STOREI4_MEMBASE_REG;
size = 4;
break;
case 3:
case 2:
load_opcode = OP_LOADI2_MEMBASE;
store_opcode = OP_STOREI2_MEMBASE_REG;
size = 2;
break;
case 1:
load_opcode = OP_LOADI1_MEMBASE;
store_opcode = OP_STOREI1_MEMBASE_REG;
size = 1;
break;
default:
g_assert_not_reached ();
break;
}
}
MONO_INST_NEW (cfg, load, load_opcode);
load->dreg = mono_alloc_ireg (cfg);
load->inst_basereg = src->dreg;
load->inst_offset = i * 8;
load->inst_offset = offset;
MONO_ADD_INS (cfg->cbb, load);
MONO_EMIT_NEW_STORE_MEMBASE (cfg, OP_STOREI8_MEMBASE_REG, ARMREG_SP, ainfo->offset + (i * 8), load->dreg);
MONO_EMIT_NEW_STORE_MEMBASE (cfg, store_opcode, ARMREG_SP, ainfo->offset + offset, load->dreg);
offset += size;
}
break;
}
case ArgInSIMDReg:
MONO_INST_NEW (cfg, load, OP_LOADX_MEMBASE);
load->dreg = mono_alloc_ireg (cfg);
Expand Down
2 changes: 1 addition & 1 deletion src/tests/issues.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2761,7 +2761,7 @@
</ItemGroup>

<!-- These are known failures on mono-arm64 on OSX -->
<ItemGroup Condition=" '$(RuntimeFlavor)' == 'mono' and '$(TargetArchitecture)' == 'arm64' and '$(TargetsOSX)' == 'true'" >
<ItemGroup Condition=" '$(RuntimeFlavor)' == 'mono' and '$(TargetArchitecture)' == 'arm64' and '$(TargetsOSX)' == 'true' and '$(RuntimeVariant)' == 'monointerpreter'" >
<ExcludeList Include = "$(XunitTestBinBase)/JIT/SIMD/Vector3Interop_r/**">
<Issue>https://github.com/dotnet/runtime/issues/96051</Issue>
</ExcludeList>
Expand Down
Loading