From ca6fff898afcb62491458ae8bcd428bfb3043da1 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 3 Oct 2017 14:49:14 +0100 Subject: ART: Use ScopedArenaAllocator for pass-local data. Passes using local ArenaAllocator were hiding their memory usage from the allocation counting, making it difficult to track down where memory was used. Using ScopedArenaAllocator reveals the memory usage. This changes the HGraph constructor which requires a lot of changes in tests. Refactor these tests to limit the amount of work needed the next time we change that constructor. Test: m test-art-host-gtest Test: testrunner.py --host Test: Build with kArenaAllocatorCountAllocations = true. Bug: 64312607 Change-Id: I34939e4086b500d6e827ff3ef2211d1a421ac91a --- compiler/optimizing/find_loops_test.cc | 58 +++++++++------------------------- 1 file changed, 15 insertions(+), 43 deletions(-) (limited to 'compiler/optimizing/find_loops_test.cc') diff --git a/compiler/optimizing/find_loops_test.cc b/compiler/optimizing/find_loops_test.cc index bbd28f5c46..c91752855b 100644 --- a/compiler/optimizing/find_loops_test.cc +++ b/compiler/optimizing/find_loops_test.cc @@ -27,7 +27,7 @@ namespace art { -class FindLoopsTest : public CommonCompilerTest {}; +class FindLoopsTest : public OptimizingUnitTest {}; TEST_F(FindLoopsTest, CFG1) { // Constant is not used. @@ -35,9 +35,7 @@ TEST_F(FindLoopsTest, CFG1) { Instruction::CONST_4 | 0 | 0, Instruction::RETURN_VOID); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); for (HBasicBlock* block : graph->GetBlocks()) { ASSERT_EQ(block->GetLoopInformation(), nullptr); } @@ -48,9 +46,7 @@ TEST_F(FindLoopsTest, CFG2) { Instruction::CONST_4 | 0 | 0, Instruction::RETURN); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); for (HBasicBlock* block : graph->GetBlocks()) { ASSERT_EQ(block->GetLoopInformation(), nullptr); } @@ -64,9 +60,7 @@ TEST_F(FindLoopsTest, CFG3) { Instruction::GOTO | 0x100, Instruction::RETURN); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); for (HBasicBlock* block : graph->GetBlocks()) { ASSERT_EQ(block->GetLoopInformation(), nullptr); } @@ -81,9 +75,7 @@ TEST_F(FindLoopsTest, CFG4) { Instruction::CONST_4 | 5 << 12 | 0, Instruction::RETURN | 0 << 8); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); for (HBasicBlock* block : graph->GetBlocks()) { ASSERT_EQ(block->GetLoopInformation(), nullptr); } @@ -96,9 +88,7 @@ TEST_F(FindLoopsTest, CFG5) { Instruction::CONST_4 | 4 << 12 | 0, Instruction::RETURN | 0 << 8); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); for (HBasicBlock* block : graph->GetBlocks()) { ASSERT_EQ(block->GetLoopInformation(), nullptr); } @@ -142,9 +132,7 @@ TEST_F(FindLoopsTest, Loop1) { Instruction::GOTO | 0xFE00, Instruction::RETURN_VOID); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); TestBlock(graph, 0, false, kInvalidBlockId); // entry block TestBlock(graph, 1, false, kInvalidBlockId); // pre header @@ -170,9 +158,7 @@ TEST_F(FindLoopsTest, Loop2) { Instruction::GOTO | 0xFD00, Instruction::RETURN | 0 << 8); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); TestBlock(graph, 0, false, kInvalidBlockId); // entry block TestBlock(graph, 1, false, kInvalidBlockId); // goto block @@ -195,9 +181,7 @@ TEST_F(FindLoopsTest, Loop3) { Instruction::GOTO | 0xFE00, Instruction::RETURN | 0 << 8); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); TestBlock(graph, 0, false, kInvalidBlockId); // entry block TestBlock(graph, 1, false, kInvalidBlockId); // goto block @@ -221,9 +205,7 @@ TEST_F(FindLoopsTest, Loop4) { Instruction::GOTO | 0xFB00, Instruction::RETURN | 0 << 8); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); TestBlock(graph, 0, false, kInvalidBlockId); // entry block TestBlock(graph, 1, false, kInvalidBlockId); // pre header @@ -247,9 +229,7 @@ TEST_F(FindLoopsTest, Loop5) { Instruction::GOTO | 0xFB00, Instruction::RETURN | 0 << 8); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); TestBlock(graph, 0, false, kInvalidBlockId); // entry block TestBlock(graph, 1, false, kInvalidBlockId); // pre header @@ -272,9 +252,7 @@ TEST_F(FindLoopsTest, InnerLoop) { Instruction::GOTO | 0xFB00, Instruction::RETURN | 0 << 8); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); TestBlock(graph, 0, false, kInvalidBlockId); // entry block TestBlock(graph, 1, false, kInvalidBlockId); // pre header of outer loop @@ -303,9 +281,7 @@ TEST_F(FindLoopsTest, TwoLoops) { Instruction::GOTO | 0xFE00, // second loop Instruction::RETURN | 0 << 8); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); TestBlock(graph, 0, false, kInvalidBlockId); // entry block TestBlock(graph, 1, false, kInvalidBlockId); // pre header of first loop @@ -333,9 +309,7 @@ TEST_F(FindLoopsTest, NonNaturalLoop) { Instruction::GOTO | 0xFD00, Instruction::RETURN | 0 << 8); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); ASSERT_TRUE(graph->GetBlocks()[3]->IsLoopHeader()); HLoopInformation* info = graph->GetBlocks()[3]->GetLoopInformation(); ASSERT_EQ(1u, info->NumberOfBackEdges()); @@ -349,9 +323,7 @@ TEST_F(FindLoopsTest, DoWhileLoop) { Instruction::IF_EQ, 0xFFFF, Instruction::RETURN | 0 << 8); - ArenaPool arena; - ArenaAllocator allocator(&arena); - HGraph* graph = CreateCFG(&allocator, data); + HGraph* graph = CreateCFG(data); TestBlock(graph, 0, false, kInvalidBlockId); // entry block TestBlock(graph, 1, false, kInvalidBlockId); // pre header of first loop -- cgit v1.2.3-59-g8ed1b