代码拉取完成，页面将自动刷新
同步操作将从 src-openEuler/openjdk-1.8.0 强制同步，此操作会覆盖自 Fork 仓库以来所做的任何修改，且无法恢复！！！
确定后同步将在后台操作，完成时将刷新页面，请耐心等待。
Date: Mon, 5 Jun 2023 20:43:22 +0800
Subject: [PATCH 14/59] 8280511: AArch64: Combine shift and negate to a single instruction
Bug url: https://bugs.openjdk.org/browse/JDK-8280511
---
hotspot/src/cpu/aarch64/vm/aarch64.ad | 102 ++++++++++
hotspot/src/cpu/aarch64/vm/aarch64_ad.m4 | 25 +++
hotspot/test/compiler/codegen/ShiftTest.java | 199 +++++++++++++++++++
3 files changed, 326 insertions(+)
create mode 100644 hotspot/test/compiler/codegen/ShiftTest.java
diff --git a/hotspot/src/cpu/aarch64/vm/aarch64.ad b/hotspot/src/cpu/aarch64/vm/aarch64.ad
index 511ce913e..d73d5d457 100644
--- a/hotspot/src/cpu/aarch64/vm/aarch64.ad
+++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad
@@ -9818,6 +9818,108 @@ instruct regI_not_reg(iRegINoSp dst,
ins_pipe(ialu_reg);
%}
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct NegI_reg_URShift_reg(iRegINoSp dst,
+ immI0 zero, iRegIorL2I src1, immI src2) %{
+ match(Set dst (SubI zero (URShiftI src1 src2)));
+
+ ins_cost(1.9 * INSN_COST);
+ format %{ "negw $dst, $src1, LSR $src2" %}
+
+ ins_encode %{
+ __ negw(as_Register($dst$$reg), as_Register($src1$$reg),
+ Assembler::LSR, $src2$$constant & 0x1f);
+ %}
+
+ ins_pipe(ialu_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct NegI_reg_RShift_reg(iRegINoSp dst,
+ immI0 zero, iRegIorL2I src1, immI src2) %{
+ match(Set dst (SubI zero (RShiftI src1 src2)));
+
+ ins_cost(1.9 * INSN_COST);
+ format %{ "negw $dst, $src1, ASR $src2" %}
+
+ ins_encode %{
+ __ negw(as_Register($dst$$reg), as_Register($src1$$reg),
+ Assembler::ASR, $src2$$constant & 0x1f);
+ %}
+
+ ins_pipe(ialu_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct NegI_reg_LShift_reg(iRegINoSp dst,
+ immI0 zero, iRegIorL2I src1, immI src2) %{
+ match(Set dst (SubI zero (LShiftI src1 src2)));
+
+ ins_cost(1.9 * INSN_COST);
+ format %{ "negw $dst, $src1, LSL $src2" %}
+
+ ins_encode %{
+ __ negw(as_Register($dst$$reg), as_Register($src1$$reg),
+ Assembler::LSL, $src2$$constant & 0x1f);
+ %}
+
+ ins_pipe(ialu_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct NegL_reg_URShift_reg(iRegLNoSp dst,
+ immL0 zero, iRegL src1, immI src2) %{
+ match(Set dst (SubL zero (URShiftL src1 src2)));
+
+ ins_cost(1.9 * INSN_COST);
+ format %{ "neg $dst, $src1, LSR $src2" %}
+
+ ins_encode %{
+ __ neg(as_Register($dst$$reg), as_Register($src1$$reg),
+ Assembler::LSR, $src2$$constant & 0x3f);
+ %}
+
+ ins_pipe(ialu_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct NegL_reg_RShift_reg(iRegLNoSp dst,
+ immL0 zero, iRegL src1, immI src2) %{
+ match(Set dst (SubL zero (RShiftL src1 src2)));
+
+ ins_cost(1.9 * INSN_COST);
+ format %{ "neg $dst, $src1, ASR $src2" %}
+
+ ins_encode %{
+ __ neg(as_Register($dst$$reg), as_Register($src1$$reg),
+ Assembler::ASR, $src2$$constant & 0x3f);
+ %}
+
+ ins_pipe(ialu_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct NegL_reg_LShift_reg(iRegLNoSp dst,
+ immL0 zero, iRegL src1, immI src2) %{
+ match(Set dst (SubL zero (LShiftL src1 src2)));
+
+ ins_cost(1.9 * INSN_COST);
+ format %{ "neg $dst, $src1, LSL $src2" %}
+
+ ins_encode %{
+ __ neg(as_Register($dst$$reg), as_Register($src1$$reg),
+ Assembler::LSL, $src2$$constant & 0x3f);
+ %}
+
+ ins_pipe(ialu_reg_shift);
+%}
+
instruct AndI_reg_not_reg(iRegINoSp dst,
iRegIorL2I src1, iRegIorL2I src2, immI_M1 m1,
rFlagsReg cr) %{
diff --git a/hotspot/src/cpu/aarch64/vm/aarch64_ad.m4 b/hotspot/src/cpu/aarch64/vm/aarch64_ad.m4
index 9fb793023..6ec8fde08 100644
--- a/hotspot/src/cpu/aarch64/vm/aarch64_ad.m4
+++ b/hotspot/src/cpu/aarch64/vm/aarch64_ad.m4
@@ -47,6 +47,24 @@ instruct $2$1_reg_$4_reg(iReg$1NoSp dst,
ins_pipe(ialu_reg_reg_shift);
%}')dnl
+define(`NEG_SHIFT_INSN',
+`// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct Neg$1_reg_$2_reg(iReg$1NoSp dst,
+ imm$1`0' zero, iReg$1`'ORL2I($1) src1, immI src2) %{
+ match(Set dst (Sub$1 zero ($2$1 src1 src2)));
+
+ ins_cost(1.9 * INSN_COST);
+ format %{ "ifelse($1, I, negw, neg) $dst, $src1, $3 $src2" %}
+
+ ins_encode %{
+ __ ifelse($1, I, negw, neg)(as_Register($dst$$reg), as_Register($src1$$reg),
+ Assembler::$3, $src2$$constant & ifelse($1,I,0x1f,0x3f));
+ %}
+
+ ins_pipe(ialu_reg_shift);
+%}
+')dnl
define(`BASE_INVERTED_INSN',
`
instruct $2$1_reg_not_reg(iReg$1NoSp dst,
@@ -110,6 +128,11 @@ define(`NOT_INSN',
ins_pipe(ialu_reg);
%}')dnl
dnl
+define(`BOTH_NEG_SHIFT_INSNS',
+`NEG_SHIFT_INSN($1, URShift, LSR)
+NEG_SHIFT_INSN($1, RShift, ASR)
+NEG_SHIFT_INSN($1, LShift, LSL)')dnl
+dnl
define(`BOTH_SHIFT_INSNS',
`BASE_SHIFT_INSN(I, $1, ifelse($2,andr,andw,$2w), $3, $4)
BASE_SHIFT_INSN(L, $1, $2, $3, $4)')dnl
@@ -134,6 +157,8 @@ BOTH_INVERTED_SHIFT_INSNS($1, $2, LShift, LSL)')dnl
dnl
NOT_INSN(L, eon)
NOT_INSN(I, eonw)
+BOTH_NEG_SHIFT_INSNS(I)
+BOTH_NEG_SHIFT_INSNS(L)
BOTH_INVERTED_INSNS(And, bic)
BOTH_INVERTED_INSNS(Or, orn)
BOTH_INVERTED_INSNS(Xor, eon)
diff --git a/hotspot/test/compiler/codegen/ShiftTest.java b/hotspot/test/compiler/codegen/ShiftTest.java
new file mode 100644
index 000000000..45d192341
--- /dev/null
+++ b/hotspot/test/compiler/codegen/ShiftTest.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2023, Huawei Technologies Co., Ltd. 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 4093292 8280511
+ * @summary Test for correct code generation by the JIT
+ * @library /testlibrary
+ * @run main compiler.codegen.ShiftTest
+ * @run main/othervm -XX:-TieredCompilation compiler.codegen.ShiftTest
+ */
+
+package compiler.codegen;
+import com.oracle.java.testlibrary.Asserts;
+
+public class ShiftTest {
+ static final int w = 32;
+
+ private static void doTest(long ct) throws Exception {
+ int S22 = 0xc46cf7c2;
+ int S23 = 0xcfda9162;
+ int S24 = 0xd029aa4c;
+ int S25 = 0x17cf1801;
+ int A = (int)(ct & 0xffffffffL);
+ int B = (int)(ct >>> 32);
+ int x, y;
+ x = B - S25;
+ y = A & (w-1);
+ B = ((x >>> y) | (x << (w-y))) ^ A;
+ x = A - S24;
+ y = B & (w-1);
+ A = ((x >>> y) | (x << (w-y))) ^ B;
+ x = B - S23;
+ y = A & (w-1);
+ B = ((x >>> y) | (x << (w-y))) ^ A;
+ x = A - S22;
+ y = B & (w-1);
+ A = ((x >>> y) | (x << (w-y))) ^ B;
+ String astr = Integer.toHexString(A);
+ String bstr = Integer.toHexString(B);
+ System.err.println("A = " + astr + " B = " + bstr);
+ if ((!astr.equals("dcb38144")) ||
+ (!bstr.equals("1916de73"))) {
+ throw new RuntimeException("Unexpected shift results!");
+ }
+ System.err.println("Test passed");
+ }
+
+ private static int[] ispecial = {
+ 0, Integer.MAX_VALUE, -Integer.MAX_VALUE, Integer.MIN_VALUE, -42, 42, -1, 1
+ };
+
+ private static long[] lspecial = {
+ 0, Long.MAX_VALUE, -Long.MAX_VALUE, Long.MIN_VALUE, Integer.MAX_VALUE, -Integer.MAX_VALUE, Integer.MIN_VALUE, -42, 42, -1, 1
+ };
+
+ private static int[] ispecial_LeftShift_expected = {
+ 0, 32, -32, 0, 1344, -1344, 32, -32
+ };
+
+ private static int[] ispecial_UnsignedRightShift_expected = {
+ 0, -33554431, -33554432, -33554432 ,-67108863, 0, -67108863, 0
+ };
+
+ private static int[] ispecial_SignedRightShift_expected = {
+ 0, -16777215, 16777216, 16777216, 1, 0, 1, 0
+ };
+
+ private static int[] ispecial_LeftShiftCorner_expected = {
+ 0, -2147483647, 2147483647, -2147483648, 42, -42, 1, -1
+ };
+
+ private static int[] ispecial_UnsignedRightShiftCorner_expected = {
+ 0, -1073741823, -1073741824, -1073741824, -2147483627, -21, -2147483647, 0
+ };
+
+ private static int[] ispecial_SignedRightShiftCorner_expected = {
+ 0, -536870911, 536870912, 536870912, 11, -10, 1, 0
+ };
+
+ private static long[] lspecial_LeftShift_expected = {
+ 0, 256, -256, 0, -549755813632L, 549755813632L, 549755813888L, 10752, -10752, 256, -256
+ };
+
+ private static long[] lspecial_UnsignedRightShift_expected = {
+ 0, -18014398509481983L, -18014398509481984L, -18014398509481984L, -4194303, -36028797014769664L, -36028797014769664L, -36028797018963967L, 0, -36028797018963967L, 0
+ };
+
+ private static long[] lspecial_SignedRightShift_expected = {
+ 0, -9007199254740991L, 9007199254740992L, 9007199254740992L, -2097151, 2097152, 2097152, 1, 0, 1, 0
+ };
+
+ private static long[] lspecial_LeftShiftCorner_expected = {
+ 0, -9223372036854775807L, 9223372036854775807L, -9223372036854775808L, -2147483647, 2147483647, 2147483648L, 42, -42, 1, -1
+ };
+
+ private static long[] lspecial_UnsignedRightShiftCorner_expected = {
+ 0, -4611686018427387903L, -4611686018427387904L, -4611686018427387904L, -1073741823, -9223372035781033984L, -9223372035781033984L, -9223372036854775787L, -21, -9223372036854775807L, 0
+ };
+
+ private static long[] lspecial_SignedRightShiftCorner_expected = {
+ 0, -2305843009213693951L, 2305843009213693952L, 2305843009213693952L, -536870911, 536870912, 536870912, 11, -10, 1, 0
+ };
+
+ private static int negLeftShiftInt(int input) {
+ return -(input << 5);
+ }
+
+ private static int negUnsignedRightShiftInt(int input) {
+ return -(input >>> 6);
+ }
+
+ private static int negSignedRightShiftInt(int input) {
+ return -(input >> 7);
+ }
+
+ private static int negLeftShiftICorner(int input) {
+ return -(input << 32);
+ }
+
+ private static int negUnsignedRightShiftICorner(int input) {
+ return -(input >>> 33);
+ }
+
+ private static int negSignedRightShiftICorner(int input) {
+ return -(input >> 34);
+ }
+
+ private static long negLeftShiftLong(long input) {
+ return -(input << 8);
+ }
+
+ private static long negUnsignedRightShiftLong(long input) {
+ return -(input >>> 9);
+ }
+
+ private static long negSignedRightShiftLong(long input) {
+ return -(input >> 10);
+ }
+
+ private static long negLeftShiftLCorner(long input) {
+ return -(input << 64);
+ }
+
+ private static long negUnsignedRightShiftLCorner(long input) {
+ return -(input >>> 65);
+ }
+
+ private static long negSignedRightShiftLCorner(long input) {
+ return -(input >> 66);
+ }
+
+ private static void testNegShift() {
+ for (int i = 0; i < 20_000; i++) {
+ for (int j = 0; j < ispecial.length; j++) {
+ Asserts.assertEquals(negLeftShiftInt(ispecial[j]), ispecial_LeftShift_expected[j]);
+ Asserts.assertEquals(negUnsignedRightShiftInt(ispecial[j]), ispecial_UnsignedRightShift_expected[j]);
+ Asserts.assertEquals(negSignedRightShiftInt(ispecial[j]), ispecial_SignedRightShift_expected[j]);
+ Asserts.assertEquals(negLeftShiftICorner(ispecial[j]), ispecial_LeftShiftCorner_expected[j]);
+ Asserts.assertEquals(negUnsignedRightShiftICorner(ispecial[j]), ispecial_UnsignedRightShiftCorner_expected[j]);
+ Asserts.assertEquals(negSignedRightShiftICorner(ispecial[j]), ispecial_SignedRightShiftCorner_expected[j]);
+ }
+ for (int j = 0; j < lspecial.length; j++) {
+ Asserts.assertEquals(negLeftShiftLong(lspecial[j]), lspecial_LeftShift_expected[j]);
+ Asserts.assertEquals(negUnsignedRightShiftLong(lspecial[j]), lspecial_UnsignedRightShift_expected[j]);
+ Asserts.assertEquals(negSignedRightShiftLong(lspecial[j]), lspecial_SignedRightShift_expected[j]);
+ Asserts.assertEquals(negLeftShiftLCorner(lspecial[j]), lspecial_LeftShiftCorner_expected[j]);
+ Asserts.assertEquals(negUnsignedRightShiftLCorner(lspecial[j]), lspecial_UnsignedRightShiftCorner_expected[j]);
+ Asserts.assertEquals(negSignedRightShiftLCorner(lspecial[j]), lspecial_SignedRightShiftCorner_expected[j]);
+ }
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ doTest(0x496def29b74be041L);
+ testNegShift();
+ }
+}
--
2.22.0
此处可能存在不合适展示的内容，页面不予展示。您可通过相关编辑功能自查并修改。
如您确认内容无涉及 不当用语 / 纯广告导流 / 暴力 / 低俗色情 / 侵权 / 盗版 / 虚假 / 无价值内容或违法国家有关法律法规的内容，可点击提交进行申诉，我们将尽快为您处理。
马建仓 AI 助手
