Skip to content

[nfc][ir2vec] Remove Valid field #157132

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

Merged
merged 3 commits into from
Sep 7, 2025
Merged

[nfc][ir2vec] Remove Valid field #157132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
768d399
[nfc][ir2vec] Remove `Valid` field
mtrofin Sep 5, 2025
1224c14
Merge remote-tracking branch 'origin/main' into ir2vec
mtrofin Sep 5, 2025
4f92e08
fix isValid()
mtrofin Sep 6, 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
13 changes: 6 additions & 7 deletions llvm/include/llvm/Analysis/IR2Vec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ class Vocabulary {
friend class llvm::IR2VecVocabAnalysis;
using VocabVector = std::vector<ir2vec::Embedding>;
VocabVector Vocab;
bool Valid = false;

public:
// Slot layout:
Expand Down Expand Up @@ -210,9 +209,9 @@ class Vocabulary {
static_cast<unsigned>(OperandKind::MaxOperandKind);

Vocabulary() = default;
LLVM_ABI Vocabulary(VocabVector &&Vocab);
LLVM_ABI Vocabulary(VocabVector &&Vocab) : Vocab(std::move(Vocab)) {}

LLVM_ABI bool isValid() const;
LLVM_ABI bool isValid() const { return Vocab.size() == NumCanonicalEntries; };
LLVM_ABI unsigned getDimension() const;
/// Total number of entries (opcodes + canonicalized types + operand kinds)
static constexpr size_t getCanonicalSize() { return NumCanonicalEntries; }
Expand Down Expand Up @@ -243,22 +242,22 @@ class Vocabulary {
/// Const Iterator type aliases
using const_iterator = VocabVector::const_iterator;
const_iterator begin() const {
assert(Valid && "IR2Vec Vocabulary is invalid");
assert(isValid() && "IR2Vec Vocabulary is invalid");
return Vocab.begin();
}

const_iterator cbegin() const {
assert(Valid && "IR2Vec Vocabulary is invalid");
assert(isValid() && "IR2Vec Vocabulary is invalid");
return Vocab.cbegin();
}

const_iterator end() const {
assert(Valid && "IR2Vec Vocabulary is invalid");
assert(isValid() && "IR2Vec Vocabulary is invalid");
return Vocab.end();
}

const_iterator cend() const {
assert(Valid && "IR2Vec Vocabulary is invalid");
assert(isValid() && "IR2Vec Vocabulary is invalid");
return Vocab.cend();
}

Expand Down
9 changes: 1 addition & 8 deletions llvm/lib/Analysis/IR2Vec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,15 +260,8 @@ void FlowAwareEmbedder::computeEmbeddings(const BasicBlock &BB) const {
// Vocabulary
//===----------------------------------------------------------------------===//

Vocabulary::Vocabulary(VocabVector &&Vocab)
: Vocab(std::move(Vocab)), Valid(true) {}

bool Vocabulary::isValid() const {
return Vocab.size() == NumCanonicalEntries && Valid;
}

unsigned Vocabulary::getDimension() const {
assert(Valid && "IR2Vec Vocabulary is invalid");
assert(isValid() && "IR2Vec Vocabulary is invalid");
return Vocab[0].size();
}

Expand Down