RFR: 8260012: Reduce inclusion of collectedHeap.hpp and heapInspection.hpp [v4]

Ioi Lam iklam at openjdk.java.net
Thu Feb 4 04:09:06 UTC 2021


> collectedHeap.hpp is included by 477 out of 1000 .o files in HotSpot. This file in turn includes many other complex header files.
> 
> In many cases, an object file only directly includes this file via:
> 
> - memAllocator.hpp (which does not actually use collectedHeap.hpp)
> - oop.inline.hpp and compressedOops.inline.hpp (only use collectedHeap.hpp in asserts via `Universe::heap()->is_in()`).
> 
> By refactoring the above 3 files, we can reduce the .o files that include collectedHeap.hpp to 242.
> 
> This RFE also removes the unnecessary inclusion of heapInspection.hpp from collectedHeap.hpp.
> 
> Build time of HotSpot is reduced for about 1%.
> 
> Tested with mach5: tier1, builds-tier2, builds-tier3, builds-tier4 and builds-tier5. Also locally: aarch64, arm, ppc64, s390, x86, and zero.

Ioi Lam has updated the pull request with a new target base due to a merge or a rebase. The incremental webrev excludes the unrelated changes brought in by the merge/rebase. The pull request contains five additional commits since the last revision:

 - Merge branch 'master' into 8260012-reduce-inclue-collectedHeap-heapInspection-hpp
 - Merge branch 'master' of https://github.com/openjdk/jdk into 8260012-reduce-inclue-collectedHeap-heapInspection-hpp
 - @tschatzl and @stefank comments
 - Merge branch 'master' into 8260012-reduce-inclue-collectedHeap-heapInspection-hpp
 - 8260012: Reduce inclusion of collectedHeap.hpp and heapInspection.hpp

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

Changes:
  - all: https://git.openjdk.java.net/jdk/pull/2347/files
  - new: https://git.openjdk.java.net/jdk/pull/2347/files/7d9015d2..cfd70b3c

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=jdk&pr=2347&range=03
 - incr: https://webrevs.openjdk.java.net/?repo=jdk&pr=2347&range=02-03

  Stats: 2645 lines in 56 files changed: 2497 ins; 69 del; 79 mod
  Patch: https://git.openjdk.java.net/jdk/pull/2347.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk pull/2347/head:pull/2347

PR: https://git.openjdk.java.net/jdk/pull/2347



More information about the hotspot-gc-dev mailing list