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
51f4dab4
Commit
51f4dab4
authored
Jan 24, 2017
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding features for invariant minimization.
parent
cf539dcc
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
330 additions
and
21 deletions
+330
-21
src/base/main/mainFrame.c
+0
-4
src/base/main/mainInt.h
+0
-2
src/base/wlc/wlcAbc.c
+100
-11
src/base/wlc/wlcCom.c
+0
-0
src/proof/pdr/pdrCore.c
+1
-3
src/proof/pdr/pdrInv.c
+228
-0
src/proof/pdr/pdrUtil.c
+1
-1
No files found.
src/base/main/mainFrame.c
View file @
51f4dab4
...
...
@@ -95,8 +95,6 @@ void Abc_FrameSetStatus( int Status ) { ABC_FREE( s_Globa
void
Abc_FrameSetManDsd
(
void
*
pMan
)
{
if
(
s_GlobalFrame
->
pManDsd
&&
s_GlobalFrame
->
pManDsd
!=
pMan
)
If_DsdManFree
((
If_DsdMan_t
*
)
s_GlobalFrame
->
pManDsd
,
0
);
s_GlobalFrame
->
pManDsd
=
pMan
;
}
void
Abc_FrameSetManDsd2
(
void
*
pMan
)
{
if
(
s_GlobalFrame
->
pManDsd2
&&
s_GlobalFrame
->
pManDsd2
!=
pMan
)
If_DsdManFree
((
If_DsdMan_t
*
)
s_GlobalFrame
->
pManDsd2
,
0
);
s_GlobalFrame
->
pManDsd2
=
pMan
;
}
void
Abc_FrameSetInv
(
Vec_Int_t
*
vInv
)
{
Vec_IntFreeP
(
&
s_GlobalFrame
->
pAbcWlcInv
);
s_GlobalFrame
->
pAbcWlcInv
=
vInv
;
}
void
Abc_FrameSetCnf
(
Vec_Int_t
*
vCnf
)
{
Vec_IntFreeP
(
&
s_GlobalFrame
->
pAbcWlcCnf
);
s_GlobalFrame
->
pAbcWlcCnf
=
vCnf
;
}
void
Abc_FrameSetStr
(
Vec_Str_t
*
vStr
)
{
Vec_StrFreeP
(
&
s_GlobalFrame
->
pAbcWlcStr
);
s_GlobalFrame
->
pAbcWlcStr
=
vStr
;
}
void
Abc_FrameSetJsonStrs
(
Abc_Nam_t
*
pStrs
)
{
Abc_NamDeref
(
s_GlobalFrame
->
pJsonStrs
);
s_GlobalFrame
->
pJsonStrs
=
pStrs
;
}
void
Abc_FrameSetJsonObjs
(
Vec_Wec_t
*
vObjs
)
{
Vec_WecFreeP
(
&
s_GlobalFrame
->
vJsonObjs
);
s_GlobalFrame
->
vJsonObjs
=
vObjs
;
}
...
...
@@ -227,8 +225,6 @@ void Abc_FrameDeallocate( Abc_Frame_t * p )
ABC_FREE
(
p
->
pCex2
);
ABC_FREE
(
p
->
pCex
);
Vec_IntFreeP
(
&
p
->
pAbcWlcInv
);
Vec_IntFreeP
(
&
p
->
pAbcWlcCnf
);
Vec_StrFreeP
(
&
p
->
pAbcWlcStr
);
Abc_NamDeref
(
s_GlobalFrame
->
pJsonStrs
);
Vec_WecFreeP
(
&
s_GlobalFrame
->
vJsonObjs
);
ABC_FREE
(
p
);
...
...
src/base/main/mainInt.h
View file @
51f4dab4
...
...
@@ -129,8 +129,6 @@ struct Abc_Frame_t_
void
*
pAbc85Delay
;
void
*
pAbcWlc
;
Vec_Int_t
*
pAbcWlcInv
;
Vec_Int_t
*
pAbcWlcCnf
;
Vec_Str_t
*
pAbcWlcStr
;
void
*
pAbcBac
;
void
*
pAbcCba
;
void
*
pAbcPla
;
...
...
src/base/wlc/wlcAbc.c
View file @
51f4dab4
...
...
@@ -42,7 +42,7 @@ ABC_NAMESPACE_IMPL_START
SeeAlso []
***********************************************************************/
void
Wlc_NtkPrintInvStats
(
Wlc_Ntk_t
*
pNtk
,
Vec_Int_t
*
v
Inv
,
int
fVerbose
)
void
Wlc_NtkPrintInvStats
(
Wlc_Ntk_t
*
pNtk
,
Vec_Int_t
*
v
Counts
,
int
fVerbose
)
{
Wlc_Obj_t
*
pObj
;
int
i
,
k
,
nNum
,
nRange
,
nBits
=
0
;
...
...
@@ -53,7 +53,7 @@ void Wlc_NtkPrintInvStats( Wlc_Ntk_t * pNtk, Vec_Int_t * vInv, int fVerbose )
nRange
=
Wlc_ObjRange
(
pObj
);
for
(
k
=
0
;
k
<
nRange
;
k
++
)
{
nNum
=
Vec_IntEntry
(
v
Inv
,
nBits
+
k
);
nNum
=
Vec_IntEntry
(
v
Counts
,
nBits
+
k
);
if
(
nNum
)
break
;
}
...
...
@@ -65,7 +65,7 @@ void Wlc_NtkPrintInvStats( Wlc_Ntk_t * pNtk, Vec_Int_t * vInv, int fVerbose )
printf
(
"%s[%d:%d] : "
,
Wlc_ObjName
(
pNtk
,
Wlc_ObjId
(
pNtk
,
pObj
)),
pObj
->
End
,
pObj
->
Beg
);
for
(
k
=
0
;
k
<
nRange
;
k
++
)
{
nNum
=
Vec_IntEntry
(
v
Inv
,
nBits
+
k
);
nNum
=
Vec_IntEntry
(
v
Counts
,
nBits
+
k
);
if
(
nNum
==
0
)
continue
;
printf
(
" [%d] -> %d"
,
k
,
nNum
);
...
...
@@ -73,8 +73,8 @@ void Wlc_NtkPrintInvStats( Wlc_Ntk_t * pNtk, Vec_Int_t * vInv, int fVerbose )
printf
(
"
\n
"
);
nBits
+=
nRange
;
}
//printf( "%d %d\n", Vec_IntSize(v
Inv
), nBits );
assert
(
Vec_IntSize
(
v
Inv
)
==
nBits
);
//printf( "%d %d\n", Vec_IntSize(v
Counts
), nBits );
assert
(
Vec_IntSize
(
v
Counts
)
==
nBits
);
}
/**Function*************************************************************
...
...
@@ -88,8 +88,14 @@ void Wlc_NtkPrintInvStats( Wlc_Ntk_t * pNtk, Vec_Int_t * vInv, int fVerbose )
SeeAlso []
***********************************************************************/
Abc_Ntk_t
*
Wlc_NtkGetInv
(
Wlc_Ntk_t
*
pNtk
,
Vec_Int_t
*
vInv
,
Vec_Str_t
*
vSop
,
int
fVerbose
)
Abc_Ntk_t
*
Wlc_NtkGetInv
(
Wlc_Ntk_t
*
pNtk
,
Vec_Int_t
*
vInv
)
{
extern
Vec_Int_t
*
Pdr_InvCounts
(
Vec_Int_t
*
vInv
);
extern
Vec_Str_t
*
Pdr_InvPrintStr
(
Vec_Int_t
*
vInv
,
Vec_Int_t
*
vCounts
);
Vec_Int_t
*
vCounts
=
Pdr_InvCounts
(
vInv
);
Vec_Str_t
*
vSop
=
Pdr_InvPrintStr
(
vInv
,
vCounts
);
Wlc_Obj_t
*
pObj
;
int
i
,
k
,
nNum
,
nRange
,
nBits
=
0
;
Abc_Ntk_t
*
pMainNtk
=
NULL
;
...
...
@@ -98,8 +104,28 @@ Abc_Ntk_t * Wlc_NtkGetInv( Wlc_Ntk_t * pNtk, Vec_Int_t * vInv, Vec_Str_t * vSop,
// start the network
pMainNtk
=
Abc_NtkAlloc
(
ABC_NTK_LOGIC
,
ABC_FUNC_SOP
,
1
);
// duplicate the name and the spec
pMainNtk
->
pName
=
Extra_UtilStrsav
(
pNtk
->
pName
);
pMainNtk
->
pName
=
Extra_UtilStrsav
(
pNtk
?
pNtk
->
pName
:
"inv"
);
// create primary inputs
if
(
pNtk
==
NULL
)
{
int
Entry
,
nInputs
=
Abc_SopGetVarNum
(
Vec_StrArray
(
vSop
)
);
Vec_IntForEachEntry
(
vCounts
,
Entry
,
i
)
{
if
(
Entry
==
0
)
continue
;
pMainObj
=
Abc_NtkCreatePi
(
pMainNtk
);
sprintf
(
Buffer
,
"pi%d"
,
i
);
Abc_ObjAssignName
(
pMainObj
,
Buffer
,
NULL
);
}
if
(
Abc_NtkPiNum
(
pMainNtk
)
!=
nInputs
)
{
printf
(
"Mismatch between number of inputs and the number of literals in the invariant.
\n
"
);
Abc_NtkDelete
(
pMainNtk
);
return
NULL
;
}
}
else
{
Wlc_NtkForEachCi
(
pNtk
,
pObj
,
i
)
{
if
(
pObj
->
Type
!=
WLC_OBJ_FO
)
...
...
@@ -107,7 +133,7 @@ Abc_Ntk_t * Wlc_NtkGetInv( Wlc_Ntk_t * pNtk, Vec_Int_t * vInv, Vec_Str_t * vSop,
nRange
=
Wlc_ObjRange
(
pObj
);
for
(
k
=
0
;
k
<
nRange
;
k
++
)
{
nNum
=
Vec_IntEntry
(
vInv
,
nBits
+
k
);
nNum
=
Vec_IntEntry
(
vCounts
,
nBits
+
k
);
if
(
nNum
)
break
;
}
...
...
@@ -119,7 +145,7 @@ Abc_Ntk_t * Wlc_NtkGetInv( Wlc_Ntk_t * pNtk, Vec_Int_t * vInv, Vec_Str_t * vSop,
//printf( "%s[%d:%d] : ", Wlc_ObjName(pNtk, Wlc_ObjId(pNtk, pObj)), pObj->End, pObj->Beg );
for
(
k
=
0
;
k
<
nRange
;
k
++
)
{
nNum
=
Vec_IntEntry
(
vInv
,
nBits
+
k
);
nNum
=
Vec_IntEntry
(
vCounts
,
nBits
+
k
);
if
(
nNum
==
0
)
continue
;
//printf( " [%d] -> %d", k, nNum );
...
...
@@ -131,13 +157,16 @@ Abc_Ntk_t * Wlc_NtkGetInv( Wlc_Ntk_t * pNtk, Vec_Int_t * vInv, Vec_Str_t * vSop,
//printf( "\n");
nBits
+=
nRange
;
}
//printf( "%d %d\n", Vec_IntSize(vInv), nBits );
assert
(
Vec_IntSize
(
vInv
)
==
nBits
);
}
//printf( "%d %d\n", Vec_IntSize(vCounts), nBits );
assert
(
pNtk
==
NULL
||
Vec_IntSize
(
vCounts
)
==
nBits
);
// create node
pMainObj
=
Abc_NtkCreateNode
(
pMainNtk
);
Abc_NtkForEachPi
(
pMainNtk
,
pMainTemp
,
i
)
Abc_ObjAddFanin
(
pMainObj
,
pMainTemp
);
pMainObj
->
pData
=
Abc_SopRegister
(
(
Mem_Flex_t
*
)
pMainNtk
->
pManFunc
,
Vec_StrArray
(
vSop
)
);
Vec_IntFree
(
vCounts
);
Vec_StrFree
(
vSop
);
// create PO
pMainTemp
=
Abc_NtkCreatePo
(
pMainNtk
);
Abc_ObjAddFanin
(
pMainTemp
,
pMainObj
);
...
...
@@ -145,6 +174,66 @@ Abc_Ntk_t * Wlc_NtkGetInv( Wlc_Ntk_t * pNtk, Vec_Int_t * vInv, Vec_Str_t * vSop,
return
pMainNtk
;
}
/**Function*************************************************************
Synopsis [Translate current network into an interpolant.]
Description []
SideEffects []
SeeAlso []
***********************************************************************/
Vec_Int_t
*
Wlc_NtkGetPut
(
Abc_Ntk_t
*
pNtk
,
int
nRegs
)
{
Vec_Int_t
*
vRes
=
NULL
;
if
(
Abc_NtkPoNum
(
pNtk
)
!=
1
)
printf
(
"The number of outputs is other than 1.
\n
"
);
else
if
(
Abc_NtkNodeNum
(
pNtk
)
!=
1
)
printf
(
"The number of internal nodes is other than 1.
\n
"
);
else
{
Abc_Obj_t
*
pNode
=
Abc_ObjFanin0
(
Abc_NtkCo
(
pNtk
,
0
)
);
char
*
pName
,
*
pCube
,
*
pSop
=
(
char
*
)
pNode
->
pData
;
Vec_Int_t
*
vFanins
=
Vec_IntAlloc
(
Abc_ObjFaninNum
(
pNode
)
);
Abc_Obj_t
*
pFanin
;
int
i
,
k
,
Value
,
nLits
;
Abc_ObjForEachFanin
(
pNode
,
pFanin
,
i
)
{
assert
(
Abc_ObjIsCi
(
pFanin
)
);
pName
=
Abc_ObjName
(
pFanin
);
for
(
k
=
(
int
)
strlen
(
pName
)
-
1
;
k
>=
0
;
k
--
)
if
(
pName
[
k
]
<
'0'
||
pName
[
k
]
>
'9'
)
break
;
if
(
k
==
(
int
)
strlen
(
pName
)
-
1
)
{
printf
(
"Cannot read input name of fanin %d.
\n
"
,
i
);
Value
=
i
;
}
else
Value
=
atoi
(
pName
+
k
+
1
);
Vec_IntPush
(
vFanins
,
Value
);
}
assert
(
Vec_IntSize
(
vFanins
)
==
Abc_ObjFaninNum
(
pNode
)
);
vRes
=
Vec_IntAlloc
(
1000
);
Vec_IntPush
(
vRes
,
Abc_SopGetCubeNum
(
pSop
)
);
Abc_SopForEachCube
(
pSop
,
Abc_ObjFaninNum
(
pNode
),
pCube
)
{
nLits
=
0
;
Abc_CubeForEachVar
(
pCube
,
Value
,
k
)
if
(
Value
!=
'-'
)
nLits
++
;
Vec_IntPush
(
vRes
,
nLits
);
Abc_CubeForEachVar
(
pCube
,
Value
,
k
)
if
(
Value
!=
'-'
)
Vec_IntPush
(
vRes
,
Abc_Var2Lit
(
Vec_IntEntry
(
vFanins
,
k
),
(
int
)
Value
==
'0'
)
);
}
Vec_IntPush
(
vRes
,
nRegs
);
Vec_IntFree
(
vFanins
);
}
return
vRes
;
}
////////////////////////////////////////////////////////////////////////
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
...
...
src/base/wlc/wlcCom.c
View file @
51f4dab4
This diff is collapsed.
Click to expand it.
src/proof/pdr/pdrCore.c
View file @
51f4dab4
...
...
@@ -923,9 +923,7 @@ int Pdr_ManSolve( Aig_Man_t * pAig, Pdr_Par_t * pPars )
if
(
p
->
pPars
->
fDumpInv
)
{
char
*
pFileName
=
Extra_FileNameGenericAppend
(
p
->
pAig
->
pName
,
"_inv.pla"
);
Abc_FrameSetCnf
(
Pdr_ManDeriveInfinityClauses
(
p
,
RetValue
!=
1
)
);
Abc_FrameSetStr
(
Pdr_ManDumpString
(
p
)
);
Abc_FrameSetInv
(
Pdr_ManCountFlopsInv
(
p
)
);
Abc_FrameSetInv
(
Pdr_ManDeriveInfinityClauses
(
p
,
RetValue
!=
1
)
);
Pdr_ManDumpClauses
(
p
,
pFileName
,
RetValue
==
1
);
}
p
->
tTotal
+=
Abc_Clock
()
-
clk
;
...
...
src/proof/pdr/pdrInv.c
View file @
51f4dab4
...
...
@@ -605,9 +605,237 @@ Vec_Int_t * Pdr_ManDeriveInfinityClauses( Pdr_Man_t * p, int fReduce )
//Vec_PtrFree( vCubes );
Vec_PtrFreeP
(
&
p
->
vInfCubes
);
p
->
vInfCubes
=
vCubes
;
Vec_IntPush
(
vResult
,
Aig_ManRegNum
(
p
->
pAig
)
);
return
vResult
;
}
/**Function*************************************************************
Synopsis [Remove clauses while maintaining the invariant.]
Description []
SideEffects []
SeeAlso []
***********************************************************************/
#define Pdr_ForEachCube( pList, pCut, i ) for ( i = 0, pCut = pList + 1; i < pList[0]; i++, pCut += pCut[0] + 1 )
extern
Cnf_Dat_t
*
Mf_ManGenerateCnf
(
Gia_Man_t
*
pGia
,
int
nLutSize
,
int
fCnfObjIds
,
int
fAddOrCla
,
int
fVerbose
);
Vec_Int_t
*
Pdr_InvMap
(
Vec_Int_t
*
vCounts
)
{
int
i
,
k
=
0
,
Count
;
Vec_Int_t
*
vMap
=
Vec_IntStart
(
Vec_IntSize
(
vCounts
)
);
Vec_IntForEachEntry
(
vCounts
,
Count
,
i
)
if
(
Count
)
Vec_IntWriteEntry
(
vMap
,
i
,
k
++
);
return
vMap
;
}
Vec_Int_t
*
Pdr_InvCounts
(
Vec_Int_t
*
vInv
)
{
int
i
,
k
,
*
pCube
,
*
pList
=
Vec_IntArray
(
vInv
);
Vec_Int_t
*
vCounts
=
Vec_IntStart
(
Vec_IntEntryLast
(
vInv
)
);
Pdr_ForEachCube
(
pList
,
pCube
,
i
)
for
(
k
=
0
;
k
<
pCube
[
0
];
k
++
)
Vec_IntAddToEntry
(
vCounts
,
Abc_Lit2Var
(
pCube
[
k
+
1
]),
1
);
return
vCounts
;
}
int
Pdr_InvUsedFlopNum
(
Vec_Int_t
*
vInv
)
{
Vec_Int_t
*
vCounts
=
Pdr_InvCounts
(
vInv
);
int
nZeros
=
Vec_IntCountZero
(
vCounts
);
Vec_IntFree
(
vCounts
);
return
Vec_IntEntryLast
(
vInv
)
-
nZeros
;
}
Vec_Str_t
*
Pdr_InvPrintStr
(
Vec_Int_t
*
vInv
,
Vec_Int_t
*
vCounts
)
{
Vec_Str_t
*
vStr
=
Vec_StrAlloc
(
1000
);
Vec_Int_t
*
vMap
=
Pdr_InvMap
(
vCounts
);
int
nVars
=
Vec_IntSize
(
vCounts
)
-
Vec_IntCountZero
(
vCounts
);
int
i
,
k
,
*
pCube
,
*
pList
=
Vec_IntArray
(
vInv
);
char
*
pBuffer
=
ABC_ALLOC
(
char
,
nVars
);
for
(
i
=
0
;
i
<
nVars
;
i
++
)
pBuffer
[
i
]
=
'-'
;
Pdr_ForEachCube
(
pList
,
pCube
,
i
)
{
for
(
k
=
0
;
k
<
pCube
[
0
];
k
++
)
pBuffer
[
Vec_IntEntry
(
vMap
,
Abc_Lit2Var
(
pCube
[
k
+
1
]))]
=
'0'
+
!
Abc_LitIsCompl
(
pCube
[
k
+
1
]);
for
(
k
=
0
;
k
<
nVars
;
k
++
)
Vec_StrPush
(
vStr
,
pBuffer
[
k
]
);
Vec_StrPush
(
vStr
,
' '
);
Vec_StrPush
(
vStr
,
'1'
);
Vec_StrPush
(
vStr
,
'\n'
);
for
(
k
=
0
;
k
<
pCube
[
0
];
k
++
)
pBuffer
[
Vec_IntEntry
(
vMap
,
Abc_Lit2Var
(
pCube
[
k
+
1
]))]
=
'-'
;
}
Vec_StrPush
(
vStr
,
'\0'
);
ABC_FREE
(
pBuffer
);
Vec_IntFree
(
vMap
);
return
vStr
;
}
void
Pdr_InvPrint
(
Vec_Int_t
*
vInv
)
{
Vec_Int_t
*
vCounts
=
Pdr_InvCounts
(
vInv
);
Vec_Str_t
*
vStr
=
Pdr_InvPrintStr
(
vInv
,
vCounts
);
printf
(
"Invariant contains %d clauses with %d literals and %d flops (out of %d).
\n
"
,
Vec_IntEntry
(
vInv
,
0
),
Vec_IntSize
(
vInv
)
-
Vec_IntEntry
(
vInv
,
0
)
-
2
,
Pdr_InvUsedFlopNum
(
vInv
),
Vec_IntEntryLast
(
vInv
)
);
printf
(
"%s"
,
Vec_StrArray
(
vStr
)
);
Vec_IntFree
(
vCounts
);
Vec_StrFree
(
vStr
);
}
void
Pdr_InvCheck
(
Gia_Man_t
*
p
,
Vec_Int_t
*
vInv
)
{
int
nBTLimit
=
0
;
int
i
,
k
,
status
,
nFailed
=
0
;
// create SAT solver
Cnf_Dat_t
*
pCnf
=
Mf_ManGenerateCnf
(
p
,
8
,
0
,
0
,
0
);
sat_solver
*
pSat
=
(
sat_solver
*
)
Cnf_DataWriteIntoSolver
(
pCnf
,
1
,
0
);
// collect cubes
int
*
pCube
,
*
pList
=
Vec_IntArray
(
vInv
),
nCubes
=
pList
[
0
];
// create variables
Vec_Int_t
*
vLits
=
Vec_IntAlloc
(
100
);
int
nVars
=
Gia_ManRegNum
(
p
);
int
iFoVarBeg
=
pCnf
->
nVars
-
Gia_ManRegNum
(
p
);
int
iFiVarBeg
=
1
+
Gia_ManPoNum
(
p
);
assert
(
Gia_ManPoNum
(
p
)
==
1
);
// add cubes
Pdr_ForEachCube
(
pList
,
pCube
,
i
)
{
// collect literals
Vec_IntClear
(
vLits
);
for
(
k
=
0
;
k
<
pCube
[
0
];
k
++
)
Vec_IntPush
(
vLits
,
Abc_Var2Lit
(
iFoVarBeg
+
Abc_Lit2Var
(
pCube
[
k
+
1
]),
!
Abc_LitIsCompl
(
pCube
[
k
+
1
]))
);
// add it to the solver
status
=
sat_solver_addclause
(
pSat
,
Vec_IntArray
(
vLits
),
Vec_IntLimit
(
vLits
)
);
assert
(
status
==
1
);
}
// iterate through cubes in the direct order
Pdr_ForEachCube
(
pList
,
pCube
,
i
)
{
// collect cube
Vec_IntClear
(
vLits
);
for
(
k
=
0
;
k
<
pCube
[
0
];
k
++
)
Vec_IntPush
(
vLits
,
Abc_Var2Lit
(
iFiVarBeg
+
Abc_Lit2Var
(
pCube
[
k
+
1
]),
Abc_LitIsCompl
(
pCube
[
k
+
1
]))
);
// check if this cube intersects with the complement of other cubes in the solver
// if it does not intersect, then it is redundant and can be skipped
status
=
sat_solver_solve
(
pSat
,
Vec_IntArray
(
vLits
),
Vec_IntLimit
(
vLits
),
nBTLimit
,
0
,
0
,
0
);
if
(
status
==
l_Undef
)
// timeout
break
;
if
(
status
==
l_False
)
// unsat -- correct
continue
;
assert
(
status
==
l_True
);
nFailed
++
;
}
if
(
nFailed
)
printf
(
"Invariant verification failed for %d clauses (out of %d).
\n
"
,
nFailed
,
nCubes
);
else
printf
(
"Invariant verification passes.
\n
"
);
Cnf_DataFree
(
pCnf
);
sat_solver_delete
(
pSat
);
Vec_IntFree
(
vLits
);
}
Vec_Int_t
*
Pdr_InvMinimize
(
Gia_Man_t
*
p
,
Vec_Int_t
*
vInv
)
{
int
nBTLimit
=
0
;
int
n
,
i
,
k
,
status
,
nLits
,
fFailed
=
0
,
fCannot
=
0
,
nRemoved
=
0
;
Vec_Int_t
*
vRes
=
NULL
;
// create SAT solver
Cnf_Dat_t
*
pCnf
=
Mf_ManGenerateCnf
(
p
,
8
,
0
,
0
,
0
);
sat_solver
*
pSat
=
(
sat_solver
*
)
Cnf_DataWriteIntoSolver
(
pCnf
,
1
,
0
);
int
*
pCube
,
*
pList
=
Vec_IntArray
(
vInv
),
nCubes
=
pList
[
0
];
// create variables
Vec_Int_t
*
vLits
=
Vec_IntAlloc
(
100
);
Vec_Bit_t
*
vRemoved
=
Vec_BitStart
(
nCubes
);
int
nVars
=
Gia_ManRegNum
(
p
);
int
iFoVarBeg
=
pCnf
->
nVars
-
Gia_ManRegNum
(
p
);
int
iFiVarBeg
=
1
+
Gia_ManPoNum
(
p
);
int
iAuxVarBeg
=
sat_solver_nvars
(
pSat
);
assert
(
Gia_ManPoNum
(
p
)
==
1
);
// allocate auxiliary variables
sat_solver_setnvars
(
pSat
,
sat_solver_nvars
(
pSat
)
+
nCubes
);
// add clauses
Pdr_ForEachCube
(
pList
,
pCube
,
i
)
{
// collect literals
Vec_IntFill
(
vLits
,
1
,
Abc_Var2Lit
(
iAuxVarBeg
+
i
,
1
)
);
// neg aux literal
for
(
k
=
0
;
k
<
pCube
[
0
];
k
++
)
Vec_IntPush
(
vLits
,
Abc_Var2Lit
(
iFoVarBeg
+
Abc_Lit2Var
(
pCube
[
k
+
1
]),
!
Abc_LitIsCompl
(
pCube
[
k
+
1
]))
);
// add it to the solver
status
=
sat_solver_addclause
(
pSat
,
Vec_IntArray
(
vLits
),
Vec_IntLimit
(
vLits
)
);
assert
(
status
==
1
);
}
// iterate through clauses
Pdr_ForEachCube
(
pList
,
pCube
,
i
)
{
if
(
Vec_BitEntry
(
vRemoved
,
i
)
)
continue
;
// collect aux literals for remaining clauses
Vec_IntClear
(
vLits
);
for
(
k
=
0
;
k
<
nCubes
;
k
++
)
if
(
k
!=
i
&&
!
Vec_BitEntry
(
vRemoved
,
k
)
)
// skip this cube and already removed cubes
Vec_IntPush
(
vLits
,
Abc_Var2Lit
(
iAuxVarBeg
+
k
,
0
)
);
// pos aux literal
nLits
=
Vec_IntSize
(
vLits
);
// try removing other clauses
fCannot
=
0
;
Pdr_ForEachCube
(
pList
,
pCube
,
n
)
{
if
(
Vec_BitEntry
(
vRemoved
,
n
)
||
n
==
i
)
continue
;
// collect cube
Vec_IntShrink
(
vLits
,
nLits
);
for
(
k
=
0
;
k
<
pCube
[
0
];
k
++
)
Vec_IntPush
(
vLits
,
Abc_Var2Lit
(
iFiVarBeg
+
Abc_Lit2Var
(
pCube
[
k
+
1
]),
Abc_LitIsCompl
(
pCube
[
k
+
1
]))
);
// check if this cube intersects with the complement of other cubes in the solver
// if it does not intersect, then it is redundant and can be skipped
status
=
sat_solver_solve
(
pSat
,
Vec_IntArray
(
vLits
),
Vec_IntLimit
(
vLits
),
nBTLimit
,
0
,
0
,
0
);
if
(
status
==
l_Undef
)
// timeout
{
fFailed
=
1
;
break
;
}
if
(
status
==
l_False
)
// unsat -- correct
continue
;
assert
(
status
==
l_True
);
// cannot remove
fCannot
=
1
;
break
;
}
if
(
fFailed
)
break
;
if
(
fCannot
)
continue
;
printf
(
"Removing clause %d.
\n
"
,
i
);
Vec_BitWriteEntry
(
vRemoved
,
i
,
1
);
nRemoved
++
;
}
if
(
nRemoved
)
printf
(
"Invariant minimization reduced %d clauses (out of %d).
\n
"
,
nRemoved
,
nCubes
);
else
printf
(
"Invariant minimization did not change the invariant.
\n
"
);
// cleanup cover
if
(
!
fFailed
&&
nRemoved
>
0
)
// finished without timeout and removed some cubes
{
vRes
=
Vec_IntAlloc
(
1000
);
Vec_IntPush
(
vRes
,
nCubes
-
nRemoved
);
Pdr_ForEachCube
(
pList
,
pCube
,
i
)
if
(
!
Vec_BitEntry
(
vRemoved
,
i
)
)
for
(
k
=
0
;
k
<=
pCube
[
0
];
k
++
)
Vec_IntPush
(
vRes
,
pCube
[
k
]
);
Vec_IntPush
(
vRes
,
Vec_IntEntryLast
(
vInv
)
);
}
Cnf_DataFree
(
pCnf
);
sat_solver_delete
(
pSat
);
Vec_BitFree
(
vRemoved
);
Vec_IntFree
(
vLits
);
return
vRes
;
}
////////////////////////////////////////////////////////////////////////
/// END OF FILE ///
////////////////////////////////////////////////////////////////////////
...
...
src/proof/pdr/pdrUtil.c
View file @
51f4dab4
...
...
@@ -284,7 +284,7 @@ void Pdr_SetPrintStr( Vec_Str_t * vStr, Pdr_Set_t * p, int nRegs, Vec_Int_t * vF
}
Vec_StrPushBuffer
(
vStr
,
pBuff
,
k
);
Vec_StrPush
(
vStr
,
' '
);
Vec_StrPush
(
vStr
,
'
0
'
);
Vec_StrPush
(
vStr
,
'
1
'
);
Vec_StrPush
(
vStr
,
'\n'
);
ABC_FREE
(
pBuff
);
}
...
...
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