Skip to content

[Mono] Pass Vector128 in SIMD registers, when LLVM is enabled #68991

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
fanyang-mono merged 14 commits into from
May 31, 2022
Merged

[Mono] Pass Vector128 in SIMD registers, when LLVM is enabled #68991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
15badfe
Add a new LLVMArgStorage type
fanyang-mono Apr 30, 2022
a069e0e
Fix llvm signature
fanyang-mono May 3, 2022
ffdcc2a
Fix emit_call
fanyang-mono May 4, 2022
6e42d91
Enable passing SIMD register on arm64 and clean up debugging stuff
fanyang-mono May 6, 2022
93da354
Clean up unnecessary format change
fanyang-mono May 6, 2022
bc396db
Merge branch 'main' into simd_register
fanyang-mono May 7, 2022
6d2c7d5
Update code after rebase
fanyang-mono May 7, 2022
3086bfa
Only use SIMD register when element type is primitive type
fanyang-mono May 9, 2022
d56bd1f
Merge branch 'main' into simd_register
fanyang-mono May 9, 2022
5383b55
Disable SIMD intrinsics for generic sharing, since it doesn't work at…
fanyang-mono May 16, 2022
91d196b
Check if element type is primitive on arm64
fanyang-mono May 16, 2022
fda3a73
Merge branch 'main' into simd_register
fanyang-mono May 23, 2022
b9b1767
Not using SIMD register when it is full aot
fanyang-mono May 24, 2022
3425bdf
Address review feedbacks
fanyang-mono May 26, 2022
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
8 changes: 8 additions & 0 deletions src/mono/mono/mini/mini-amd64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2174,6 +2174,14 @@ mono_arch_get_llvm_call_info (MonoCompile *cfg, MonoMethodSignature *sig)
return linfo;
}

if ((t->type == MONO_TYPE_GENERICINST) && !cfg->full_aot && !sig->pinvoke) {
MonoClass *klass = mono_class_from_mono_type_internal (t);
if (m_class_is_simd_type (klass)) {
linfo->args [i].storage = LLVMArgVtypeInSIMDReg;
break;
}
}

linfo->args [i].storage = LLVMArgVtypeInReg;
for (j = 0; j < 2; ++j)
linfo->args [i].pair_storage [j] = arg_storage_to_llvm_arg_storage (cfg, ainfo->pair_storage [j]);
Expand Down
15 changes: 15 additions & 0 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 @@ -2491,6 +2491,13 @@ mono_arch_get_llvm_call_info (MonoCompile *cfg, MonoMethodSignature *sig)

lainfo->storage = LLVMArgNone;

MonoType *t;
if (i >= sig->hasthis)
t = sig->params [i - sig->hasthis];
else
t = mono_get_int_type ();
t = mini_type_get_underlying_type (t);

switch (ainfo->storage) {
case ArgInIReg:
case ArgInFReg:
Expand All @@ -2515,6 +2522,14 @@ mono_arch_get_llvm_call_info (MonoCompile *cfg, MonoMethodSignature *sig)
break;
}
case ArgVtypeInIRegs:
if ((t->type == MONO_TYPE_GENERICINST) && !cfg->full_aot && !sig->pinvoke) {
MonoClass *klass = mono_class_from_mono_type_internal (t);
if (m_class_is_simd_type (klass)) {
lainfo->storage = LLVMArgVtypeInSIMDReg;
break;
}
}

lainfo->storage = LLVMArgAsIArgs;
lainfo->nslots = ainfo->nregs;
break;
Expand Down
18 changes: 18 additions & 0 deletions src/mono/mono/mini/mini-llvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1738,6 +1738,11 @@ sig_to_llvm_sig_full (EmitContext *ctx, MonoMethodSignature *sig, LLVMCallInfo *
}
}
break;
case LLVMArgVtypeInSIMDReg: {
MonoClass *klass = mono_class_from_mono_type_internal (sig->params [i]);
param_types [pindex ++] = simd_class_to_llvm_type (ctx, klass);
break;
}
case LLVMArgVtypeByVal:
param_types [pindex] = type_to_llvm_arg_type (ctx, ainfo->type);
if (!ctx_ok (ctx))
Expand Down Expand Up @@ -3922,6 +3927,13 @@ emit_entry_bb (EmitContext *ctx, LLVMBuilderRef builder)
emit_args_to_vtype (ctx, builder, ainfo->type, ctx->addresses [reg]->value, ainfo, args);
break;
}
case LLVMArgVtypeInSIMDReg: {
LLVMValueRef arg = LLVMGetParam (ctx->lmethod, pindex);

ctx->addresses [reg] = build_alloca_address (ctx, ainfo->type);
LLVMBuildStore (builder, arg, build_ptr_cast (builder, ctx->addresses [reg]->value, pointer_type(LLVMTypeOf (arg))));
break;
}
case LLVMArgVtypeByVal: {
g_assert (ctx->param_etypes [pindex]);
ctx->addresses [reg] = create_address (ctx->module, LLVMGetParam (ctx->lmethod, pindex), ctx->param_etypes [pindex]);
Expand Down Expand Up @@ -4017,6 +4029,7 @@ emit_entry_bb (EmitContext *ctx, LLVMBuilderRef builder)

switch (ainfo->storage) {
case LLVMArgVtypeInReg:
case LLVMArgVtypeInSIMDReg:
case LLVMArgVtypeByVal:
case LLVMArgAsIArgs:
// FIXME: Enabling this fails on windows
Expand Down Expand Up @@ -4571,6 +4584,10 @@ process_call (EmitContext *ctx, MonoBasicBlock *bb, LLVMBuilderRef *builder_ref,
// FIXME: Get rid of the VMOVE
break;
}
case LLVMArgVtypeInSIMDReg: {
args [pindex] = LLVMBuildLoad2 (ctx->builder, addresses [reg]->type, addresses [reg]->value, "load_param");
break;
}
case LLVMArgVtypeByVal:
g_assert (addresses [reg]);
args [pindex] = addresses [reg]->value;
Expand Down Expand Up @@ -12427,6 +12444,7 @@ mono_llvm_emit_call (MonoCompile *cfg, MonoCallInst *call)
case LLVMArgVtypeByVal:
case LLVMArgVtypeByRef:
case LLVMArgVtypeInReg:
case LLVMArgVtypeInSIMDReg:
case LLVMArgVtypeAddr:
case LLVMArgVtypeAsScalar:
case LLVMArgAsIArgs:
Expand Down
2 changes: 2 additions & 0 deletions src/mono/mono/mini/mini.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,8 @@ typedef enum {
LLVMArgInFPReg,
/* Valuetype passed in 1-2 consecutive register */
LLVMArgVtypeInReg,
/* Pass vector types in SIMD registers */
LLVMArgVtypeInSIMDReg,
LLVMArgVtypeByVal,
LLVMArgVtypeRetAddr, /* On on cinfo->ret */
LLVMArgGSharedVt,
Expand Down