Skip to content

Fix AlphaEquivalenceSolver #143

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
misonijnik merged 1 commit into from
Oct 25, 2023
Merged

Fix AlphaEquivalenceSolver #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 include/klee/Expr/AlphaBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class AlphaBuilder final : public ExprVisitor {
public:
AlphaBuilder(ArrayCache &_arrayCache);
constraints_ty visitConstraints(constraints_ty cs);
ref<Expr> visitExpr(ref<Expr> v);
ref<Expr> build(ref<Expr> v);
};

} // namespace klee
Expand Down
2 changes: 1 addition & 1 deletion lib/Expr/AlphaBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ constraints_ty AlphaBuilder::visitConstraints(constraints_ty cs) {
}
return result;
}
ref<Expr> AlphaBuilder::visitExpr(ref<Expr> v) {
ref<Expr> AlphaBuilder::build(ref<Expr> v) {
ref<Expr> e = visit(v);
reverseExprMap[e] = v;
reverseExprMap[Expr::createIsZero(e)] = Expr::createIsZero(v);
Expand Down
44 changes: 32 additions & 12 deletions lib/Solver/AlphaEquivalenceSolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,14 @@ class AlphaEquivalenceSolver : public SolverImpl {
void notifyStateTermination(std::uint32_t id);
ValidityCore changeVersion(const ValidityCore &validityCore,
const ExprHashMap<ref<Expr>> &reverse);
const std::vector<const Array *>
std::vector<const Array *>
changeVersion(const std::vector<const Array *> &objects,
const ArrayCache::ArrayHashMap<const Array *> &reverse);
Assignment
changeVersion(const std::vector<const Array *> &objects,
const std::vector<SparseStorage<unsigned char>> &values,
const ArrayCache::ArrayHashMap<const Array *> &reverse);
Assignment
changeVersion(const Assignment &a,
const ArrayCache::ArrayHashMap<const Array *> &reverse);
ref<SolverResponse> changeVersion(ref<SolverResponse> res,
Expand All @@ -80,12 +84,29 @@ AlphaEquivalenceSolver::changeVersion(const ValidityCore &validityCore,
return reverseValidityCore;
}

const std::vector<const Array *> AlphaEquivalenceSolver::changeVersion(
Assignment AlphaEquivalenceSolver::changeVersion(
const std::vector<const Array *> &objects,
const std::vector<SparseStorage<unsigned char>> &values,
const ArrayCache::ArrayHashMap<const Array *> &reverse) {
std::vector<const Array *> reverseObjects;
std::vector<SparseStorage<unsigned char>> reverseValues;
for (size_t i = 0; i < objects.size(); i++) {
if (reverse.count(objects.at(i)) != 0) {
reverseObjects.push_back(reverse.at(objects.at(i)));
reverseValues.push_back(values.at(i));
}
}
return Assignment(reverseObjects, reverseValues);
}

std::vector<const Array *> AlphaEquivalenceSolver::changeVersion(
const std::vector<const Array *> &objects,
const ArrayCache::ArrayHashMap<const Array *> &reverse) {
std::vector<const Array *> reverseObjects;
for (auto it : objects) {
reverseObjects.push_back(reverse.at(it));
for (size_t i = 0; i < objects.size(); i++) {
if (reverse.count(objects.at(i)) != 0) {
reverseObjects.push_back(reverse.at(objects.at(i)));
}
}
return reverseObjects;
}
Expand All @@ -95,8 +116,7 @@ Assignment AlphaEquivalenceSolver::changeVersion(
const ArrayCache::ArrayHashMap<const Array *> &reverse) {
std::vector<const Array *> objects = a.keys();
std::vector<SparseStorage<unsigned char>> values = a.values();
objects = changeVersion(objects, reverse);
return Assignment(objects, values);
return changeVersion(objects, values, reverse);
}

ref<SolverResponse>
Expand Down Expand Up @@ -136,7 +156,7 @@ bool AlphaEquivalenceSolver::computeValidity(const Query &query,
PartialValidity &result) {
AlphaBuilder builder(arrayCache);
constraints_ty alphaQuery = builder.visitConstraints(query.constraints.cs());
ref<Expr> alphaQueryExpr = builder.visitExpr(query.expr);
ref<Expr> alphaQueryExpr = builder.build(query.expr);
return solver->impl->computeValidity(
Query(ConstraintSet(alphaQuery, {}, {}), alphaQueryExpr, query.id),
result);
Expand All @@ -145,7 +165,7 @@ bool AlphaEquivalenceSolver::computeValidity(const Query &query,
bool AlphaEquivalenceSolver::computeTruth(const Query &query, bool &isValid) {
AlphaBuilder builder(arrayCache);
constraints_ty alphaQuery = builder.visitConstraints(query.constraints.cs());
ref<Expr> alphaQueryExpr = builder.visitExpr(query.expr);
ref<Expr> alphaQueryExpr = builder.build(query.expr);
return solver->impl->computeTruth(
Query(ConstraintSet(alphaQuery, {}, {}), alphaQueryExpr, query.id),
isValid);
Expand All @@ -155,7 +175,7 @@ bool AlphaEquivalenceSolver::computeValue(const Query &query,
ref<Expr> &result) {
AlphaBuilder builder(arrayCache);
constraints_ty alphaQuery = builder.visitConstraints(query.constraints.cs());
ref<Expr> alphaQueryExpr = builder.visitExpr(query.expr);
ref<Expr> alphaQueryExpr = builder.build(query.expr);
return solver->impl->computeValue(
Query(ConstraintSet(alphaQuery, {}, {}), alphaQueryExpr, query.id),
result);
Expand All @@ -166,7 +186,7 @@ bool AlphaEquivalenceSolver::computeInitialValues(
std::vector<SparseStorage<unsigned char>> &values, bool &hasSolution) {
AlphaBuilder builder(arrayCache);
constraints_ty alphaQuery = builder.visitConstraints(query.constraints.cs());
ref<Expr> alphaQueryExpr = builder.visitExpr(query.expr);
ref<Expr> alphaQueryExpr = builder.build(query.expr);
const std::vector<const Array *> newObjects =
changeVersion(objects, builder.alphaArrayMap);

Expand All @@ -183,7 +203,7 @@ bool AlphaEquivalenceSolver::check(const Query &query,
AlphaBuilder builder(arrayCache);

constraints_ty alphaQuery = builder.visitConstraints(query.constraints.cs());
ref<Expr> alphaQueryExpr = builder.visitExpr(query.expr);
ref<Expr> alphaQueryExpr = builder.build(query.expr);
result = createAlphaVersion(result, builder);
if (!solver->impl->check(
Query(ConstraintSet(alphaQuery, {}, {}), alphaQueryExpr, query.id),
Expand All @@ -201,7 +221,7 @@ bool AlphaEquivalenceSolver::computeValidityCore(const Query &query,
AlphaBuilder builder(arrayCache);

constraints_ty alphaQuery = builder.visitConstraints(query.constraints.cs());
ref<Expr> alphaQueryExpr = builder.visitExpr(query.expr);
ref<Expr> alphaQueryExpr = builder.build(query.expr);
if (!solver->impl->computeValidityCore(
Query(ConstraintSet(alphaQuery, {}, {}), alphaQueryExpr, query.id),
validityCore, isValid)) {
Expand Down