3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-07 01:32:13 +00:00

Implement finite_set_rewriter with basic algebraic simplification rules (#7972)

* Initial plan

* Add finite_set_rewriter implementation with basic rewrite rules

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

* Fix finite_set_decl_plugin bug and complete implementation

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

* Revert finite_set_decl_plugin changes and disable difference rule

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

* Re-enable difference rule using set_sort directly

Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>

* Update finite_set_rewriter.h

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: NikolajBjorner <3085284+NikolajBjorner@users.noreply.github.com>
Co-authored-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Copilot 2025-10-14 17:13:18 +02:00 committed by GitHub
parent 9442b41716
commit c526c20cfc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 279 additions and 3 deletions

View file

@ -22,6 +22,7 @@ z3_add_component(rewriter
expr_safe_replace.cpp
factor_equivs.cpp
factor_rewriter.cpp
finite_set_rewriter.cpp
fpa_rewriter.cpp
func_decl_replace.cpp
inj_axiom.cpp

View file

@ -1 +1,85 @@
/*++
Copyright (c) 2025 Microsoft Corporation
Module Name:
finite_set_rewriter.cpp
Abstract:
Rewriting Simplification for finite sets
Author:
GitHub Copilot Agent 2025
--*/
#include "ast/rewriter/finite_set_rewriter.h"
br_status finite_set_rewriter::mk_app_core(func_decl * f, unsigned num_args, expr * const * args, expr_ref & result) {
SASSERT(f->get_family_id() == get_fid());
switch (f->get_decl_kind()) {
case OP_FINITE_SET_UNION:
return mk_union(num_args, args, result);
case OP_FINITE_SET_INTERSECT:
return mk_intersect(num_args, args, result);
case OP_FINITE_SET_DIFFERENCE:
SASSERT(num_args == 2);
return mk_difference(args[0], args[1], result);
case OP_FINITE_SET_SUBSET:
SASSERT(num_args == 2);
return mk_subset(args[0], args[1], result);
default:
return BR_FAILED;
}
}
br_status finite_set_rewriter::mk_union(unsigned num_args, expr * const * args, expr_ref & result) {
// Handle binary case - check if both arguments are the same
// set.union(x, x) -> x
if (num_args == 2 && args[0] == args[1]) {
result = args[0];
return BR_DONE;
}
// Additional simplifications can be added here
// For example: set.union(x, empty) -> x
// But for now, we keep it minimal as per requirements
return BR_FAILED;
}
br_status finite_set_rewriter::mk_intersect(unsigned num_args, expr * const * args, expr_ref & result) {
// set.intersect(x, x) -> x
if (num_args == 2 && args[0] == args[1]) {
result = args[0];
return BR_DONE;
}
return BR_FAILED;
}
br_status finite_set_rewriter::mk_difference(expr * arg1, expr * arg2, expr_ref & result) {
// set.difference(x, x) -> set.empty
if (arg1 == arg2) {
// Get the set sort directly from the argument
sort* set_sort = arg1->get_sort();
SASSERT(m_util.is_finite_set(set_sort));
// Call mk_empty with set_sort directly as suggested
result = m_util.mk_empty(set_sort);
return BR_DONE;
}
return BR_FAILED;
}
br_status finite_set_rewriter::mk_subset(expr * arg1, expr * arg2, expr_ref & result) {
// set.subset(x, y) -> set.intersect(x, y) = x
expr_ref intersect(m());
intersect = m_util.mk_intersect(arg1, arg2);
result = m().mk_eq(intersect, arg1);
return BR_REWRITE3;
}

View file

@ -9,12 +9,44 @@ Abstract:
Rewriting Simplification for finite sets
Sampe rewrite rules:
Sample rewrite rules:
set.union s set.empty -> s
set.intersect s set.empty -> set.empty
set.in x (set.singleton y) -> x = y
set.subset(x,y) -> set.intersect(x,y) = x
set.union(x, x) -> x
set.intersect(x, x) -> x
set.difference(x, x) -> set.empty
Generally this module implements basic algebraic simplificaiton rules for finite sets
where the signature is defined in finite_sets_decl_plugin.h.
Generally this module implements basic algebraic simplification rules for finite sets
where the signature is defined in finite_set_decl_plugin.h.
--*/
#pragma once
#include "ast/finite_set_decl_plugin.h"
#include "ast/rewriter/rewriter_types.h"
#include "util/params.h"
/**
\brief Cheap rewrite rules for finite sets
*/
class finite_set_rewriter {
finite_set_util m_util;
// Rewrite rules for set operations
br_status mk_union(unsigned num_args, expr * const * args, expr_ref & result);
br_status mk_intersect(unsigned num_args, expr * const * args, expr_ref & result);
br_status mk_difference(expr * arg1, expr * arg2, expr_ref & result);
br_status mk_subset(expr * arg1, expr * arg2, expr_ref & result);
public:
finite_set_rewriter(ast_manager & m, params_ref const & p = params_ref()):
m_util(m) {
}
ast_manager & m() const { return m_util.get_manager(); }
family_id get_fid() const { return m_util.get_family_id(); }
finite_set_util& util() { return m_util; }
br_status mk_app_core(func_decl * f, unsigned num_args, expr * const * args, expr_ref & result);
};