[JIT] Backport 8318446: C2: optimize stores into primitive arrays by … #921
Conversation
…combining values into larger store Summary: include these patches for merge stores optimization 8318446: C2: optimize stores into primitive arrays by combining values into larger store 8319690: [AArch64] C2 compilation hits offset_ok_for_immed: assert "c2 compiler bug" 8335390: C2 MergeStores: wrong result with Unsafe 8331311: C2: Big Endian Port of 8318446: optimize stores into primitive arrays by combining values into larger store 8331085: Crash in MergePrimitiveArrayStores::is_compatible_store() 8331252: C2: MergeStores: handle negative shift values 8331054: C2 MergeStores: assert failed: unexpected basic type after JDK-8318446 and JDK-8329555 8335392: C2 MergeStores: enhanced pointer parsing 8334342: Add MergeStore JMH benchmarks 8226411: C2: Avoid memory barriers around off-heap unsafe accesses Fix is_ConI() query after port 8318446 Testing: CI/CD Reviewers: zhuoren.wz, MaxXSoft Issue: dragonwell-project#920
|
LGTM |
There was a problem hiding this comment.
这个文件在 JDK-8335392 的 patch 中叫 test_no_overflow_int.cpp 而非 test_no_overflow.cpp：openjdk/jdk@f3671be#diff-65c7ade01f9f7b974da5242a049166feed0da47c34f7656a357039b4842bc2b5
修改文件名的原因是什么呢？
| @@ -312,6 +312,7 @@ bool LibraryCallKit::try_to_inline(int predicate) { | |||
| case vmIntrinsics::_equalsU: return inline_string_equals(StrIntrinsicNode::UU); | |||
|
|
|||
| case vmIntrinsics::_toBytesStringU: return inline_string_toBytesU(); | |||
|
|
|||
There was a problem hiding this comment.
这行更改在 PR 描述中提到的所有 patch 中都没出现，且在上游最新的代码中也没出现。
参考 OpenJDK 中的相关提交：openjdk/jdk@eabb5cc#diff-1929ace9ae6df116e2fa2a718ed3924d9dae9a2daea454ca9a78177c21477aa3
| return Status::make(def_store, cfg_status_for_pair(use_store, def_store)); | ||
| } | ||
|
|
||
| static int round_down_power_of_2(uint value) { |
There was a problem hiding this comment.
这部分看起来本来应该是在 src/hotspot/share/utilities/powerOfTwo.hpp 里的，但 dw11 没这个文件。
此外，这部分的语义和原有的相比缺了一个 assert。
|
|
||
| #ifndef PRODUCT | ||
| bool is_trace_basic() const { | ||
| return _trace; |
There was a problem hiding this comment.
看上去这里和 compilerDirectives.hpp 对 TraceMergeStores做了简化处理，改成了统一的 boolean flag。
There was a problem hiding this comment.
是的，简化为用TraceMergeStores来控制trace，原patch中加了多个标志位，需要在compilerOracle中引入更多的改动
…combining values into larger store
Summary: include these patches for merge stores optimization
8318446: C2: optimize stores into primitive arrays by combining values into larger store
8319690: [AArch64] C2 compilation hits offset_ok_for_immed: assert "c2 compiler bug"
8335390: C2 MergeStores: wrong result with Unsafe
8331311: C2: Big Endian Port of 8318446: optimize stores into primitive arrays by combining values into larger store
8331085: Crash in MergePrimitiveArrayStores::is_compatible_store()
8331252: C2: MergeStores: handle negative shift values
8331054: C2 MergeStores: assert failed: unexpected basic type after JDK-8318446 and JDK-8329555
8335392: C2 MergeStores: enhanced pointer parsing
8334342: Add MergeStore JMH benchmarks
8226411: C2: Avoid memory barriers around off-heap unsafe accesses
Fix is_ConI() query after port 8318446
Testing: CI/CD
Reviewers: zhuoren.wz, MaxXSoft
Issue: #920