RFR: 8332499: Gtest codestrings.validate_vm fail on linux x64 when hsdis is present [v5]

Christian Hagedorn chagedorn at openjdk.org
Tue Jun 4 15:03:27 UTC 2024


On Tue, 28 May 2024 15:47:25 GMT, SendaoYan <syan at openjdk.org> wrote:

>> Hi all,
>>   There's some arch-specific code to trim trailing entries as descripted in [JDK-8332499](https://bugs.openjdk.org/browse/JDK-8332499). Only change the gtest testcase, the risk is low.
>> 
>> On linux x86_64, before this PR, after deal with `std::regex_replace(tmp4, std::regex("\\s+<addr>:\\s+hlt[ \\t]+(?!\\n\\s+;;)"), "")`, the output differents because the first output has trailing empty spaces, show as below:
>> 
>> -  <addr>:   nop    
>> +  <addr>:   nop
>> 
>> So we need to delete the empty spaces after `<addr>:   nop` use `std::regex_replace(tmp5, std::regex("(\\s+<addr>:\\s+nop)[ \\t]*"), "$1")`
>> 
>> 
>> Additional test:
>> - [x] codestrings.validate_vm on linux x64
>> - [x] codestrings.validate_vm on linux aarch64
>> - [x] codestrings.validate_vm on linux riscv64
>
> SendaoYan has updated the pull request incrementally with two additional commits since the last revision:
> 
>  - Merge branch 'jbs8332499' of github.com:sendaoYan/jdk-ysd into jbs8332499
>  - delete the empty spaces after <addr>:   nop

Looks good to me, too.

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

Marked as reviewed by chagedorn (Reviewer).

PR Review: https://git.openjdk.org/jdk/pull/19309#pullrequestreview-2096681027


More information about the hotspot-compiler-dev mailing list