src/cpu/x86/vm/vm_version_x86.hpp

*** 205,215 ****
                          : 1,
                     avx2 : 1,
                          : 2,
                     bmi2 : 1,
                     erms : 1,
!                         : 22;
      } bits;
    };
  
    union XemXcr0Eax {
      uint32_t value;
--- 205,217 ----
                          : 1,
                     avx2 : 1,
                          : 2,
                     bmi2 : 1,
                     erms : 1,
!                         : 1,
!                    rtm  : 1,
!                         : 20;
      } bits;
    };
  
    union XemXcr0Eax {
      uint32_t value;
*** 255,265 ****
      CPU_AVX2   = (1 << 18),
      CPU_AES    = (1 << 19),
      CPU_ERMS   = (1 << 20), // enhanced 'rep movsb/stosb' instructions
      CPU_CLMUL  = (1 << 21), // carryless multiply for CRC
      CPU_BMI1   = (1 << 22),
!     CPU_BMI2   = (1 << 23)
    } cpuFeatureFlags;
  
    enum {
      // AMD
      CPU_FAMILY_AMD_11H       = 0x11,
--- 257,268 ----
      CPU_AVX2   = (1 << 18),
      CPU_AES    = (1 << 19),
      CPU_ERMS   = (1 << 20), // enhanced 'rep movsb/stosb' instructions
      CPU_CLMUL  = (1 << 21), // carryless multiply for CRC
      CPU_BMI1   = (1 << 22),
!     CPU_BMI2   = (1 << 23),
!     CPU_RTM    = (1 << 24)  // Restricted Transactional Memory instructions
    } cpuFeatureFlags;
  
    enum {
      // AMD
      CPU_FAMILY_AMD_11H       = 0x11,
*** 442,451 ****
--- 445,456 ----
        result |= CPU_AES;
      if (_cpuid_info.sef_cpuid7_ebx.bits.erms != 0)
        result |= CPU_ERMS;
      if (_cpuid_info.std_cpuid1_ecx.bits.clmul != 0)
        result |= CPU_CLMUL;
+     if (_cpuid_info.sef_cpuid7_ebx.bits.rtm != 0)
+       result |= CPU_RTM;
  
      // AMD features.
      if (is_amd()) {
        if ((_cpuid_info.ext_cpuid1_edx.bits.tdnow != 0) ||
            (_cpuid_info.ext_cpuid1_ecx.bits.prefetchw != 0))
*** 512,521 ****
--- 517,529 ----
  
  
    // Initialization
    static void initialize();
  
+   // Override Abstract_VM_Version implementation
+   static bool use_biased_locking();
+ 
    // Asserts
    static void assert_is_initialized() {
      assert(_cpuid_info.std_cpuid1_eax.bits.family != 0, "VM_Version not initialized");
    }
  
*** 604,613 ****
--- 612,622 ----
    static bool supports_avx2()     { return (_cpuFeatures & CPU_AVX2) != 0; }
    static bool supports_tsc()      { return (_cpuFeatures & CPU_TSC)    != 0; }
    static bool supports_aes()      { return (_cpuFeatures & CPU_AES) != 0; }
    static bool supports_erms()     { return (_cpuFeatures & CPU_ERMS) != 0; }
    static bool supports_clmul()    { return (_cpuFeatures & CPU_CLMUL) != 0; }
+   static bool supports_rtm()      { return (_cpuFeatures & CPU_RTM) != 0; }
    static bool supports_bmi1()     { return (_cpuFeatures & CPU_BMI1) != 0; }
    static bool supports_bmi2()     { return (_cpuFeatures & CPU_BMI2) != 0; }
    // Intel features
    static bool is_intel_family_core() { return is_intel() &&
                                         extended_cpu_family() == CPU_FAMILY_INTEL_CORE; }