test/compiler/codegen/BMI1.java

rev 11557 : 8132919: use package in compiler tests
Reviewed-by: duke

@@ -23,87 +23,18 @@
 
 /*
  * @test
  * @bug 8031321
  * @summary Support BMI1 instructions on x86/x64
- * @run main/othervm -Xbatch -XX:-TieredCompilation -XX:CompileCommand=compileonly,BMITests.* BMI1
  *
+ * @run main/othervm -Xbatch -XX:-TieredCompilation
+ *      -XX:CompileCommand=compileonly,compiler.codegen.BMI1$BMITests::*
+ *      compiler.codegen.BMI1
  */
 
-class MemI {
-  public int x;
-  public MemI(int x) { this.x = x; }
-}
+package compiler.codegen;
 
-class MemL {
-  public long x;
-  public MemL(long x) { this.x = x; }
-}
-
-class BMITests {
-  static int andnl(int src1, int src2) {
-    return ~src1 & src2;
-  }
-  static long andnq(long src1, long src2) {
-    return ~src1 & src2;
-  }
-  static int andnl(int src1, MemI src2) {
-    return ~src1 & src2.x;
-  }
-  static long andnq(long src1, MemL src2) {
-    return ~src1 & src2.x;
-  }
-  static int blsil(int src1) {
-    return src1 & -src1;
-  }
-  static long blsiq(long src1) {
-    return src1 & -src1;
-  }
-  static int blsil(MemI src1) {
-    return src1.x & -src1.x;
-  }
-  static long blsiq(MemL src1) {
-    return src1.x & -src1.x;
-  }
-  static int blsmskl(int src1) {
-    return (src1 - 1) ^ src1;
-  }
-  static long blsmskq(long src1) {
-    return (src1 - 1) ^ src1;
-  }
-  static int blsmskl(MemI src1) {
-    return (src1.x - 1) ^ src1.x;
-  }
-  static long blsmskq(MemL src1) {
-    return (src1.x - 1) ^ src1.x;
-  }
-  static int blsrl(int src1) {
-    return (src1 - 1) & src1;
-  }
-  static long blsrq(long src1) {
-    return (src1 - 1) & src1;
-  }
-  static int blsrl(MemI src1) {
-    return (src1.x - 1) & src1.x;
-  }
-  static long blsrq(MemL src1) {
-    return (src1.x - 1) & src1.x;
-  }
-  static int lzcntl(int src1) {
-    return Integer.numberOfLeadingZeros(src1);
-  }
-  static int lzcntq(long src1) {
-    return Long.numberOfLeadingZeros(src1);
-  }
-  static int tzcntl(int src1) {
-    return Integer.numberOfTrailingZeros(src1);
-  }
-  static int tzcntq(long src1) {
-    return Long.numberOfTrailingZeros(src1);
-  }
-}
-
 public class BMI1 {
   private final static int ITERATIONS = 1000000;
 
   public static void main(String[] args) {
     int ix = 0x01234567;

@@ -296,6 +227,104 @@
           throw new Error("tzcntq failed");
         }
       }
     }
   }
+
+    static class MemI {
+        public int x;
+
+        public MemI(int x) {
+            this.x = x;
+        }
+    }
+
+    static class MemL {
+        public long x;
+
+        public MemL(long x) {
+            this.x = x;
+        }
+    }
+
+    static class BMITests {
+        static int andnl(int src1, int src2) {
+            return ~src1 & src2;
+        }
+
+        static long andnq(long src1, long src2) {
+            return ~src1 & src2;
+        }
+
+        static int andnl(int src1, MemI src2) {
+            return ~src1 & src2.x;
+        }
+
+        static long andnq(long src1, MemL src2) {
+            return ~src1 & src2.x;
+        }
+
+        static int blsil(int src1) {
+            return src1 & -src1;
+        }
+
+        static long blsiq(long src1) {
+            return src1 & -src1;
+        }
+
+        static int blsil(MemI src1) {
+            return src1.x & -src1.x;
+        }
+
+        static long blsiq(MemL src1) {
+            return src1.x & -src1.x;
+        }
+
+        static int blsmskl(int src1) {
+            return (src1 - 1) ^ src1;
+        }
+
+        static long blsmskq(long src1) {
+            return (src1 - 1) ^ src1;
+        }
+
+        static int blsmskl(MemI src1) {
+            return (src1.x - 1) ^ src1.x;
+        }
+
+        static long blsmskq(MemL src1) {
+            return (src1.x - 1) ^ src1.x;
+        }
+
+        static int blsrl(int src1) {
+            return (src1 - 1) & src1;
+        }
+
+        static long blsrq(long src1) {
+            return (src1 - 1) & src1;
+        }
+
+        static int blsrl(MemI src1) {
+            return (src1.x - 1) & src1.x;
+        }
+
+        static long blsrq(MemL src1) {
+            return (src1.x - 1) & src1.x;
+        }
+
+        static int lzcntl(int src1) {
+            return Integer.numberOfLeadingZeros(src1);
+        }
+
+        static int lzcntq(long src1) {
+            return Long.numberOfLeadingZeros(src1);
+        }
+
+        static int tzcntl(int src1) {
+            return Integer.numberOfTrailingZeros(src1);
+        }
+
+        static int tzcntq(long src1) {
+            return Long.numberOfTrailingZeros(src1);
+        }
+    }
 }