Reviewers: Michael Starzinger,
Message:
Please take a look.
Description:
Revert r11835 'Unify promotion and allocation limit computation' due to V8
Splay
performance regression on Mac.
[email protected]
BUG=134183
Please review this at https://chromiumcodereview.appspot.com/10664013/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/heap.h
M src/heap.cc
Index: src/heap.cc
diff --git a/src/heap.cc b/src/heap.cc
index
f3c53a1fe68756e9a30feb8e453fe61aef4ef04d..d15d99d821295d866cfc45972b2ac711a8978836
100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -118,8 +118,8 @@ Heap::Heap()
debug_utils_(NULL),
#endif // DEBUG
new_space_high_promotion_mode_active_(false),
- old_gen_promotion_limit_(kMinPromotionLimit),
- old_gen_allocation_limit_(kMinAllocationLimit),
+ old_gen_promotion_limit_(kMinimumPromotionLimit),
+ old_gen_allocation_limit_(kMinimumAllocationLimit),
old_gen_limit_factor_(1),
size_of_old_gen_at_last_old_space_gc_(0),
external_allocation_limit_(0),
@@ -829,9 +829,9 @@ bool Heap::PerformGarbageCollection(GarbageCollector
collector,
}
old_gen_promotion_limit_ =
- OldGenLimit(size_of_old_gen_at_last_old_space_gc_,
kMinPromotionLimit);
+ OldGenPromotionLimit(size_of_old_gen_at_last_old_space_gc_);
old_gen_allocation_limit_ =
- OldGenLimit(size_of_old_gen_at_last_old_space_gc_,
kMinAllocationLimit);
+ OldGenAllocationLimit(size_of_old_gen_at_last_old_space_gc_);
old_gen_exhausted_ = false;
} else {
Index: src/heap.h
diff --git a/src/heap.h b/src/heap.h
index
93978ead5c95e689470703bf746e3af9ab0ec6d2..dd1f710b25224a9521636d12cb221871a39e4f59
100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -1359,13 +1359,24 @@ class Heap {
return max_old_generation_size_ - PromotedTotalSize();
}
- static const intptr_t kMinPromotionLimit = 5 * Page::kPageSize;
- static const intptr_t kMinAllocationLimit =
+ static const intptr_t kMinimumPromotionLimit = 5 * Page::kPageSize;
+ static const intptr_t kMinimumAllocationLimit =
8 * (Page::kPageSize > MB ? Page::kPageSize : MB);
- intptr_t OldGenLimit(intptr_t old_gen_size, intptr_t min_limit) {
+ intptr_t OldGenPromotionLimit(intptr_t old_gen_size) {
+ const int divisor = FLAG_stress_compaction ? 10 : 3;
+ intptr_t limit =
+ Max(old_gen_size + old_gen_size / divisor, kMinimumPromotionLimit);
+ limit += new_space_.Capacity();
+ limit *= old_gen_limit_factor_;
+ intptr_t halfway_to_the_max = (old_gen_size +
max_old_generation_size_) / 2;
+ return Min(limit, halfway_to_the_max);
+ }
+
+ intptr_t OldGenAllocationLimit(intptr_t old_gen_size) {
const int divisor = FLAG_stress_compaction ? 8 : 2;
- intptr_t limit = Max(old_gen_size + old_gen_size / divisor, min_limit);
+ intptr_t limit =
+ Max(old_gen_size + old_gen_size / divisor,
kMinimumAllocationLimit);
limit += new_space_.Capacity();
limit *= old_gen_limit_factor_;
intptr_t halfway_to_the_max = (old_gen_size +
max_old_generation_size_) / 2;
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
