[bug#34048] [PATCH] gnu: z3: Update to 4.8.4.

[bug#34048] [PATCH] gnu: z3: Update to 4.8.4.

[Amin Bandali]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-gnu-z3-Update-to-4.8.4.patch --]
[-- Type: text/x-patch, Size: 1153 bytes --]

From 2cd82564402e4363db581bde066766d779b6af1a Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Fri, 11 Jan 2019 18:08:42 -0500
Subject: [PATCH] gnu: z3: Update to 4.8.4.

* gnu/packages/maths.scm (z3): Update to 4.8.4.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4138c7a3b..2c5108388 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3937,7 +3937,7 @@ as equations, scalars, vectors, and matrices.")
 (define-public z3
   (package
     (name "z3")
-    (version "4.8.3")
+    (version "4.8.4")
     (home-page "https://github.com/Z3Prover/z3")
     (source (origin
               (method git-fetch)
@@ -3946,7 +3946,7 @@ as equations, scalars, vectors, and matrices.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0p5gdmhd32x6zwmx7j5cgwh4jyfxa9yapym95nlmyfaqzak92qar"))))
+                "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
-- 
2.20.1

[bug#34048] [PATCH] gnu: z3: Update to 4.8.4.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

On Fri, Jan 11, 2019 at 06:13:53PM -0500, Amin Bandali wrote:
> From 2cd82564402e4363db581bde066766d779b6af1a Mon Sep 17 00:00:00 2001
> From: Amin Bandali <bandali@gnu.org>
> Date: Fri, 11 Jan 2019 18:08:42 -0500
> Subject: [PATCH] gnu: z3: Update to 4.8.4.
> 
> * gnu/packages/maths.scm (z3): Update to 4.8.4.

Thanks!

I tested this patch and found that arachne-pnr fails its test suite
after upgrading z3.

Can you take a look?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#34048] [PATCH] gnu: z3: Update to 4.8.4.

[Amin Bandali]

Hi Leo,

Thanks for the reply.

[...]

>
> I tested this patch and found that arachne-pnr fails its test suite
> after upgrading z3.
>
> Can you take a look?
>

Do you have test suite logs from before and after applying the patch?
Running ‘guix build arachne-pnr’ seems to fail for me on both ‘master’
and on my local ‘z3-4.8.4’ branch with my patch applied, so I’m not sure
if it’s my patch that’s broken its test suite.

Also, I’m a bit of Guix newbie, and I’m curious about if, and how, you
test all the packages, only those that depend on Z3, or if you happened
to stumble upon arachne-pnr’s failure.

Thanks,
amin

[bug#34048] [PATCH] gnu: z3: Update to 4.8.4.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1293 bytes --]

On Sat, Jan 12, 2019 at 10:57:02PM -0500, Amin Bandali wrote:
> Hi Leo,
> 
> Thanks for the reply.
> 
> [...]
> 
> >
> > I tested this patch and found that arachne-pnr fails its test suite
> > after upgrading z3.
> >
> > Can you take a look?
> >
> 
> Do you have test suite logs from before and after applying the patch?
> Running ‘guix build arachne-pnr’ seems to fail for me on both ‘master’
> and on my local ‘z3-4.8.4’ branch with my patch applied, so I’m not sure
> if it’s my patch that’s broken its test suite.
> 
> Also, I’m a bit of Guix newbie, and I’m curious about if, and how, you
> test all the packages, only those that depend on Z3, or if you happened
> to stumble upon arachne-pnr’s failure.
> 

'guix refresh -l z3' shows:
Building the following 2 packages would ensure 3 dependent packages are rebuilt: arachne-pnr@0.0-1-52e69ed20 cubicle@1.1.2

so in theory it's inexpensive to test the packages. Based on
arachne-pnr's version number, I'd check if there's a later commit that
doesn't fail the test suite.

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#34048] [PATCH] gnu: z3: Update to 4.8.4.

[Amin Bandali]

[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]

Hi Efraim,

[...]

> 'guix refresh -l z3' shows:
> Building the following 2 packages would ensure 3 dependent packages are rebuilt: arachne-pnr@0.0-1-52e69ed20 cubicle@1.1.2
>

TIL, thanks!

>
> so in theory it's inexpensive to test the packages. Based on
> arachne-pnr's version number, I'd check if there's a later commit that
> doesn't fail the test suite.
>

Based on your suggestion, I tried bumping arachne-pnr from its current
version in Guix from way back in 2016 to latest master from September
2018 (see the attached patch).

The build phase fails, but it seems to be for another reason than its
current failure.  However, I’ve never used arachne-pnr and don’t know
much about it.

I’ve Cc’ed Danny who originally added the package.  Danny, would you be
able to have a look and see if anything can be done to fix arachne-pnr?

The failure seems to be due to a missing txt file:

,----
| make: *** No rule to make target '/usr/local/share/icebox/chipdb-384.txt', needed by 'share/arachne-pnr/chipdb-384.bin'.  Stop.
`----

Best,
amin


[-- Attachment #2: 0001-gnu-arachne-pnr-Update-to-840bdfdeb.patch --]
[-- Type: text/x-patch, Size: 2326 bytes --]

From b2ad4c311a19d96110790b4e0537cfbcd1999a1a Mon Sep 17 00:00:00 2001
From: Amin Bandali <bandali@gnu.org>
Date: Sun, 13 Jan 2019 10:07:11 -0500
Subject: [PATCH] gnu: arachne-pnr: Update to 840bdfdeb.

* gnu/packages/fpga.scm (arachne-pnr): Update to 840bdfdeb.
---
 gnu/packages/fpga.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 9ab2e3525..79966e266 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
 ;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2019 Amin Bandali <bandali@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -256,7 +257,7 @@ Includes the actual FTDI connector.")
     (license license:isc))))
 
 (define-public arachne-pnr
-  (let ((commit "52e69ed207342710080d85c7c639480e74a021d7")
+  (let ((commit "840bdfdeb38809f9f6af4d89dd7b22959b176fdd")
         (revision "1"))
    (package
     (name "arachne-pnr")
@@ -264,12 +265,12 @@ Includes the actual FTDI connector.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                     (url "https://github.com/cseed/arachne-pnr.git")
+                     (url "https://github.com/YosysHQ/arachne-pnr.git")
                      (commit commit)))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                 (base32
-                   "15bdw5yxj76lxrwksp6liwmr6l1x77isf4bs50ys9rsnmiwh8c3w"))))
+                   "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl"))))
     (build-system gnu-build-system)
     (arguments
      `(#:test-target "test"
@@ -294,7 +295,7 @@ Includes the actual FTDI connector.")
        ("yosys" ,yosys) ; for tests
        ("perl" ,perl) ; for shasum
        ("python-2" ,python-2))) ; for tests
-    (home-page "https://github.com/cseed/arachne-pnr")
+    (home-page "https://github.com/YosysHQ/arachne-pnr")
     (synopsis "Place-and-Route tool for FPGAs")
     (description "Arachne-PNR is a Place-and-Route Tool For FPGAs.")
     (license license:gpl2))))
-- 
2.20.1

[bug#34048] [PATCH] gnu: z3: Update to 4.8.4.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 183 bytes --]

Hi,

I've updated arachne-pnr, icestorm (please make sure to also update this when
you update arachne-pnr since arachne-pnr tests require icestorm) and yosys on
guix master now.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#34048] [PATCH] gnu: z3: Update to 4.8.4.

[Amin Bandali]

[-- Attachment #1: Type: text/plain, Size: 1069 bytes --]

Hi Danny,

On 2019-01-15  4:48 PM, Danny Milosavljevic wrote:
> Hi,
>
> I've updated arachne-pnr, icestorm (please make sure to also update this when
> you update arachne-pnr since arachne-pnr tests require icestorm) and yosys on
> guix master now.
>

Thanks; I’ll keep your advice about them in mind if I end up changing
them in the future.

With Danny’s changes the build phase for arachne-pnr passes but the
check phase fails on one of the test cases, with or without my z3 4.8.4
update patch.  I’ve attached the corresponding logs:

- gwa4kkg00rzp96jkqv52fzz4g197q4-arachne-pnr-0.0-2-840bdfdeb.drv.bz2:
  with z3 4.8.3 (without my patch)
- s1lqkz49nlp147m96bnn0d0yl21dgi-arachne-pnr-0.0-2-840bdfdeb.drv.bz2:
  with z3 4.8.4 (with my patch)

A quick glance at the ediff of the two files, I didn’t see anything
suggesting that the failure may be due to updating z3 from 4.8.3 to
4.8.4.  It might be a good idea to apply the z3 update patch and try
resolving arachne-pnr’s test suite failure in a separate issue.

Thanks,
amin


[-- Attachment #2: gwa4kkg00rzp96jkqv52fzz4g197q4-arachne-pnr-0.0-2-840bdfdeb.drv.bz2 --]
[-- Type: application/x-bzip2, Size: 10233 bytes --]

[-- Attachment #3: s1lqkz49nlp147m96bnn0d0yl21dgi-arachne-pnr-0.0-2-840bdfdeb.drv.bz2 --]
[-- Type: application/x-bzip2, Size: 10221 bytes --]

bug#34048: [PATCH] gnu: z3: Update to 4.8.4.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 881 bytes --]

On Thu, Jan 17, 2019 at 11:27:40PM -0500, Amin Bandali wrote:
> With Danny’s changes the build phase for arachne-pnr passes but the
> check phase fails on one of the test cases, with or without my z3 4.8.4
> update patch.  I’ve attached the corresponding logs:
> 
> - gwa4kkg00rzp96jkqv52fzz4g197q4-arachne-pnr-0.0-2-840bdfdeb.drv.bz2:
>   with z3 4.8.3 (without my patch)
> - s1lqkz49nlp147m96bnn0d0yl21dgi-arachne-pnr-0.0-2-840bdfdeb.drv.bz2:
>   with z3 4.8.4 (with my patch)
> 
> A quick glance at the ediff of the two files, I didn’t see anything
> suggesting that the failure may be due to updating z3 from 4.8.3 to
> 4.8.4.  It might be a good idea to apply the z3 update patch and try
> resolving arachne-pnr’s test suite failure in a separate issue.

Thanks for investigating. I've pushed the z3 update as
6654f8c1447d80c4899c4234306801407315b31f

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]