From 37f8b059c1c9245e7f3af90d6ed47c862fee54a3 Mon Sep 17 00:00:00 2001 From: Jamil Nimeh Date: Thu, 29 Dec 2022 22:34:53 +0000 Subject: [PATCH 1/2] 8298592: Add java man page documentation for ChaCha20 and Poly1305 intrinsics Reviewed-by: weijun --- src/java.base/share/man/java.1 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/java.base/share/man/java.1 b/src/java.base/share/man/java.1 index 82ddd5143dc..bbbf24476d7 100644 --- a/src/java.base/share/man/java.1 +++ b/src/java.base/share/man/java.1 @@ -2524,6 +2524,22 @@ instructions. Flags that control intrinsics now require the option \f[V]-XX:+UnlockDiagnosticVMOptions\f[R]. .TP +\f[V]-XX:+UseChaCha20Intrinsics\f[R] +Enable ChaCha20 intrinsics. +This option is on by default for supported platforms. +To disable ChaCha20 intrinsics, specify +\f[V]-XX:-UseChaCha20Intrinsics\f[R]. +Flags that control intrinsics now require the option +\f[V]-XX:+UnlockDiagnosticVMOptions\f[R]. +.TP +\f[V]-XX:+UsePoly1305Intrinsics\f[R] +Enable Poly1305 intrinsics. +This option is on by default for supported platforms. +To disable Poly1305 intrinsics, specify +\f[V]-XX:-UsePoly1305Intrinsics\f[R]. +Flags that control intrinsics now require the option +\f[V]-XX:+UnlockDiagnosticVMOptions\f[R]. +.TP \f[V]-XX:+UseBASE64Intrinsics\f[R] Controls the use of accelerated BASE64 encoding routines for \f[V]java.util.Base64\f[R]. From a6a903d4b627bde85a311336ce25a7f5e25cf664 Mon Sep 17 00:00:00 2001 From: Tobias Hartmann Date: Tue, 3 Jan 2023 08:21:22 +0000 Subject: [PATCH 2/2] 8288204: GVN Crash: assert() failed: correct memory chain Backport-of: 04591595374e84cfbfe38d92bff4409105b28009 --- src/hotspot/share/opto/cfgnode.cpp | 8 --- src/hotspot/share/opto/memnode.cpp | 25 +++++-- .../jtreg/compiler/c2/TestGVNCrash.java | 67 +++++++++++++++++++ 3 files changed, 87 insertions(+), 13 deletions(-) create mode 100644 test/hotspot/jtreg/compiler/c2/TestGVNCrash.java diff --git a/src/hotspot/share/opto/cfgnode.cpp b/src/hotspot/share/opto/cfgnode.cpp index 8afc4d5d844..a7074bbf95f 100644 --- a/src/hotspot/share/opto/cfgnode.cpp +++ b/src/hotspot/share/opto/cfgnode.cpp @@ -982,14 +982,6 @@ PhiNode* PhiNode::slice_memory(const TypePtr* adr_type) const { PhiNode* PhiNode::split_out_instance(const TypePtr* at, PhaseIterGVN *igvn) const { const TypeOopPtr *t_oop = at->isa_oopptr(); assert(t_oop != NULL && t_oop->is_known_instance(), "expecting instance oopptr"); - const TypePtr *t = adr_type(); - assert(type() == Type::MEMORY && - (t == TypePtr::BOTTOM || t == TypeRawPtr::BOTTOM || - t->isa_oopptr() && !t->is_oopptr()->is_known_instance() && - t->is_oopptr()->cast_to_exactness(true) - ->is_oopptr()->cast_to_ptr_type(t_oop->ptr()) - ->is_oopptr()->cast_to_instance_id(t_oop->instance_id()) == t_oop), - "bottom or raw memory required"); // Check if an appropriate node already exists. Node *region = in(0); diff --git a/src/hotspot/share/opto/memnode.cpp b/src/hotspot/share/opto/memnode.cpp index 603f82c6309..12b7181690a 100644 --- a/src/hotspot/share/opto/memnode.cpp +++ b/src/hotspot/share/opto/memnode.cpp @@ -215,11 +215,26 @@ Node *MemNode::optimize_memory_chain(Node *mchain, const TypePtr *t_adr, Node *l PhiNode *mphi = result->as_Phi(); assert(mphi->bottom_type() == Type::MEMORY, "memory phi required"); const TypePtr *t = mphi->adr_type(); - if (t == TypePtr::BOTTOM || t == TypeRawPtr::BOTTOM || - (t->isa_oopptr() && !t->is_oopptr()->is_known_instance() && - t->is_oopptr()->cast_to_exactness(true) - ->is_oopptr()->cast_to_ptr_type(t_oop->ptr()) - ->is_oopptr()->cast_to_instance_id(t_oop->instance_id()) == t_oop)) { + bool do_split = false; + // In the following cases, Load memory input can be further optimized based on + // its precise address type + if (t == TypePtr::BOTTOM || t == TypeRawPtr::BOTTOM ) { + do_split = true; + } else if (t->isa_oopptr() && !t->is_oopptr()->is_known_instance()) { + const TypeOopPtr* mem_t = + t->is_oopptr()->cast_to_exactness(true) + ->is_oopptr()->cast_to_ptr_type(t_oop->ptr()) + ->is_oopptr()->cast_to_instance_id(t_oop->instance_id()); + if (t_oop->is_aryptr()) { + mem_t = mem_t->is_aryptr() + ->cast_to_stable(t_oop->is_aryptr()->is_stable()) + ->cast_to_size(t_oop->is_aryptr()->size()) + ->with_offset(t_oop->is_aryptr()->offset()) + ->is_aryptr(); + } + do_split = mem_t == t_oop; + } + if (do_split) { // clone the Phi with our address type result = mphi->split_out_instance(t_adr, igvn); } else { diff --git a/test/hotspot/jtreg/compiler/c2/TestGVNCrash.java b/test/hotspot/jtreg/compiler/c2/TestGVNCrash.java new file mode 100644 index 00000000000..38c935f4dcb --- /dev/null +++ b/test/hotspot/jtreg/compiler/c2/TestGVNCrash.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2022, Alibaba Group Holding Limited. 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 + * @key stress randomness + * @bug 8288204 + * @summary GVN Crash: assert() failed: correct memory chain + * + * @run main/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+StressIGVN -XX:CompileCommand=compileonly,compiler.c2.TestGVNCrash::test compiler.c2.TestGVNCrash + */ + +package compiler.c2; + +public class TestGVNCrash { + public static int iField = 0; + public static double[] dArrFld = new double[256]; + public static int[] iArrFld = new int[256]; + public int[][] iArrFld1 = new int[256][256]; + + public void test() { + int x = 0; + for (int i = 0; i < 10; i++) { + do { + for (float j = 0; j < 0; j++) { + iArrFld[x] = 3; + iArrFld1[1][x] -= iField; + dArrFld = new double[256]; + for (int k = 0; k < dArrFld.length; k++) { + dArrFld[k] = (k % 2 == 0) ? k + 1 : k - 1; + } + } + } while (++x < 5); + for (int j = 0; j < 100_000; j++) { + String s = "test"; + s = s + s; + s = s + s; + } + } + } + + public static void main(String[] args) { + TestGVNCrash t = new TestGVNCrash(); + t.test(); + } +} \ No newline at end of file