From f308e107ce8b993641ee3d0a0d5d52bf5cd3b94e Mon Sep 17 00:00:00 2001 From: Bhavana Kilambi Date: Mon, 6 May 2024 22:59:14 +0000 Subject: [PATCH] 8331400: AArch64: Sync aarch64_vector.ad with aarch64_vector_ad.m4 Reviewed-by: aph, kvn, eliu --- src/hotspot/cpu/aarch64/aarch64_vector.ad | 2 +- src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/hotspot/cpu/aarch64/aarch64_vector.ad b/src/hotspot/cpu/aarch64/aarch64_vector.ad index 4e8eb47ee5f..b14295ca15c 100644 --- a/src/hotspot/cpu/aarch64/aarch64_vector.ad +++ b/src/hotspot/cpu/aarch64/aarch64_vector.ad @@ -1,6 +1,6 @@ // // Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. -// Copyright (c) 2020, 2023, Arm Limited. All rights reserved. +// Copyright (c) 2020, 2024, 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 diff --git a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 index d31a4e05799..060bb4a11d4 100644 --- a/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 +++ b/src/hotspot/cpu/aarch64/aarch64_vector_ad.m4 @@ -1,6 +1,6 @@ // // Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved. -// Copyright (c) 2020, 2023, Arm Limited. All rights reserved. +// Copyright (c) 2020, 2024, 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 @@ -159,9 +159,7 @@ source %{ case Op_VectorMaskGen: case Op_LoadVectorMasked: case Op_StoreVectorMasked: - case Op_LoadVectorGather: case Op_StoreVectorScatter: - case Op_LoadVectorGatherMasked: case Op_StoreVectorScatterMasked: case Op_PopulateIndex: case Op_CompressM: @@ -170,6 +168,12 @@ source %{ return false; } break; + case Op_LoadVectorGather: + case Op_LoadVectorGatherMasked: + if (UseSVE == 0 || is_subword_type(bt)) { + return false; + } + break; case Op_MulAddVS2VI: if (length_in_bytes != 16) { return false;