--- /dev/null	2016-12-01 16:34:58.000000000 +0000
+++ new/test/compiler/intrinsics/bmi/VerifyLzcntI.java	2016-12-01 16:34:58.192889016 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @summary Verify results of intrinsic Integer lzcnt computations are correct
+ * @library /test/lib /
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ *
+ * @build sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ *                                sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ *                   -XX:+WhiteBoxAPI
+ *                   -XX:+UseCountLeadingZerosInstruction
+ *                   compiler.intrinsics.bmi.VerifyLzcntI
+ */
+
+package compiler.intrinsics.bmi;
+
+import sun.hotspot.cpuinfo.CPUInfo;
+
+public class VerifyLzcntI extends VerifyLzcntBase<Integer>
+{
+    public VerifyLzcntI()
+    {
+        super();
+        expMax = 32;
+    }
+
+    protected int getCount()
+    {
+        return Integer.numberOfLeadingZeros(testValue);
+    }
+
+    protected void initValue()
+    {
+        testValue = 0;
+    }
+
+    protected void nextValue()
+    {
+            if (testValue == 0) {
+                testValue = 1;
+            } else {
+                testValue <<= 1;
+            }
+    }
+
+    protected String valueToHexString()
+    {
+        return Integer.toHexString(testValue);
+    }
+
+    public static void main(String[] args)
+    {
+        /*
+         * Check for lzcnt feature on x86 platforms and vis3 on SPARC
+         */
+        if (!(CPUInfo.hasFeature("lzcnt") || CPUInfo.hasFeature("vis3"))) {
+            System.out.println("INFO: CPU does not support lzcnt feature.");
+        }
+
+        VerifyLzcntI testI = new VerifyLzcntI();
+        testI.runTest();
+    }
+}