8007708: compiler/6855215 assert(VM_Version::supports_sse4_2())
Summary: Added missing UseSSE42 check. Also added missing avx2 assert for vpermq instruction.
Reviewed-by: roland, twisti
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp Fri Feb 08 08:16:00 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp Fri Feb 08 15:07:17 2013 -0800
@@ -2270,10 +2270,11 @@
}
void Assembler::vpermq(XMMRegister dst, XMMRegister src, int imm8, bool vector256) {
- int encode = simd_prefix_and_encode(dst, xnoreg, src, VEX_SIMD_66, VEX_OPCODE_0F_3A, true, vector256);
- emit_int8(0x00);
- emit_int8(0xC0 | encode);
- emit_int8(imm8);
+ assert(VM_Version::supports_avx2(), "");
+ int encode = simd_prefix_and_encode(dst, xnoreg, src, VEX_SIMD_66, VEX_OPCODE_0F_3A, true, vector256);
+ emit_int8(0x00);
+ emit_int8(0xC0 | encode);
+ emit_int8(imm8);
}
void Assembler::pcmpestri(XMMRegister dst, Address src, int imm8) {
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Fri Feb 08 08:16:00 2013 -0800
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Fri Feb 08 15:07:17 2013 -0800
@@ -5691,7 +5691,7 @@
Address::ScaleFactor scale = Address::times_2;
int stride = 8;
- if (UseAVX >= 2) {
+ if (UseAVX >= 2 && UseSSE42Intrinsics) {
Label COMPARE_WIDE_VECTORS, VECTOR_NOT_EQUAL, COMPARE_WIDE_TAIL, COMPARE_SMALL_STR;
Label COMPARE_WIDE_VECTORS_LOOP, COMPARE_16_CHARS, COMPARE_INDEX_CHAR;
Label COMPARE_TAIL_LONG;