From e4ccbb5d014bc154d5368a43fb95ebd9c79f26fa Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 15 Mar 2022 08:51:33 +0000 Subject: Revert^2 "Faster deduplication of `CodeInfo` tables." This reverts commit 8c7f649fff75ba98392931157292f06f7930f2b6. Reason for revert: Add hwasan exclusion annotation. Test: m test-art-host-gtest Test: testrunner.py --host --optimizing Bug: 181943478 Change-Id: Ifc4dec165a2977a08654d7ae094fe1aa8a5bbbe5 --- compiler/optimizing/stack_map_test.cc | 42 ----------------------------------- 1 file changed, 42 deletions(-) (limited to 'compiler/optimizing/stack_map_test.cc') diff --git a/compiler/optimizing/stack_map_test.cc b/compiler/optimizing/stack_map_test.cc index e83d37eb6b..f6a739e15a 100644 --- a/compiler/optimizing/stack_map_test.cc +++ b/compiler/optimizing/stack_map_test.cc @@ -724,46 +724,4 @@ TEST(StackMapTest, TestDeduplicateStackMask) { stack_map2.GetStackMaskIndex()); } -TEST(StackMapTest, TestDedupeBitTables) { - MallocArenaPool pool; - ArenaStack arena_stack(&pool); - ScopedArenaAllocator allocator(&arena_stack); - StackMapStream stream(&allocator, kRuntimeISA); - stream.BeginMethod(32, 0, 0, 2); - - stream.BeginStackMapEntry(0, 64 * kPcAlign); - stream.AddDexRegisterEntry(Kind::kInStack, 0); - stream.AddDexRegisterEntry(Kind::kConstant, -2); - stream.EndStackMapEntry(); - - stream.EndMethod(64 * kPcAlign); - ScopedArenaVector memory = stream.Encode(); - - std::vector out; - CodeInfo::Deduper deduper(&out); - size_t deduped1 = deduper.Dedupe(memory.data()); - size_t deduped2 = deduper.Dedupe(memory.data()); - - for (size_t deduped : { deduped1, deduped2 }) { - CodeInfo code_info(out.data() + deduped); - ASSERT_EQ(1u, code_info.GetNumberOfStackMaps()); - - StackMap stack_map = code_info.GetStackMapAt(0); - ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForDexPc(0))); - ASSERT_TRUE(stack_map.Equals(code_info.GetStackMapForNativePcOffset(64 * kPcAlign))); - ASSERT_EQ(0u, stack_map.GetDexPc()); - ASSERT_EQ(64u * kPcAlign, stack_map.GetNativePcOffset(kRuntimeISA)); - - ASSERT_TRUE(stack_map.HasDexRegisterMap()); - DexRegisterMap dex_register_map = code_info.GetDexRegisterMapOf(stack_map); - - ASSERT_EQ(Kind::kInStack, dex_register_map[0].GetKind()); - ASSERT_EQ(Kind::kConstant, dex_register_map[1].GetKind()); - ASSERT_EQ(0, dex_register_map[0].GetStackOffsetInBytes()); - ASSERT_EQ(-2, dex_register_map[1].GetConstant()); - } - - ASSERT_GT(memory.size() * 2, out.size()); -} - } // namespace art -- cgit v1.2.3-59-g8ed1b