diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-09-02 15:17:15 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-09-08 12:15:07 +0100 |
| commit | 3946844c34ad965515f677084b07d663d70ad1b8 (patch) | |
| tree | 0d85bfba2ff69c34a2897351d1e50a1464509305 /compiler/optimizing/stack_map_test.cc | |
| parent | e2c23739c6395a83b30ece38f8a2e9e1bf7cf3ce (diff) | |
Runtime support for the new stack maps for the opt compiler.
Now most of the methods supported by the compiler can be optimized,
instead of using the baseline.
Change-Id: I80ab36a34913fa4e7dd576c7bf55af63594dc1fa
Diffstat (limited to 'compiler/optimizing/stack_map_test.cc')
| -rw-r--r-- | compiler/optimizing/stack_map_test.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/compiler/optimizing/stack_map_test.cc b/compiler/optimizing/stack_map_test.cc index a70259e7b9..5ee6ae049c 100644 --- a/compiler/optimizing/stack_map_test.cc +++ b/compiler/optimizing/stack_map_test.cc @@ -34,7 +34,7 @@ bool SameBits(MemoryRegion region, const BitVector& bit_vector) { TEST(StackMapTest, Test1) { ArenaPool pool; ArenaAllocator arena(&pool); - StackMapStream<size_t> stream(&arena); + StackMapStream stream(&arena); ArenaBitVector sp_mask(&arena, 0, false); stream.AddStackMapEntry(0, 64, 0x3, &sp_mask, 2, 0); @@ -46,15 +46,15 @@ TEST(StackMapTest, Test1) { MemoryRegion region(memory, size); stream.FillIn(region); - CodeInfo<size_t> code_info(region); + CodeInfo code_info(region); ASSERT_EQ(0u, code_info.GetStackMaskSize()); ASSERT_EQ(1u, code_info.GetNumberOfStackMaps()); - StackMap<size_t> stack_map = code_info.GetStackMapAt(0); + StackMap stack_map = code_info.GetStackMapAt(0); ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForDexPc(0))); - ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForNativePc(64))); + ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForNativePcOffset(64))); ASSERT_EQ(0u, stack_map.GetDexPc()); - ASSERT_EQ(64u, stack_map.GetNativePc()); + ASSERT_EQ(64u, stack_map.GetNativePcOffset()); ASSERT_EQ(0x3u, stack_map.GetRegisterMask()); ASSERT_FALSE(stack_map.HasInlineInfo()); @@ -71,7 +71,7 @@ TEST(StackMapTest, Test1) { TEST(StackMapTest, Test2) { ArenaPool pool; ArenaAllocator arena(&pool); - StackMapStream<size_t> stream(&arena); + StackMapStream stream(&arena); ArenaBitVector sp_mask1(&arena, 0, true); sp_mask1.SetBit(2); @@ -93,15 +93,15 @@ TEST(StackMapTest, Test2) { MemoryRegion region(memory, size); stream.FillIn(region); - CodeInfo<size_t> code_info(region); + CodeInfo code_info(region); ASSERT_EQ(1u, code_info.GetStackMaskSize()); ASSERT_EQ(2u, code_info.GetNumberOfStackMaps()); - StackMap<size_t> stack_map = code_info.GetStackMapAt(0); + StackMap stack_map = code_info.GetStackMapAt(0); ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForDexPc(0))); - ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForNativePc(64))); + ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForNativePcOffset(64))); ASSERT_EQ(0u, stack_map.GetDexPc()); - ASSERT_EQ(64u, stack_map.GetNativePc()); + ASSERT_EQ(64u, stack_map.GetNativePcOffset()); ASSERT_EQ(0x3u, stack_map.GetRegisterMask()); MemoryRegion stack_mask = stack_map.GetStackMask(); @@ -120,9 +120,9 @@ TEST(StackMapTest, Test2) { stack_map = code_info.GetStackMapAt(1); ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForDexPc(1u))); - ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForNativePc(128u))); + ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForNativePcOffset(128u))); ASSERT_EQ(1u, stack_map.GetDexPc()); - ASSERT_EQ(128u, stack_map.GetNativePc()); + ASSERT_EQ(128u, stack_map.GetNativePcOffset()); ASSERT_EQ(0xFFu, stack_map.GetRegisterMask()); stack_mask = stack_map.GetStackMask(); |