Skip to content

Commit 6ce0e55

Browse files
Mohamed IssaDerek White
Mohamed Issa
authored and
Derek White
committed
8368977: Provide clear naming for AVX10 identifiers
Backport-of: 4f1dcf8
1 parent 5755ce6 commit 6ce0e55

9 files changed

Lines changed: 99 additions & 99 deletions

File tree

‎src/hotspot/cpu/x86/assembler_x86.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ const int FPUStateSizeInWords = 2688 / wordSize;
449449
// imm8[1:0] = 00 (min) / 01 (max)
450450
//
451451
// [1] https://www.intel.com/content/www/us/en/content-details/856721/intel-advanced-vector-extensions-10-2-intel-avx10-2-architecture-specification.html?wapkw=AVX10
452-
const int AVX10_MINMAX_MAX_COMPARE_SIGN = 0x5;
453-
const int AVX10_MINMAX_MIN_COMPARE_SIGN = 0x4;
452+
const int AVX10_2_MINMAX_MAX_COMPARE_SIGN = 0x5;
453+
const int AVX10_2_MINMAX_MIN_COMPARE_SIGN = 0x4;
454454

455455
// The Intel x86/Amd64 Assembler: Pure assembler doing NO optimizations on the instruction
456456
// level (e.g. mov rax, 0 is not translated into xor rax, rax!); i.e., what you write

‎src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1033,8 +1033,8 @@ void C2_MacroAssembler::vminmax_fp(int opc, BasicType elem_bt, XMMRegister dst,
10331033
assert(opc == Op_MinV || opc == Op_MinReductionV ||
10341034
opc == Op_MaxV || opc == Op_MaxReductionV, "sanity");
10351035

1036-
int imm8 = (opc == Op_MinV || opc == Op_MinReductionV) ? AVX10_MINMAX_MIN_COMPARE_SIGN
1037-
: AVX10_MINMAX_MAX_COMPARE_SIGN;
1036+
int imm8 = (opc == Op_MinV || opc == Op_MinReductionV) ? AVX10_2_MINMAX_MIN_COMPARE_SIGN
1037+
: AVX10_2_MINMAX_MAX_COMPARE_SIGN;
10381038
if (elem_bt == T_FLOAT) {
10391039
evminmaxps(dst, mask, src1, src2, true, imm8, vlen_enc);
10401040
} else {
@@ -5163,7 +5163,7 @@ void C2_MacroAssembler::vector_castD2X_evex(BasicType to_elem_bt, XMMRegister ds
51635163
}
51645164
}
51655165

5166-
void C2_MacroAssembler::vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc) {
5166+
void C2_MacroAssembler::vector_castF2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc) {
51675167
switch(to_elem_bt) {
51685168
case T_LONG:
51695169
evcvttps2qqs(dst, src, vec_enc);
@@ -5183,7 +5183,7 @@ void C2_MacroAssembler::vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister d
51835183
}
51845184
}
51855185

5186-
void C2_MacroAssembler::vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc) {
5186+
void C2_MacroAssembler::vector_castF2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc) {
51875187
switch(to_elem_bt) {
51885188
case T_LONG:
51895189
evcvttps2qqs(dst, src, vec_enc);
@@ -5203,7 +5203,7 @@ void C2_MacroAssembler::vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister d
52035203
}
52045204
}
52055205

5206-
void C2_MacroAssembler::vector_castD2X_avx10(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc) {
5206+
void C2_MacroAssembler::vector_castD2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc) {
52075207
switch(to_elem_bt) {
52085208
case T_LONG:
52095209
evcvttpd2qqs(dst, src, vec_enc);
@@ -5223,7 +5223,7 @@ void C2_MacroAssembler::vector_castD2X_avx10(BasicType to_elem_bt, XMMRegister d
52235223
}
52245224
}
52255225

5226-
void C2_MacroAssembler::vector_castD2X_avx10(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc) {
5226+
void C2_MacroAssembler::vector_castD2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc) {
52275227
switch(to_elem_bt) {
52285228
case T_LONG:
52295229
evcvttpd2qqs(dst, src, vec_enc);

‎src/hotspot/cpu/x86/c2_MacroAssembler_x86.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,13 +347,13 @@
347347
XMMRegister xtmp2, XMMRegister xtmp3, XMMRegister xtmp4, XMMRegister xtmp5,
348348
AddressLiteral float_sign_flip, Register rscratch, int vec_enc);
349349

350-
void vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc);
350+
void vector_castF2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc);
351351

352-
void vector_castF2X_avx10(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc);
352+
void vector_castF2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc);
353353

354-
void vector_castD2X_avx10(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc);
354+
void vector_castD2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, XMMRegister src, int vec_enc);
355355

356-
void vector_castD2X_avx10(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc);
356+
void vector_castD2X_avx10_2(BasicType to_elem_bt, XMMRegister dst, Address src, int vec_enc);
357357

358358
void vector_cast_double_to_int_special_cases_avx(XMMRegister dst, XMMRegister src, XMMRegister xtmp1, XMMRegister xtmp2,
359359
XMMRegister xtmp3, XMMRegister xtmp4, XMMRegister xtmp5, Register rscratch,

‎src/hotspot/cpu/x86/macroAssembler_x86.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8885,9 +8885,9 @@ void MacroAssembler::evpmins(BasicType type, XMMRegister dst, KRegister mask, XM
88858885
case T_LONG:
88868886
evpminsq(dst, mask, nds, src, merge, vector_len); break;
88878887
case T_FLOAT:
8888-
evminmaxps(dst, mask, nds, src, merge, AVX10_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
8888+
evminmaxps(dst, mask, nds, src, merge, AVX10_2_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
88898889
case T_DOUBLE:
8890-
evminmaxpd(dst, mask, nds, src, merge, AVX10_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
8890+
evminmaxpd(dst, mask, nds, src, merge, AVX10_2_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
88918891
default:
88928892
fatal("Unexpected type argument %s", type2name(type)); break;
88938893
}
@@ -8904,9 +8904,9 @@ void MacroAssembler::evpmaxs(BasicType type, XMMRegister dst, KRegister mask, XM
89048904
case T_LONG:
89058905
evpmaxsq(dst, mask, nds, src, merge, vector_len); break;
89068906
case T_FLOAT:
8907-
evminmaxps(dst, mask, nds, src, merge, AVX10_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
8907+
evminmaxps(dst, mask, nds, src, merge, AVX10_2_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
89088908
case T_DOUBLE:
8909-
evminmaxpd(dst, mask, nds, src, merge, AVX10_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
8909+
evminmaxpd(dst, mask, nds, src, merge, AVX10_2_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
89108910
default:
89118911
fatal("Unexpected type argument %s", type2name(type)); break;
89128912
}
@@ -8923,9 +8923,9 @@ void MacroAssembler::evpmins(BasicType type, XMMRegister dst, KRegister mask, XM
89238923
case T_LONG:
89248924
evpminsq(dst, mask, nds, src, merge, vector_len); break;
89258925
case T_FLOAT:
8926-
evminmaxps(dst, mask, nds, src, merge, AVX10_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
8926+
evminmaxps(dst, mask, nds, src, merge, AVX10_2_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
89278927
case T_DOUBLE:
8928-
evminmaxpd(dst, mask, nds, src, merge, AVX10_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
8928+
evminmaxpd(dst, mask, nds, src, merge, AVX10_2_MINMAX_MIN_COMPARE_SIGN, vector_len); break;
89298929
default:
89308930
fatal("Unexpected type argument %s", type2name(type)); break;
89318931
}
@@ -8942,9 +8942,9 @@ void MacroAssembler::evpmaxs(BasicType type, XMMRegister dst, KRegister mask, XM
89428942
case T_LONG:
89438943
evpmaxsq(dst, mask, nds, src, merge, vector_len); break;
89448944
case T_FLOAT:
8945-
evminmaxps(dst, mask, nds, src, merge, AVX10_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
8945+
evminmaxps(dst, mask, nds, src, merge, AVX10_2_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
89468946
case T_DOUBLE:
8947-
evminmaxps(dst, mask, nds, src, merge, AVX10_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
8947+
evminmaxps(dst, mask, nds, src, merge, AVX10_2_MINMAX_MAX_COMPARE_SIGN, vector_len); break;
89488948
default:
89498949
fatal("Unexpected type argument %s", type2name(type)); break;
89508950
}

0 commit comments

Comments
 (0)