Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 the V8 project authors. All rights reserved. | 1 // Copyright 2014 the V8 project authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "src/v8.h" | 5 #include "src/v8.h" |
| 6 | 6 |
| 7 #include "src/factory.h" | 7 #include "src/factory.h" |
| 8 #include "src/handles-inl.h" | 8 #include "src/handles-inl.h" |
| 9 #include "src/interpreter/constant-array-builder.h" | 9 #include "src/interpreter/constant-array-builder.h" |
| 10 #include "src/isolate.h" | 10 #include "src/isolate.h" |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 static const size_t k8BitCapacity = ConstantArrayBuilder::k8BitCapacity; | 22 static const size_t k8BitCapacity = ConstantArrayBuilder::k8BitCapacity; |
| 23 static const size_t k16BitCapacity = ConstantArrayBuilder::k16BitCapacity; | 23 static const size_t k16BitCapacity = ConstantArrayBuilder::k16BitCapacity; |
| 24 }; | 24 }; |
| 25 | 25 |
| 26 STATIC_CONST_MEMBER_DEFINITION const size_t | 26 STATIC_CONST_MEMBER_DEFINITION const size_t |
| 27 ConstantArrayBuilderTest::k16BitCapacity; | 27 ConstantArrayBuilderTest::k16BitCapacity; |
| 28 STATIC_CONST_MEMBER_DEFINITION const size_t | 28 STATIC_CONST_MEMBER_DEFINITION const size_t |
| 29 ConstantArrayBuilderTest::k8BitCapacity; | 29 ConstantArrayBuilderTest::k8BitCapacity; |
| 30 | 30 |
| 31 TEST_F(ConstantArrayBuilderTest, AllocateAllEntries) { | 31 TEST_F(ConstantArrayBuilderTest, AllocateAllEntries) { |
| 32 CanonicalHandleScope canonical(isolate()); | |
| 32 ConstantArrayBuilder builder(isolate(), zone()); | 33 ConstantArrayBuilder builder(isolate(), zone()); |
| 33 for (size_t i = 0; i < k16BitCapacity; i++) { | 34 for (size_t i = 0; i < k16BitCapacity; i++) { |
| 34 builder.Insert(handle(Smi::FromInt(static_cast<int>(i)), isolate())); | 35 builder.Insert(handle(Smi::FromInt(static_cast<int>(i)), isolate())); |
| 35 } | 36 } |
| 36 CHECK_EQ(builder.size(), k16BitCapacity); | 37 CHECK_EQ(builder.size(), k16BitCapacity); |
| 37 for (size_t i = 0; i < k16BitCapacity; i++) { | 38 for (size_t i = 0; i < k16BitCapacity; i++) { |
| 38 CHECK_EQ(Handle<Smi>::cast(builder.At(i))->value(), i); | 39 CHECK_EQ(Handle<Smi>::cast(builder.At(i))->value(), i); |
| 39 } | 40 } |
| 40 } | 41 } |
| 41 | 42 |
| 42 TEST_F(ConstantArrayBuilderTest, AllocateEntriesWithIdx8Reservations) { | 43 TEST_F(ConstantArrayBuilderTest, AllocateEntriesWithIdx8Reservations) { |
| 44 CanonicalHandleScope canonical(isolate()); | |
| 43 for (size_t reserved = 1; reserved < k8BitCapacity; reserved *= 3) { | 45 for (size_t reserved = 1; reserved < k8BitCapacity; reserved *= 3) { |
| 44 ConstantArrayBuilder builder(isolate(), zone()); | 46 ConstantArrayBuilder builder(isolate(), zone()); |
| 45 for (size_t i = 0; i < reserved; i++) { | 47 for (size_t i = 0; i < reserved; i++) { |
| 46 OperandSize operand_size = builder.CreateReservedEntry(); | 48 OperandSize operand_size = builder.CreateReservedEntry(); |
| 47 CHECK(operand_size == OperandSize::kByte); | 49 CHECK(operand_size == OperandSize::kByte); |
| 48 } | 50 } |
| 49 for (size_t i = 0; i < 2 * k8BitCapacity; i++) { | 51 for (size_t i = 0; i < 2 * k8BitCapacity; i++) { |
| 50 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); | 52 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); |
| 51 builder.Insert(object); | 53 builder.Insert(object); |
| 52 if (i + reserved < k8BitCapacity) { | 54 if (i + reserved < k8BitCapacity) { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 102 isolate()->factory()->NewNumberFromSize(2 * k8BitCapacity + i); | 104 isolate()->factory()->NewNumberFromSize(2 * k8BitCapacity + i); |
| 103 size_t index = builder.CommitReservedEntry(OperandSize::kByte, object); | 105 size_t index = builder.CommitReservedEntry(OperandSize::kByte, object); |
| 104 CHECK_EQ(static_cast<int>(index), k8BitCapacity - reserved + i); | 106 CHECK_EQ(static_cast<int>(index), k8BitCapacity - reserved + i); |
| 105 CHECK(builder.At(static_cast<int>(index))->SameValue(*object)); | 107 CHECK(builder.At(static_cast<int>(index))->SameValue(*object)); |
| 106 } | 108 } |
| 107 CHECK_EQ(builder.size(), 2 * k8BitCapacity + reserved); | 109 CHECK_EQ(builder.size(), 2 * k8BitCapacity + reserved); |
| 108 } | 110 } |
| 109 } | 111 } |
| 110 | 112 |
| 111 TEST_F(ConstantArrayBuilderTest, AllocateEntriesWithWideReservations) { | 113 TEST_F(ConstantArrayBuilderTest, AllocateEntriesWithWideReservations) { |
| 114 CanonicalHandleScope canonical(isolate()); | |
| 112 for (size_t reserved = 1; reserved < k8BitCapacity; reserved *= 3) { | 115 for (size_t reserved = 1; reserved < k8BitCapacity; reserved *= 3) { |
| 113 ConstantArrayBuilder builder(isolate(), zone()); | 116 ConstantArrayBuilder builder(isolate(), zone()); |
| 114 for (size_t i = 0; i < k8BitCapacity; i++) { | 117 for (size_t i = 0; i < k8BitCapacity; i++) { |
| 115 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); | 118 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); |
| 116 builder.Insert(object); | 119 builder.Insert(object); |
| 117 CHECK(builder.At(i)->SameValue(*object)); | 120 CHECK(builder.At(i)->SameValue(*object)); |
| 118 CHECK_EQ(builder.size(), i + 1); | 121 CHECK_EQ(builder.size(), i + 1); |
| 119 } | 122 } |
| 120 for (size_t i = 0; i < reserved; i++) { | 123 for (size_t i = 0; i < reserved; i++) { |
| 121 OperandSize operand_size = builder.CreateReservedEntry(); | 124 OperandSize operand_size = builder.CreateReservedEntry(); |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 138 CHECK(operand_size == OperandSize::kShort); | 141 CHECK(operand_size == OperandSize::kShort); |
| 139 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); | 142 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); |
| 140 builder.CommitReservedEntry(operand_size, object); | 143 builder.CommitReservedEntry(operand_size, object); |
| 141 CHECK_EQ(builder.size(), i + 1); | 144 CHECK_EQ(builder.size(), i + 1); |
| 142 } | 145 } |
| 143 } | 146 } |
| 144 } | 147 } |
| 145 | 148 |
| 146 | 149 |
| 147 TEST_F(ConstantArrayBuilderTest, ToFixedArray) { | 150 TEST_F(ConstantArrayBuilderTest, ToFixedArray) { |
| 151 CanonicalHandleScope canonical(isolate()); | |
| 148 ConstantArrayBuilder builder(isolate(), zone()); | 152 ConstantArrayBuilder builder(isolate(), zone()); |
| 149 static const size_t kNumberOfElements = 37; | 153 static const size_t kNumberOfElements = 37; |
| 150 for (size_t i = 0; i < kNumberOfElements; i++) { | 154 for (size_t i = 0; i < kNumberOfElements; i++) { |
| 151 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); | 155 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); |
| 152 builder.Insert(object); | 156 builder.Insert(object); |
| 153 CHECK(builder.At(i)->SameValue(*object)); | 157 CHECK(builder.At(i)->SameValue(*object)); |
| 154 } | 158 } |
| 155 Handle<FixedArray> constant_array = builder.ToFixedArray(); | 159 Handle<FixedArray> constant_array = builder.ToFixedArray(); |
| 156 CHECK_EQ(constant_array->length(), kNumberOfElements); | 160 CHECK_EQ(constant_array->length(), kNumberOfElements); |
| 157 for (size_t i = 0; i < kNumberOfElements; i++) { | 161 for (size_t i = 0; i < kNumberOfElements; i++) { |
| 158 CHECK(constant_array->get(static_cast<int>(i))->SameValue(*builder.At(i))); | 162 CHECK(constant_array->get(static_cast<int>(i))->SameValue(*builder.At(i))); |
| 159 } | 163 } |
| 160 } | 164 } |
| 161 | 165 |
| 162 TEST_F(ConstantArrayBuilderTest, ToLargeFixedArray) { | 166 TEST_F(ConstantArrayBuilderTest, ToLargeFixedArray) { |
| 167 CanonicalHandleScope canonical(isolate()); | |
| 163 ConstantArrayBuilder builder(isolate(), zone()); | 168 ConstantArrayBuilder builder(isolate(), zone()); |
| 164 static const size_t kNumberOfElements = 37373; | 169 static const size_t kNumberOfElements = 37373; |
| 165 for (size_t i = 0; i < kNumberOfElements; i++) { | 170 for (size_t i = 0; i < kNumberOfElements; i++) { |
| 166 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); | 171 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); |
| 167 builder.Insert(object); | 172 builder.Insert(object); |
| 168 CHECK(builder.At(i)->SameValue(*object)); | 173 CHECK(builder.At(i)->SameValue(*object)); |
| 169 } | 174 } |
| 170 Handle<FixedArray> constant_array = builder.ToFixedArray(); | 175 Handle<FixedArray> constant_array = builder.ToFixedArray(); |
| 171 CHECK_EQ(constant_array->length(), kNumberOfElements); | 176 CHECK_EQ(constant_array->length(), kNumberOfElements); |
| 172 for (size_t i = 0; i < kNumberOfElements; i++) { | 177 for (size_t i = 0; i < kNumberOfElements; i++) { |
| 173 CHECK(constant_array->get(static_cast<int>(i))->SameValue(*builder.At(i))); | 178 CHECK(constant_array->get(static_cast<int>(i))->SameValue(*builder.At(i))); |
| 174 } | 179 } |
| 175 } | 180 } |
| 176 | 181 |
| 177 TEST_F(ConstantArrayBuilderTest, GapFilledWhenLowReservationCommitted) { | 182 TEST_F(ConstantArrayBuilderTest, GapFilledWhenLowReservationCommitted) { |
|
Michael Starzinger
2016/08/05 09:19:06
nit: Can we add a CanonicalHandleScope here as wel
rmcilroy
2016/08/05 09:45:08
Opps missed this one. Done.
| |
| 178 ConstantArrayBuilder builder(isolate(), zone()); | 183 ConstantArrayBuilder builder(isolate(), zone()); |
| 179 for (size_t i = 0; i < k8BitCapacity; i++) { | 184 for (size_t i = 0; i < k8BitCapacity; i++) { |
| 180 OperandSize operand_size = builder.CreateReservedEntry(); | 185 OperandSize operand_size = builder.CreateReservedEntry(); |
| 181 CHECK(OperandSize::kByte == operand_size); | 186 CHECK(OperandSize::kByte == operand_size); |
| 182 CHECK_EQ(builder.size(), 0); | 187 CHECK_EQ(builder.size(), 0); |
| 183 } | 188 } |
| 184 for (size_t i = 0; i < k8BitCapacity; i++) { | 189 for (size_t i = 0; i < k8BitCapacity; i++) { |
| 185 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); | 190 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); |
| 186 builder.Insert(object); | 191 builder.Insert(object); |
| 187 CHECK_EQ(builder.size(), i + k8BitCapacity + 1); | 192 CHECK_EQ(builder.size(), i + k8BitCapacity + 1); |
| 188 } | 193 } |
| 189 for (size_t i = 0; i < k8BitCapacity; i++) { | 194 for (size_t i = 0; i < k8BitCapacity; i++) { |
| 190 builder.CommitReservedEntry(OperandSize::kByte, | 195 builder.CommitReservedEntry(OperandSize::kByte, |
| 191 builder.At(i + k8BitCapacity)); | 196 builder.At(i + k8BitCapacity)); |
| 192 CHECK_EQ(builder.size(), 2 * k8BitCapacity); | 197 CHECK_EQ(builder.size(), 2 * k8BitCapacity); |
| 193 } | 198 } |
| 194 for (size_t i = 0; i < k8BitCapacity; i++) { | 199 for (size_t i = 0; i < k8BitCapacity; i++) { |
| 195 Handle<Object> original = builder.At(k8BitCapacity + i); | 200 Handle<Object> original = builder.At(k8BitCapacity + i); |
| 196 Handle<Object> duplicate = builder.At(i); | 201 Handle<Object> duplicate = builder.At(i); |
| 197 CHECK(original->SameValue(*duplicate)); | 202 CHECK(original->SameValue(*duplicate)); |
| 198 Handle<Object> reference = isolate()->factory()->NewNumberFromSize(i); | 203 Handle<Object> reference = isolate()->factory()->NewNumberFromSize(i); |
| 199 CHECK(original->SameValue(*reference)); | 204 CHECK(original->SameValue(*reference)); |
| 200 } | 205 } |
| 201 } | 206 } |
| 202 | 207 |
| 203 TEST_F(ConstantArrayBuilderTest, GapNotFilledWhenLowReservationDiscarded) { | 208 TEST_F(ConstantArrayBuilderTest, GapNotFilledWhenLowReservationDiscarded) { |
| 209 CanonicalHandleScope canonical(isolate()); | |
| 204 ConstantArrayBuilder builder(isolate(), zone()); | 210 ConstantArrayBuilder builder(isolate(), zone()); |
| 205 for (size_t i = 0; i < k8BitCapacity; i++) { | 211 for (size_t i = 0; i < k8BitCapacity; i++) { |
| 206 OperandSize operand_size = builder.CreateReservedEntry(); | 212 OperandSize operand_size = builder.CreateReservedEntry(); |
| 207 CHECK(OperandSize::kByte == operand_size); | 213 CHECK(OperandSize::kByte == operand_size); |
| 208 CHECK_EQ(builder.size(), 0); | 214 CHECK_EQ(builder.size(), 0); |
| 209 } | 215 } |
| 210 for (size_t i = 0; i < k8BitCapacity; i++) { | 216 for (size_t i = 0; i < k8BitCapacity; i++) { |
| 211 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); | 217 Handle<Object> object = isolate()->factory()->NewNumberFromSize(i); |
| 212 builder.Insert(object); | 218 builder.Insert(object); |
| 213 CHECK_EQ(builder.size(), i + k8BitCapacity + 1); | 219 CHECK_EQ(builder.size(), i + k8BitCapacity + 1); |
| 214 } | 220 } |
| 215 for (size_t i = 0; i < k8BitCapacity; i++) { | 221 for (size_t i = 0; i < k8BitCapacity; i++) { |
| 216 builder.DiscardReservedEntry(OperandSize::kByte); | 222 builder.DiscardReservedEntry(OperandSize::kByte); |
| 217 builder.Insert(builder.At(i + k8BitCapacity)); | 223 builder.Insert(builder.At(i + k8BitCapacity)); |
| 218 CHECK_EQ(builder.size(), 2 * k8BitCapacity); | 224 CHECK_EQ(builder.size(), 2 * k8BitCapacity); |
| 219 } | 225 } |
| 220 for (size_t i = 0; i < k8BitCapacity; i++) { | 226 for (size_t i = 0; i < k8BitCapacity; i++) { |
| 221 Handle<Object> reference = isolate()->factory()->NewNumberFromSize(i); | 227 Handle<Object> reference = isolate()->factory()->NewNumberFromSize(i); |
| 222 Handle<Object> original = builder.At(k8BitCapacity + i); | 228 Handle<Object> original = builder.At(k8BitCapacity + i); |
| 223 CHECK(original->SameValue(*reference)); | 229 CHECK(original->SameValue(*reference)); |
| 224 Handle<Object> duplicate = builder.At(i); | 230 Handle<Object> duplicate = builder.At(i); |
| 225 CHECK(duplicate->SameValue(*isolate()->factory()->the_hole_value())); | 231 CHECK(duplicate->SameValue(*isolate()->factory()->the_hole_value())); |
| 226 } | 232 } |
| 227 } | 233 } |
| 228 | 234 |
| 229 TEST_F(ConstantArrayBuilderTest, HolesWithUnusedReservations) { | 235 TEST_F(ConstantArrayBuilderTest, HolesWithUnusedReservations) { |
| 236 CanonicalHandleScope canonical(isolate()); | |
| 230 static int kNumberOfHoles = 128; | 237 static int kNumberOfHoles = 128; |
| 231 ConstantArrayBuilder builder(isolate(), zone()); | 238 ConstantArrayBuilder builder(isolate(), zone()); |
| 232 for (int i = 0; i < kNumberOfHoles; ++i) { | 239 for (int i = 0; i < kNumberOfHoles; ++i) { |
| 233 CHECK_EQ(builder.CreateReservedEntry(), OperandSize::kByte); | 240 CHECK_EQ(builder.CreateReservedEntry(), OperandSize::kByte); |
| 234 } | 241 } |
| 235 for (int i = 0; i < 128; ++i) { | 242 for (int i = 0; i < 128; ++i) { |
| 236 CHECK_EQ(builder.Insert(isolate()->factory()->NewNumber(i)), i); | 243 CHECK_EQ(builder.Insert(isolate()->factory()->NewNumber(i)), i); |
| 237 } | 244 } |
| 238 CHECK_EQ(builder.Insert(isolate()->factory()->NewNumber(256)), 256); | 245 CHECK_EQ(builder.Insert(isolate()->factory()->NewNumber(256)), 256); |
| 239 | 246 |
| 240 Handle<FixedArray> constant_array = builder.ToFixedArray(); | 247 Handle<FixedArray> constant_array = builder.ToFixedArray(); |
| 241 CHECK_EQ(constant_array->length(), 257); | 248 CHECK_EQ(constant_array->length(), 257); |
| 242 for (int i = 128; i < 256; i++) { | 249 for (int i = 128; i < 256; i++) { |
| 243 CHECK(constant_array->get(i)->SameValue( | 250 CHECK(constant_array->get(i)->SameValue( |
| 244 *isolate()->factory()->the_hole_value())); | 251 *isolate()->factory()->the_hole_value())); |
| 245 } | 252 } |
| 246 CHECK(!constant_array->get(127)->SameValue( | 253 CHECK(!constant_array->get(127)->SameValue( |
| 247 *isolate()->factory()->the_hole_value())); | 254 *isolate()->factory()->the_hole_value())); |
| 248 CHECK(!constant_array->get(256)->SameValue( | 255 CHECK(!constant_array->get(256)->SameValue( |
| 249 *isolate()->factory()->the_hole_value())); | 256 *isolate()->factory()->the_hole_value())); |
| 250 } | 257 } |
| 251 | 258 |
| 252 TEST_F(ConstantArrayBuilderTest, ReservationsAtAllScales) { | 259 TEST_F(ConstantArrayBuilderTest, ReservationsAtAllScales) { |
| 260 CanonicalHandleScope canonical(isolate()); | |
| 253 ConstantArrayBuilder builder(isolate(), zone()); | 261 ConstantArrayBuilder builder(isolate(), zone()); |
| 254 for (int i = 0; i < 256; i++) { | 262 for (int i = 0; i < 256; i++) { |
| 255 CHECK_EQ(builder.CreateReservedEntry(), OperandSize::kByte); | 263 CHECK_EQ(builder.CreateReservedEntry(), OperandSize::kByte); |
| 256 } | 264 } |
| 257 for (int i = 256; i < 65536; ++i) { | 265 for (int i = 256; i < 65536; ++i) { |
| 258 CHECK_EQ(builder.CreateReservedEntry(), OperandSize::kShort); | 266 CHECK_EQ(builder.CreateReservedEntry(), OperandSize::kShort); |
| 259 } | 267 } |
| 260 for (int i = 65536; i < 131072; ++i) { | 268 for (int i = 65536; i < 131072; ++i) { |
| 261 CHECK_EQ(builder.CreateReservedEntry(), OperandSize::kQuad); | 269 CHECK_EQ(builder.CreateReservedEntry(), OperandSize::kQuad); |
| 262 } | 270 } |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 277 if (i == 0 || i == 256 || i == 65536) { | 285 if (i == 0 || i == 256 || i == 65536) { |
| 278 expected = isolate()->factory()->NewNumber(count++); | 286 expected = isolate()->factory()->NewNumber(count++); |
| 279 } else { | 287 } else { |
| 280 expected = isolate()->factory()->the_hole_value(); | 288 expected = isolate()->factory()->the_hole_value(); |
| 281 } | 289 } |
| 282 CHECK(constant_array->get(i)->SameValue(*expected)); | 290 CHECK(constant_array->get(i)->SameValue(*expected)); |
| 283 } | 291 } |
| 284 } | 292 } |
| 285 | 293 |
| 286 TEST_F(ConstantArrayBuilderTest, AllocateEntriesWithFixedReservations) { | 294 TEST_F(ConstantArrayBuilderTest, AllocateEntriesWithFixedReservations) { |
| 295 CanonicalHandleScope canonical(isolate()); | |
| 287 ConstantArrayBuilder builder(isolate(), zone()); | 296 ConstantArrayBuilder builder(isolate(), zone()); |
| 288 for (size_t i = 0; i < k16BitCapacity; i++) { | 297 for (size_t i = 0; i < k16BitCapacity; i++) { |
| 289 if ((i % 2) == 0) { | 298 if ((i % 2) == 0) { |
| 290 CHECK_EQ(i, builder.AllocateEntry()); | 299 CHECK_EQ(i, builder.AllocateEntry()); |
| 291 } else { | 300 } else { |
| 292 builder.Insert(handle(Smi::FromInt(static_cast<int>(i)), isolate())); | 301 builder.Insert(handle(Smi::FromInt(static_cast<int>(i)), isolate())); |
| 293 } | 302 } |
| 294 } | 303 } |
| 295 CHECK_EQ(builder.size(), k16BitCapacity); | 304 CHECK_EQ(builder.size(), k16BitCapacity); |
| 296 | 305 |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 313 | 322 |
| 314 // Check values after reserved entries are inserted. | 323 // Check values after reserved entries are inserted. |
| 315 for (size_t i = 0; i < k16BitCapacity; i++) { | 324 for (size_t i = 0; i < k16BitCapacity; i++) { |
| 316 CHECK_EQ(Handle<Smi>::cast(builder.At(i))->value(), i); | 325 CHECK_EQ(Handle<Smi>::cast(builder.At(i))->value(), i); |
| 317 } | 326 } |
| 318 } | 327 } |
| 319 | 328 |
| 320 } // namespace interpreter | 329 } // namespace interpreter |
| 321 } // namespace internal | 330 } // namespace internal |
| 322 } // namespace v8 | 331 } // namespace v8 |
| OLD | NEW |