Skip to content

[MC/DC] Refactor MCDC::State::Decision. NFC. #125408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chapuni wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[MC/DC] Refactor MCDC::State::Decision. NFC. #125408

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a6d4be0
[MC/DC] Update CoverageMapping tests
chapuni Feb 2, 2025
d414f29
[MC/DC] Refactor MCDC::State::Decision. NFC.
chapuni Feb 2, 2025
079bf69
isValid()
chapuni Mar 1, 2025
8b35e76
Remove mcdc-single-cond.cpp
chapuni Mar 1, 2025
9a175d0
Merge branch 'main' into users/chapuni/mcdc/nest/tests
chapuni Mar 1, 2025
457cf4b
Merge branch 'users/chapuni/mcdc/nest/tests' into users/chapuni/mcdc/…
chapuni Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clang/lib/CodeGen/CodeGenPGO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ struct MapRegionCounters : public RecursiveASTVisitor<MapRegionCounters> {
}

// Otherwise, allocate the Decision.
MCDCState.DecisionByStmt[BinOp].BitmapIdx = 0;
MCDCState.DecisionByStmt[BinOp].ID = MCDCState.DecisionByStmt.size();
}
return true;
}
Expand Down
6 changes: 2 additions & 4 deletions clang/lib/CodeGen/CoverageMappingGen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2197,10 +2197,8 @@ struct CounterCoverageMappingBuilder

// Update the state for CodeGenPGO
assert(MCDCState.DecisionByStmt.contains(E));
MCDCState.DecisionByStmt[E] = {
MCDCState.BitmapBits, // Top
std::move(Builder.Indices),
};
MCDCState.DecisionByStmt[E].update(MCDCState.BitmapBits, // Top
std::move(Builder.Indices));

auto DecisionParams = mcdc::DecisionParameters{
MCDCState.BitmapBits += NumTVs, // Tail
Expand Down
16 changes: 15 additions & 1 deletion clang/lib/CodeGen/MCDCState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ProfileData/Coverage/MCDCTypes.h"
#include <cassert>
#include <limits>

namespace clang {
class Stmt;
Expand All @@ -30,8 +32,20 @@ struct State {
unsigned BitmapBits = 0;

struct Decision {
using IndicesTy = llvm::SmallVector<std::array<int, 2>>;
static constexpr auto InvalidID = std::numeric_limits<unsigned>::max();

unsigned BitmapIdx;
llvm::SmallVector<std::array<int, 2>> Indices;
IndicesTy Indices;
unsigned ID = InvalidID;

bool isValid() const { return ID != InvalidID; }

void update(unsigned I, IndicesTy &&X) {
assert(ID != InvalidID);
Copy link

@ornata ornata Feb 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just use isValid()?

Copy link

@ornata ornata Feb 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, how expensive is this? Would it make sense for this to be a real error in release builds as well?

Copy link
Contributor Author

@chapuni chapuni Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It shouldn't be the real error. I suppose it the expectation here.

I can update this. IIRC, I implemented isValid later.

Copy link
Contributor Author

@chapuni chapuni Mar 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

BitmapIdx = I;
Indices = std::move(X);
}
};

llvm::DenseMap<const Stmt *, Decision> DecisionByStmt;
Expand Down