Skip to content

[analysis] Allow joining a single vector element efficiently #6071

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.

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 1 commit into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions src/analysis/lattices/inverted.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,14 @@ template<FullLattice L> struct Inverted {
LatticeComparison compare(const Element& a, const Element& b) const noexcept {
return lattice.compare(b, a);
}
bool join(Element& joinee, Element joiner) const noexcept {

template<typename Elem>
bool join(Element& joinee, const Elem& joiner) const noexcept {
return lattice.meet(joinee, joiner);
}
bool meet(Element& meetee, Element meeter) const noexcept {

template<typename Elem>
bool meet(Element& meetee, const Elem& meeter) const noexcept {
return lattice.join(meetee, meeter);
}
};
Expand Down
3 changes: 2 additions & 1 deletion src/analysis/lattices/shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ template<Lattice L> struct Shared {
return false;
}

bool join(Element& joinee, const typename L::Element& joiner) const noexcept {
template<typename Elem>
bool join(Element& joinee, const Elem& joiner) const noexcept {
if (lattice.join(val, joiner)) {
// We have moved to the next value in our ascending chain. Assign it a new
// sequence number and update joinee with that sequence number.
Expand Down
97 changes: 60 additions & 37 deletions src/analysis/lattices/vector.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ namespace wasm::analysis {
template<Lattice L> struct Vector {
using Element = std::vector<typename L::Element>;

// Represent a vector in which all but one of the elements are bottom without
// materializing the full vector.
struct SingletonElement : std::pair<size_t, typename L::Element> {
SingletonElement(size_t i, typename L::Element&& elem)
: std::pair<size_t, typename L::Element>{i, std::move(elem)} {}
};

L lattice;
const size_t size;

Expand All @@ -39,13 +46,7 @@ template<Lattice L> struct Vector {
return Element(size, lattice.getBottom());
}

Element getTop() const noexcept
#if __cplusplus >= 202002L
requires FullLattice<L>
#endif
Copy link
Member

Choose a reason for hiding this comment

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

What happened here?

Copy link
Member Author

Choose a reason for hiding this comment

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

This wasn't pulling its weight, complexity-wise, so I removed it as a drive-by.

{
return Element(size, lattice.getTop());
}
Element getTop() const noexcept { return Element(size, lattice.getTop()); }

// `a` <= `b` if their elements are pairwise <=, etc. Unless we determine
// that there is no relation, we must check all the elements.
Expand Down Expand Up @@ -84,48 +85,70 @@ template<Lattice L> struct Vector {
assert(joiner.size() == size);
bool result = false;
for (size_t i = 0; i < size; ++i) {
if constexpr (std::is_same_v<typename L::Element, bool>) {
// The vector<bool> specialization does not expose references to the
// individual bools because they might be in a bitmap, so we need a
// workaround.
bool e = joinee[i];
if (lattice.join(e, joiner[i])) {
joinee[i] = e;
result = true;
}
} else {
result |= lattice.join(joinee[i], joiner[i]);
}
result |= joinAtIndex(joinee, i, joiner[i]);
}

return result;
}

bool join(Element& joinee, const SingletonElement& joiner) const noexcept {
const auto& [index, elem] = joiner;
assert(index < joinee.size());
return joinAtIndex(joinee, index, elem);
}

// Pairwise meet on the elements.
bool meet(Element& meetee, const Element& meeter) const noexcept
#if __cplusplus >= 202002L
requires FullLattice<L>
#endif
{
bool meet(Element& meetee, const Element& meeter) const noexcept {
assert(meetee.size() == size);
assert(meeter.size() == size);
bool result = false;
for (size_t i = 0; i < size; ++i) {
if constexpr (std::is_same_v<typename L::Element, bool>) {
// The vector<bool> specialization does not expose references to the
// individual bools because they might be in a bitmap, so we need a
// workaround.
bool e = meetee[i];
if (lattice.meet(e, meeter[i])) {
meetee[i] = e;
result = true;
}
} else {
result |= lattice.meet(meetee[i], meeter[i]);
}
result |= meetAtIndex(meetee, i, meeter[i]);
}
return result;
}

bool meet(Element& meetee, const SingletonElement& meeter) const noexcept {
const auto& [index, elem] = meeter;
assert(index < meetee.size());
return meetAtIndex(meetee, index, elem);
}

private:
bool joinAtIndex(Element& joinee,
size_t i,
const typename L::Element& elem) const noexcept {
if constexpr (std::is_same_v<typename L::Element, bool>) {
// The vector<bool> specialization does not expose references to the
// individual bools because they might be in a bitmap, so we need a
// workaround.
bool e = joinee[i];
if (lattice.join(e, elem)) {
joinee[i] = e;
return true;
}
return false;
} else {
return lattice.join(joinee[i], elem);
}
}

bool meetAtIndex(Element& meetee,
size_t i,
const typename L::Element& elem) const noexcept {
if constexpr (std::is_same_v<typename L::Element, bool>) {
// The vector<bool> specialization does not expose references to the
// individual bools because they might be in a bitmap, so we need a
// workaround.
bool e = meetee[i];
if (lattice.meet(e, elem)) {
meetee[i] = e;
return true;
}
return false;
} else {
return lattice.meet(meetee[i], elem);
}
}
};

#if __cplusplus >= 202002L
Expand Down
43 changes: 43 additions & 0 deletions test/gtest/lattices.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,30 @@ TEST(VectorLattice, Meet) {
vector, {false, false}, {false, true}, {true, false}, {true, true});
}

TEST(VectorLattice, JoinSingleton) {
using Vec = analysis::Vector<analysis::Bool>;
Vec vector{analysis::Bool{}, 2};
auto elem = vector.getBottom();

EXPECT_FALSE(vector.join(elem, Vec::SingletonElement(0, false)));
EXPECT_EQ(elem, (std::vector{false, false}));

EXPECT_TRUE(vector.join(elem, Vec::SingletonElement(1, true)));
EXPECT_EQ(elem, (std::vector{false, true}));
}

TEST(VectorLattice, MeetSingleton) {
using Vec = analysis::Vector<analysis::Bool>;
Vec vector{analysis::Bool{}, 2};
auto elem = vector.getTop();

EXPECT_FALSE(vector.meet(elem, Vec::SingletonElement(1, true)));
EXPECT_EQ(elem, (std::vector{true, true}));

EXPECT_TRUE(vector.meet(elem, Vec::SingletonElement(0, false)));
EXPECT_EQ(elem, (std::vector{false, true}));
}

TEST(TupleLattice, GetBottom) {
analysis::Tuple<analysis::Bool, analysis::UInt32> tuple{analysis::Bool{},
analysis::UInt32{}};
Expand Down Expand Up @@ -656,6 +680,25 @@ TEST(SharedLattice, Join) {
}
}

TEST(SharedLattice, JoinVecSingleton) {
using Vec = analysis::Vector<analysis::Bool>;
analysis::Shared<Vec> shared{analysis::Vector{analysis::Bool{}, 2}};

auto elem = shared.getBottom();
EXPECT_TRUE(shared.join(elem, Vec::SingletonElement(1, true)));
EXPECT_EQ(*elem, (std::vector{false, true}));
}

TEST(SharedLattice, JoinInvertedVecSingleton) {
using Vec = analysis::Vector<analysis::Bool>;
analysis::Shared<analysis::Inverted<Vec>> shared{
analysis::Inverted{analysis::Vector{analysis::Bool{}, 2}}};

auto elem = shared.getBottom();
EXPECT_TRUE(shared.join(elem, Vec::SingletonElement(1, false)));
EXPECT_EQ(*elem, (std::vector{true, false}));
}

TEST(StackLattice, GetBottom) {
analysis::Stack stack{analysis::Flat<uint32_t>{}};
EXPECT_EQ(stack.getBottom().size(), 0u);
Expand Down