diff options
author | Tobias Hartmann <thartmann@openjdk.org> | 2023-08-09 07:56:41 +0000 |
---|---|---|
committer | Vitaly Provodin <vitaly.provodin@jetbrains.com> | 2023-08-12 06:47:31 +0700 |
commit | 64c0d8c181cb8e6672bb84bbfc82ecc64a1461e4 (patch) | |
tree | b4c4fa88e13b6bcb556414b5e438fa39d4d5c67c | |
parent | 33e83936c6a0dc83c6f161bd588c6c25cc08c517 (diff) | |
download | JetBrainsRuntime-64c0d8c181cb8e6672bb84bbfc82ecc64a1461e4.tar.gz |
8313345: SuperWord fails due to CMove without matching Bool pack
Reviewed-by: chagedorn
Backport-of: d3b578f1c9d296ce8f99c70069df886e9f2dbef9
-rw-r--r-- | src/hotspot/share/opto/superword.cpp | 12 | ||||
-rw-r--r-- | test/hotspot/jtreg/compiler/vectorization/TestCMoveWithoutBoolPack.java | 67 |
2 files changed, 79 insertions, 0 deletions
diff --git a/src/hotspot/share/opto/superword.cpp b/src/hotspot/share/opto/superword.cpp index faf2f7e51d9..6dcea46b4be 100644 --- a/src/hotspot/share/opto/superword.cpp +++ b/src/hotspot/share/opto/superword.cpp @@ -2196,6 +2196,18 @@ bool SuperWord::profitable(Node_List* p) { } } } + if (p0->is_CMove()) { + // Verify that CMove has a matching Bool pack + BoolNode* bol = p0->in(1)->as_Bool(); + if (bol == nullptr || my_pack(bol) == nullptr) { + return false; + } + // Verify that Bool has a matching Cmp pack + CmpNode* cmp = bol->in(1)->as_Cmp(); + if (cmp == nullptr || my_pack(cmp) == nullptr) { + return false; + } + } return true; } diff --git a/test/hotspot/jtreg/compiler/vectorization/TestCMoveWithoutBoolPack.java b/test/hotspot/jtreg/compiler/vectorization/TestCMoveWithoutBoolPack.java new file mode 100644 index 00000000000..7ba9c1c80c8 --- /dev/null +++ b/test/hotspot/jtreg/compiler/vectorization/TestCMoveWithoutBoolPack.java @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2023, 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 8313345 + * @summary Test SuperWord with a CMove that does not have a matching bool pack. + * @requires vm.compiler2.enabled + * @run main/othervm -XX:-TieredCompilation -XX:CompileCommand=compileonly,*TestCMoveWithoutBoolPack*::fill -Xbatch + * compiler.vectorization.TestCMoveWithoutBoolPack + * @run main/othervm -XX:-TieredCompilation -XX:CompileCommand=compileonly,*TestCMoveWithoutBoolPack*::fill -Xbatch + * -XX:+UseCMoveUnconditionally + * compiler.vectorization.TestCMoveWithoutBoolPack + */ + +package compiler.vectorization; + +public class TestCMoveWithoutBoolPack { + + public static void main(String[] args) { + A a = new A(); + B b = new B(); + double[] c = new double[1000]; + for (int i = 0; i < 1000; i++) { + a.fill(c); + b.fill(c); + } + } + + public static class A { + void fill(double[] array) { + for (int i = 0; i < array.length; ++i) { + array[i] = this.transform(array[i]); + } + } + + public double transform(double value) { + return value * value; + } + } + + public static class B extends A { + public double transform(double value) { + return value; + } + } +} |