stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8047330: Remove unrolled card loops in G1 SparsePRTEntry

Browse Source 
Reviewed-by: ehelin, mgerdin, tschatzl
This commit is contained in:
Andreas Sjoberg 2015-05-20 10:45:40 +02:00 committed by Bengt Rutisson
parent 9fb89f6d01
commit c8fa7eb4dd
1 changed files with 2 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
hotspot/src/share/vm/gc/g1/sparsePRT.cpp
View File

@ -34,106 +34,42 @@
#define SPARSE_PRT_VERBOSE 0 #define SPARSE_PRT_VERBOSE 0
#define UNROLL_CARD_LOOPS 1
void SparsePRTEntry::init(RegionIdx_t region_ind) { void SparsePRTEntry::init(RegionIdx_t region_ind) {
_region_ind = region_ind; _region_ind = region_ind;
_next_index = NullEntry; _next_index = NullEntry;
#if UNROLL_CARD_LOOPS for (int i = 0; i < cards_num(); i++) {
assert((cards_num() & (UnrollFactor - 1)) == 0, "Invalid number of cards in the entry");
for (int i = 0; i < cards_num(); i += UnrollFactor) {
_cards[i] = NullEntry; _cards[i] = NullEntry;
_cards[i + 1] = NullEntry;
_cards[i + 2] = NullEntry;
_cards[i + 3] = NullEntry;
} }
#else
for (int i = 0; i < cards_num(); i++)
_cards[i] = NullEntry;
#endif
} }
bool SparsePRTEntry::contains_card(CardIdx_t card_index) const { bool SparsePRTEntry::contains_card(CardIdx_t card_index) const {
#if UNROLL_CARD_LOOPS
assert((cards_num() & (UnrollFactor - 1)) == 0, "Invalid number of cards in the entry");
for (int i = 0; i < cards_num(); i += UnrollFactor) {
if (_cards[i] == card_index ||
_cards[i + 1] == card_index ||
_cards[i + 2] == card_index ||
_cards[i + 3] == card_index) return true;
}
#else
for (int i = 0; i < cards_num(); i++) { for (int i = 0; i < cards_num(); i++) {
if (_cards[i] == card_index) return true; if (_cards[i] == card_index) return true;
} }
#endif
// Otherwise, we're full.
return false; return false;
} }
int SparsePRTEntry::num_valid_cards() const { int SparsePRTEntry::num_valid_cards() const {
int sum = 0; int sum = 0;
#if UNROLL_CARD_LOOPS
assert((cards_num() & (UnrollFactor - 1)) == 0, "Invalid number of cards in the entry");
for (int i = 0; i < cards_num(); i += UnrollFactor) {
sum += (_cards[i] != NullEntry);
sum += (_cards[i + 1] != NullEntry);
sum += (_cards[i + 2] != NullEntry);
sum += (_cards[i + 3] != NullEntry);
}
#else
for (int i = 0; i < cards_num(); i++) { for (int i = 0; i < cards_num(); i++) {
sum += (_cards[i] != NullEntry); sum += (_cards[i] != NullEntry);
} }
#endif
// Otherwise, we're full.
return sum; return sum;
} }
SparsePRTEntry::AddCardResult SparsePRTEntry::add_card(CardIdx_t card_index) { SparsePRTEntry::AddCardResult SparsePRTEntry::add_card(CardIdx_t card_index) {
#if UNROLL_CARD_LOOPS
assert((cards_num() & (UnrollFactor - 1)) == 0, "Invalid number of cards in the entry");
CardIdx_t c;
for (int i = 0; i < cards_num(); i += UnrollFactor) {
c = _cards[i];
if (c == card_index) return found;
if (c == NullEntry) { _cards[i] = card_index; return added; }
c = _cards[i + 1];
if (c == card_index) return found;
if (c == NullEntry) { _cards[i + 1] = card_index; return added; }
c = _cards[i + 2];
if (c == card_index) return found;
if (c == NullEntry) { _cards[i + 2] = card_index; return added; }
c = _cards[i + 3];
if (c == card_index) return found;
if (c == NullEntry) { _cards[i + 3] = card_index; return added; }
}
#else
for (int i = 0; i < cards_num(); i++) { for (int i = 0; i < cards_num(); i++) {
CardIdx_t c = _cards[i]; CardIdx_t c = _cards[i];
if (c == card_index) return found; if (c == card_index) return found;
if (c == NullEntry) { _cards[i] = card_index; return added; } if (c == NullEntry) { _cards[i] = card_index; return added; }
} }
#endif
// Otherwise, we're full. // Otherwise, we're full.
return overflow; return overflow;
} }
void SparsePRTEntry::copy_cards(CardIdx_t* cards) const { void SparsePRTEntry::copy_cards(CardIdx_t* cards) const {
#if UNROLL_CARD_LOOPS memcpy(cards, _cards, cards_num() * sizeof(CardIdx_t));
assert((cards_num() & (UnrollFactor - 1)) == 0, "Invalid number of cards in the entry");
for (int i = 0; i < cards_num(); i += UnrollFactor) {
cards[i] = _cards[i];
cards[i + 1] = _cards[i + 1];
cards[i + 2] = _cards[i + 2];
cards[i + 3] = _cards[i + 3];
}
#else
for (int i = 0; i < cards_num(); i++) {
cards[i] = _cards[i];
}
#endif
} }
void SparsePRTEntry::copy_cards(SparsePRTEntry* e) const { void SparsePRTEntry::copy_cards(SparsePRTEntry* e) const {