Skip to content

Commit de71b17

Browse files
Nathan RicciNathan Ricci
Nathan Ricci
and
Nathan Ricci
authored
Normalized names SIMD_OP_LLVM_* -> SIMD_OP_ARM64_* (#48489)
Co-authored-by: Nathan Ricci <naricc@xam-emag-01.redmond.corp.microsoft.com>
1 parent 9286fdc commit de71b17

File tree

3 files changed

+54
-54
lines changed

3 files changed

+54
-54
lines changed

‎src/mono/mono/mini/mini-llvm.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9071,14 +9071,14 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
90719071
case SIMD_OP_AES_ENC: id = INTRINS_AARCH64_AESE; break;
90729072
case SIMD_OP_ARM64_SHA1SU1: id = INTRINS_AARCH64_SHA1SU1; break;
90739073
case SIMD_OP_ARM64_SHA256SU0: id = INTRINS_AARCH64_SHA256SU0; break;
9074-
case SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GT_FLOAT; break;
9075-
case SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GT_DOUBLE; break;
9076-
case SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GTE_FLOAT; break;
9077-
case SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GTE_DOUBLE; break;
9078-
case SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LT_FLOAT; break;
9079-
case SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LT_DOUBLE; break;
9080-
case SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LTE_FLOAT; break;
9081-
case SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LTE_DOUBLE; break;
9074+
case SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GT_FLOAT; break;
9075+
case SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GT_DOUBLE; break;
9076+
case SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GTE_FLOAT; break;
9077+
case SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_GTE_DOUBLE; break;
9078+
case SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LT_FLOAT; break;
9079+
case SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LT_DOUBLE; break;
9080+
case SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LTE_FLOAT; break;
9081+
case SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL: id = INTRINS_AARCH64_ADV_SIMD_ABS_COMPARE_LTE_DOUBLE; break;
90829082
default: g_assert_not_reached (); break;
90839083
}
90849084
LLVMValueRef arg1 = rhs;
@@ -9114,16 +9114,16 @@ process_bb (EmitContext *ctx, MonoBasicBlock *bb)
91149114
switch (ins->inst_c0) {
91159115
case SIMD_OP_AES_IMC: id = INTRINS_AARCH64_AESIMC; break;
91169116
case SIMD_OP_ARM64_AES_AESMC: id = INTRINS_AARCH64_AESMC; break;
9117-
case SIMD_OP_LLVM_FABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_FLOAT; break;
9118-
case SIMD_OP_LLVM_DABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_DOUBLE; break;
9119-
case SIMD_OP_LLVM_I8ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT8; break;
9120-
case SIMD_OP_LLVM_I16ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT16; break;
9121-
case SIMD_OP_LLVM_I32ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT32; break;
9122-
case SIMD_OP_LLVM_I64ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT64; break;
9123-
case SIMD_OP_LLVM_I8ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT8; break;
9124-
case SIMD_OP_LLVM_I16ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT16; break;
9125-
case SIMD_OP_LLVM_I32ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT32; break;
9126-
case SIMD_OP_LLVM_I64ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT64; break;
9117+
case SIMD_OP_ARM64_FABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_FLOAT; break;
9118+
case SIMD_OP_ARM64_DABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_DOUBLE; break;
9119+
case SIMD_OP_ARM64_I8ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT8; break;
9120+
case SIMD_OP_ARM64_I16ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT16; break;
9121+
case SIMD_OP_ARM64_I32ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT32; break;
9122+
case SIMD_OP_ARM64_I64ABS: id = INTRINS_AARCH64_ADV_SIMD_ABS_INT64; break;
9123+
case SIMD_OP_ARM64_I8ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT8; break;
9124+
case SIMD_OP_ARM64_I16ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT16; break;
9125+
case SIMD_OP_ARM64_I32ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT32; break;
9126+
case SIMD_OP_ARM64_I64ABS_SATURATE: id = INTRINS_AARCH64_ADV_SIMD_ABS_SATURATE_INT64; break;
91279127
case SIMD_OP_ARM64_SHA1H: id = INTRINS_AARCH64_SHA1H; getLowerElement = TRUE; break;
91289128
default: g_assert_not_reached (); break;
91299129
}

‎src/mono/mono/mini/mini.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2879,24 +2879,24 @@ enum {
28792879

28802880
/* SIMD operations */
28812881
typedef enum {
2882-
SIMD_OP_LLVM_FABS,
2883-
SIMD_OP_LLVM_DABS,
2884-
SIMD_OP_LLVM_I8ABS,
2885-
SIMD_OP_LLVM_I16ABS,
2886-
SIMD_OP_LLVM_I32ABS,
2887-
SIMD_OP_LLVM_I64ABS,
2888-
SIMD_OP_LLVM_I8ABS_SATURATE,
2889-
SIMD_OP_LLVM_I16ABS_SATURATE,
2890-
SIMD_OP_LLVM_I32ABS_SATURATE,
2891-
SIMD_OP_LLVM_I64ABS_SATURATE,
2892-
SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN,
2893-
SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN,
2894-
SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL,
2895-
SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL,
2896-
SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN,
2897-
SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN,
2898-
SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL,
2899-
SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL,
2882+
SIMD_OP_ARM64_FABS,
2883+
SIMD_OP_ARM64_DABS,
2884+
SIMD_OP_ARM64_I8ABS,
2885+
SIMD_OP_ARM64_I16ABS,
2886+
SIMD_OP_ARM64_I32ABS,
2887+
SIMD_OP_ARM64_I64ABS,
2888+
SIMD_OP_ARM64_I8ABS_SATURATE,
2889+
SIMD_OP_ARM64_I16ABS_SATURATE,
2890+
SIMD_OP_ARM64_I32ABS_SATURATE,
2891+
SIMD_OP_ARM64_I64ABS_SATURATE,
2892+
SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN,
2893+
SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN,
2894+
SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL,
2895+
SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN_OR_EQUAL,
2896+
SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN,
2897+
SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN,
2898+
SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL,
2899+
SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN_OR_EQUAL,
29002900
SIMD_OP_SSE_CVTSS2SI,
29012901
SIMD_OP_SSE_CVTTSS2SI,
29022902
SIMD_OP_SSE_CVTSS2SI64,

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,32 +1033,32 @@ emit_arm64_intrinsics (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignatur
10331033
SimdOp op = (SimdOp)0;
10341034
switch (get_underlying_type (fsig->params [0])) {
10351035
case MONO_TYPE_R8:
1036-
op = SIMD_OP_LLVM_DABS;
1036+
op = SIMD_OP_ARM64_DABS;
10371037
break;
10381038
case MONO_TYPE_R4:
1039-
op = SIMD_OP_LLVM_FABS;
1039+
op = SIMD_OP_ARM64_FABS;
10401040
break;
10411041
case MONO_TYPE_I1:
1042-
op = SIMD_OP_LLVM_I8ABS;
1042+
op = SIMD_OP_ARM64_I8ABS;
10431043
break;
10441044
case MONO_TYPE_I2:
1045-
op = SIMD_OP_LLVM_I16ABS;
1045+
op = SIMD_OP_ARM64_I16ABS;
10461046
break;
10471047
case MONO_TYPE_I4:
1048-
op = SIMD_OP_LLVM_I32ABS;
1048+
op = SIMD_OP_ARM64_I32ABS;
10491049
break;
10501050
case MONO_TYPE_I8:
1051-
op = SIMD_OP_LLVM_I64ABS;
1051+
op = SIMD_OP_ARM64_I64ABS;
10521052
break;
10531053
}
10541054
}
10551055

10561056
case SN_AbsoluteCompareGreaterThan: {
1057-
return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_LLVM_FABSOLUTE_COMPARE_GREATER_THAN, SIMD_OP_LLVM_DABSOLUTE_COMPARE_GREATER_THAN);
1057+
return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_ARM64_FABSOLUTE_COMPARE_GREATER_THAN, SIMD_OP_ARM64_DABSOLUTE_COMPARE_GREATER_THAN);
10581058
}
10591059

10601060
case SN_AbsoluteCompareGreaterThanOrEqual: {
1061-
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);
1061+
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);
10621062
}
10631063

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

1070-
return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_LLVM_FABSOLUTE_COMPARE_LESS_THAN, SIMD_OP_LLVM_DABSOLUTE_COMPARE_LESS_THAN);
1070+
return emit_absolute_compare (cfg, klass, fsig, arg0_type, args, SIMD_OP_ARM64_FABSOLUTE_COMPARE_LESS_THAN, SIMD_OP_ARM64_DABSOLUTE_COMPARE_LESS_THAN);
10711071
}
10721072

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

1079-
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);
1079+
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);
10801080
}
10811081

10821082
case SN_AbsSaturate: {
10831083
SimdOp op = (SimdOp)0;
10841084
switch (get_underlying_type (fsig->params [0])) {
10851085
case MONO_TYPE_I1:
1086-
op = SIMD_OP_LLVM_I8ABS_SATURATE;
1086+
op = SIMD_OP_ARM64_I8ABS_SATURATE;
10871087
break;
10881088
case MONO_TYPE_I2:
1089-
op = SIMD_OP_LLVM_I16ABS_SATURATE;
1089+
op = SIMD_OP_ARM64_I16ABS_SATURATE;
10901090
break;
10911091
case MONO_TYPE_I4:
1092-
op = SIMD_OP_LLVM_I32ABS_SATURATE;
1092+
op = SIMD_OP_ARM64_I32ABS_SATURATE;
10931093
break;
10941094
case MONO_TYPE_I8:
1095-
op = SIMD_OP_LLVM_I64ABS_SATURATE;
1095+
op = SIMD_OP_ARM64_I64ABS_SATURATE;
10961096
break;
10971097
}
10981098

@@ -1103,16 +1103,16 @@ emit_arm64_intrinsics (MonoCompile *cfg, MonoMethod *cmethod, MonoMethodSignatur
11031103
SimdOp op = (SimdOp)0;
11041104
switch (get_underlying_type (fsig->params [0])) {
11051105
case MONO_TYPE_I1:
1106-
op = SIMD_OP_LLVM_I8ABS_SATURATE;
1106+
op = SIMD_OP_ARM64_I8ABS_SATURATE;
11071107
break;
11081108
case MONO_TYPE_I2:
1109-
op = SIMD_OP_LLVM_I16ABS_SATURATE;
1109+
op = SIMD_OP_ARM64_I16ABS_SATURATE;
11101110
break;
11111111
case MONO_TYPE_I4:
1112-
op = SIMD_OP_LLVM_I32ABS_SATURATE;
1112+
op = SIMD_OP_ARM64_I32ABS_SATURATE;
11131113
break;
11141114
case MONO_TYPE_I8:
1115-
op = SIMD_OP_LLVM_I64ABS_SATURATE;
1115+
op = SIMD_OP_ARM64_I64ABS_SATURATE;
11161116
break;
11171117
}
11181118
return emit_simd_ins_for_sig (cfg, klass, OP_XOP_X_X, op, arg0_type, fsig, args);

0 commit comments

Comments
 (0)