Skip to content

Commit de7016e

Browse files
committed
z3: bump version to 4.12.6
4.12.6 is the latest version released last week. The main motivation for the upgrade, though, is to get past 4.12.3, as subsequent versions (4.12.4 onward) support aarch64 for Linux.
1 parent edf682d commit de7016e

File tree

3 files changed

+25
-20
lines changed

3 files changed

+25
-20
lines changed

rosette/private/install.rkt

+15-17
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
; far more obvious.
2121
(define z3-install-failure #f)
2222

23-
(define z3-version "4.8.8")
23+
(define z3-version "4.12.6")
2424

2525
(define (print-failure path msg)
2626
(printf "\n\n********** Failed to install Z3 **********\n\n")
@@ -66,19 +66,17 @@
6666
(not (equal? (resolve-path p) p)))))
6767

6868
(define (get-z3-url)
69-
; TODO: Z3 packages a macOS aarch64 binary as of 4.8.16, so remove this special case when we update
70-
; to a newer Z3 version.
71-
(if (and (equal? (system-type 'os*) 'macosx) (equal? (system-type 'arch) 'aarch64))
72-
(values "https://github.com/emina/rosette/releases/download/4.1/z3-4.8.8-aarch64-osx-13.3.1.zip" "z3")
73-
(let ()
74-
(define site "https://github.com/Z3Prover/z3/releases/download")
75-
(define-values (os exe)
76-
(match (list (system-type 'os*) (system-type 'arch))
77-
['(linux x86_64) (values "x64-ubuntu-16.04" "z3")]
78-
[`(macosx ,_) (values "x64-osx-10.14.6" "z3")]
79-
['(windows x86_64) (values "x64-win" "z3.exe")]
80-
[any (raise-user-error 'get-z3-url "No Z3 binary available for system type '~a" any)]))
81-
(define name (format "z3-~a-~a" z3-version os))
82-
(values
83-
(format "~a/z3-~a/~a.zip" site z3-version name)
84-
(format "~a/bin/~a" name exe)))))
69+
(define site "https://github.com/Z3Prover/z3/releases/download")
70+
(define-values (os exe)
71+
(match (list (system-type 'os*) (system-type 'arch))
72+
['(linux x86_64) (values "x64-glibc-2.35" "z3")]
73+
['(linux aarch64) (values "arm64-glibc-2.35" "z3")]
74+
['(macosx x86_64) (values "x64-osx-11.7.10" "z3")]
75+
['(macosx aarch64) (values "arm64-osx-11.0" "z3")]
76+
['(windows x86_64) (values "x64-win" "z3.exe")]
77+
['(windows aarch64) (values "arm64-win" "z3.exe")]
78+
[any (raise-user-error 'get-z3-url "No Z3 binary available for system type '~a" any)]))
79+
(define name (format "z3-~a-~a" z3-version os))
80+
(values
81+
(format "~a/z3-~a/~a.zip" site z3-version name)
82+
(format "~a/bin/~a" name exe)))

rosette/solver/smt/dec.rkt

+7-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@bvslt @bvsle @bvult @bvule
1515
@bvnot @bvor @bvand @bvxor @bvshl @bvlshr @bvashr
1616
@bvneg @bvadd @bvmul @bvudiv @bvsdiv @bvurem @bvsrem @bvsmod
17-
@concat @extract))
17+
@concat @extract @sign-extend @zero-extend @integer->bitvector))
1818

1919

2020
(provide decode-model)
@@ -131,6 +131,12 @@
131131
(bv n (bitvector len))]
132132
[(list (list (== '_) (== 'extract) i j) s)
133133
`(, @extract ,(inline i sol ~env) ,(inline j sol ~env) ,(inline s sol ~env))]
134+
[(list (list (== '_) (== 'sign_extend) i) s)
135+
`(, @sign-extend ,(inline s sol ~env) ,(bitvector (inline i sol ~env)))]
136+
[(list (list (== '_) (== 'zero_extend) i) s)
137+
`(, @zero-extend ,(inline s sol ~env) ,(bitvector (inline i sol ~env)))]
138+
[(list (list (== '_) (== 'int2bv) i) s)
139+
`(, @integer->bitvector ,(inline s sol ~env) ,(bitvector (inline i sol ~env)))]
134140
[(list (== 'let) binds body)
135141
(substitute (inline body sol ~env)
136142
(for/hash ([id:expr binds])

test/query/solve.rkt

+3-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@
6565
(check-pred
6666
unknown?
6767
(solve
68-
(begin (assert (> (* xi xi) 3))
69-
(assert (= (+ (* xr xr xr) (* xr yr)) 3.0))))))))
68+
(assert (forall (list xi)
69+
(exists (list xr)
70+
(= yi (* (- xi xr) (- xi xr)))))))))))
7071

7172
(define regression-tests
7273
(test-suite+ "Solve regression tests."

0 commit comments

Comments
 (0)