[master] RFR: 8317352: [Lilliput] Sync with upstreaming PRs

Roman Kennke rkennke at openjdk.org
Tue Oct 10 20:29:34 UTC 2023


On Tue, 10 Oct 2023 17:53:08 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:

>> This PR syncs the Lilliput mainline repo with the changes that we are proposing in the upstreaming PRs. We have accumulated a number of diversions. Ideally, the Lilliput repo should mirror what is proposed for upstreaming, except where it integrates the upstreaming PRs in various places.
>> 
>> Notable changes:
>> - Removed leftovers from Klass encoding removal
>> - Removed heap object stats. This is currently better done by JOL.
>> - Sliding GC template optimizations and fallback for G1
>> - Re-enabled many tests
>> 
>> There is a remaining problem with CDS (the changes in archiveBuilder.cpp) which affect only Windows, which I am sorting out separately.
>> 
>> Testing:
>>  - [x] All changed tests +UCOH
>>  - [x]  All changed tests -UCOH
>>  - [x] tier1 x86_64 +UCOH
>>  - [x] tier1 x86_64 -UCOH
>>  - [x] tier1 aarch64 +UCOH
>>  - [x] tier1 aarch64 -UCOH
>>  - [x] tier2 x86_64 +UCOH
>>  - [x] tier2 x86_64 -UCOH
>>  - [x] tier2 aarch64 +UCOH
>>  - [x] tier2 aarch64 -UCOH
>
> src/hotspot/cpu/x86/x86_64.ad line 5336:
> 
>> 5334:   format %{ "movl    $dst, $mem\t# compressed klass ptr" %}
>> 5335:   ins_encode %{
>> 5336:     assert($mem$$disp == TypeOopPtr::klass_offset_in_bytes(), "expect correct offset 4, but got: %d", $mem$$disp);
> 
> Haven't we decided to avoid changing `oopDesc::klass_offset_in_bytes` to `TypeOopPtr::klass_offset_in_bytes`? I remember this discussion, but cannot find the reference it it right now.

Right. That was in Lilliput 21 (and/or 17). Shall we also get rid of the extra assert that the change provides us here? And also in the upstreaming PR https://github.com/openjdk/jdk/pull/13961?

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

PR Review Comment: https://git.openjdk.org/lilliput/pull/110#discussion_r1353233214


More information about the lilliput-dev mailing list