[Coverage] Sort `MCDCRecord::ExecVectors` order by Bitmap index #121195

chapuni · 2024-12-27T09:35:17Z

This makes easier to merge MCDCRecords in later stages.

Depends on: #110966, #121188, #121190

`SingleByteCoverage` is not per-region attribute at least. At the moment, this change moves it into `FunctionRecord`.

- Round `Counts` as 1/0 - Confirm both `ExecutionCount` and `AltExecutionCount` are in range.

…tedRegion")

…matches

And reformat. NFC.

…ingle/merge

Conflicts: llvm/test/tools/llvm-cov/branch-macros.cpp

…ingle/merge Conflicts: llvm/test/tools/llvm-cov/Inputs/showLineExecutionCounts.cpp

…v/binary' into users/chapuni/cov/single/refactor-base Conflicts: llvm/test/tools/llvm-cov/branch-macros.test llvm/test/tools/llvm-cov/showLineExecutionCounts.test

Conflicts: llvm/test/tools/llvm-cov/branch-macros.test llvm/test/tools/llvm-cov/showLineExecutionCounts.test

…/refactor

…. NFC.

…cov/merge/mov_ind' into users/chapuni/cov/merge/mcdcsort-base

…tor' and 'origin/users/chapuni/cov/single/unify' into users/chapuni/cov/merge/forfile-base

llvmbot · 2024-12-27T09:35:53Z

@llvm/pr-subscribers-pgo

Author: NAKAMURA Takumi (chapuni)

Changes

This makes easier to merge MCDCRecords in later stages.

Depends on: #120842, #110966, #121188, #121190

Full diff: https://github.com/llvm/llvm-project/pull/121195.diff

3 Files Affected:

(modified) llvm/lib/ProfileData/Coverage/CoverageMapping.cpp (+27-13)
(modified) llvm/test/tools/llvm-cov/mcdc-const.test (+16-16)
(modified) llvm/test/tools/llvm-cov/mcdc-general.test (+4-4)

diff --git a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
index 3bbee70be0fe93..53445b1030c9fd 100644
--- a/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
+++ b/llvm/lib/ProfileData/Coverage/CoverageMapping.cpp
@@ -401,13 +401,27 @@ class MCDCRecordProcessor : NextIDsBuilder, mcdc::TVIdxBuilder {
   /// Mapping of calculated MC/DC Independence Pairs for each condition.
   MCDCRecord::TVPairMap IndependencePairs;
 
-  /// Storage for ExecVectors
-  /// ExecVectors is the alias of its 0th element.
-  std::array<MCDCRecord::TestVectors, 2> ExecVectorsByCond;
+  /// Helper for sorting ExecVectors.
+  struct TVIdxTuple {
+    MCDCRecord::CondState MCDCCond; /// True/False
+    unsigned BIdx;                  /// Bitmap Index
+    unsigned Ord;                   /// Last position on ExecVectors
+
+    TVIdxTuple(MCDCRecord::CondState MCDCCond, unsigned BIdx, unsigned Ord)
+        : MCDCCond(MCDCCond), BIdx(BIdx), Ord(Ord) {}
+
+    bool operator<(const TVIdxTuple &RHS) const {
+      return (std::tie(this->MCDCCond, this->BIdx, this->Ord) <
+              std::tie(RHS.MCDCCond, RHS.BIdx, RHS.Ord));
+    }
+  };
+
+  // Indices for sorted TestVectors;
+  std::vector<TVIdxTuple> ExecVectorIdxs;
 
   /// Actual executed Test Vectors for the boolean expression, based on
   /// ExecutedTestVectorBitmap.
-  MCDCRecord::TestVectors &ExecVectors;
+  MCDCRecord::TestVectors ExecVectors;
 
 #ifndef NDEBUG
   DenseSet<unsigned> TVIdxs;
@@ -424,8 +438,7 @@ class MCDCRecordProcessor : NextIDsBuilder, mcdc::TVIdxBuilder {
         Region(Region), DecisionParams(Region.getDecisionParams()),
         Branches(Branches), NumConditions(DecisionParams.NumConditions),
         Folded{{BitVector(NumConditions), BitVector(NumConditions)}},
-        IndependencePairs(NumConditions), ExecVectors(ExecVectorsByCond[false]),
-        IsVersion11(IsVersion11) {}
+        IndependencePairs(NumConditions), IsVersion11(IsVersion11) {}
 
 private:
   // Walk the binary decision diagram and try assigning both false and true to
@@ -453,10 +466,12 @@ class MCDCRecordProcessor : NextIDsBuilder, mcdc::TVIdxBuilder {
                       : DecisionParams.BitmapIdx - NumTestVectors + NextTVIdx])
         continue;
 
+      ExecVectorIdxs.emplace_back(MCDCCond, NextTVIdx, ExecVectors.size());
+
       // Copy the completed test vector to the vector of testvectors.
       // The final value (T,F) is equal to the last non-dontcare state on the
       // path (in a short-circuiting system).
-      ExecVectorsByCond[MCDCCond].push_back({TV, MCDCCond});
+      ExecVectors.push_back({TV, MCDCCond});
     }
 
     // Reset back to DontCare.
@@ -475,12 +490,11 @@ class MCDCRecordProcessor : NextIDsBuilder, mcdc::TVIdxBuilder {
     assert(TVIdxs.size() == unsigned(NumTestVectors) &&
            "TVIdxs wasn't fulfilled");
 
-    // Fill ExecVectors order by False items and True items.
-    // ExecVectors is the alias of ExecVectorsByCond[false], so
-    // Append ExecVectorsByCond[true] on it.
-    auto &ExecVectorsT = ExecVectorsByCond[true];
-    ExecVectors.append(std::make_move_iterator(ExecVectorsT.begin()),
-                       std::make_move_iterator(ExecVectorsT.end()));
+    llvm::sort(ExecVectorIdxs);
+    MCDCRecord::TestVectors NewTestVectors;
+    for (const auto &IdxTuple : ExecVectorIdxs)
+      NewTestVectors.push_back(std::move(ExecVectors[IdxTuple.Ord]));
+    ExecVectors = std::move(NewTestVectors);
   }
 
 public:
diff --git a/llvm/test/tools/llvm-cov/mcdc-const.test b/llvm/test/tools/llvm-cov/mcdc-const.test
index 5424625cf6a6b5..76eb7cf706d737 100644
--- a/llvm/test/tools/llvm-cov/mcdc-const.test
+++ b/llvm/test/tools/llvm-cov/mcdc-const.test
@@ -61,8 +61,8 @@
 //      CHECKFULLCASE: |  C1-Pair: constant folded
 // CHECKFULLCASE-NEXT: |  C2-Pair: not covered
 //      CHECKFULLCASE: |  MC/DC Coverage for Decision: 0.00%
-//      CHECKFULLCASE: |  1 { F,  C  = T      }
-// CHECKFULLCASE-NEXT: |  2 { T,  C  = T      }
+//      CHECKFULLCASE: |  1 { T,  C  = T      }
+// CHECKFULLCASE-NEXT: |  2 { F,  C  = T      }
 //      CHECKFULLCASE: |  C1-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C2-Pair: constant folded
 //      CHECKFULLCASE: |  MC/DC Coverage for Decision: 0.00%
@@ -106,20 +106,20 @@
 // CHECKFULLCASE-NEXT: |  C2-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C3-Pair: not covered
 //      CHECKFULLCASE: |  MC/DC Coverage for Decision: 0.00%
-//      CHECKFULLCASE: |  1 { F,  C,  -  = T      }
-// CHECKFULLCASE-NEXT: |  2 { T,  C,  -  = T      }
+//      CHECKFULLCASE: |  1 { T,  C,  -  = T      }
+// CHECKFULLCASE-NEXT: |  2 { F,  C,  -  = T      }
 //      CHECKFULLCASE: |  C1-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C2-Pair: constant folded
 // CHECKFULLCASE-NEXT: |  C3-Pair: not covered
 //      CHECKFULLCASE: |  MC/DC Coverage for Decision: 0.00%
-//      CHECKFULLCASE: |  1 { C,  F,  T  = T      }
-// CHECKFULLCASE-NEXT: |  2 { C,  T,  -  = T      }
+//      CHECKFULLCASE: |  1 { C,  T,  -  = T      }
+// CHECKFULLCASE-NEXT: |  2 { C,  F,  T  = T      }
 //      CHECKFULLCASE: |  C1-Pair: constant folded
 // CHECKFULLCASE-NEXT: |  C2-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C3-Pair: not covered
 //      CHECKFULLCASE: |  MC/DC Coverage for Decision: 0.00%
-//      CHECKFULLCASE: |  1 { F,  C,  T  = T      }
-// CHECKFULLCASE-NEXT: |  2 { T,  C,  -  = T      }
+//      CHECKFULLCASE: |  1 { T,  C,  -  = T      }
+// CHECKFULLCASE-NEXT: |  2 { F,  C,  T  = T      }
 //      CHECKFULLCASE: |  C1-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C2-Pair: constant folded
 // CHECKFULLCASE-NEXT: |  C3-Pair: not covered
@@ -151,26 +151,26 @@
 // CHECKFULLCASE-NEXT: |  C2-Pair: constant folded
 // CHECKFULLCASE-NEXT: |  C3-Pair: covered: (2,3)
 //      CHECKFULLCASE: |  MC/DC Coverage for Decision: 100.00%
-//      CHECKFULLCASE: |  1 { F,  T,  C  = T      }
-// CHECKFULLCASE-NEXT: |  2 { T,  -,  C  = T      }
+//      CHECKFULLCASE: |  1 { T,  -,  C  = T      }
+// CHECKFULLCASE-NEXT: |  2 { F,  T,  C  = T      }
 //      CHECKFULLCASE: |  C1-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C2-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C3-Pair: constant folded
 //      CHECKFULLCASE: |  MC/DC Coverage for Decision: 0.00%
-//      CHECKFULLCASE: |  1 { F,  C,  -  = T      }
-// CHECKFULLCASE-NEXT: |  2 { T,  C,  -  = T      }
+//      CHECKFULLCASE: |  1 { T,  C,  -  = T      }
+// CHECKFULLCASE-NEXT: |  2 { F,  C,  -  = T      }
 //      CHECKFULLCASE: |  C1-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C2-Pair: constant folded
 // CHECKFULLCASE-NEXT: |  C3-Pair: not covered
 //      CHECKFULLCASE: |  MC/DC Coverage for Decision: 0.00%
-//      CHECKFULLCASE: |  1 { F,  T,  C  = T      }
-// CHECKFULLCASE-NEXT: |  2 { T,  -,  C  = T      }
+//      CHECKFULLCASE: |  1 { T,  -,  C  = T      }
+// CHECKFULLCASE-NEXT: |  2 { F,  T,  C  = T      }
 //      CHECKFULLCASE: |  C1-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C2-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C3-Pair: constant folded
 //      CHECKFULLCASE: |  MC/DC Coverage for Decision: 0.00%
-//      CHECKFULLCASE: |  1 { F,  C,  T  = T      }
-// CHECKFULLCASE-NEXT: |  2 { T,  C,  -  = T      }
+//      CHECKFULLCASE: |  1 { T,  C,  -  = T      }
+// CHECKFULLCASE-NEXT: |  2 { F,  C,  T  = T      }
 //      CHECKFULLCASE: |  C1-Pair: not covered
 // CHECKFULLCASE-NEXT: |  C2-Pair: constant folded
 // CHECKFULLCASE-NEXT: |  C3-Pair: not covered
diff --git a/llvm/test/tools/llvm-cov/mcdc-general.test b/llvm/test/tools/llvm-cov/mcdc-general.test
index c1e95cb2bd92ac..1835af9a4c6b5c 100644
--- a/llvm/test/tools/llvm-cov/mcdc-general.test
+++ b/llvm/test/tools/llvm-cov/mcdc-general.test
@@ -19,15 +19,15 @@
 // CHECK-NEXT:  |
 // CHECK-NEXT:  |     C1, C2, C3, C4    Result
 // CHECK-NEXT:  |  1 { F,  -,  F,  -  = F      }
-// CHECK-NEXT:  |  2 { F,  -,  T,  F  = F      }
-// CHECK-NEXT:  |  3 { T,  F,  F,  -  = F      }
+// CHECK-NEXT:  |  2 { T,  F,  F,  -  = F      }
+// CHECK-NEXT:  |  3 { F,  -,  T,  F  = F      }
 // CHECK-NEXT:  |  4 { T,  F,  T,  F  = F      }
 // CHECK-NEXT:  |  5 { T,  F,  T,  T  = T      }
 // CHECK-NEXT:  |  6 { T,  T,  -,  -  = T      }
 // CHECK-NEXT:  |
 // CHECK-NEXT:  |  C1-Pair: covered: (1,6)
-// CHECK-NEXT:  |  C2-Pair: covered: (3,6)
-// CHECK-NEXT:  |  C3-Pair: covered: (3,5)
+// CHECK-NEXT:  |  C2-Pair: covered: (2,6)
+// CHECK-NEXT:  |  C3-Pair: covered: (2,5)
 // CHECK-NEXT:  |  C4-Pair: covered: (4,5)
 // CHECK-NEXT:  |  MC/DC Coverage for Decision: 100.00%
 // CHECK-NEXT:  |

Conflicts: llvm/test/tools/llvm-cov/branch-macros.test llvm/test/tools/llvm-cov/showLineExecutionCounts.test llvm/tools/llvm-cov/CodeCoverage.cpp llvm/tools/llvm-cov/SourceCoverageView.h

…ov/single/unify

evodius96 · 2024-12-28T08:36:32Z

Hi! Due to the holidays, it will be another week before I can look at these reviews, but I really would like to look at them to keep up on what you're doing. Are you in a hurry to get them in prior to branching?

chapuni · 2024-12-28T09:07:16Z

@evodius96 Thanks and sorry for disturbing your vacation!
No problem, this is not urgent.

Please be patient while I'll be pushing more requests (and possibly issues). See also #121197

…/cov/merge/mcdcsort-base

…merge/mcdcsort-base

…ni/cov/merge/mcdcsort

chapuni · 2025-01-07T01:07:49Z

This doesn't depend on #120842 and will be applied to origin/main directly.

…uni/cov/merge/mcdcsort-base" This reverts commit c33e898, reversing changes made to ad6726d.

chapuni added 30 commits October 3, 2024 15:47

[Coverage] Move SingleByteCoverage out of CountedRegion

178b57c

`SingleByteCoverage` is not per-region attribute at least. At the moment, this change moves it into `FunctionRecord`.

[Coverage] Make SingleByteCoverage work consistent to merging

aacb50d

- Round `Counts` as 1/0 - Confirm both `ExecutionCount` and `AltExecutionCount` are in range.

Rework. (Also reverts "[Coverage] Move SingleByteCoverage out of Coun…

b9bbc7c

…tedRegion")

clang/test/CoverageMapping/single-byte-counters.cpp: Rewrite counter …

52f072e

…matches

test/llvm-cov: Transform %.c* tests to {%.test, Inputs/%.c*}

97a4a8f

And reformat. NFC.

Introduce test/llvm-cov/Inputs/yaml.makefile for convenience.

c50c492

Add tests for SingleByteCoverage

d7c5b44

Merge branch 'users/chapuni/cov/single/test' into users/chapuni/cov/s…

6675226

…ingle/merge

Fix a test to fix linecount=1

5fc3408

threads.c: Fixup on the clean testdir

eb7fff9

Rename threads.c to threads.test since it is no longer C source file.

7543095

llvm/test/tools/llvm-cov/Inputs: Avoid wildcards rm -rf %t*.dir

00ac90d

Merge branch 'main' into users/chapuni/cov/single/test

fcb3ee8

Conflicts: llvm/test/tools/llvm-cov/branch-macros.cpp

Use [[#min(C,n)]] for tests

5fa862a

llvm-cov: Introduce --binary-counters

805e9a9

LLVMCoverage: Unify getCoverageForFile and getCoverageForFunction

5b6c0b0

Merge branch 'users/chapuni/cov/single/test' into users/chapuni/cov/s…

68d7b3b

…ingle/merge Conflicts: llvm/test/tools/llvm-cov/Inputs/showLineExecutionCounts.cpp

Update tests

24457a7

Merge branches 'users/chapuni/cov/single/merge' and 'users/chapuni/co…

805dbd9

…v/binary' into users/chapuni/cov/single/refactor-base Conflicts: llvm/test/tools/llvm-cov/branch-macros.test llvm/test/tools/llvm-cov/showLineExecutionCounts.test

New SingleByteCoverage

f96b435

threads.c => threads.test (following #113114)

47550d1

s/Count1/BinaryCount/

f4dc4eb

Update desc

822620b

Merge branch 'main' into users/chapuni/cov/binary

658bd48

Conflicts: llvm/test/tools/llvm-cov/branch-macros.test llvm/test/tools/llvm-cov/showLineExecutionCounts.test

Merge branch 'users/chapuni/cov/binary' into users/chapuni/cov/single…

0780993

…/refactor

Fix wrong merge resolutions

dfc99ba

Reorganize CoverageMapping::SingleByteCoverage

f3c9593

Prune commented-out line

3780e07

[Coverage] Make MCDCRecord::Folded as [false/true] with BitVector…

36b4aaf

…. NFC.

[Coverage] MCDC: Move findIndependencePairs into MCDCRecord

978070d

chapuni added 4 commits December 27, 2024 15:39

Merge branches 'users/chapuni/cov/merge/mcdcfold' and 'users/chapuni/…

f42bb83

…cov/merge/mov_ind' into users/chapuni/cov/merge/mcdcsort-base

[Coverage] Sort MCDCRecord::ExecVectors order by Bitmap index

3abe2ac

llvm-cov: Refactor CoverageSummaryInfo. NFC.

f86c537

Merge remote-tracking branches 'origin/users/chapuni/cov/single/refac…

2293b8d

…tor' and 'origin/users/chapuni/cov/single/unify' into users/chapuni/cov/merge/forfile-base

chapuni requested review from MaskRay, ornata and evodius96 December 27, 2024 09:35

llvmbot added the PGO Profile Guided Optimizations label Dec 27, 2024

This was referenced Dec 27, 2024

llvm-cov: [MCDC] Merge and recalculate independence pairs on template instantiations. #121196

Open

llvm-cov: Merge records for template instantiations #121197

Draft

chapuni added 3 commits December 27, 2024 20:12

Merge branch 'main' into users/chapuni/cov/single/refactor

894c383

Conflicts: llvm/test/tools/llvm-cov/branch-macros.test llvm/test/tools/llvm-cov/showLineExecutionCounts.test llvm/tools/llvm-cov/CodeCoverage.cpp llvm/tools/llvm-cov/SourceCoverageView.h

Merge branch 'main' into users/chapuni/cov/single/refactor

7c26a2a

Merge branch 'users/chapuni/cov/single/refactor' into users/chapuni/c…

184dc0c

…ov/single/unify

Merge branch 'main' into users/chapuni/cov/merge/summaryinfo

764b14b

chapuni added 4 commits December 28, 2024 18:54

Merge branch 'users/chapuni/cov/merge/summaryinfo' into users/chapuni…

85b1602

…/cov/merge/mcdcsort-base

Merge branch 'main' into users/chapuni/cov/merge/mcdcsort-base

ad6726d

Merge branch 'main' into users/chapuni/cov/single/unify

10517c4

Merge branch 'users/chapuni/cov/single/unify' into users/chapuni/cov/…

c33e898

…merge/mcdcsort-base

chapuni changed the base branch from users/chapuni/cov/merge/mcdcsort-base to users/chapuni/cov/single/unify January 7, 2025 00:25

Merge branch 'users/chapuni/cov/merge/mcdcsort-base' into users/chapu…

fa45418

…ni/cov/merge/mcdcsort

Revert "Merge branch 'users/chapuni/cov/single/unify' into users/chap…

694a772

…uni/cov/merge/mcdcsort-base" This reverts commit c33e898, reversing changes made to ad6726d.

chapuni changed the base branch from users/chapuni/cov/single/unify to main January 7, 2025 02:40

Merge branch 'main' into users/chapuni/cov/merge/mcdcsort

8b02a27

chapuni added tools:llvm-cov and removed PGO Profile Guided Optimizations labels Mar 15, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[Coverage] Sort `MCDCRecord::ExecVectors` order by Bitmap index #121195

[Coverage] Sort `MCDCRecord::ExecVectors` order by Bitmap index #121195

Uh oh!

chapuni commented Dec 27, 2024 •

edited

Loading

Uh oh!

llvmbot commented Dec 27, 2024

Uh oh!

evodius96 commented Dec 28, 2024

Uh oh!

chapuni commented Dec 28, 2024

Uh oh!

chapuni commented Jan 7, 2025

Uh oh!

Uh oh!

[Coverage] Sort MCDCRecord::ExecVectors order by Bitmap index #121195

Are you sure you want to change the base?

[Coverage] Sort MCDCRecord::ExecVectors order by Bitmap index #121195

Uh oh!

Conversation

chapuni commented Dec 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Dec 27, 2024

Uh oh!

evodius96 commented Dec 28, 2024

Uh oh!

chapuni commented Dec 28, 2024

Uh oh!

chapuni commented Jan 7, 2025

Uh oh!

Uh oh!

[Coverage] Sort `MCDCRecord::ExecVectors` order by Bitmap index #121195

[Coverage] Sort `MCDCRecord::ExecVectors` order by Bitmap index #121195

chapuni commented Dec 27, 2024 •

edited

Loading