Revision: 15839
Author: [email protected]
Date: Tue Jul 23 12:27:00 2013
Log: Support double allocations when folding allocation.
BUG=
[email protected]
Review URL: https://codereview.chromium.org/19956002
http://code.google.com/p/v8/source/detail?r=15839
Modified:
/branches/bleeding_edge/src/hydrogen-instructions.cc
/branches/bleeding_edge/test/mjsunit/allocation-folding.js
=======================================
--- /branches/bleeding_edge/src/hydrogen-instructions.cc Tue Jul 23
06:35:10 2013
+++ /branches/bleeding_edge/src/hydrogen-instructions.cc Tue Jul 23
12:27:00 2013
@@ -3267,12 +3267,9 @@
HValue* dominator_size = dominator_allocate_instr->size();
HValue* current_size = size();
// We can just fold allocations that are guaranteed in new space.
- // TODO(hpayer): Support double aligned allocations.
// TODO(hpayer): Add support for non-constant allocation in dominator.
- if (!GuaranteedInNewSpace() || MustAllocateDoubleAligned() ||
- !current_size->IsInteger32Constant() ||
+ if (!GuaranteedInNewSpace() || !current_size->IsInteger32Constant() ||
!dominator_allocate_instr->GuaranteedInNewSpace() ||
- dominator_allocate_instr->MustAllocateDoubleAligned() ||
!dominator_size->IsInteger32Constant()) {
if (FLAG_trace_allocation_folding) {
PrintF("#%d (%s) cannot fold into #%d (%s)\n",
@@ -3287,6 +3284,17 @@
int32_t current_size_constant =
HConstant::cast(current_size)->GetInteger32Constant();
int32_t new_dominator_size = dominator_size_constant +
current_size_constant;
+
+ if (MustAllocateDoubleAligned()) {
+ if (!dominator_allocate_instr->MustAllocateDoubleAligned()) {
+
dominator_allocate_instr->SetFlags(HAllocate::ALLOCATE_DOUBLE_ALIGNED);
+ }
+ if ((dominator_size_constant & kDoubleAlignmentMask) != 0) {
+ dominator_size_constant += kDoubleSize / 2;
+ new_dominator_size += kDoubleSize / 2;
+ }
+ }
+
if (new_dominator_size > Page::kMaxNonCodeHeapObjectSize) {
if (FLAG_trace_allocation_folding) {
PrintF("#%d (%s) cannot fold into #%d (%s) due to size: %d\n",
=======================================
--- /branches/bleeding_edge/test/mjsunit/allocation-folding.js Fri Jul 12
08:06:50 2013
+++ /branches/bleeding_edge/test/mjsunit/allocation-folding.js Tue Jul 23
12:27:00 2013
@@ -25,7 +25,10 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Flags: --allow-natives-syntax --nouse-osr
+// Flags: --allow-natives-syntax --nouse-osr --expose-gc
+
+// Test loop barrier when folding allocations.
+
function f() {
var elem1 = [1,2,3];
for (var i=0; i < 100000; i++) {
@@ -39,8 +42,38 @@
%OptimizeFunctionOnNextCall(f);
var result = f();
-for (var i=0; i < 100000; i++) {
- var bar = [1];
+gc();
+
+assertEquals(result[2], 3);
+
+// Test allocation folding of doubles.
+
+function doubles() {
+ var elem1 = [1.1, 1.2];
+ var elem2 = [2.1, 2.2];
+ return elem2;
+}
+
+doubles(); doubles(); doubles();
+%OptimizeFunctionOnNextCall(doubles);
+var result = doubles();
+
+gc();
+
+assertEquals(result[1], 2.2);
+
+// Test allocation folding of doubles into non-doubles.
+
+function doubles_int() {
+ var elem1 = [2, 3];
+ var elem2 = [2.1, 3.1];
+ return elem2;
}
-assertEquals(result[2], 3);
+doubles_int(); doubles_int(); doubles_int();
+%OptimizeFunctionOnNextCall(doubles_int);
+var result = doubles_int();
+
+gc();
+
+assertEquals(result[1], 3.1);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
