From 93e8e462023c6ab612a46b4e8b8d46c1727ee0ba Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Tue, 17 Feb 2015 13:18:43 +0000 Subject: [PATCH] Reverting r229473; it does not compile with MSVC 2013, and I suspect it was meant to be reverted in r229483. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229496 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/ProfileData/CoverageMappingTest.cpp | 146 +++++++++--------- 1 file changed, 69 insertions(+), 77 deletions(-) diff --git a/unittests/ProfileData/CoverageMappingTest.cpp b/unittests/ProfileData/CoverageMappingTest.cpp index a678750f05a..859c5127a67 100644 --- a/unittests/ProfileData/CoverageMappingTest.cpp +++ b/unittests/ProfileData/CoverageMappingTest.cpp @@ -33,91 +33,83 @@ void PrintTo(const Counter &C, ::std::ostream *os) { namespace { -struct CoverageMappingTest : ::testing::Test { - StringMap Files; - unsigned NextFile; - std::vector InputCMRs; - - std::vector OutputFiles; - std::vector OutputExpressions; - std::vector OutputCMRs; - - void SetUp() override { - NextFile = 0; - } - - unsigned getFile(StringRef Name) { - auto R = Files.find(Name); - if (R != Files.end()) - return R->second; - Files[Name] = NextFile; - return NextFile++; - } - - void addCMR(Counter C, StringRef File, unsigned LS, unsigned CS, unsigned LE, - unsigned CE) { - InputCMRs.push_back( - CounterMappingRegion::makeRegion(C, getFile(File), LS, CS, LE, CE)); - } +static std::string writeCoverage(MutableArrayRef Regions, + int NumFiles) { + SmallVector FileIDs; + for (int I = 0; I < NumFiles; ++I) + FileIDs.push_back(I); + + std::string Coverage; + llvm::raw_string_ostream OS(Coverage); + CoverageMappingWriter(FileIDs, None, Regions).write(OS); + OS.flush(); + + return Coverage; +} - void addExpansionCMR(StringRef File, StringRef ExpandedFile, unsigned LS, - unsigned CS, unsigned LE, unsigned CE) { - InputCMRs.push_back(CounterMappingRegion::makeExpansion( - getFile(File), getFile(ExpandedFile), LS, CS, LE, CE)); +static std::vector +readCoverageRegions(std::string Coverage, int NumFiles) { + SmallVector Filenames; + SmallVector FilenameRefs; + for (int I = 0; I < NumFiles; ++I) { + std::ostringstream S; + S << "file" << I; + Filenames.push_back(S.str()); + FilenameRefs.push_back(Filenames.back()); } - std::string writeCoverageRegions() { - SmallVector FileIDs; - for (const auto &E : Files) - FileIDs.push_back(E.getValue()); - std::string Coverage; - llvm::raw_string_ostream OS(Coverage); - CoverageMappingWriter(FileIDs, None, InputCMRs).write(OS); - return OS.str(); - } + std::vector FuncFiles; + std::vector Expressions; + std::vector Regions; + RawCoverageMappingReader Reader(Coverage, FilenameRefs, FuncFiles, + Expressions, Regions); + if (Reader.read()) + // ASSERT doesn't work here, we'll just return an empty vector. + Regions.clear(); + return Regions; +} - void readCoverageRegions(std::string Coverage) { - SmallVector Filenames; - for (const auto &E : Files) - Filenames.push_back(E.getKey()); - RawCoverageMappingReader Reader(Coverage, Filenames, OutputFiles, - OutputExpressions, OutputCMRs); - std::error_code EC = Reader.read(); - ASSERT_EQ(instrprof_error::success, EC); - } -}; - -TEST_F(CoverageMappingTest, basic_write_read) { - addCMR(Counter::getCounter(0), "foo", 1, 1, 1, 1); - addCMR(Counter::getCounter(1), "foo", 2, 1, 2, 2); - addCMR(Counter::getZero(), "foo", 3, 1, 3, 4); - addCMR(Counter::getCounter(2), "foo", 4, 1, 4, 8); - addCMR(Counter::getCounter(3), "bar", 1, 2, 3, 4); - std::string Coverage = writeCoverageRegions(); - readCoverageRegions(Coverage); - - size_t N = makeArrayRef(InputCMRs).size(); - ASSERT_EQ(N, OutputCMRs.size()); +TEST(CoverageMappingTest, basic_write_read) { + int NumFiles = 2; + CounterMappingRegion InputRegions[] = { + CounterMappingRegion::makeRegion(Counter::getCounter(0), 0, 1, 1, 1, 1), + CounterMappingRegion::makeRegion(Counter::getCounter(1), 0, 2, 1, 2, 2), + CounterMappingRegion::makeRegion(Counter::getZero(), 0, 3, 1, 3, 4), + CounterMappingRegion::makeRegion(Counter::getCounter(2), 0, 4, 1, 4, 8), + CounterMappingRegion::makeRegion(Counter::getCounter(3), 1, 1, 2, 3, 4), + }; + std::string Coverage = writeCoverage(InputRegions, NumFiles); + std::vector OutputRegions = + readCoverageRegions(Coverage, NumFiles); + ASSERT_FALSE(OutputRegions.empty()); + + size_t N = makeArrayRef(InputRegions).size(); + ASSERT_EQ(N, OutputRegions.size()); for (size_t I = 0; I < N; ++I) { - ASSERT_EQ(InputCMRs[I].Count, OutputCMRs[I].Count); - ASSERT_EQ(InputCMRs[I].FileID, OutputCMRs[I].FileID); - ASSERT_EQ(InputCMRs[I].startLoc(), OutputCMRs[I].startLoc()); - ASSERT_EQ(InputCMRs[I].endLoc(), OutputCMRs[I].endLoc()); - ASSERT_EQ(InputCMRs[I].Kind, OutputCMRs[I].Kind); + ASSERT_EQ(InputRegions[I].Count, OutputRegions[I].Count); + ASSERT_EQ(InputRegions[I].FileID, OutputRegions[I].FileID); + ASSERT_EQ(InputRegions[I].startLoc(), OutputRegions[I].startLoc()); + ASSERT_EQ(InputRegions[I].endLoc(), OutputRegions[I].endLoc()); + ASSERT_EQ(InputRegions[I].Kind, OutputRegions[I].Kind); } } -TEST_F(CoverageMappingTest, expansion_gets_first_counter) { - addCMR(Counter::getCounter(1), "foo", 10, 1, 10, 2); - // This starts earlier in "foo", so the expansion should get its counter. - addCMR(Counter::getCounter(2), "foo", 1, 1, 20, 1); - addExpansionCMR("bar", "foo", 3, 3, 3, 3); - std::string Coverage = writeCoverageRegions(); - readCoverageRegions(Coverage); - - ASSERT_EQ(CounterMappingRegion::ExpansionRegion, OutputCMRs[2].Kind); - ASSERT_EQ(Counter::getCounter(2), OutputCMRs[2].Count); - ASSERT_EQ(3U, OutputCMRs[2].LineStart); +TEST(CoverageMappingTest, expansion_gets_first_counter) { + int NumFiles = 2; + CounterMappingRegion InputRegions[] = { + CounterMappingRegion::makeRegion(Counter::getCounter(1), 0, 10, 1, 10, 2), + // This starts earlier in file 0, so the expansion should get its counter. + CounterMappingRegion::makeRegion(Counter::getCounter(2), 0, 1, 1, 20, 1), + CounterMappingRegion::makeExpansion(1, 0, 3, 3, 3, 3), + }; + std::string Coverage = writeCoverage(InputRegions, NumFiles); + std::vector OutputRegions = + readCoverageRegions(Coverage, NumFiles); + ASSERT_FALSE(OutputRegions.empty()); + + ASSERT_EQ(CounterMappingRegion::ExpansionRegion, OutputRegions[2].Kind); + ASSERT_EQ(Counter::getCounter(2), OutputRegions[2].Count); + ASSERT_EQ(3U, OutputRegions[2].LineStart); } -- 2.34.1