Skip to content

Commit

Permalink
Implement some of the convert methods, disable the rest.
Browse files Browse the repository at this point in the history
  • Loading branch information
@vargaz
vargaz committed Jun 10, 2023
1 parent 4b970d5 commit 2c9964f
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 35 deletions.
2 changes: 2 additions & 0 deletions src/mono/mono/mini/cpu-amd64.mdesc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,8 @@ ones_complement: dest:x src1:x len:16 clob:1
negate: dest:x src1:x len:24 clob:1
xlower: dest:x src1:x len:16
xupper: dest:x src1:x len:16
convert_fp_to_si: dest:x src1:x len:16
convert_si_to_fp: dest:x src1:x len:16

addps: dest:x src1:x src2:x len:4 clob:1
divps: dest:x src1:x src2:x len:4 clob:1
Expand Down
6 changes: 6 additions & 0 deletions src/mono/mono/mini/mini-amd64.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7414,6 +7414,12 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
amd64_movhlps_reg_reg (code, SIMD_TEMP_REG, ins->sreg1);
amd64_sse_movaps_reg_reg (code, ins->dreg, SIMD_TEMP_REG);
break;
case OP_CVT_FP_SI:
amd64_sse_cvttps2dq_reg_reg (code, ins->dreg, ins->sreg1);
break;
case OP_CVT_SI_FP:
amd64_sse_cvtdq2ps_reg_reg (code, ins->dreg, ins->sreg1);
break;
case OP_STOREX_MEMBASE_REG:
case OP_STOREX_MEMBASE:
amd64_sse_movups_membase_reg (code, ins->dreg, ins->inst_offset, ins->sreg1);
Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/mini-ops.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1846,6 +1846,7 @@ MINI_OP(OP_CVT_SI_FP_SCALAR, "convert_si_to_fp_scalar", XREG, XREG, NONE)
/* inst_c1 is one of the MONO_TYPE_ constants */
MINI_OP(OP_NEGATION, "negate", XREG, XREG, NONE)
MINI_OP(OP_NEGATION_SCALAR, "negate_scalar", XREG, XREG, NONE)
/* Select bits from src2/src3 using src1 */
MINI_OP3(OP_BSL, "bitwise_select", XREG, XREG, XREG, XREG)
#endif // TARGET_ARM64 || TARGET_AMD64 || TARGET_WASM

Expand Down
100 changes: 65 additions & 35 deletions src/mono/mono/mini/simd-intrinsics.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1403,30 +1403,6 @@ emit_sri_vector (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsi
#ifdef TARGET_WIN32
return NULL;
#endif
switch (id) {
case SN_ConditionalSelect:
case SN_ConvertToDouble:
case SN_ConvertToInt32:
case SN_ConvertToInt64:
case SN_ConvertToSingle:
case SN_ConvertToUInt32:
case SN_ConvertToUInt64:
case SN_ExtractMostSignificantBits:
case SN_Narrow:
case SN_Shuffle:
case SN_ToScalar:
case SN_ToVector128:
case SN_ToVector128Unsafe:
case SN_WidenLower:
case SN_WidenUpper:
return NULL;
case SN_GetLower:
case SN_GetUpper:
/* These return a Vector64 */
return NULL;
default:
break;
}
}
#endif

Expand Down Expand Up @@ -1541,9 +1517,22 @@ emit_sri_vector (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsi
#endif
}
case SN_ConditionalSelect: {
#if defined(TARGET_ARM64) || defined(TARGET_AMD64) || defined(TARGET_WASM)
if (!is_element_type_primitive (fsig->params [0]))
return NULL;

#if defined(TARGET_ARM64) || defined(TARGET_AMD64) || defined(TARGET_WASM)

#if defined(TARGET_AMD64)
if (!COMPILE_LLVM (cfg)) {
MonoInst *val1 = emit_simd_ins (cfg, klass, OP_XBINOP_FORCEINT, args [0]->dreg, args [1]->dreg);
val1->inst_c0 = XBINOP_FORCEINT_AND;
MonoInst *val2 = emit_simd_ins (cfg, klass, OP_VECTOR_ANDN, args [0]->dreg, args [2]->dreg);
MonoInst *ins = emit_simd_ins (cfg, klass, OP_XBINOP_FORCEINT, val1->dreg, val2->dreg);
ins->inst_c0 = XBINOP_FORCEINT_OR;
return ins;
}
#endif

return emit_simd_ins_for_sig (cfg, klass, OP_BSL, -1, arg0_type, fsig, args);
#else
return NULL;
Expand All @@ -1567,6 +1556,13 @@ emit_sri_vector (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsi
op = arg0_type == MONO_TYPE_I8 ? OP_CVT_SI_FP_SCALAR : OP_CVT_UI_FP_SCALAR;
else
op = arg0_type == MONO_TYPE_I8 ? OP_CVT_SI_FP : OP_CVT_UI_FP;

#ifdef TARGET_AMD64
// Fall back to the c# code
if (!COMPILE_LLVM (cfg))
return NULL;
#endif

return emit_simd_ins_for_sig (cfg, klass, op, -1, arg0_type, fsig, args);
#else
return NULL;
Expand All @@ -1585,6 +1581,13 @@ emit_sri_vector (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsi
}
#endif
#if defined(TARGET_ARM64) || defined(TARGET_AMD64)

#if defined(TARGET_AMD64)
if (!COMPILE_LLVM (cfg) && id == SN_ConvertToUInt32)
// FIXME:
return NULL;
#endif

int op = id == SN_ConvertToInt32 ? OP_CVT_FP_SI : OP_CVT_FP_UI;
return emit_simd_ins_for_sig (cfg, klass, op, -1, arg0_type, fsig, args);
#else
Expand All @@ -1611,6 +1614,13 @@ emit_sri_vector (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsi
op = size == 8 ? OP_CVT_FP_SI_SCALAR : OP_CVT_FP_SI;
else
op = size == 8 ? OP_CVT_FP_UI_SCALAR : OP_CVT_FP_UI;

#if defined(TARGET_AMD64)
if (!COMPILE_LLVM (cfg))
// FIXME:
return NULL;
#endif

return emit_simd_ins_for_sig (cfg, klass, op, -1, arg0_type, fsig, args);
#else
return NULL;
Expand All @@ -1628,6 +1638,13 @@ emit_sri_vector (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsi
#endif
#if defined(TARGET_ARM64) || defined(TARGET_AMD64)
int op = arg0_type == MONO_TYPE_I4 ? OP_CVT_SI_FP : OP_CVT_UI_FP;

#if defined(TARGET_AMD64)
if (!COMPILE_LLVM (cfg) && op == OP_CVT_UI_FP)
// FIXME:
return NULL;
#endif

return emit_simd_ins_for_sig (cfg, klass, op, -1, arg0_type, fsig, args);
#else
return NULL;
Expand Down Expand Up @@ -1906,6 +1923,13 @@ emit_sri_vector (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsi
if (!is_element_type_primitive (fsig->params [0]))
return NULL;
int op = id == SN_GetLower ? OP_XLOWER : OP_XUPPER;

#ifdef TARGET_AMD64
if (!COMPILE_LLVM (cfg))
/* These return a Vector64 */
return NULL;
#endif

return emit_simd_ins_for_sig (cfg, klass, op, 0, arg0_type, fsig, args);
}
case SN_GreaterThan:
Expand Down Expand Up @@ -2109,6 +2133,9 @@ emit_sri_vector (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsi
if (vector_size == 128 && (arg0_type == MONO_TYPE_I1 || arg0_type == MONO_TYPE_U1))
return emit_simd_ins_for_sig (cfg, klass, OP_XOP_OVR_X_X_X, INTRINS_AARCH64_ADV_SIMD_TBL1, 0, fsig, args);
return NULL;
#elif defined(TARGET_AMD64)
// FIXME:
return NULL;
#else
return NULL;
#endif
Expand Down Expand Up @@ -2255,16 +2282,19 @@ emit_sri_vector (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignature *fsi
}
#endif
#if defined(TARGET_ARM64) || defined(TARGET_WASM)
int op = id == SN_WidenLower ? OP_XLOWER : OP_XUPPER;
MonoInst *lower_or_upper_half = emit_simd_ins_for_sig (cfg, klass, op, 0, arg0_type, fsig, args);
if (type_enum_is_float (arg0_type)) {
return emit_simd_ins (cfg, klass, OP_SIMD_FCVTL, lower_or_upper_half->dreg, -1);
} else {
int zero = alloc_ireg (cfg);
MONO_EMIT_NEW_ICONST (cfg, zero, 0);
op = type_enum_is_unsigned (arg0_type) ? OP_SIMD_USHLL : OP_SIMD_SSHLL;
return emit_simd_ins (cfg, klass, op, lower_or_upper_half->dreg, zero);
}
int op = id == SN_WidenLower ? OP_XLOWER : OP_XUPPER;
MonoInst *lower_or_upper_half = emit_simd_ins_for_sig (cfg, klass, op, 0, arg0_type, fsig, args);
if (type_enum_is_float (arg0_type)) {
return emit_simd_ins (cfg, klass, OP_SIMD_FCVTL, lower_or_upper_half->dreg, -1);
} else {
int zero = alloc_ireg (cfg);
MONO_EMIT_NEW_ICONST (cfg, zero, 0);
op = type_enum_is_unsigned (arg0_type) ? OP_SIMD_USHLL : OP_SIMD_SSHLL;
return emit_simd_ins (cfg, klass, op, lower_or_upper_half->dreg, zero);
}
#elif defined(TARGET_AMD64)
// FIXME:
return NULL;
#else
return NULL;
#endif
Expand Down

0 comments on commit 2c9964f

Please sign in to comment.