Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
abc
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
abc
Commits
aebf1e7b
Commit
aebf1e7b
authored
Jun 02, 2022
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Integrated Kissat, by Armin Biere, as an external binary.
parent
94ab17c3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
191 additions
and
0 deletions
+191
-0
src/base/abci/abc.c
+113
-0
src/base/cmd/cmdUtils.c
+78
-0
No files found.
src/base/abci/abc.c
View file @
aebf1e7b
...
@@ -337,6 +337,7 @@ static int Abc_CommandXSat ( Abc_Frame_t * pAbc, int argc, cha
...
@@ -337,6 +337,7 @@ static int Abc_CommandXSat ( Abc_Frame_t * pAbc, int argc, cha
static
int
Abc_CommandSatoko
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandSatoko
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandAbc9Satoko
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandAbc9Satoko
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandAbc9Sat3
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandAbc9Sat3
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandAbc9Kissat
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandPSat
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandPSat
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandProve
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandProve
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandIProve
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
static
int
Abc_CommandIProve
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
);
...
@@ -1084,6 +1085,7 @@ void Abc_Init( Abc_Frame_t * pAbc )
...
@@ -1084,6 +1085,7 @@ void Abc_Init( Abc_Frame_t * pAbc )
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"satoko"
,
Abc_CommandSatoko
,
0
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"satoko"
,
Abc_CommandSatoko
,
0
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"&satoko"
,
Abc_CommandAbc9Satoko
,
0
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"&satoko"
,
Abc_CommandAbc9Satoko
,
0
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"&sat3"
,
Abc_CommandAbc9Sat3
,
0
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"&sat3"
,
Abc_CommandAbc9Sat3
,
0
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"&kissat"
,
Abc_CommandAbc9Kissat
,
0
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"psat"
,
Abc_CommandPSat
,
0
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"psat"
,
Abc_CommandPSat
,
0
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"prove"
,
Abc_CommandProve
,
1
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"prove"
,
Abc_CommandProve
,
1
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"iprove"
,
Abc_CommandIProve
,
1
);
Cmd_CommandAdd
(
pAbc
,
"Verification"
,
"iprove"
,
Abc_CommandIProve
,
1
);
...
@@ -25887,6 +25889,117 @@ usage:
...
@@ -25887,6 +25889,117 @@ usage:
SeeAlso []
SeeAlso []
***********************************************************************/
***********************************************************************/
int
Abc_CommandAbc9Kissat
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
)
{
extern
void
Mf_ManDumpCnf
(
Gia_Man_t
*
p
,
char
*
pFileName
,
int
nLutSize
,
int
fCnfObjIds
,
int
fAddOrCla
,
int
fVerbose
);
extern
void
Gia_ManKissatCall
(
Abc_Frame_t
*
pAbc
,
char
*
pFileName
,
char
*
pArgs
,
int
nConfs
,
int
nTimeLimit
,
int
fSat
,
int
fUnsat
,
int
fPrintCex
,
int
fVerbose
);
int
c
,
nConfs
=
0
,
nTimeLimit
=
0
,
fSat
=
0
,
fUnsat
=
0
,
fPrintCex
=
0
,
fVerbose
=
0
;
char
*
pArgs
=
NULL
;
Extra_UtilGetoptReset
();
while
(
(
c
=
Extra_UtilGetopt
(
argc
,
argv
,
"CTAsucvh"
)
)
!=
EOF
)
{
switch
(
c
)
{
case
'C'
:
if
(
globalUtilOptind
>=
argc
)
{
Abc_Print
(
-
1
,
"Command line switch
\"
-C
\"
should be followed by an integer.
\n
"
);
goto
usage
;
}
nConfs
=
atoi
(
argv
[
globalUtilOptind
]);
globalUtilOptind
++
;
if
(
nConfs
<
0
)
goto
usage
;
break
;
case
'T'
:
if
(
globalUtilOptind
>=
argc
)
{
Abc_Print
(
-
1
,
"Command line switch
\"
-T
\"
should be followed by an integer.
\n
"
);
goto
usage
;
}
nTimeLimit
=
atoi
(
argv
[
globalUtilOptind
]);
globalUtilOptind
++
;
if
(
nTimeLimit
<
0
)
goto
usage
;
break
;
case
'A'
:
if
(
globalUtilOptind
>=
argc
)
{
Abc_Print
(
-
1
,
"Command line switch
\"
-A
\"
should be followed by a file name.
\n
"
);
goto
usage
;
}
pArgs
=
argv
[
globalUtilOptind
];
globalUtilOptind
++
;
break
;
case
's'
:
fSat
^=
1
;
break
;
case
'u'
:
fUnsat
^=
1
;
break
;
case
'c'
:
fPrintCex
^=
1
;
break
;
case
'v'
:
fVerbose
^=
1
;
break
;
case
'h'
:
goto
usage
;
default:
goto
usage
;
}
}
if
(
argc
==
globalUtilOptind
+
1
)
{
Gia_ManKissatCall
(
pAbc
,
argv
[
globalUtilOptind
],
pArgs
,
nConfs
,
nTimeLimit
,
fSat
,
fUnsat
,
fPrintCex
,
fVerbose
);
return
0
;
}
if
(
pAbc
->
pGia
==
NULL
)
{
Abc_Print
(
-
1
,
"Abc_CommandAbc9Satoko(): There is no AIG.
\n
"
);
return
1
;
}
else
{
int
nLutSize
=
8
;
int
fCnfObjIds
=
0
;
int
fAddOrCla
=
1
;
char
*
pFileName
=
"_temp_.cnf"
;
Mf_ManDumpCnf
(
pAbc
->
pGia
,
pFileName
,
nLutSize
,
fCnfObjIds
,
fAddOrCla
,
fVerbose
);
Gia_ManKissatCall
(
pAbc
,
pFileName
,
pArgs
,
nConfs
,
nTimeLimit
,
fSat
,
fUnsat
,
fPrintCex
,
fVerbose
);
unlink
(
pFileName
);
}
return
0
;
usage:
Abc_Print
(
-
2
,
"usage: &kissat [-CT num] [-sucvh] [-A string] <file.cnf>
\n
"
);
Abc_Print
(
-
2
,
"
\t
run SAT solver Kissat, by Armin Biere (https://github.com/arminbiere/kissat)
\n
"
);
Abc_Print
(
-
2
,
"
\t
-C num : limit on the number of conflicts [default = %d]
\n
"
,
nConfs
);
Abc_Print
(
-
2
,
"
\t
-T num : runtime limit in seconds [default = %d]
\n
"
,
nTimeLimit
);
Abc_Print
(
-
2
,
"
\t
-s : expect a satisfiable problem [default = %s]
\n
"
,
fSat
?
"yes"
:
"no"
);
Abc_Print
(
-
2
,
"
\t
-u : expect an unsatisfiable problem [default = %s]
\n
"
,
fUnsat
?
"yes"
:
"no"
);
Abc_Print
(
-
2
,
"
\t
-c : prints satisfying assignment if satisfiable [default = %s]
\n
"
,
fPrintCex
?
"yes"
:
"no"
);
Abc_Print
(
-
2
,
"
\t
-v : prints verbose information [default = %s]
\n
"
,
fVerbose
?
"yes"
:
"no"
);
Abc_Print
(
-
2
,
"
\t
-A num : string containing additional command-line args for the Kissat binary [default = %s]
\n
"
,
pArgs
?
pArgs
:
"unused"
);
Abc_Print
(
-
2
,
"
\t
(in particular, <&kissat -A
\"
--help
\"
> prints all command-line args of Kissat)
\n
"
);
Abc_Print
(
-
2
,
"
\t
<file.cnf> : (optional) CNF file to solve
\n
"
);
Abc_Print
(
-
2
,
"
\t
-h : print the command usage
\n
"
);
return
1
;
}
/**Function*************************************************************
Synopsis []
Description []
SideEffects []
SeeAlso []
***********************************************************************/
int
Abc_CommandPSat
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
)
int
Abc_CommandPSat
(
Abc_Frame_t
*
pAbc
,
int
argc
,
char
**
argv
)
{
{
Abc_Ntk_t
*
pNtk
=
Abc_FrameReadNtk
(
pAbc
);
Abc_Ntk_t
*
pNtk
=
Abc_FrameReadNtk
(
pAbc
);
src/base/cmd/cmdUtils.c
View file @
aebf1e7b
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
#include "base/abc/abc.h"
#include "base/abc/abc.h"
#include "base/main/mainInt.h"
#include "base/main/mainInt.h"
#include "misc/util/utilSignal.h"
#include "cmdInt.h"
#include "cmdInt.h"
#include <ctype.h>
#include <ctype.h>
...
@@ -749,6 +750,83 @@ void CmdPrintTable( st__table * tTable, int fAliases )
...
@@ -749,6 +750,83 @@ void CmdPrintTable( st__table * tTable, int fAliases )
ABC_FREE
(
ppNames
);
ABC_FREE
(
ppNames
);
}
}
/**Function*************************************************************
Synopsis []
Description []
SideEffects []
SeeAlso []
***********************************************************************/
void
Gia_ManKissatCall
(
Abc_Frame_t
*
pAbc
,
char
*
pFileName
,
char
*
pArgs
,
int
nConfs
,
int
nTimeLimit
,
int
fSat
,
int
fUnsat
,
int
fPrintCex
,
int
fVerbose
)
{
char
Command
[
1000
],
Buffer
[
100
];
char
*
pNameWin
=
"kissat.exe"
;
char
*
pNameUnix
=
"kissat"
;
char
*
pKissatName
=
NULL
;
FILE
*
pFile
=
NULL
;
// get the names from the resource file
if
(
Cmd_FlagReadByName
(
pAbc
,
"kissatwin"
)
)
pNameWin
=
Cmd_FlagReadByName
(
pAbc
,
"kissatwin"
);
if
(
Cmd_FlagReadByName
(
pAbc
,
"kissatunix"
)
)
pNameUnix
=
Cmd_FlagReadByName
(
pAbc
,
"kissatunix"
);
// check if the binary is available
if
(
(
pFile
=
fopen
(
pNameWin
,
"r"
))
)
pKissatName
=
pNameWin
;
else
if
(
(
pFile
=
fopen
(
pNameUnix
,
"r"
))
)
pKissatName
=
pNameUnix
;
else
if
(
pFile
==
NULL
)
{
fprintf
(
stdout
,
"Cannot find Kissat binary
\"
%s
\"
or
\"
%s
\"
in the current directory.
\n
"
,
pNameWin
,
pNameUnix
);
return
;
}
fclose
(
pFile
);
sprintf
(
Command
,
"%s"
,
pKissatName
);
if
(
pArgs
)
{
strcat
(
Command
,
" "
);
strcat
(
Command
,
pArgs
);
}
if
(
!
pArgs
||
(
strcmp
(
pArgs
,
"-h"
)
&&
strcmp
(
pArgs
,
"--help"
))
)
{
if
(
!
fVerbose
)
strcat
(
Command
,
" -q"
);
if
(
!
fPrintCex
)
strcat
(
Command
,
" -n"
);
if
(
fSat
)
strcat
(
Command
,
" --sat"
);
if
(
fUnsat
)
strcat
(
Command
,
" --unsat"
);
if
(
nConfs
)
{
sprintf
(
Buffer
,
" --conflicts=%d"
,
nConfs
);
strcat
(
Command
,
Buffer
);
}
if
(
nTimeLimit
)
{
sprintf
(
Buffer
,
" --time=%d"
,
nTimeLimit
);
strcat
(
Command
,
Buffer
);
}
strcat
(
Command
,
" "
);
strcat
(
Command
,
pFileName
);
}
if
(
fVerbose
)
printf
(
"Running command: %s
\n
"
,
Command
);
if
(
Util_SignalSystem
(
Command
)
==
-
1
)
{
fprintf
(
stdout
,
"The following command has returned a strange exit status:
\n
"
);
fprintf
(
stdout
,
"
\"
%s
\"\n
"
,
Command
);
}
}
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
/// END OF FILE ///
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment