From ab3cd075b314995f213b6ca50b6b3b4a14c051bd Mon Sep 17 00:00:00 2001 From: Alan Phipps Date: Wed, 20 Sep 2023 16:31:49 -0500 Subject: Revert "[Coverage][llvm-cov] Enable MC/DC Support in LLVM Source-based Code Coverage (2/3)" This reverts commit 618a22144db5e45da8c95dc22064103e1b5e5b71. Buildbots failing on windows and one other issue. --- llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp | 52 -------------------------- 1 file changed, 52 deletions(-) (limited to 'llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp') diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp index 28c221d..79a0494 100644 --- a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp +++ b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp @@ -335,10 +335,6 @@ void emitTableRow(raw_ostream &OS, const CoverageViewOptions &Opts, AddCoverageTripleToColumn(FCS.BranchCoverage.getCovered(), FCS.BranchCoverage.getNumBranches(), FCS.BranchCoverage.getPercentCovered()); - if (Opts.ShowMCDCSummary) - AddCoverageTripleToColumn(FCS.MCDCCoverage.getCoveredPairs(), - FCS.MCDCCoverage.getNumPairs(), - FCS.MCDCCoverage.getPercentCovered()); if (IsTotals) OS << tag("tr", join(Columns.begin(), Columns.end(), ""), "light-row-bold"); @@ -389,8 +385,6 @@ static void emitColumnLabelsForIndex(raw_ostream &OS, Columns.emplace_back(tag("td", "Region Coverage", "column-entry-bold")); if (Opts.ShowBranchSummary) Columns.emplace_back(tag("td", "Branch Coverage", "column-entry-bold")); - if (Opts.ShowMCDCSummary) - Columns.emplace_back(tag("td", "MC/DC", "column-entry-bold")); OS << tag("tr", join(Columns.begin(), Columns.end(), "")); } @@ -961,52 +955,6 @@ void SourceCoverageViewHTML::renderBranchView(raw_ostream &OS, BranchView &BRV, OS << EndExpansionDiv; } -void SourceCoverageViewHTML::renderMCDCView(raw_ostream &OS, MCDCView &MRV, - unsigned ViewDepth) { - for (auto &Record : MRV.Records) { - OS << BeginExpansionDiv; - OS << BeginPre; - OS << " MC/DC Decision Region ("; - - // Display Line + Column information. - const CounterMappingRegion &DecisionRegion = Record.getDecisionRegion(); - std::string LineNoStr = utostr(uint64_t(DecisionRegion.LineStart)); - std::string ColNoStr = utostr(uint64_t(DecisionRegion.ColumnStart)); - std::string TargetName = "L" + LineNoStr; - OS << tag("span", - a("#" + TargetName, tag("span", LineNoStr + ":" + ColNoStr), - TargetName), - "line-number") + - ") to ("; - LineNoStr = utostr(uint64_t(DecisionRegion.LineEnd)); - ColNoStr = utostr(uint64_t(DecisionRegion.ColumnEnd)); - OS << tag("span", - a("#" + TargetName, tag("span", LineNoStr + ":" + ColNoStr), - TargetName), - "line-number") + - ")\n\n"; - - // Display MC/DC Information. - OS << " Number of Conditions: " << Record.getNumConditions() << "\n"; - for (unsigned i = 0; i < Record.getNumConditions(); i++) { - OS << " " << Record.getConditionHeaderString(i); - } - OS << "\n"; - OS << " Executed MC/DC Test Vectors:\n\n "; - OS << Record.getTestVectorHeaderString(); - for (unsigned i = 0; i < Record.getNumTestVectors(); i++) - OS << Record.getTestVectorString(i); - OS << "\n"; - for (unsigned i = 0; i < Record.getNumConditions(); i++) - OS << Record.getConditionCoverageString(i); - OS << " MC/DC Coverage for Expression: "; - OS << format("%0.2f", Record.getPercentCovered()) << "%\n"; - OS << EndPre; - OS << EndExpansionDiv; - } - return; -} - void SourceCoverageViewHTML::renderInstantiationView(raw_ostream &OS, InstantiationView &ISV, unsigned ViewDepth) { -- cgit v1.1