# HG changeset patch
# User jwilhelm
# Date 1482874444 -3600
# Node ID 0a176b0dd6f0814065852ba05d57283104349f98
# Parent  b37629ea3943b10ea3e22b55609333eb02a09674# Parent  53ff01a9206a6b92e49bdf49ba9717e5d715fe2d
Merge

diff -r b37629ea3943 -r 0a176b0dd6f0 test/jtreg-ext/requires/VMProps.java
--- a/test/jtreg-ext/requires/VMProps.java	Thu Dec 22 22:10:02 2016 +0100
+++ b/test/jtreg-ext/requires/VMProps.java	Tue Dec 27 22:34:04 2016 +0100
@@ -33,6 +33,8 @@
 import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
+import sun.hotspot.cpuinfo.CPUInfo;
 import sun.hotspot.gc.GC;
 import sun.hotspot.WhiteBox;
 
@@ -62,6 +64,7 @@
         map.put("vm.simpleArch", vmArch());
         map.put("vm.debug", vmDebug());
         map.put("vm.jvmci", vmJvmci());
+        map.put("vm.cpu.features", cpuFeatures());
         vmGC(map); // vm.gc.X = true/false
 
         VMProps.dump(map);
@@ -166,6 +169,13 @@
     }
 
     /**
+     * @return supported CPU features
+     */
+    protected String cpuFeatures() {
+        return CPUInfo.getFeatures().toString();
+    }
+
+    /**
      * For all existing GC sets vm.gc.X property.
      * Example vm.gc.G1=true means:
      *    VM supports G1