Skip to content

[mono] Add basic Vector128 support for arm64. #47028

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
imhameed merged 6 commits into from
Jan 20, 2021
+168 −124
Merged

[mono] Add basic Vector128 support for arm64. #47028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a9a2a8
Add basic Vector128 support for arm64.
imhameed Jan 15, 2021
4026257
-
imhameed Jan 15, 2021
8b54b33
Checkpoint: Make OP_LDADDR SIMD-aware.
imhameed Jan 19, 2021
515fa29
Checkpoint: convert SIMD-in-LLVM-integer call results to LLVM-vectors
imhameed Jan 19, 2021
e7c67c3
Checkpoint: Unpack SIMD parameters passed via multiple GPRs
imhameed Jan 20, 2021
20b3523
-
imhameed Jan 20, 2021
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
10 changes: 9 additions & 1 deletion src/mono/mono/mini/mini-llvm-cpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,15 @@ mono_llvm_dump_module (LLVMModuleRef module)
{
/* Same as LLVMDumpModule (), but print to stdout */
fflush (stdout);
outs () << (*unwrap (module));
outs () << (*unwrap (module)) << "\n";
outs ().flush ();
}

void
mono_llvm_dump_type (LLVMTypeRef type)
{
fflush (stdout);
outs () << (*unwrap (type)) << "\n";
outs ().flush ();
}

Expand Down
3 changes: 3 additions & 0 deletions src/mono/mono/mini/mini-llvm-cpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ mono_llvm_dump_value (LLVMValueRef value);
void
mono_llvm_dump_module (LLVMModuleRef module);

void
mono_llvm_dump_type (LLVMTypeRef type);

LLVMValueRef
mono_llvm_build_alloca (LLVMBuilderRef builder, LLVMTypeRef Ty,
LLVMValueRef ArraySize,
Expand Down
92 changes: 54 additions & 38 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 @@ -1228,7 +1228,7 @@ convert_full (EmitContext *ctx, LLVMValueRef v, LLVMTypeRef dtype, gboolean is_u
return LLVMBuildBitCast (ctx->builder, v, dtype, "");

mono_llvm_dump_value (v);
mono_llvm_dump_value (LLVMConstNull (dtype));
mono_llvm_dump_type (dtype);
printf ("\n");
g_assert_not_reached ();
return NULL;
Expand Down Expand Up @@ -2593,8 +2593,9 @@ build_alloca_llvm_type (EmitContext *ctx, LLVMTypeRef t, int align)
return build_alloca_llvm_type_name (ctx, t, align, "");
}


static LLVMValueRef
build_alloca (EmitContext *ctx, MonoType *t)
build_named_alloca (EmitContext *ctx, MonoType *t, char const *name)
{
MonoClass *k = mono_class_from_mono_type_internal (t);
int align;
Expand All @@ -2610,7 +2611,13 @@ build_alloca (EmitContext *ctx, MonoType *t)
while (mono_is_power_of_two (align) == -1)
align ++;

return build_alloca_llvm_type (ctx, type_to_llvm_type (ctx, t), align);
return build_alloca_llvm_type_name (ctx, type_to_llvm_type (ctx, t), align, name);
}

static LLVMValueRef
build_alloca (EmitContext *ctx, MonoType *t)
{
return build_named_alloca (ctx, t, "");
}

static LLVMValueRef
Expand Down Expand Up @@ -3599,9 +3606,9 @@ emit_entry_bb (EmitContext *ctx, LLVMBuilderRef builder)
/* Could be already created by an OP_VPHI */
if (!ctx->addresses [var->dreg]) {
if (var->flags & MONO_INST_LMF)
ctx->addresses [var->dreg] = build_alloca_llvm_type (ctx, LLVMArrayType (LLVMInt8Type (), MONO_ABI_SIZEOF (MonoLMF)), sizeof (target_mgreg_t));
ctx->addresses [var->dreg] = build_alloca_llvm_type_name (ctx, LLVMArrayType (LLVMInt8Type (), MONO_ABI_SIZEOF (MonoLMF)), sizeof (target_mgreg_t), "entry_lmf");
else
ctx->addresses [var->dreg] = build_alloca (ctx, var->inst_vtype);
ctx->addresses [var->dreg] = build_named_alloca (ctx, var->inst_vtype, "entry");
//LLVMSetValueName (ctx->addresses [var->dreg], g_strdup_printf ("vreg_loc_%d", var->dreg));
}
ctx->vreg_cli_types [var->dreg] = var->inst_vtype;
Expand Down Expand Up @@ -3721,6 +3728,7 @@ emit_entry_bb (EmitContext *ctx, LLVMBuilderRef builder)
switch (ainfo->storage) {
case LLVMArgVtypeInReg:
case LLVMArgVtypeByVal:
case LLVMArgAsIArgs:
#ifdef ENABLE_NETCORE
// FIXME: Enabling this fails on windows
case LLVMArgVtypeAddr:
Expand All @@ -3729,7 +3737,7 @@ emit_entry_bb (EmitContext *ctx, LLVMBuilderRef builder)
{
if (MONO_CLASS_IS_SIMD (ctx->cfg, mono_class_from_mono_type_internal (ainfo->type)))
/* Treat these as normal values */
ctx->values [reg] = LLVMBuildLoad (builder, ctx->addresses [reg], "");
ctx->values [reg] = LLVMBuildLoad (builder, ctx->addresses [reg], "simd_vtype");
break;
}
default:
Expand Down Expand Up @@ -4314,6 +4322,8 @@ process_call (EmitContext *ctx, MonoBasicBlock *bb, LLVMBuilderRef *builder_ref,
if (!addresses [call->inst.dreg])
addresses [call->inst.dreg] = build_alloca (ctx, sig->ret);
LLVMBuildStore (builder, lcall, convert_full (ctx, addresses [call->inst.dreg], LLVMPointerType (LLVMTypeOf (lcall), 0), FALSE));
if (MONO_CLASS_IS_SIMD (ctx->cfg, mono_class_from_mono_type_internal (sig->ret)))
values [ins->dreg] = LLVMBuildBitCast(builder, lcall, type_to_llvm_type (ctx, sig->ret), "callret_cvt_simd");
break;
case LLVMArgVtypeRetAddr:
case LLVMArgVtypeByRef:
Expand Down Expand Up @@ -5201,10 +5211,12 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
case LLVMArgVtypeAsScalar: {
LLVMTypeRef ret_type = LLVMGetReturnType (LLVMGetElementType (LLVMTypeOf (method)));
LLVMValueRef retval;

g_assert (addresses [ins->sreg1]);

retval = LLVMBuildLoad (builder, LLVMBuildBitCast (builder, addresses [ins->sreg1], LLVMPointerType (ret_type, 0), ""), "");
if (MONO_CLASS_IS_SIMD (ctx->cfg, mono_class_from_mono_type_internal (sig->ret)))
retval = LLVMBuildBitCast (builder, values [ins->sreg1], ret_type, "setret_cvt_simd");
else {
g_assert (addresses [ins->sreg1]);
retval = LLVMBuildLoad (builder, LLVMBuildBitCast (builder, addresses [ins->sreg1], LLVMPointerType (ret_type, 0), ""), "");
}
LLVMBuildRet (builder, retval);
break;
}
Expand Down Expand Up @@ -6185,8 +6197,9 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
break;
case OP_LDADDR: {
MonoInst *var = ins->inst_i0;
MonoClass *klass = var->klass;

if (var->opcode == OP_VTARG_ADDR) {
if (var->opcode == OP_VTARG_ADDR && !MONO_CLASS_IS_SIMD(cfg, klass)) {
/* The variable contains the vtype address */
values [ins->dreg] = values [var->dreg];
} else if (var->opcode == OP_GSHAREDVT_LOCAL) {
Expand Down Expand Up @@ -6755,7 +6768,7 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
}

if (!addresses [ins->dreg])
addresses [ins->dreg] = build_alloca (ctx, m_class_get_byval_arg (klass));
addresses [ins->dreg] = build_named_alloca (ctx, m_class_get_byval_arg (klass), "vzero");
LLVMValueRef ptr = LLVMBuildBitCast (builder, addresses [ins->dreg], LLVMPointerType (LLVMInt8Type (), 0), "");
emit_memset (ctx, builder, ptr, const_int32 (mono_class_value_size (klass, NULL)), 0);
break;
Expand Down Expand Up @@ -6922,7 +6935,31 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
/*
* SIMD
*/
#if defined(TARGET_X86) || defined(TARGET_AMD64) || defined(TARGET_WASM)
#if defined(TARGET_X86) || defined(TARGET_AMD64) || defined(TARGET_ARM64) || defined(TARGET_WASM)
case OP_EXPAND_I1:
case OP_EXPAND_I2:
case OP_EXPAND_I4:
case OP_EXPAND_I8:
case OP_EXPAND_R4:
case OP_EXPAND_R8: {
LLVMTypeRef t;
LLVMValueRef mask [32], v;
int i;

#ifdef ENABLE_NETCORE
t = simd_class_to_llvm_type (ctx, ins->klass);
#else
t = simd_op_to_llvm_type (ins->opcode);
#endif
for (i = 0; i < 32; ++i)
mask [i] = LLVMConstInt (LLVMInt32Type (), 0, FALSE);

v = convert (ctx, values [ins->sreg1], LLVMGetElementType (t));

values [ins->dreg] = LLVMBuildInsertElement (builder, LLVMConstNull (t), v, LLVMConstInt (LLVMInt32Type (), 0, FALSE), "");
values [ins->dreg] = LLVMBuildShuffleVector (builder, values [ins->dreg], LLVMGetUndef (t), LLVMConstVector (mask, LLVMGetVectorSize (t)), "");
break;
}
case OP_XZERO: {
values [ins->dreg] = LLVMConstNull (type_to_llvm_type (ctx, m_class_get_byval_arg (ins->klass)));
break;
Expand All @@ -6943,6 +6980,9 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
mono_llvm_build_aligned_store (builder, values [ins->sreg1], dest, FALSE, 1);
break;
}
#endif // defined(TARGET_X86) || defined(TARGET_AMD64) || defined(TARGET_ARM64) || defined(TARGET_WASM)

#if defined(TARGET_X86) || defined(TARGET_AMD64) || defined(TARGET_WASM)
case OP_PADDB:
case OP_PADDW:
case OP_PADDD:
Expand Down Expand Up @@ -7177,31 +7217,6 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
break;
}

case OP_EXPAND_I1:
case OP_EXPAND_I2:
case OP_EXPAND_I4:
case OP_EXPAND_I8:
case OP_EXPAND_R4:
case OP_EXPAND_R8: {
LLVMTypeRef t;
LLVMValueRef mask [32], v;
int i;

#ifdef ENABLE_NETCORE
t = simd_class_to_llvm_type (ctx, ins->klass);
#else
t = simd_op_to_llvm_type (ins->opcode);
#endif
for (i = 0; i < 32; ++i)
mask [i] = LLVMConstInt (LLVMInt32Type (), 0, FALSE);

v = convert (ctx, values [ins->sreg1], LLVMGetElementType (t));

values [ins->dreg] = LLVMBuildInsertElement (builder, LLVMConstNull (t), v, LLVMConstInt (LLVMInt32Type (), 0, FALSE), "");
values [ins->dreg] = LLVMBuildShuffleVector (builder, values [ins->dreg], LLVMGetUndef (t), LLVMConstVector (mask, LLVMGetVectorSize (t)), "");
break;
}

case OP_INSERT_I1:
values [ins->dreg] = LLVMBuildInsertElement (builder, values [ins->sreg1], convert (ctx, values [ins->sreg2], LLVMInt8Type ()), LLVMConstInt (LLVMInt32Type (), ins->inst_c0, FALSE), dname);
break;
Expand Down Expand Up @@ -9593,6 +9608,7 @@ emit_method_inner (EmitContext *ctx)
linfo->rgctx_arg = TRUE;
else if (needs_extra_arg (ctx, cfg->method))
linfo->dummy_arg = TRUE;

ctx->method_type = method_type = sig_to_llvm_sig_full (ctx, sig, linfo);
if (!ctx_ok (ctx))
return;
Expand Down
5 changes: 3 additions & 2 deletions src/mono/mono/mini/mini.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,9 @@ enum {
#define MONO_IS_ZERO(ins) (((ins)->opcode == OP_VZERO) || ((ins)->opcode == OP_XZERO))

#ifdef TARGET_ARM64
// FIXME: enable for Arm64
#define MONO_CLASS_IS_SIMD(cfg, klass) (0)
// SIMD is only supported on arm64 when using the LLVM backend. When not using
// the LLVM backend, treat SIMD datatypes as regular value types.
#define MONO_CLASS_IS_SIMD(cfg, klass) ( ((cfg)->opt & MONO_OPT_SIMD) && ( COMPILE_LLVM (cfg) ) && m_class_is_simd_type (klass) )
#else
#define MONO_CLASS_IS_SIMD(cfg, klass) (((cfg)->opt & MONO_OPT_SIMD) && m_class_is_simd_type (klass))
#endif
Expand Down
Loading