Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[Mono] [Arm64] Add basic Vector3 SIMD intrinsics #97416

Merged
merged 9 commits into from
Feb 5, 2024
Merged

[Mono] [Arm64] Add basic Vector3 SIMD intrinsics #97416

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a9918e5
[Mono] [Arm64] Add basic Vector3 SIMD intrinsics
jkurdek Jan 23, 2024
d384ae7
Merge branch 'main' into vector3-arm64-intrinsics
jkurdek Jan 23, 2024
1e30142
Add support for LLVM
jkurdek Jan 29, 2024
dfcbb55
Add insert zero as last element to vector3 as vector4 ctor
jkurdek Jan 30, 2024
552c019
Fix dreg redeclaration
jkurdek Jan 30, 2024
472cabd
fixed const value insert
jkurdek Jan 31, 2024
74a2a29
llvm loadx zero padding + formatting + review suggestions
jkurdek Jan 31, 2024
b47cdf9
Apply suggestions from code review
jkurdek Feb 1, 2024
e672c53
Add review suggestions
jkurdek Feb 1, 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
4 changes: 2 additions & 2 deletions src/mono/mono/mini/cpu-arm64.mdesc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ r8const: dest:f len:20
label: len:0
store_membase_imm: dest:b len:20
store_membase_reg: dest:b src1:i len:20
storex_membase: dest:b src1:x len:16
storex_membase: dest:b src1:x len:20
storei1_membase_imm: dest:b len:20
storei1_membase_reg: dest:b src1:i len:12
storei2_membase_imm: dest:b len:20
Expand All @@ -136,7 +136,7 @@ storei1_memindex: dest:b src1:i src2:i len:4
storei2_memindex: dest:b src1:i src2:i len:4
storei4_memindex: dest:b src1:i src2:i len:4
load_membase: dest:i src1:b len:20
loadx_membase: dest:x src1:b len:16
loadx_membase: dest:x src1:b len:20
loadi1_membase: dest:i src1:b len:32
loadu1_membase: dest:i src1:b len:32
loadi2_membase: dest:i src1:b len:32
Expand Down
13 changes: 11 additions & 2 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 @@ -437,6 +437,7 @@ get_vector_size_macro (MonoInst *ins)
g_assert (ins->klass);
int size = mono_class_value_size (ins->klass, NULL);
switch (size) {
case 12:
case 16:
return VREG_FULL;
case 8:
Expand Down Expand Up @@ -4064,13 +4065,21 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
case OP_STOREX_MEMBASE:
if (ins->klass && mono_class_value_size (ins->klass, NULL) == 8)
code = emit_strfpx (code, sreg1, dreg, GTMREG_TO_INT (ins->inst_offset));
else
else if (ins->klass && mono_class_value_size (ins->klass, NULL) == 12) {
arm_neon_ins_e (code, SIZE_4, ARMREG_IP0, sreg1, 0, 2);
code = emit_strfpx (code, sreg1, dreg, GTMREG_TO_INT (ins->inst_offset));
code = emit_strfpw (code, ARMREG_IP0, dreg , GTMREG_TO_INT (ins->inst_offset + 8));
} else
code = emit_strfpq (code, sreg1, dreg, GTMREG_TO_INT (ins->inst_offset));
break;
case OP_LOADX_MEMBASE:
if (ins->klass && mono_class_value_size (ins->klass, NULL) == 8)
code = emit_ldrfpx (code, dreg, sreg1, GTMREG_TO_INT (ins->inst_offset));
else
else if (ins->klass && mono_class_value_size (ins->klass, NULL) == 12) {
code = emit_ldrfpx (code, dreg, sreg1, GTMREG_TO_INT (ins->inst_offset));
code = emit_ldrfpw (code, ARMREG_IP0, sreg1, GTMREG_TO_INT (ins->inst_offset + 8));
arm_neon_ins_e (code, SIZE_4, dreg, ARMREG_IP0, 2, 0);
} else
code = emit_ldrfpq (code, dreg, sreg1, GTMREG_TO_INT (ins->inst_offset));
break;
case OP_XMOVE:
Expand Down
33 changes: 27 additions & 6 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 @@ -469,12 +469,12 @@ ovr_tag_from_mono_vector_class (MonoClass *klass)
llvm_ovr_tag_t ret = 0;
switch (size) {
case 8: ret |= INTRIN_vector64; break;
case 12: ret |= INTRIN_vector128; break;
case 16: ret |= INTRIN_vector128; break;
}

const char *class_name = m_class_get_name (klass);
if (!strcmp ("Vector2", class_name) || !strcmp ("Vector4", class_name) || !strcmp ("Quaternion", class_name) || !strcmp ("Plane", class_name)) {
// FIXME: Support Vector3
if (!strcmp ("Vector2", class_name) || !strcmp ("Vector3", class_name) || !strcmp ("Vector4", class_name) || !strcmp ("Quaternion", class_name) || !strcmp ("Plane", class_name)) {
return ret | INTRIN_float32;
}

Expand Down Expand Up @@ -507,6 +507,7 @@ ovr_tag_from_llvm_type (LLVMTypeRef type)
unsigned int bits = mono_llvm_get_prim_size_bits (type);
switch (bits) {
case 64: ret |= INTRIN_vector64; break;
case 96: ret |= INTRIN_vector128; break;
case 128: ret |= INTRIN_vector128; break;
default: g_assert_not_reached ();
}
Expand Down Expand Up @@ -4168,9 +4169,18 @@ emit_entry_bb (EmitContext *ctx, LLVMBuilderRef builder)
case LLVMArgVtypeByRef:
case LLVMArgAsFpArgs:
{
if (mini_class_is_simd (ctx->cfg, mono_class_from_mono_type_internal (ainfo->type)))
/* Treat these as normal values */
ctx->values [reg] = LLVMBuildLoad2 (builder, ctx->addresses [reg]->type, ctx->addresses [reg]->value, "simd_vtype");
MonoClass *klass = mono_class_from_mono_type_internal (ainfo->type);
if (mini_class_is_simd (ctx->cfg, klass)) {
LLVMValueRef loadedVector = LLVMBuildLoad2 (builder, ctx->addresses [reg]->type, ctx->addresses [reg]->value, "simd_vtype");

if (mono_class_value_size (klass, NULL) == 12) {
LLVMValueRef zero = LLVMConstReal (LLVMFloatType (), 0.0);
LLVMValueRef index = LLVMConstInt (LLVMInt32Type (), 3, 0);
loadedVector = LLVMBuildInsertElement (builder, loadedVector, zero, index, "insert_zero");
}

ctx->values [reg] = loadedVector;
}
break;
}
default:
Expand Down Expand Up @@ -6195,13 +6205,19 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
case LLVMArgFpStruct: {
LLVMTypeRef ret_type = LLVMGetReturnType (ctx->lmethod_type);
LLVMValueRef retval, elem;
gboolean is_simd = mini_class_is_simd (ctx->cfg, mono_class_from_mono_type_internal (sig->ret));

MonoClass *klass= mono_class_from_mono_type_internal (sig->ret);
gboolean is_simd = mini_class_is_simd (ctx->cfg, klass);

if (is_simd) {
retval = LLVMConstNull(ret_type);

if (lhs) {
int len = LLVMGetVectorSize (LLVMTypeOf (lhs));

if (mono_class_value_size (klass, NULL) == 12)
len--;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we decrementing len here?

Copy link
Member Author

@jkurdek jkurdek Jan 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I encountered case that lhs would be V3 represented as V4(three elements + zero). And the retval would be V3.

The code tried to extract the fourth value of lhs and insert it into retval which caused an error, as retval had only three elements.

The change made it only extract and insert the first three elms if V3 was encoutered

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would add comment explaining this special case for easier comprehension.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jkurdek thank you for the explanation.

Just for my understanding, so it basically means that in such cases LLVMGetReturnType (ctx->lmethod_type) and LLVMTypeOf (lhs) are returning a different type (as we end up having different vector sizes) ?

If we have these kind of workarounds across the mini-llvm code, I think it is ok to manually adjust the len however to be less cryptic, it might be better to have a comment explaining the special-casing (as @matouskozak suggested) and something like this instead:

// TODO: Here add explanation why handling Vector3 requires special treatment
int len = mono_class_value_size (klass, NULL) == 12 ? 3 : LLVMGetVectorSize (LLVMTypeOf (lhs));

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, LLVMGetReturnType (ctx->lmethod_type) is a vector of three elements, whereas LLVMTypeOf (lhs) is a vector of four elements (three + zero)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since 3 element vectors don't exist in the hardware, it might be easier to use 4 elements ones in return types etc. and only handle 3 element ones in loads/stores etc.


for (int i = 0; i < len; i++) {
elem = LLVMBuildExtractElement (builder, lhs, const_int32 (i), "extract_elem");
retval = LLVMBuildInsertValue (builder, retval, elem, i, "insert_val_struct");
Expand Down Expand Up @@ -8301,6 +8317,11 @@ MONO_RESTORE_WARNING

src = convert (ctx, LLVMBuildAdd (builder, convert (ctx, values [ins->inst_basereg], IntPtrType ()), LLVMConstInt (IntPtrType (), ins->inst_offset, FALSE), ""), pointer_type (t));
values [ins->dreg] = mono_llvm_build_aligned_load (builder, t, src, "", FALSE, 1);
if (mono_class_value_size (ins->klass, NULL) == 12) {
LLVMValueRef zero = LLVMConstReal (LLVMFloatType (), 0.0);
LLVMValueRef index = LLVMConstInt (LLVMInt32Type (), 3, 0);
values [ins->dreg] = LLVMBuildInsertElement (builder, values [ins->dreg], zero, index, "insert_zero");
}
break;
}
case OP_STOREX_MEMBASE: {
Expand Down
3 changes: 1 addition & 2 deletions src/mono/mono/mini/mini-runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4489,8 +4489,7 @@ init_class (MonoClass *klass)

#ifdef TARGET_ARM64
if (!strcmp (m_class_get_name_space (klass), "System.Numerics")) {
// FIXME: Support Vector3 https://github.com/dotnet/runtime/issues/81501
if (!strcmp (name, "Vector2") || !strcmp (name, "Vector4") || !strcmp (name, "Quaternion") || !strcmp (name, "Plane"))
if (!strcmp (name, "Vector2") || !strcmp (name, "Vector3") ||!strcmp (name, "Vector4") || !strcmp (name, "Quaternion") || !strcmp (name, "Plane"))
mono_class_set_is_simd_type (klass, TRUE);
}
#endif
Expand Down
5 changes: 5 additions & 0 deletions src/mono/mono/mini/mini.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4591,6 +4591,10 @@ mini_get_simd_type_info (MonoClass *klass, guint32 *nelems)
} else if (!strcmp (klass_name, "Vector2")) {
*nelems = 2;
return MONO_TYPE_R4;
} else if (!strcmp (klass_name, "Vector3")) {
// For LLVM SIMD support, Vector3 is treated as a 4-element vector (three elements + zero).
*nelems = 4;
return MONO_TYPE_R4;
} else if (!strcmp (klass_name, "Vector`1") || !strcmp (klass_name, "Vector64`1") || !strcmp (klass_name, "Vector128`1") || !strcmp (klass_name, "Vector256`1") || !strcmp (klass_name, "Vector512`1")) {
MonoType *etype = mono_class_get_generic_class (klass)->context.class_inst->type_argv [0];
int size = mono_class_value_size (klass, NULL);
Expand All @@ -4602,3 +4606,4 @@ mini_get_simd_type_info (MonoClass *klass, guint32 *nelems)
return MONO_TYPE_VOID;
}
}

2 changes: 1 addition & 1 deletion src/mono/mono/mini/mini.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2998,7 +2998,7 @@ mini_class_is_simd (MonoCompile *cfg, MonoClass *klass)
return TRUE;
int size = mono_type_size (m_class_get_byval_arg (klass), NULL);
#ifdef TARGET_ARM64
if (size == 8 || size == 16)
if (size == 8 || size == 16 || size == 12)
return TRUE;
#else
if (size == 16)
Expand Down
27 changes: 22 additions & 5 deletions src/mono/mono/mini/simd-intrinsics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,13 +554,14 @@ static MonoInst*
emit_xequal (MonoCompile *cfg, MonoClass *klass, MonoTypeEnum element_type, MonoInst *arg1, MonoInst *arg2)
{
#ifdef TARGET_ARM64
gint32 simd_size = mono_class_value_size (klass, NULL);
if (!COMPILE_LLVM (cfg)) {
MonoInst* cmp = emit_xcompare (cfg, klass, element_type, arg1, arg2);
MonoInst* ret = emit_simd_ins (cfg, mono_defaults.boolean_class, OP_XEXTRACT, cmp->dreg, -1);
ret->inst_c0 = SIMD_EXTR_ARE_ALL_SET;
ret->inst_c1 = mono_class_value_size (klass, NULL);
return ret;
} else if (mono_class_value_size (klass, NULL) == 16) {
} else if (simd_size == 16 || simd_size == 12) {
return emit_simd_ins (cfg, klass, OP_XEQUAL_ARM64_V128_FAST, arg1->dreg, arg2->dreg);
} else {
return emit_simd_ins (cfg, klass, OP_XEQUAL, arg1->dreg, arg2->dreg);
Expand Down Expand Up @@ -649,10 +650,15 @@ emit_sum_vector (MonoCompile *cfg, MonoType *vector_type, MonoTypeEnum element_t
MonoClass *vector_class = mono_class_from_mono_type_internal (vector_type);
int vector_size = mono_class_value_size (vector_class, NULL);
int element_size;

// FIXME: Support Vector3

guint32 nelems;
mini_get_simd_type_info (vector_class, &nelems);
mini_get_simd_type_info (vector_class, &nelems);

// Override nelems for Vector3, with actual number of elements
const char *klass_name = m_class_get_name (vector_class);
if (!strcmp (klass_name, "Vector3"))
nelems = 3;

element_size = vector_size / nelems;
gboolean has_single_element = vector_size == element_size;

Expand Down Expand Up @@ -2721,6 +2727,17 @@ emit_vector_2_3_4 (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *f
for (int i = 1; i < fsig->param_count; ++i)
ins = emit_vector_insert_element (cfg, klass, ins, MONO_TYPE_R4, args [i + 1], i, FALSE);

if (len == 3) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this also handle the Vector3 constructor: Vector3 (Vector2, float)? As a follow up we could enable this block

runtime/src/mono/mono/mini/simd-intrinsics.c

Lines 2734 to 2762 in 93381bf

#if 0
} else if (len == 3 && fsig->param_count == 2 && fsig->params [0]->type == MONO_TYPE_VALUETYPE && fsig->params [1]->type == etype->type) {
/* Vector3 (Vector2, float) */
int dreg = load_simd_vreg (cfg, cmethod, args [0], NULL);
ins = emit_simd_ins (cfg, klass, OP_INSERT_R4, args [1]->dreg, args [2]->dreg);
ins->inst_c0 = 2;
ins->dreg = dreg;
return ins;
} else if (len == 4 && fsig->param_count == 2 && fsig->params [0]->type == MONO_TYPE_VALUETYPE && fsig->params [1]->type == etype->type) {
/* Vector4 (Vector3, float) */
int dreg = load_simd_vreg (cfg, cmethod, args [0], NULL);
ins = emit_simd_ins (cfg, klass, OP_INSERT_R4, args [1]->dreg, args [2]->dreg);
ins->inst_c0 = 3;
ins->dreg = dreg;
return ins;
} else if (len == 4 && fsig->param_count == 3 && fsig->params [0]->type == MONO_TYPE_VALUETYPE && fsig->params [1]->type == etype->type && fsig->params [2]->type == etype->type) {
/* Vector4 (Vector2, float, float) */
int dreg = load_simd_vreg (cfg, cmethod, args [0], NULL);
int sreg = args [1]->dreg;
ins = emit_simd_ins (cfg, klass, OP_INSERT_R4, sreg, args [2]->dreg);
ins->inst_c0 = 2;
ins = emit_simd_ins (cfg, klass, OP_INSERT_R4, ins->dreg, args [3]->dreg);
ins->inst_c0 = 3;
ins->dreg = dreg;
return ins;
} else {
g_assert_not_reached ();
}
#endif
to intrinsify constructors that take another vector as a parameter.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is not supported yet, I created a new issue for the rest of vector constructors as it seems they don't work out of the box.

#97815

static float r4_0 = 0;
MonoInst *zero;
int zero_dreg = alloc_freg (cfg);
MONO_INST_NEW (cfg, zero, OP_R4CONST);
zero->inst_p0 = (void*)&r4_0;
zero->dreg = zero_dreg;
MONO_ADD_INS (cfg->cbb, zero);
ins = emit_vector_insert_element (cfg, klass, ins, MONO_TYPE_R4, zero, 3, FALSE);
}

ins->dreg = dreg;

if (indirect) {
Expand Down Expand Up @@ -5923,7 +5940,7 @@ arch_emit_simd_intrinsics (const char *class_ns, const char *class_name, MonoCom

if (!strcmp (class_ns, "System.Numerics")) {
// FIXME: Support Vector2 https://github.com/dotnet/runtime/issues/81501
if (!strcmp (class_name, "Vector2") || !strcmp (class_name, "Vector4") ||
if (!strcmp (class_name, "Vector2") || !strcmp (class_name, "Vector3") || !strcmp (class_name, "Vector4") ||
!strcmp (class_name, "Quaternion") || !strcmp (class_name, "Plane"))
return emit_vector_2_3_4 (cfg, cmethod, fsig, args);
}
Expand Down
Loading