From 136f5db03d664fd77f8042c6f0875dea964ca5e9 Mon Sep 17 00:00:00 2001 From: Bhavana Kilambi Date: Fri, 6 Jan 2023 10:04:04 +0000 Subject: [PATCH] 8299528: IR test: TestEor3AArch64.java fails on aarch64 Reviewed-by: thartmann, chagedorn --- .../jtreg/compiler/lib/ir_framework/IRNode.java | 12 +++++++++++- .../compiler/vectorization/TestEor3AArch64.java | 10 +++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java index 7e08baab74c..e69e6194e8f 100644 --- a/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java +++ b/test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 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 @@ -1199,6 +1199,16 @@ public class IRNode { beforeMatchingNameRegex(XOR_V_MASK, "XorVMask"); } + public static final String XOR3_NEON = PREFIX + "XOR3_NEON" + POSTFIX; + static { + machOnlyNameRegex(XOR3_NEON, "veor3_neon"); + } + + public static final String XOR3_SVE = PREFIX + "XOR3_SVE" + POSTFIX; + static { + machOnlyNameRegex(XOR3_SVE, "veor3_sve"); + } + /* * Utility methods to set up IR_NODE_MAPPINGS. */ diff --git a/test/hotspot/jtreg/compiler/vectorization/TestEor3AArch64.java b/test/hotspot/jtreg/compiler/vectorization/TestEor3AArch64.java index ae7cb037739..d5a3de09123 100644 --- a/test/hotspot/jtreg/compiler/vectorization/TestEor3AArch64.java +++ b/test/hotspot/jtreg/compiler/vectorization/TestEor3AArch64.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022, Arm Limited. All rights reserved. + * Copyright (c) 2022, 2023, Arm 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 @@ -78,8 +78,8 @@ public class TestEor3AArch64 { // Test for eor3 Neon and SVE2 instruction for integers @Test - @IR(counts = {"veor3_neon", "> 0"}, applyIf = {"MaxVectorSize", "16"}, applyIfCPUFeature = {"sha3", "true"}) - @IR(counts = {"veor3_sve", "> 0"}, applyIfAnd = {"UseSVE", "2", "MaxVectorSize", "> 16"}) + @IR(counts = {IRNode.XOR3_NEON, "> 0"}, applyIf = {"MaxVectorSize", "16"}, applyIfCPUFeature = {"sha3", "true"}) + @IR(counts = {IRNode.XOR3_SVE, "> 0"}, applyIfAnd = {"UseSVE", "2", "MaxVectorSize", "> 16"}) public static void testIntEor3() { for (int i = 0; i < LENGTH; i++) { ir[i] = ia[i] ^ ib[i] ^ ic[i]; @@ -96,8 +96,8 @@ public class TestEor3AArch64 { // Test for eor3 Neon and SVE2 instruction for longs @Test - @IR(counts = {"veor3_neon", "> 0"}, applyIf = {"MaxVectorSize", "16"}, applyIfCPUFeature = {"sha3", "true"}) - @IR(counts = {"veor3_sve", "> 0"}, applyIfAnd = {"UseSVE", "2", "MaxVectorSize", "> 16"}) + @IR(counts = {IRNode.XOR3_NEON, "> 0"}, applyIf = {"MaxVectorSize", "16"}, applyIfCPUFeature = {"sha3", "true"}) + @IR(counts = {IRNode.XOR3_SVE, "> 0"}, applyIfAnd = {"UseSVE", "2", "MaxVectorSize", "> 16"}) public static void testLongEor3() { for (int i = 0; i < LENGTH; i++) { lr[i] = la[i] ^ lb[i] ^ lc[i];