From b0ec158d0672f6baf76e3db7397e19acb791ffd7 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Tue, 10 Jul 2018 19:56:10 +0000 Subject: [PATCH] Revert r336653 "[VPlan] Add VPlanTestBase.h with helper class to build VPlan for tests." Memory leaks in tests. http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-bootstrap/builds/6289/steps/check-llvm%20asan/logs/stdio Direct leak of 192 byte(s) in 1 object(s) allocated from: #0 0x554ea8 in operator new(unsigned long) /b/sanitizer-x86_64-linux-bootstrap/build/llvm/projects/compiler-rt/lib/asan/asan_new_delete.cc:106 #1 0x56cef1 in llvm::VPlanTestBase::doAnalysis(llvm::Function&) /b/sanitizer-x86_64-linux-bootstrap/build/llvm/unittests/Transforms/Vectorize/VPlanTestBase.h:53:14 #2 0x56bec4 in llvm::VPlanTestBase::buildHCFG(llvm::BasicBlock*) /b/sanitizer-x86_64-linux-bootstrap/build/llvm/unittests/Transforms/Vectorize/VPlanTestBase.h:57:3 #3 0x571f1e in llvm::(anonymous namespace)::VPlanHCFGTest_testVPInstructionToVPRecipesInner_Test::TestBody() /b/sanitizer-x86_64-linux-bootstrap/build/llvm/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp:119:15 #4 0xed2291 in testing::Test::Run() /b/sanitizer-x86_64-linux-bootstrap/build/llvm/utils/unittest/googletest/src/gtest.cc #5 0xed44c8 in testing::TestInfo::Run() /b/sanitizer-x86_64-linux-bootstrap/build/llvm/utils/unittest/googletest/src/gtest.cc:2656:11 #6 0xed5890 in testing::TestCase::Run() /b/sanitizer-x86_64-linux-bootstrap/build/llvm/utils/unittest/googletest/src/gtest.cc:2774:28 #7 0xef3634 in testing::internal::UnitTestImpl::RunAllTests() /b/sanitizer-x86_64-linux-bootstrap/build/llvm/utils/unittest/googletest/src/gtest.cc:4649:43 #8 0xef27e0 in testing::UnitTest::Run() /b/sanitizer-x86_64-linux-bootstrap/build/llvm/utils/unittest/googletest/src/gtest.cc #9 0xebbc23 in RUN_ALL_TESTS /b/sanitizer-x86_64-linux-bootstrap/build/llvm/utils/unittest/googletest/include/gtest/gtest.h:2233:46 #10 0xebbc23 in main /b/sanitizer-x86_64-linux-bootstrap/build/llvm/utils/unittest/UnitTestMain/TestMain.cpp:51 #11 0x7f65569592e0 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x202e0) and more. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@336718 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Transforms/Vectorize/VPlanHCFGTest.cpp | 38 ++++++++--- .../Transforms/Vectorize/VPlanTestBase.h | 68 ------------------- 2 files changed, 30 insertions(+), 76 deletions(-) delete mode 100644 unittests/Transforms/Vectorize/VPlanTestBase.h diff --git a/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp b/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp index 215c3ef40daa..e2b8a8ab5d8d 100644 --- a/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp +++ b/unittests/Transforms/Vectorize/VPlanHCFGTest.cpp @@ -8,16 +8,35 @@ //===----------------------------------------------------------------------===// #include "../lib/Transforms/Vectorize/VPlan.h" +#include "../lib/Transforms/Vectorize/VPlanHCFGBuilder.h" #include "../lib/Transforms/Vectorize/VPlanHCFGTransforms.h" -#include "VPlanTestBase.h" +#include "llvm/AsmParser/Parser.h" +#include "llvm/IR/Dominators.h" #include "gtest/gtest.h" namespace llvm { namespace { -class VPlanHCFGTest : public VPlanTestBase {}; +class VPlanHCFGTest : public testing::Test { +protected: + std::unique_ptr DT; + std::unique_ptr LI; + + VPlanHCFGTest() {} + + VPlanPtr doBuildPlan(BasicBlock *LoopHeader) { + DT.reset(new DominatorTree(*LoopHeader->getParent())); + LI.reset(new LoopInfo(*DT)); + + auto Plan = llvm::make_unique(); + VPlanHCFGBuilder HCFGBuilder(LI->getLoopFor(LoopHeader), LI.get()); + HCFGBuilder.buildHierarchicalCFG(*Plan.get()); + return Plan; + } +}; TEST_F(VPlanHCFGTest, testBuildHCFGInnerLoop) { + LLVMContext Ctx; const char *ModuleString = "define void @f(i32* %A, i64 %N) {\n" "entry:\n" @@ -35,11 +54,12 @@ TEST_F(VPlanHCFGTest, testBuildHCFGInnerLoop) { " ret void\n" "}\n"; - Module &M = parseModule(ModuleString); + SMDiagnostic Err; + std::unique_ptr M = parseAssemblyString(ModuleString, Err, Ctx); - Function *F = M.getFunction("f"); + Function *F = M->getFunction("f"); BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor(); - auto Plan = buildHCFG(LoopHeader); + auto Plan = doBuildPlan(LoopHeader); VPBasicBlock *Entry = Plan->getEntry()->getEntryBasicBlock(); EXPECT_NE(nullptr, Entry->getSingleSuccessor()); @@ -95,6 +115,7 @@ TEST_F(VPlanHCFGTest, testBuildHCFGInnerLoop) { } TEST_F(VPlanHCFGTest, testVPInstructionToVPRecipesInner) { + LLVMContext Ctx; const char *ModuleString = "define void @f(i32* %A, i64 %N) {\n" "entry:\n" @@ -112,11 +133,12 @@ TEST_F(VPlanHCFGTest, testVPInstructionToVPRecipesInner) { " ret void\n" "}\n"; - Module &M = parseModule(ModuleString); + SMDiagnostic Err; + std::unique_ptr M = parseAssemblyString(ModuleString, Err, Ctx); - Function *F = M.getFunction("f"); + Function *F = M->getFunction("f"); BasicBlock *LoopHeader = F->getEntryBlock().getSingleSuccessor(); - auto Plan = buildHCFG(LoopHeader); + auto Plan = doBuildPlan(LoopHeader); LoopVectorizationLegality::InductionList Inductions; SmallPtrSet DeadInstructions; diff --git a/unittests/Transforms/Vectorize/VPlanTestBase.h b/unittests/Transforms/Vectorize/VPlanTestBase.h deleted file mode 100644 index 3e0fb5d6786b..000000000000 --- a/unittests/Transforms/Vectorize/VPlanTestBase.h +++ /dev/null @@ -1,68 +0,0 @@ -//===- llvm/unittest/Transforms/Vectorize/VPlanTestBase.h -----------------===// -// -// The LLVM Compiler Infrastructure -// -// This file is distributed under the University of Illinois Open Source -// License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -/// \file -/// This file defines a VPlanTestBase class, which provides helpers to parse -/// a LLVM IR string and create VPlans given a loop entry block. -//===----------------------------------------------------------------------===// -#ifndef LLVM_UNITTESTS_TRANSFORMS_VECTORIZE_VPLANTESTBASE_H -#define LLVM_UNITTESTS_TRANSFORMS_VECTORIZE_VPLANTESTBASE_H - -#include "../lib/Transforms/Vectorize/VPlan.h" -#include "../lib/Transforms/Vectorize/VPlanHCFGBuilder.h" -#include "llvm/Analysis/LoopInfo.h" -#include "llvm/AsmParser/Parser.h" -#include "llvm/IR/Dominators.h" -#include "llvm/Support/SourceMgr.h" -#include "gtest/gtest.h" - -namespace llvm { - -/// Helper class to create a module from an assembly string and VPlans for a -/// given loop entry block. -class VPlanTestBase : public testing::Test { -protected: - std::unique_ptr DT; - std::unique_ptr LI; - std::unique_ptr M; - std::unique_ptr Ctx; - - VPlanTestBase() : Ctx(new LLVMContext) {} - ~VPlanTestBase() { - LI.release(); - DT.release(); - M.release(); - // We need to release objects depending on Ctx first. - Ctx.release(); - } - - Module &parseModule(const char *ModuleString) { - SMDiagnostic Err; - M = parseAssemblyString(ModuleString, Err, *Ctx); - EXPECT_TRUE(M); - return *M; - } - - void doAnalysis(Function &F) { - DT.reset(new DominatorTree(F)); - LI.reset(new LoopInfo(*DT)); - } - - VPlanPtr buildHCFG(BasicBlock *LoopHeader) { - doAnalysis(*LoopHeader->getParent()); - - auto Plan = llvm::make_unique(); - VPlanHCFGBuilder HCFGBuilder(LI->getLoopFor(LoopHeader), LI.get()); - HCFGBuilder.buildHierarchicalCFG(*Plan.get()); - return Plan; - } -}; - -} // namespace llvm - -#endif // LLVM_UNITTESTS_TRANSFORMS_VECTORIZE_VPLANTESTBASE_H