8320564: RISC-V: Minimal build failed after JDK-8316592

[feilongjiang]

Hi, please review this patch that fix the minimal build failed for riscv.

Error log for minimal build:

ERROR: Build failed for target 'all' in configuration 'linux-riscv64-minimal-fastdebug' (exit code 2)
Stopping javac server

=== Output from failing command(s) repeated here ===
* For target hotspot_variant-minimal_libjvm_objs_macroAssembler_riscv.o:
/home/jiangfeilong/workspace/jdk/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp: In member function 'void MacroAssembler::wide_madd(Register, Register, Register, Register, Register, Register)':
/home/jiangfeilong/workspace/jdk/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp:2064:3: error: 'cad' was not declared in this scope
 2064 | cad(sum_lo, sum_lo, tmp1, tmp1); // Add tmp1 to sum_lo with carry output to tmp1
      | ^~~
/home/jiangfeilong/workspace/jdk/src/hotspot/cpu/riscv/macroAssembler_riscv.cpp:2065:3: error: 'adc' was not declared in this scope; did you mean 'add'?
 2065 | adc(sum_hi, sum_hi, tmp2, tmp1); // Add tmp2 with carry to sum_hi
      | ^~~
      | add

* All command lines available in /home/jiangfeilong/workspace/jdk/build/linux-riscv64-minimal-fastdebug/make-support/failure-logs.
=== End of repeated output ===

The root cause is that cad and adc are defined under COMPILER2 macro but new methods wide_mul and wide_madd are not.

Testing:

• linux-riscv minimal fastdebug cross-compile

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8320564: RISC-V: Minimal build failed after JDK-8316592 (Bug - P3)

Reviewers

• Fei Yang (@RealFYang - Reviewer)
• Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/16781/head:pull/16781
$ git checkout pull/16781

Update a local copy of the PR:
$ git checkout pull/16781
$ git pull https://git.openjdk.org/jdk.git pull/16781/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16781

View PR using the GUI difftool:
$ git pr show -t 16781

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/16781.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back fjiang! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@feilongjiang The following label will be automatically applied to this pull request:

• hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (1e131a27)

[feilongjiang]

/label remove hotspot
/label add hotspot-compiler

[openjdk]

@feilongjiang
The hotspot label was successfully removed.

[openjdk]

@feilongjiang
The hotspot-compiler label was successfully added.

[openjdk]

@feilongjiang This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8320564: RISC-V: Minimal build failed after JDK-8316592

Reviewed-by: fyang, shade

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 13 new commits pushed to the master branch:

• 30462f9: 8318986: Improve GenericWaitBarrier performance
• 407cdd4: 8320207: doclet incorrectly chooses code font for a See Also link
• 1629a90: 8320331: G1 Full GC Heap verification relies on metadata not reset before verification
• 93bdc2a: 8306055: Add a built-in Catalog to JDK XML module
• a4bd9e4: 8319440: RISC-V: jdk can't be built with clang due to register keyword
• 524da14: 8320418: PPC64: invokevfinal_helper duplicates code to handle ResolvedMethodEntry
• 5d4a54b: 8319449: compiler/print/CompileCommandPrintMemStat.java fails on Graal
• 35526d0: 8257076: os::scan_pages is empty on all platforms
• 25cebe8: 8317799: AIX PPC64: FFI symbol lookup doesn't find symbols
• c39d001: 8319137: release _object in ObjectMonitor dtor to avoid races
• ... and 3 more: https://git.openjdk.org/jdk/compare/5e818318eac8cda7d42b599dc7d7d44e5c299a9f...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[feilongjiang]

@RealFYang @shipilev -- Thanks!
/integrate

[openjdk]

Going to push as commit 864b39a.
Since your change was applied there have been 17 commits pushed to the master branch:

• 2bb4b93: 8319569: Several java/util tests should be updated to accept VM flags
• 6016536: 8314745: JFR: @StackFilter
• aac4318: 8320577: Improve MessageHeader's toString() function to make HttpURLConnection's debug log readable
• 572b14a: 8320536: problemlist failing serviceability/attach/ConcAttachTest.java test on macosx
• 30462f9: 8318986: Improve GenericWaitBarrier performance
• 407cdd4: 8320207: doclet incorrectly chooses code font for a See Also link
• 1629a90: 8320331: G1 Full GC Heap verification relies on metadata not reset before verification
• 93bdc2a: 8306055: Add a built-in Catalog to JDK XML module
• a4bd9e4: 8319440: RISC-V: jdk can't be built with clang due to register keyword
• 524da14: 8320418: PPC64: invokevfinal_helper duplicates code to handle ResolvedMethodEntry
• ... and 7 more: https://git.openjdk.org/jdk/compare/5e818318eac8cda7d42b599dc7d7d44e5c299a9f...master

Your commit was automatically rebased without conflicts.

[openjdk]

@feilongjiang Pushed as commit 864b39a.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.