RFR: 8327283: RISC-V: Minimal build failed after JDK-8319716 [v3]

[Fei Yang]

On Wed, 6 Mar 2024 14:37:01 GMT, Gui Cao <gcao at openjdk.org> wrote:

>> Hi, please review this patch that fix the minimal build failed for riscv.
>> 
>> Error log for minimal build:
>> 
>> Creating support/modules_libs/java.base/minimal/libjvm.so from 591 file(s)
>> ^@/home/zifeihan/jdk/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp: In member function ‘u_char* StubGenerator::Sha2Generator::generate_sha2_implCompress(Assembler::SEW, bool)’:
>> /home/zifeihan/jdk/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp:3938:41: error: ‘MaxVectorSize’ was not declared in this scope; did you mean ‘MaxNewSize’?
>>  3938 |       if (vset_sew == Assembler::e64 && MaxVectorSize == 16) { // SHA512 and VLEN = 128
>>       |                                         ^~~~~~~~~~~~~
>>       |                                         MaxNewSize
>> gmake[3]: *** [lib/CompileJvm.gmk:165: /home/zifeihan/jdk/build/linux-riscv64-minimal-fastdebug/hotspot/variant-minimal/libjvm/objs/stubGenerator_riscv.o] Error 1
>> gmake[3]: *** Waiting for unfinished jobs....
>> ^@gmake[2]: *** [make/Main.gmk:253: hotspot-minimal-libs] Error 2
>> gmake[2]: *** Waiting for unfinished jobs....
>> ^@
>> ERROR: Build failed for target 'images' in configuration 'linux-riscv64-minimal-fastdebug' (exit code 2)
>> 
>> === Output from failing command(s) repeated here ===
>> * For target hotspot_variant-minimal_libjvm_objs_stubGenerator_riscv.o:
>> /home/zifeihan/jdk/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp: In member function ‘u_char* StubGenerator::Sha2Generator::generate_sha2_implCompress(Assembler::SEW, bool)’:
>> /home/zifeihan/jdk/src/hotspot/cpu/riscv/stubGenerator_riscv.cpp:3938:41: error: ‘MaxVectorSize’ was not declared in this scope; did you mean ‘MaxNewSize’?
>>  3938 |       if (vset_sew == Assembler::e64 && MaxVectorSize == 16) { // SHA512 and VLEN = 128
>>       |                                         ^~~~~~~~~~~~~
>>       |                                         MaxNewSize
>> 
>> * All command lines available in /home/zifeihan/jdk/build/linux-riscv64-minimal-fastdebug/make-support/failure-logs.
>> === End of repeated output ===
>> 
>> No indication of failed target found.
>> HELP: Try searching the build log for '] Error'.
>> HELP: Run 'make doctor' to diagnose build problems.
>> 
>> make[1]: *** [/home/zifeihan/jdk/make/Init.gmk:323: main] Error 2
>> make: *** [/home/zifeihan/jdk/make/Init.gmk:189: images] Error 2
>> 
>> 
>> The root cause is that MaxVectorSize is only defined under COMPILER2 , We should use VM_Version::_initial_vector_length instead of MaxVectorSize.  
>> 
>> Testing:
>> 
>> - [...
>
> Gui Cao has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. The pull request contains one new commit since the last revision:
> 
>   Fix for robehn comment

Hi, I think we can simply move the sha256/512 part together with code for md5, chacha20 and sha1 and add put them into a single #if COMPILER2_OR_JVMCI block. Thanks.

-------------

PR Comment: https://git.openjdk.org/jdk/pull/18114#issuecomment-1982321606