--- old/test/compiler/c2/8004867/TestIntUnsafeOrdered.java 2016-07-06 19:20:18.971392945 +0300 +++ /dev/null 2016-06-14 14:43:27.230512026 +0300 @@ -1,991 +0,0 @@ -/* - * Copyright (c) 2013, 2015, 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 - * @bug 8004867 - * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob" - * - * @modules java.base/jdk.internal.misc - * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:-OptimizeFill TestIntUnsafeOrdered - * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation -XX:+OptimizeFill TestIntUnsafeOrdered - */ - -import jdk.internal.misc.Unsafe; -import java.lang.reflect.Field; - -public class TestIntUnsafeOrdered { - private static final int ARRLEN = 97; - private static final int ITERS = 11000; - private static final int OFFSET = 3; - private static final int SCALE = 2; - private static final int ALIGN_OFF = 8; - private static final int UNALIGN_OFF = 5; - - private static final Unsafe unsafe; - private static final int BASE; - static { - try { - Class c = Unsafe.class; - Field f = c.getDeclaredField("theUnsafe"); - f.setAccessible(true); - unsafe = (Unsafe) f.get(c); - BASE = unsafe.arrayBaseOffset(int[].class); - } catch (Exception e) { - InternalError err = new InternalError(); - err.initCause(e); - throw err; - } - } - - public static void main(String args[]) { - System.out.println("Testing Integer array unsafe ordered operations"); - int errn = test(false); - if (errn > 0) { - System.err.println("FAILED: " + errn + " errors"); - System.exit(97); - } - System.out.println("PASSED"); - } - - static int test(boolean test_only) { - int[] a1 = new int[ARRLEN]; - int[] a2 = new int[ARRLEN]; - // Initialize - for (int i=0; i 0 || test_only) - return errn; - - // Initialize - for (int i=0; i= 0; i-=1) { - unsafe.putIntRelease(a, byte_offset(i), -123); - } - } - static void test_vi_neg(int[] a, int b, int old) { - for (int i = ARRLEN-1; i >= 0; i-=1) { - unsafe.putIntRelease(a, byte_offset(i), b); - } - } - static void test_cp_neg(int[] a, int[] b) { - for (int i = ARRLEN-1; i >= 0; i-=1) { - unsafe.putIntRelease(a, byte_offset(i), b[i]); - } - } - static void test_2ci_neg(int[] a, int[] b) { - for (int i = ARRLEN-1; i >= 0; i-=1) { - unsafe.putIntRelease(a, byte_offset(i), -123); - unsafe.putIntRelease(b, byte_offset(i), -103); - } - } - static void test_2vi_neg(int[] a, int[] b, int c, int d) { - for (int i = ARRLEN-1; i >= 0; i-=1) { - unsafe.putIntRelease(a, byte_offset(i), c); - unsafe.putIntRelease(b, byte_offset(i), d); - } - } - static void test_ci_oppos(int[] a, int old) { - int limit = ARRLEN-1; - for (int i = 0; i < ARRLEN; i+=1) { - unsafe.putIntRelease(a, byte_offset(limit-i), -123); - } - } - static void test_vi_oppos(int[] a, int b, int old) { - int limit = ARRLEN-1; - for (int i = limit; i >= 0; i-=1) { - unsafe.putIntRelease(a, byte_offset(limit-i), b); - } - } - static void test_cp_oppos(int[] a, int[] b) { - int limit = ARRLEN-1; - for (int i = 0; i < ARRLEN; i+=1) { - unsafe.putIntRelease(a, byte_offset(i), b[limit-i]); - } - } - static void test_2ci_oppos(int[] a, int[] b) { - int limit = ARRLEN-1; - for (int i = 0; i < ARRLEN; i+=1) { - unsafe.putIntRelease(a, byte_offset(limit-i), -123); - unsafe.putIntRelease(b, byte_offset(i), -103); - } - } - static void test_2vi_oppos(int[] a, int[] b, int c, int d) { - int limit = ARRLEN-1; - for (int i = limit; i >= 0; i-=1) { - unsafe.putIntRelease(a, byte_offset(i), c); - unsafe.putIntRelease(b, byte_offset(limit-i), d); - } - } - static void test_ci_off(int[] a, int old) { - for (int i = 0; i < ARRLEN-OFFSET; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+OFFSET), -123); - } - } - static void test_vi_off(int[] a, int b, int old) { - for (int i = 0; i < ARRLEN-OFFSET; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+OFFSET), b); - } - } - static void test_cp_off(int[] a, int[] b) { - for (int i = 0; i < ARRLEN-OFFSET; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+OFFSET), b[i+OFFSET]); - } - } - static void test_2ci_off(int[] a, int[] b) { - for (int i = 0; i < ARRLEN-OFFSET; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+OFFSET), -123); - unsafe.putIntRelease(b, byte_offset(i+OFFSET), -103); - } - } - static void test_2vi_off(int[] a, int[] b, int c, int d) { - for (int i = 0; i < ARRLEN-OFFSET; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+OFFSET), c); - unsafe.putIntRelease(b, byte_offset(i+OFFSET), d); - } - } - static void test_ci_inv(int[] a, int k, int old) { - for (int i = 0; i < ARRLEN-k; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+k), -123); - } - } - static void test_vi_inv(int[] a, int b, int k, int old) { - for (int i = 0; i < ARRLEN-k; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+k), b); - } - } - static void test_cp_inv(int[] a, int[] b, int k) { - for (int i = 0; i < ARRLEN-k; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+k), b[i+k]); - } - } - static void test_2ci_inv(int[] a, int[] b, int k) { - for (int i = 0; i < ARRLEN-k; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+k), -123); - unsafe.putIntRelease(b, byte_offset(i+k), -103); - } - } - static void test_2vi_inv(int[] a, int[] b, int c, int d, int k) { - for (int i = 0; i < ARRLEN-k; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+k), c); - unsafe.putIntRelease(b, byte_offset(i+k), d); - } - } - static void test_ci_scl(int[] a, int old) { - for (int i = 0; i*SCALE < ARRLEN; i+=1) { - unsafe.putIntRelease(a, byte_offset(i*SCALE), -123); - } - } - static void test_vi_scl(int[] a, int b, int old) { - for (int i = 0; i*SCALE < ARRLEN; i+=1) { - unsafe.putIntRelease(a, byte_offset(i*SCALE), b); - } - } - static void test_cp_scl(int[] a, int[] b) { - for (int i = 0; i*SCALE < ARRLEN; i+=1) { - unsafe.putIntRelease(a, byte_offset(i*SCALE), b[i*SCALE]); - } - } - static void test_2ci_scl(int[] a, int[] b) { - for (int i = 0; i*SCALE < ARRLEN; i+=1) { - unsafe.putIntRelease(a, byte_offset(i*SCALE), -123); - unsafe.putIntRelease(b, byte_offset(i*SCALE), -103); - } - } - static void test_2vi_scl(int[] a, int[] b, int c, int d) { - for (int i = 0; i*SCALE < ARRLEN; i+=1) { - unsafe.putIntRelease(a, byte_offset(i*SCALE), c); - unsafe.putIntRelease(b, byte_offset(i*SCALE), d); - } - } - static void test_cp_alndst(int[] a, int[] b) { - for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+ALIGN_OFF), b[i]); - } - } - static void test_cp_alnsrc(int[] a, int[] b) { - for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) { - unsafe.putIntRelease(a, byte_offset(i), b[i+ALIGN_OFF]); - } - } - static void test_2ci_aln(int[] a, int[] b) { - for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+ALIGN_OFF), -123); - unsafe.putIntRelease(b, byte_offset(i), -103); - } - } - static void test_2vi_aln(int[] a, int[] b, int c, int d) { - for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) { - unsafe.putIntRelease(a, byte_offset(i), c); - unsafe.putIntRelease(b, byte_offset(i+ALIGN_OFF), d); - } - } - static void test_cp_unalndst(int[] a, int[] b) { - for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+UNALIGN_OFF), b[i]); - } - } - static void test_cp_unalnsrc(int[] a, int[] b) { - for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) { - unsafe.putIntRelease(a, byte_offset(i), b[i+UNALIGN_OFF]); - } - } - static void test_2ci_unaln(int[] a, int[] b) { - for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) { - unsafe.putIntRelease(a, byte_offset(i+UNALIGN_OFF), -123); - unsafe.putIntRelease(b, byte_offset(i), -103); - } - } - static void test_2vi_unaln(int[] a, int[] b, int c, int d) { - for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) { - unsafe.putIntRelease(a, byte_offset(i), c); - unsafe.putIntRelease(b, byte_offset(i+UNALIGN_OFF), d); - } - } - - static int verify(String text, int i, int elem, int val) { - if (elem != val) { - System.err.println(text + "[" + i + "] = " + elem + " != " + val); - return 1; - } - return 0; - } -} --- /dev/null 2016-06-14 14:43:27.230512026 +0300 +++ new/test/compiler/c2/cr8004867/TestIntUnsafeOrdered.java 2016-07-06 19:20:18.815392940 +0300 @@ -0,0 +1,998 @@ +/* + * Copyright (c) 2013, 2015, 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 + * @bug 8004867 + * @summary VM crashing with assert "share/vm/opto/node.hpp:357 - assert(i < _max) failed: oob" + * @modules java.base/jdk.internal.misc + * + * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation + * -XX:-OptimizeFill + * compiler.c2.cr8004867.TestIntUnsafeOrdered + * @run main/othervm/timeout=300 -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:-TieredCompilation + * -XX:+OptimizeFill + * compiler.c2.cr8004867.TestIntUnsafeOrdered + */ + +package compiler.c2.cr8004867; + +import jdk.internal.misc.Unsafe; + +import java.lang.reflect.Field; + +public class TestIntUnsafeOrdered { + private static final int ARRLEN = 97; + private static final int ITERS = 11000; + private static final int OFFSET = 3; + private static final int SCALE = 2; + private static final int ALIGN_OFF = 8; + private static final int UNALIGN_OFF = 5; + + private static final Unsafe unsafe; + private static final int BASE; + static { + try { + Class c = Unsafe.class; + Field f = c.getDeclaredField("theUnsafe"); + f.setAccessible(true); + unsafe = (Unsafe) f.get(c); + BASE = unsafe.arrayBaseOffset(int[].class); + } catch (Exception e) { + InternalError err = new InternalError(); + err.initCause(e); + throw err; + } + } + + public static void main(String args[]) { + System.out.println("Testing Integer array unsafe ordered operations"); + int errn = test(false); + if (errn > 0) { + System.err.println("FAILED: " + errn + " errors"); + System.exit(97); + } + System.out.println("PASSED"); + } + + static int test(boolean test_only) { + int[] a1 = new int[ARRLEN]; + int[] a2 = new int[ARRLEN]; + // Initialize + for (int i=0; i 0 || test_only) + return errn; + + // Initialize + for (int i=0; i= 0; i-=1) { + unsafe.putIntRelease(a, byte_offset(i), -123); + } + } + static void test_vi_neg(int[] a, int b, int old) { + for (int i = ARRLEN-1; i >= 0; i-=1) { + unsafe.putIntRelease(a, byte_offset(i), b); + } + } + static void test_cp_neg(int[] a, int[] b) { + for (int i = ARRLEN-1; i >= 0; i-=1) { + unsafe.putIntRelease(a, byte_offset(i), b[i]); + } + } + static void test_2ci_neg(int[] a, int[] b) { + for (int i = ARRLEN-1; i >= 0; i-=1) { + unsafe.putIntRelease(a, byte_offset(i), -123); + unsafe.putIntRelease(b, byte_offset(i), -103); + } + } + static void test_2vi_neg(int[] a, int[] b, int c, int d) { + for (int i = ARRLEN-1; i >= 0; i-=1) { + unsafe.putIntRelease(a, byte_offset(i), c); + unsafe.putIntRelease(b, byte_offset(i), d); + } + } + static void test_ci_oppos(int[] a, int old) { + int limit = ARRLEN-1; + for (int i = 0; i < ARRLEN; i+=1) { + unsafe.putIntRelease(a, byte_offset(limit-i), -123); + } + } + static void test_vi_oppos(int[] a, int b, int old) { + int limit = ARRLEN-1; + for (int i = limit; i >= 0; i-=1) { + unsafe.putIntRelease(a, byte_offset(limit-i), b); + } + } + static void test_cp_oppos(int[] a, int[] b) { + int limit = ARRLEN-1; + for (int i = 0; i < ARRLEN; i+=1) { + unsafe.putIntRelease(a, byte_offset(i), b[limit-i]); + } + } + static void test_2ci_oppos(int[] a, int[] b) { + int limit = ARRLEN-1; + for (int i = 0; i < ARRLEN; i+=1) { + unsafe.putIntRelease(a, byte_offset(limit-i), -123); + unsafe.putIntRelease(b, byte_offset(i), -103); + } + } + static void test_2vi_oppos(int[] a, int[] b, int c, int d) { + int limit = ARRLEN-1; + for (int i = limit; i >= 0; i-=1) { + unsafe.putIntRelease(a, byte_offset(i), c); + unsafe.putIntRelease(b, byte_offset(limit-i), d); + } + } + static void test_ci_off(int[] a, int old) { + for (int i = 0; i < ARRLEN-OFFSET; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+OFFSET), -123); + } + } + static void test_vi_off(int[] a, int b, int old) { + for (int i = 0; i < ARRLEN-OFFSET; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+OFFSET), b); + } + } + static void test_cp_off(int[] a, int[] b) { + for (int i = 0; i < ARRLEN-OFFSET; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+OFFSET), b[i+OFFSET]); + } + } + static void test_2ci_off(int[] a, int[] b) { + for (int i = 0; i < ARRLEN-OFFSET; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+OFFSET), -123); + unsafe.putIntRelease(b, byte_offset(i+OFFSET), -103); + } + } + static void test_2vi_off(int[] a, int[] b, int c, int d) { + for (int i = 0; i < ARRLEN-OFFSET; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+OFFSET), c); + unsafe.putIntRelease(b, byte_offset(i+OFFSET), d); + } + } + static void test_ci_inv(int[] a, int k, int old) { + for (int i = 0; i < ARRLEN-k; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+k), -123); + } + } + static void test_vi_inv(int[] a, int b, int k, int old) { + for (int i = 0; i < ARRLEN-k; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+k), b); + } + } + static void test_cp_inv(int[] a, int[] b, int k) { + for (int i = 0; i < ARRLEN-k; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+k), b[i+k]); + } + } + static void test_2ci_inv(int[] a, int[] b, int k) { + for (int i = 0; i < ARRLEN-k; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+k), -123); + unsafe.putIntRelease(b, byte_offset(i+k), -103); + } + } + static void test_2vi_inv(int[] a, int[] b, int c, int d, int k) { + for (int i = 0; i < ARRLEN-k; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+k), c); + unsafe.putIntRelease(b, byte_offset(i+k), d); + } + } + static void test_ci_scl(int[] a, int old) { + for (int i = 0; i*SCALE < ARRLEN; i+=1) { + unsafe.putIntRelease(a, byte_offset(i*SCALE), -123); + } + } + static void test_vi_scl(int[] a, int b, int old) { + for (int i = 0; i*SCALE < ARRLEN; i+=1) { + unsafe.putIntRelease(a, byte_offset(i*SCALE), b); + } + } + static void test_cp_scl(int[] a, int[] b) { + for (int i = 0; i*SCALE < ARRLEN; i+=1) { + unsafe.putIntRelease(a, byte_offset(i*SCALE), b[i*SCALE]); + } + } + static void test_2ci_scl(int[] a, int[] b) { + for (int i = 0; i*SCALE < ARRLEN; i+=1) { + unsafe.putIntRelease(a, byte_offset(i*SCALE), -123); + unsafe.putIntRelease(b, byte_offset(i*SCALE), -103); + } + } + static void test_2vi_scl(int[] a, int[] b, int c, int d) { + for (int i = 0; i*SCALE < ARRLEN; i+=1) { + unsafe.putIntRelease(a, byte_offset(i*SCALE), c); + unsafe.putIntRelease(b, byte_offset(i*SCALE), d); + } + } + static void test_cp_alndst(int[] a, int[] b) { + for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+ALIGN_OFF), b[i]); + } + } + static void test_cp_alnsrc(int[] a, int[] b) { + for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) { + unsafe.putIntRelease(a, byte_offset(i), b[i+ALIGN_OFF]); + } + } + static void test_2ci_aln(int[] a, int[] b) { + for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+ALIGN_OFF), -123); + unsafe.putIntRelease(b, byte_offset(i), -103); + } + } + static void test_2vi_aln(int[] a, int[] b, int c, int d) { + for (int i = 0; i < ARRLEN-ALIGN_OFF; i+=1) { + unsafe.putIntRelease(a, byte_offset(i), c); + unsafe.putIntRelease(b, byte_offset(i+ALIGN_OFF), d); + } + } + static void test_cp_unalndst(int[] a, int[] b) { + for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+UNALIGN_OFF), b[i]); + } + } + static void test_cp_unalnsrc(int[] a, int[] b) { + for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) { + unsafe.putIntRelease(a, byte_offset(i), b[i+UNALIGN_OFF]); + } + } + static void test_2ci_unaln(int[] a, int[] b) { + for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) { + unsafe.putIntRelease(a, byte_offset(i+UNALIGN_OFF), -123); + unsafe.putIntRelease(b, byte_offset(i), -103); + } + } + static void test_2vi_unaln(int[] a, int[] b, int c, int d) { + for (int i = 0; i < ARRLEN-UNALIGN_OFF; i+=1) { + unsafe.putIntRelease(a, byte_offset(i), c); + unsafe.putIntRelease(b, byte_offset(i+UNALIGN_OFF), d); + } + } + + static int verify(String text, int i, int elem, int val) { + if (elem != val) { + System.err.println(text + "[" + i + "] = " + elem + " != " + val); + return 1; + } + return 0; + } +}