Browse Source

patch now unneeded with new version of super_prove

T. Meissner 1 month ago
parent
commit
c77a31e70a
2 changed files with 1 additions and 29 deletions
  1. 0
    25
      packages/fix_super_prove_build.txt
  2. 1
    4
      symbiyosys.Dockerfile

+ 0
- 25
packages/fix_super_prove_build.txt View File

@@ -1,25 +0,0 @@
1
-diff -r bde167bca3cd Bip/Main_bip.cc
2
---- a/Bip/Main_bip.cc	Thu Sep 14 01:44:08 2017 -0700
3
-+++ b/Bip/Main_bip.cc	Thu Aug 08 15:02:00 2019 +0200
4
-@@ -508,8 +508,8 @@
5
- void writeCex(Out& out, NetlistRef N, const Cex& cex, uint orig_num_pis)
6
- {
7
-     Vec<Pair<int,GLit> > ffs, pis;
8
--    For_Gatetype(N, gate_Flop, w) ffs.push(tuple(attr_Flop(w).number, w));
9
--    For_Gatetype(N, gate_PI  , w) pis.push(tuple(attr_PI  (w).number, w));
10
-+    For_Gatetype(N, gate_Flop, w) ffs.push(::tuple(attr_Flop(w).number, w));
11
-+    For_Gatetype(N, gate_PI  , w) pis.push(::tuple(attr_PI  (w).number, w));
12
-     sort(ffs);
13
-     sort(pis);
14
-
15
-diff -r bde167bca3cd MetaSat/MiniSat2/System.cc
16
---- a/MetaSat/MiniSat2/System.cc	Thu Sep 14 01:44:08 2017 -0700
17
-+++ b/MetaSat/MiniSat2/System.cc	Thu Aug 08 15:02:00 2019 +0200
18
-@@ -20,6 +20,7 @@
19
-
20
- #include <signal.h>
21
- #include <stdio.h>
22
-+#include <stdlib.h>
23
-
24
- #include "System.hh"
25
-

+ 1
- 4
symbiyosys.Dockerfile View File

@@ -41,7 +41,6 @@ RUN apt-get update -qq && \
41 41
 FROM yosys AS symbiyosys
42 42
 
43 43
 COPY packages/suprove /root/suprove
44
-COPY packages/fix_super_prove_build.txt /root/fix_super_prove_build.txt
45 44
 
46 45
 RUN apt-get update -qq && \
47 46
     DEBIAN_FRONTEND=noninteractive apt-get -y install --no-install-recommends \
@@ -96,9 +95,7 @@ RUN apt-get update -qq && \
96 95
     cp deps/btor2tools/bin/btorsim /opt/boolector/bin/ && \
97 96
     cd /root && \
98 97
     git clone --recursive https://github.com/sterin/super-prove-build && \
99
-    cd super-prove-build/abc-zz && \
100
-    patch -p1 < /root/fix_super_prove_build.txt && \
101
-    cd .. && \
98
+    cd super-prove-build && \
102 99
     mkdir build && \
103 100
     cd build && \
104 101
     cmake -DCMAKE_BUILD_TYPE=Release -G Ninja .. && \