--- old/src/hotspot/cpu/x86/vm_version_x86.hpp	2018-07-25 11:31:23.656906331 +0100
+++ new/src/hotspot/cpu/x86/vm_version_x86.hpp	2018-07-25 11:31:23.381905510 +0100
@@ -218,7 +218,10 @@
                avx512dq : 1,
                         : 1,
                     adx : 1,
-                        : 6,
+                        : 3,
+             clflushopt : 1,
+                   clwb : 1,
+                        : 1,
                avx512pf : 1,
                avx512er : 1,
                avx512cd : 1,
@@ -337,7 +340,10 @@
 #define CPU_VPCLMULQDQ ((uint64_t)UCONST64(0x4000000000)) //Vector carryless multiplication
 #define CPU_VAES ((uint64_t)UCONST64(0x8000000000))    // Vector AES instructions
 
-  enum Extended_Family {
+#define CPU_FLUSHOPT ((uint64_t)UCONST64(0x1000000000)) // flushopt instruction
+#define CPU_CLWB ((uint64_t)UCONST64(0x2000000000)) // clwb instruction
+
+enum Extended_Family {
     // AMD
     CPU_FAMILY_AMD_11H       = 0x11,
     // ZX
@@ -572,6 +578,8 @@
       result |= CPU_SHA;
     if (_cpuid_info.std_cpuid1_ecx.bits.fma != 0)
       result |= CPU_FMA;
+    if (_cpuid_info.sef_cpuid7_ebx.bits.clflushopt != 0)
+      result |= CPU_FLUSHOPT;
 
     // AMD features.
     if (is_amd()) {
@@ -591,6 +599,9 @@
       if (_cpuid_info.ext_cpuid1_ecx.bits.misalignsse != 0) {
         result |= CPU_3DNOW_PREFETCH;
       }
+      if (_cpuid_info.sef_cpuid7_ebx.bits.clwb != 0) {
+        result |= CPU_CLWB;
+      }
     }
 
     // ZX features.
@@ -925,6 +936,32 @@
   // that can be used for efficient implementation of
   // the intrinsic for java.lang.Thread.onSpinWait()
   static bool supports_on_spin_wait() { return supports_sse2(); }
+
+  // there are several insns to force cache line sync to memory which
+  // we can use to ensure mapped persistent memory is up to date with
+  // pending in-cache changes.
+  //
+  // 64 bit cpus always support clflush which writes back and evicts
+  //
+  // clflushopt is optional and acts like clflush except it does
+  // not synchronize with other memory ops. it needs a preceding
+  // and trailing StoreStore fence
+  //
+  // clwb is an optional, intel-specific instruction optional which
+  // writes back without evicting the line. it also does not
+  // synchronize with other memory ops. so, it also needs a preceding
+  // and trailing StoreStore fence.
+
+#ifdef _LP64
+  static bool supports_clflush() { return true; }
+  static bool supports_clflushopt() { return (_features & CPU_FLUSHOPT == 0); }
+  static bool supports_clwb() { return (_features & CPU_CLWB == 0); }
+#else
+  static bool supports_clflush() { return true; }
+  static bool supports_clflushopt() { return false; }
+  static bool supports_clwb() { return false; }
+#endif // _LP64
+
 };
 
 #endif // CPU_X86_VM_VM_VERSION_X86_HPP