infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-19 23:48:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

8267833: Improve G1CardSetInlinePtr::add()

Browse Source 
Reviewed-by: tschatzl, kbarrett
This commit is contained in:
Ivan Walulya 2021-08-16 13:08:36 +00:00
parent 69cc588fce
commit 83d0e128e3
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/share/gc/g1/g1CardSetContainers.hpp
View File

@ -94,6 +94,9 @@ class G1CardSetInlinePtr : public StackObj {
uint result = ((uintptr_t)value >> card_pos) & (((uintptr_t)1 << bits_per_card) - 1);
return result;
}
uint find(uint const card_idx, uint const bits_per_card, uint start_at, uint num_elems);
public:
G1CardSetInlinePtr() : _value_addr(nullptr), _value((CardSetPtr)G1CardSet::CardSetInlinePtr) { }

30
src/hotspot/share/gc/g1/g1CardSetContainers.inline.hpp
View File

@ -47,10 +47,14 @@ inline G1CardSetInlinePtr::CardSetPtr G1CardSetInlinePtr::merge(CardSetPtr orig_
inline G1AddCardResult G1CardSetInlinePtr::add(uint card_idx, uint bits_per_card, uint max_cards_in_inline_ptr) {
assert(_value_addr != nullptr, "No value address available, cannot add to set.");
uint cur_idx = 0;
while (true) {
uint num_elems = num_cards_in(_value);
if (num_elems > 0) {
cur_idx = find(card_idx, bits_per_card, cur_idx, num_elems);
}
// Check if the card is already stored in the pointer.
if (contains(card_idx, bits_per_card)) {
if (cur_idx < num_elems) {
return Found;
}
// Check if there is actually enough space.
@ -72,19 +76,29 @@ inline G1AddCardResult G1CardSetInlinePtr::add(uint card_idx, uint bits_per_card
}
}
inline bool G1CardSetInlinePtr::contains(uint card_idx, uint bits_per_card) {
uint num_elems = num_cards_in(_value);
uintptr_t const card_mask = (1 << bits_per_card) - 1;
inline uint G1CardSetInlinePtr::find(uint card_idx, uint bits_per_card, uint start_at, uint num_elems) {
assert(start_at < num_elems, "Precondition!");
uintptr_t const card_mask = (1 << bits_per_card) - 1;
uintptr_t value = ((uintptr_t)_value) >> card_pos_for(start_at, bits_per_card);
uintptr_t value = ((uintptr_t)_value) >> card_pos_for(0, bits_per_card);
// Check if the card is already stored in the pointer.
for (uint cur_idx = 0; cur_idx < num_elems; cur_idx++) {
for (uint cur_idx = start_at; cur_idx < num_elems; cur_idx++) {
if ((value & card_mask) == card_idx) {
return true;
return cur_idx;
}
value >>= bits_per_card;
}
return false;
return num_elems;
}
inline bool G1CardSetInlinePtr::contains(uint card_idx, uint bits_per_card) {
uint num_elems = num_cards_in(_value);
if (num_elems == 0) {
return false;
}
uint cur_idx = find(card_idx, bits_per_card, 0, num_elems);
return cur_idx < num_elems;
}
template <class CardVisitor>