Skip to content

[MONO][LLVM] Normalized names for ARM64 Intrinsics #48489

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
merged 1 commit into from
Feb 19, 2021
Merged

[MONO][LLVM] Normalized names for ARM64 Intrinsics #48489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 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 @@ -9071,14 +9071,14 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
case SIMD_OP_AES_ENC: id = INTRINS_AARCH64_AESE; break;
case SIMD_OP_ARM64_SHA1SU1: id = INTRINS_AARCH64_SHA1SU1; break;
case SIMD_OP_ARM64_SHA256SU0: id = INTRINS_AARCH64_SHA256SU0; break;
case SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GT_FLOAT; break;
case SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GT_DOUBLE; break;
case SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GTE_FLOAT; break;
case SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GTE_DOUBLE; break;
case SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LT_FLOAT; break;
case SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LT_DOUBLE; break;
case SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LTE_FLOAT; break;
case SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LTE_DOUBLE; break;
case SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GT_FLOAT; break;
case SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GT_DOUBLE; break;
case SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GTE_FLOAT; break;
case SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GTE_DOUBLE; break;
case SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LT_FLOAT; break;
case SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LT_DOUBLE; break;
case SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LTE_FLOAT; break;
case SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LTE_DOUBLE; break;
default: g_assert_not_reached (); break;
}
LLVMValueRef arg1 = rhs;
Expand Down Expand Up @@ -9114,16 +9114,16 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
switch (ins->inst_c0) {
case SIMD_OP_AES_IMC: id = INTRINS_AARCH64_AESIMC; break;
case SIMD_OP_ARM64_AES_AESMC: id = INTRINS_AARCH64_AESMC; break;
case SIMD_OP_LLVM_FABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_FLOAT; break;
case SIMD_OP_LLVM_DABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_DOUBLE; break;
case SIMD_OP_LLVM_I8ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT8; break;
case SIMD_OP_LLVM_I16ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT16; break;
case SIMD_OP_LLVM_I32ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT32; break;
case SIMD_OP_LLVM_I64ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT64; break;
case SIMD_OP_LLVM_I8ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT8; break;
case SIMD_OP_LLVM_I16ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT16; break;
case SIMD_OP_LLVM_I32ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT32; break;
case SIMD_OP_LLVM_I64ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT64; break;
case SIMD_OP_ARM64_FABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_FLOAT; break;
case SIMD_OP_ARM64_DABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_DOUBLE; break;
case SIMD_OP_ARM64_I8ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT8; break;
case SIMD_OP_ARM64_I16ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT16; break;
case SIMD_OP_ARM64_I32ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT32; break;
case SIMD_OP_ARM64_I64ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT64; break;
case SIMD_OP_ARM64_I8ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT8; break;
case SIMD_OP_ARM64_I16ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT16; break;
case SIMD_OP_ARM64_I32ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT32; break;
case SIMD_OP_ARM64_I64ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT64; break;
case SIMD_OP_ARM64_SHA1H: id = INTRINS_AARCH64_SHA1H; getLowerElement = TRUE; break;
default: g_assert_not_reached (); break;
}
Expand Down
36 changes: 18 additions & 18 deletions src/mono/mono/mini/mini.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2882,24 +2882,24 @@ enum {

/* SIMD operations */
typedef enum {
SIMD_OP_LLVM_FABS,
SIMD_OP_LLVM_DABS,
SIMD_OP_LLVM_I8ABS,
SIMD_OP_LLVM_I16ABS,
SIMD_OP_LLVM_I32ABS,
SIMD_OP_LLVM_I64ABS,
SIMD_OP_LLVM_I8ABS_SATURATE,
SIMD_OP_LLVM_I16ABS_SATURATE,
SIMD_OP_LLVM_I32ABS_SATURATE,
SIMD_OP_LLVM_I64ABS_SATURATE,
SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN,
SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN,
SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL,
SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL,
SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN,
SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN,
SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL,
SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL,
SIMD_OP_ARM64_FABS,
SIMD_OP_ARM64_DABS,
SIMD_OP_ARM64_I8ABS,
SIMD_OP_ARM64_I16ABS,
SIMD_OP_ARM64_I32ABS,
SIMD_OP_ARM64_I64ABS,
SIMD_OP_ARM64_I8ABS_SATURATE,
SIMD_OP_ARM64_I16ABS_SATURATE,
SIMD_OP_ARM64_I32ABS_SATURATE,
SIMD_OP_ARM64_I64ABS_SATURATE,
SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN,
SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN,
SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL,
SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL,
SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN,
SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN,
SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL,
SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL,
SIMD_OP_SSE_CVTSS2SI,
SIMD_OP_SSE_CVTTSS2SI,
SIMD_OP_SSE_CVTSS2SI64,
Expand Down
36 changes: 18 additions & 18 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 @@ -1033,32 +1033,32 @@ emit_arm64_intrinsics (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignatur
SimdOp op = (SimdOp)0;
switch (get_underlying_type (fsig->params [0])) {
case MONO_TYPE_R8:
op = SIMD_OP_LLVM_DABS;
op = SIMD_OP_ARM64_DABS;
break;
case MONO_TYPE_R4:
op = SIMD_OP_LLVM_FABS;
op = SIMD_OP_ARM64_FABS;
break;
case MONO_TYPE_I1:
op = SIMD_OP_LLVM_I8ABS;
op = SIMD_OP_ARM64_I8ABS;
break;
case MONO_TYPE_I2:
op = SIMD_OP_LLVM_I16ABS;
op = SIMD_OP_ARM64_I16ABS;
break;
case MONO_TYPE_I4:
op = SIMD_OP_LLVM_I32ABS;
op = SIMD_OP_ARM64_I32ABS;
break;
case MONO_TYPE_I8:
op = SIMD_OP_LLVM_I64ABS;
op = SIMD_OP_ARM64_I64ABS;
break;
}
}

case SN_AbsoluteCompareGreaterThan: {
return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN, SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN);
return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN, SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN);
}

case SN_AbsoluteCompareGreaterThanOrEqual: {
return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL, SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL);
return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL, SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL);
}

case SN_AbsoluteCompareLessThan: {
Expand All @@ -1067,7 +1067,7 @@ emit_arm64_intrinsics (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignatur
args [0] = args [1];
args [1] = temp_for_swap;

return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN, SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN);
return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN, SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN);
}

case SN_AbsoluteCompareLessThanOrEqual: {
Expand All @@ -1076,23 +1076,23 @@ emit_arm64_intrinsics (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignatur
args [0] = args [1];
args [1] = temp_for_swap;

return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL, SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL);
return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL, SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL);
}

case SN_AbsSaturate: {
SimdOp op = (SimdOp)0;
switch (get_underlying_type (fsig->params [0])) {
case MONO_TYPE_I1:
op = SIMD_OP_LLVM_I8ABS_SATURATE;
op = SIMD_OP_ARM64_I8ABS_SATURATE;
break;
case MONO_TYPE_I2:
op = SIMD_OP_LLVM_I16ABS_SATURATE;
op = SIMD_OP_ARM64_I16ABS_SATURATE;
break;
case MONO_TYPE_I4:
op = SIMD_OP_LLVM_I32ABS_SATURATE;
op = SIMD_OP_ARM64_I32ABS_SATURATE;
break;
case MONO_TYPE_I8:
op = SIMD_OP_LLVM_I64ABS_SATURATE;
op = SIMD_OP_ARM64_I64ABS_SATURATE;
break;
}

Expand All @@ -1103,16 +1103,16 @@ emit_arm64_intrinsics (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignatur
SimdOp op = (SimdOp)0;
switch (get_underlying_type (fsig->params [0])) {
case MONO_TYPE_I1:
op = SIMD_OP_LLVM_I8ABS_SATURATE;
op = SIMD_OP_ARM64_I8ABS_SATURATE;
break;
case MONO_TYPE_I2:
op = SIMD_OP_LLVM_I16ABS_SATURATE;
op = SIMD_OP_ARM64_I16ABS_SATURATE;
break;
case MONO_TYPE_I4:
op = SIMD_OP_LLVM_I32ABS_SATURATE;
op = SIMD_OP_ARM64_I32ABS_SATURATE;
break;
case MONO_TYPE_I8:
op = SIMD_OP_LLVM_I64ABS_SATURATE;
op = SIMD_OP_ARM64_I64ABS_SATURATE;
break;
}
return emit_simd_ins_for_sig (cfg, klass, OP_XOP_X_X, op, arg0_type, fsig, args);
Expand Down