From c66f785fb685d5c378fb4c4cdebdef29c01d321b Mon Sep 17 00:00:00 2001 From: Gui Cao Date: Wed, 26 Jun 2024 00:59:49 +0000 Subject: [PATCH] 8334505: RISC-V: Several tests fail when MaxVectorSize does not match VM_Version::_initial_vector_length Reviewed-by: fyang --- src/hotspot/cpu/riscv/vm_version_riscv.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/hotspot/cpu/riscv/vm_version_riscv.cpp b/src/hotspot/cpu/riscv/vm_version_riscv.cpp index 995e8b722485d..b9467bb2245da 100644 --- a/src/hotspot/cpu/riscv/vm_version_riscv.cpp +++ b/src/hotspot/cpu/riscv/vm_version_riscv.cpp @@ -327,15 +327,11 @@ void VM_Version::c2_initialize() { FLAG_SET_DEFAULT(MaxVectorSize, 0); FLAG_SET_DEFAULT(UseRVVForBigIntegerShiftIntrinsics, false); } else { - if (FLAG_IS_DEFAULT(MaxVectorSize)) { - MaxVectorSize = _initial_vector_length; - } else if (!is_power_of_2(MaxVectorSize)) { - vm_exit_during_initialization(err_msg("Unsupported MaxVectorSize: %d, must be a power of 2", (int)MaxVectorSize)); - } else if (MaxVectorSize > _initial_vector_length) { - warning("Current system only supports max RVV vector length %d. Set MaxVectorSize to %d", - _initial_vector_length, _initial_vector_length); - MaxVectorSize = _initial_vector_length; + if (!FLAG_IS_DEFAULT(MaxVectorSize) && MaxVectorSize != _initial_vector_length) { + warning("Current system does not support RVV vector length for MaxVectorSize %d. Set MaxVectorSize to %d", + (int)MaxVectorSize, _initial_vector_length); } + MaxVectorSize = _initial_vector_length; if (MaxVectorSize < 16) { warning("RVV does not support vector length less than 16 bytes. Disabling RVV."); UseRVV = false;