# HG changeset patch
# User jwilhelm
# Date 1550599495 -3600
# Node ID d3213547a7679a661d45235983cf54e5fb606bd0
# Parent  2e1137e55536038dd103be3c52288061c52b9379# Parent  b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1
Merge

diff -r 2e1137e55536 -r d3213547a767 .hgtags
--- a/.hgtags	Tue Feb 19 12:50:09 2019 -0500
+++ b/.hgtags	Tue Feb 19 19:04:55 2019 +0100
@@ -543,3 +543,4 @@
 021917019cda1c0c5853255322274f37693a2431 jdk-13+7
 b5f7bb57de2f797be34f6c75d45c3245ad37ab97 jdk-12+31
 a535ba736cabc6886acdff36de3a096c46e5ddc5 jdk-13+8
+4ce47bc1fb92cf94c6e3d1f49d582f02dcb851ab jdk-12+32
diff -r 2e1137e55536 -r d3213547a767 src/hotspot/cpu/x86/vm_version_x86.hpp
--- a/src/hotspot/cpu/x86/vm_version_x86.hpp	Tue Feb 19 12:50:09 2019 -0500
+++ b/src/hotspot/cpu/x86/vm_version_x86.hpp	Tue Feb 19 19:04:55 2019 +0100
@@ -336,7 +336,7 @@
 #define CPU_AVX512_VPOPCNTDQ ((uint64_t)UCONST64(0x2000000000)) // Vector popcount
 #define CPU_VPCLMULQDQ ((uint64_t)UCONST64(0x4000000000)) //Vector carryless multiplication
 #define CPU_VAES ((uint64_t)UCONST64(0x8000000000))    // Vector AES instructions
-#define CPU_VNNI ((uint64_t)UCONST64(0x16000000000))   // Vector Neural Network Instructions
+#define CPU_VNNI ((uint64_t)UCONST64(0x10000000000))   // Vector Neural Network Instructions
 
   enum Extended_Family {
     // AMD