Skip to content
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

feat: add a parameter to adjust SMT encoding of literals #276

Closed
wants to merge 1 commit into from
Closed
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
29 changes: 29 additions & 0 deletions rosette/solver/smt/enc-lit.rkt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#lang racket/base

(provide current-enc-lit
enc-real
enc-integer)

(require racket/match
racket/format
(prefix-in $ "smtlib2.rkt")
(only-in "../../base/core/bitvector.rkt" bv bitvector-size))

(define (enc-lit v)
(match v
[#t $true]
[#f $false]
[(? integer?) (enc-integer v)]
[(? real?) (enc-real v)]
[(bv lit t) ($bv lit (bitvector-size t))]
[_ (error 'enc "expected a boolean?, integer?, real?, or bitvector?, given ~a" v)]))

(define current-enc-lit
(make-parameter enc-lit))

(define-syntax-rule (enc-real v)
(if (exact? v) ($/ (numerator v) (denominator v)) (string->symbol (~r v))))

(define-syntax-rule (enc-integer v)
(let ([v* (inexact->exact v)])
(if (< v* 0) ($- (abs v*)) v*)))
19 changes: 4 additions & 15 deletions rosette/solver/smt/enc.rkt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#lang racket

(require "env.rkt"
(prefix-in $ "smtlib2.rkt")
(require "env.rkt"
"enc-lit.rkt"
(prefix-in $ "smtlib2.rkt")
(only-in "../../base/core/term.rkt" expression expression? constant? term? get-type @app)
(only-in "../../base/core/polymorphic.rkt" ite ite* =? guarded-test guarded-value)
(only-in "../../base/core/distinct.rkt" @distinct?)
Expand Down Expand Up @@ -74,19 +75,7 @@
[_ (error 'enc "cannot encode ~a to SMT" v)]))

(define (enc-lit v env quantified)
(match v
[#t $true]
[#f $false]
[(? integer?) (enc-integer v)]
[(? real?) (enc-real v)]
[(bv lit t) ($bv lit (bitvector-size t))]
[_ (error 'enc "expected a boolean?, integer?, real?, or bitvector?, given ~a" v)]))

(define-syntax-rule (enc-real v)
(if (exact? v) ($/ (numerator v) (denominator v)) (string->symbol (~r v))))
(define-syntax-rule (enc-integer v)
(let ([v* (inexact->exact v)])
(if (< v* 0) ($- (abs v*)) v*)))
((current-enc-lit) v))

(define-syntax define-encoder
(syntax-rules ()
Expand Down
18 changes: 16 additions & 2 deletions test/base/real.rkt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#lang racket

(require rackunit rackunit/text-ui "common.rkt" "solver.rkt"
(require rackunit rackunit/text-ui "common.rkt" "solver.rkt"
rosette/solver/smt/enc-lit
rosette/solver/smt/z3
rosette/solver/solution
rosette/lib/roseunit
Expand Down Expand Up @@ -256,7 +257,19 @@
(parameterize ([solver (z3 #:options (hash ':pp.decimal 'true ':pp.decimal-precision 15))])
(check-= (abs ((solve (@= (@* xr xr) 2)) xr)) (abs (sqrt 2)) 1e-15)
(solver-shutdown (solver))))


(define (check-qf-nra)
(parameterize ([solver (z3 #:logic 'QF_NRA)]
[current-enc-lit
(let ([enc-lit (current-enc-lit)])
(λ (x)
(cond
[(real? x) (enc-real x)]
[else (enc-lit x)])))])
(define-symbolic x @real?)
(check-pred sat? (solve (@= -2.0 x)))
(solver-shutdown (solver))))

(define (check-division-simplifications div x y z [epsilon 0])
(check-valid? (div 0 x) 0)
(check-valid? (div x 1) x)
Expand Down Expand Up @@ -563,6 +576,7 @@
(check-*-simplifications xr yr zr)
(check-*-real-simplifications)
(check-irrationals)
(check-qf-nra)
(check-semantics @* xi yi zi)
(check-semantics @* xr yr zr)))

Expand Down