--- old/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp	2018-12-21 11:16:48.936840844 -0800
+++ new/src/hotspot/cpu/x86/c1_LIRAssembler_x86.cpp	2018-12-21 11:16:48.736840847 -0800
@@ -649,7 +649,7 @@
 
     case T_FLOAT: {
       if (dest->is_single_xmm()) {
-        if (LP64_ONLY(UseAVX < 2 &&) c->is_zero_float()) {
+        if (LP64_ONLY(UseAVX <= 2 &&) c->is_zero_float()) {
           __ xorps(dest->as_xmm_float_reg(), dest->as_xmm_float_reg());
         } else {
           __ movflt(dest->as_xmm_float_reg(),
@@ -671,7 +671,7 @@
 
     case T_DOUBLE: {
       if (dest->is_double_xmm()) {
-        if (LP64_ONLY(UseAVX < 2 &&) c->is_zero_double()) {
+        if (LP64_ONLY(UseAVX <= 2 &&) c->is_zero_double()) {
           __ xorpd(dest->as_xmm_double_reg(), dest->as_xmm_double_reg());
         } else {
           __ movdbl(dest->as_xmm_double_reg(),
--- old/src/hotspot/cpu/x86/x86.ad	2018-12-21 11:16:49.360840837 -0800
+++ new/src/hotspot/cpu/x86/x86.ad	2018-12-21 11:16:49.184840840 -0800
@@ -2924,7 +2924,7 @@
   match(Set dst src);
   format %{ "movdqu $dst,$src\t! load vector (16 bytes)" %}
   ins_encode %{
-    if (UseAVX < 2 || VM_Version::supports_avx512vl()) {
+    if (UseAVX <= 2 || VM_Version::supports_avx512vl()) {
       __ movdqu($dst$$XMMRegister, $src$$XMMRegister);
     } else {
       int vector_len = 2;
@@ -2939,7 +2939,7 @@
   match(Set dst src);
   format %{ "movdqu $dst,$src\t! load vector (16 bytes)" %}
   ins_encode %{
-    if (UseAVX < 2 || VM_Version::supports_avx512vl()) {
+    if (UseAVX <= 2 || VM_Version::supports_avx512vl()) {
       __ movdqu($dst$$XMMRegister, $src$$XMMRegister);
     } else {
       int vector_len = 2;
@@ -2966,7 +2966,7 @@
   match(Set dst src);
   format %{ "vmovdqu $dst,$src\t! load vector (32 bytes)" %}
   ins_encode %{
-    if (UseAVX < 2 || VM_Version::supports_avx512vl()) {
+    if (UseAVX <= 2 || VM_Version::supports_avx512vl()) {
       __ vmovdqu($dst$$XMMRegister, $src$$XMMRegister);
     } else {
       int vector_len = 2;
@@ -2981,7 +2981,7 @@
   match(Set dst src);
   format %{ "vmovdqu $dst,$src\t! load vector (32 bytes)" %}
   ins_encode %{
-    if (UseAVX < 2 || VM_Version::supports_avx512vl()) {
+    if (UseAVX <= 2 || VM_Version::supports_avx512vl()) {
       __ vmovdqu($dst$$XMMRegister, $src$$XMMRegister);
     } else {
       int vector_len = 2;