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
8e13245e
Commit
8e13245e
authored
Apr 24, 2022
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding switch to stop scorr if refinement is too slow.
parent
b79f37ae
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
121 additions
and
18 deletions
+121
-18
src/base/abci/abc.c
+61
-12
src/base/abci/abcDar.c
+2
-1
src/proof/cec/cec.h
+1
-0
src/proof/cec/cecCorr.c
+33
-3
src/proof/ssw/ssw.h
+1
-0
src/proof/ssw/sswCore.c
+23
-2
No files found.
src/base/abci/abc.c
View file @
8e13245e
This diff is collapsed.
Click to expand it.
src/base/abci/abcDar.c
View file @
8e13245e
...
@@ -2302,7 +2302,7 @@ Abc_Ntk_t * Abc_NtkDarLcorr( Abc_Ntk_t * pNtk, int nFramesP, int nConfMax, int f
...
@@ -2302,7 +2302,7 @@ Abc_Ntk_t * Abc_NtkDarLcorr( Abc_Ntk_t * pNtk, int nFramesP, int nConfMax, int f
SeeAlso []
SeeAlso []
***********************************************************************/
***********************************************************************/
Abc_Ntk_t
*
Abc_NtkDarLcorrNew
(
Abc_Ntk_t
*
pNtk
,
int
nVarsMax
,
int
nConfMax
,
int
fVerbose
)
Abc_Ntk_t
*
Abc_NtkDarLcorrNew
(
Abc_Ntk_t
*
pNtk
,
int
nVarsMax
,
int
nConfMax
,
int
nLimitMax
,
int
fVerbose
)
{
{
Ssw_Pars_t
Pars
,
*
pPars
=
&
Pars
;
Ssw_Pars_t
Pars
,
*
pPars
=
&
Pars
;
Aig_Man_t
*
pMan
,
*
pTemp
;
Aig_Man_t
*
pMan
,
*
pTemp
;
...
@@ -2314,6 +2314,7 @@ Abc_Ntk_t * Abc_NtkDarLcorrNew( Abc_Ntk_t * pNtk, int nVarsMax, int nConfMax, in
...
@@ -2314,6 +2314,7 @@ Abc_Ntk_t * Abc_NtkDarLcorrNew( Abc_Ntk_t * pNtk, int nVarsMax, int nConfMax, in
pPars
->
fLatchCorrOpt
=
1
;
pPars
->
fLatchCorrOpt
=
1
;
pPars
->
nBTLimit
=
nConfMax
;
pPars
->
nBTLimit
=
nConfMax
;
pPars
->
nSatVarMax
=
nVarsMax
;
pPars
->
nSatVarMax
=
nVarsMax
;
pPars
->
nLimitMax
=
nLimitMax
;
pPars
->
fVerbose
=
fVerbose
;
pPars
->
fVerbose
=
fVerbose
;
pMan
=
Ssw_SignalCorrespondence
(
pTemp
=
pMan
,
pPars
);
pMan
=
Ssw_SignalCorrespondence
(
pTemp
=
pMan
,
pPars
);
Aig_ManStop
(
pTemp
);
Aig_ManStop
(
pTemp
);
...
...
src/proof/cec/cec.h
View file @
8e13245e
...
@@ -149,6 +149,7 @@ struct Cec_ParCor_t_
...
@@ -149,6 +149,7 @@ struct Cec_ParCor_t_
int
nBTLimit
;
// conflict limit at a node
int
nBTLimit
;
// conflict limit at a node
int
nLevelMax
;
// (scorr only) the max number of levels
int
nLevelMax
;
// (scorr only) the max number of levels
int
nStepsMax
;
// (scorr only) the max number of induction steps
int
nStepsMax
;
// (scorr only) the max number of induction steps
int
nLimitMax
;
// (scorr only) stop after this many iterations if little or no improvement
int
fLatchCorr
;
// consider only latch outputs
int
fLatchCorr
;
// consider only latch outputs
int
fConstCorr
;
// consider only constants
int
fConstCorr
;
// consider only constants
int
fUseRings
;
// use rings
int
fUseRings
;
// use rings
...
...
src/proof/cec/cecCorr.c
View file @
8e13245e
...
@@ -756,6 +756,21 @@ void Cec_ManRefinedClassPrintStats( Gia_Man_t * p, Vec_Str_t * vStatus, int iIte
...
@@ -756,6 +756,21 @@ void Cec_ManRefinedClassPrintStats( Gia_Man_t * p, Vec_Str_t * vStatus, int iIte
Abc_Print
(
1
,
"%c "
,
Gia_ObjIsConst
(
p
,
Gia_ObjFaninId0p
(
p
,
Gia_ManPo
(
p
,
0
))
)
?
'+'
:
'-'
);
Abc_Print
(
1
,
"%c "
,
Gia_ObjIsConst
(
p
,
Gia_ObjFaninId0p
(
p
,
Gia_ManPo
(
p
,
0
))
)
?
'+'
:
'-'
);
Abc_PrintTime
(
1
,
"T"
,
Time
);
Abc_PrintTime
(
1
,
"T"
,
Time
);
}
}
int
Cec_ManCountLits
(
Gia_Man_t
*
p
)
{
int
i
,
CounterX
=
0
,
Counter0
=
0
,
Counter
=
0
;
for
(
i
=
1
;
i
<
Gia_ManObjNum
(
p
);
i
++
)
{
if
(
Gia_ObjIsNone
(
p
,
i
)
)
CounterX
++
;
else
if
(
Gia_ObjIsConst
(
p
,
i
)
)
Counter0
++
;
else
if
(
Gia_ObjIsHead
(
p
,
i
)
)
Counter
++
;
}
CounterX
-=
Gia_ManCoNum
(
p
);
return
Gia_ManCiNum
(
p
)
+
Gia_ManAndNum
(
p
)
-
Counter
-
CounterX
;
}
/**Function*************************************************************
/**Function*************************************************************
...
@@ -777,7 +792,7 @@ void Cec_ManLSCorrespondenceBmc( Gia_Man_t * pAig, Cec_ParCor_t * pPars, int nPr
...
@@ -777,7 +792,7 @@ void Cec_ManLSCorrespondenceBmc( Gia_Man_t * pAig, Cec_ParCor_t * pPars, int nPr
Vec_Int_t
*
vCexStore
;
Vec_Int_t
*
vCexStore
;
Cec_ManSim_t
*
pSim
;
Cec_ManSim_t
*
pSim
;
Gia_Man_t
*
pSrm
;
Gia_Man_t
*
pSrm
;
int
fChanges
,
RetValue
;
int
fChanges
,
RetValue
,
i
;
// prepare simulation manager
// prepare simulation manager
Cec_ManSimSetDefaultParams
(
pParsSim
);
Cec_ManSimSetDefaultParams
(
pParsSim
);
pParsSim
->
nWords
=
pPars
->
nWords
;
pParsSim
->
nWords
=
pPars
->
nWords
;
...
@@ -791,7 +806,7 @@ void Cec_ManLSCorrespondenceBmc( Gia_Man_t * pAig, Cec_ParCor_t * pPars, int nPr
...
@@ -791,7 +806,7 @@ void Cec_ManLSCorrespondenceBmc( Gia_Man_t * pAig, Cec_ParCor_t * pPars, int nPr
pParsSat
->
nBTLimit
=
pPars
->
nBTLimit
;
pParsSat
->
nBTLimit
=
pPars
->
nBTLimit
;
pParsSat
->
fVerbose
=
pPars
->
fVerbose
;
pParsSat
->
fVerbose
=
pPars
->
fVerbose
;
fChanges
=
1
;
fChanges
=
1
;
while
(
fChanges
)
for
(
i
=
0
;
fChanges
&&
(
!
pPars
->
nLimitMax
||
i
<
pPars
->
nLimitMax
);
i
++
)
{
{
abctime
clkBmc
=
Abc_Clock
();
abctime
clkBmc
=
Abc_Clock
();
fChanges
=
0
;
fChanges
=
0
;
...
@@ -918,7 +933,7 @@ int Cec_ManLSCorrespondenceClasses( Gia_Man_t * pAig, Cec_ParCor_t * pPars )
...
@@ -918,7 +933,7 @@ int Cec_ManLSCorrespondenceClasses( Gia_Man_t * pAig, Cec_ParCor_t * pPars )
Cec_ParSat_t
ParsSat
,
*
pParsSat
=
&
ParsSat
;
Cec_ParSat_t
ParsSat
,
*
pParsSat
=
&
ParsSat
;
Cec_ManSim_t
*
pSim
;
Cec_ManSim_t
*
pSim
;
Gia_Man_t
*
pSrm
;
Gia_Man_t
*
pSrm
;
int
r
,
RetValue
;
int
r
,
RetValue
,
nPrev
[
4
]
=
{
0
}
;
abctime
clkTotal
=
Abc_Clock
();
abctime
clkTotal
=
Abc_Clock
();
abctime
clkSat
=
0
,
clkSim
=
0
,
clkSrm
=
0
;
abctime
clkSat
=
0
,
clkSim
=
0
,
clkSrm
=
0
;
abctime
clk2
,
clk
=
Abc_Clock
();
abctime
clk2
,
clk
=
Abc_Clock
();
...
@@ -1031,6 +1046,21 @@ int Cec_ManLSCorrespondenceClasses( Gia_Man_t * pAig, Cec_ParCor_t * pPars )
...
@@ -1031,6 +1046,21 @@ int Cec_ManLSCorrespondenceClasses( Gia_Man_t * pAig, Cec_ParCor_t * pPars )
Cec_ManSimStop
(
pSim
);
Cec_ManSimStop
(
pSim
);
return
0
;
return
0
;
}
}
if
(
pPars
->
nLimitMax
)
{
int
nCur
=
Cec_ManCountLits
(
pAig
);
if
(
r
>
4
&&
nPrev
[
0
]
-
nCur
<=
4
*
pPars
->
nLimitMax
)
{
printf
(
"Iterative refinement is stopped after iteration %d
\n
"
,
r
);
printf
(
"because refinement does not proceed quickly.
\n
"
);
Cec_ManSimStop
(
pSim
);
return
0
;
}
nPrev
[
0
]
=
nPrev
[
1
];
nPrev
[
1
]
=
nPrev
[
2
];
nPrev
[
2
]
=
nPrev
[
3
];
nPrev
[
3
]
=
nCur
;
}
}
}
if
(
pPars
->
fVerbose
)
if
(
pPars
->
fVerbose
)
Cec_ManRefinedClassPrintStats
(
pAig
,
NULL
,
r
+
1
,
Abc_Clock
()
-
clk
);
Cec_ManRefinedClassPrintStats
(
pAig
,
NULL
,
r
+
1
,
Abc_Clock
()
-
clk
);
...
...
src/proof/ssw/ssw.h
View file @
8e13245e
...
@@ -55,6 +55,7 @@ struct Ssw_Pars_t_
...
@@ -55,6 +55,7 @@ struct Ssw_Pars_t_
int
nResimDelta
;
// the number of nodes to resimulate
int
nResimDelta
;
// the number of nodes to resimulate
int
nStepsMax
;
// (scorr only) the max number of induction steps
int
nStepsMax
;
// (scorr only) the max number of induction steps
int
TimeLimit
;
// time out in seconds
int
TimeLimit
;
// time out in seconds
int
nLimitMax
;
// the limit on the number of iterations
int
fPolarFlip
;
// uses polarity adjustment
int
fPolarFlip
;
// uses polarity adjustment
int
fLatchCorr
;
// perform register correspondence
int
fLatchCorr
;
// perform register correspondence
int
fConstCorr
;
// perform constant correspondence
int
fConstCorr
;
// perform constant correspondence
...
...
src/proof/ssw/sswCore.c
View file @
8e13245e
...
@@ -236,7 +236,7 @@ Aig_Man_t * Ssw_SignalCorrespondenceRefine( Ssw_Man_t * p )
...
@@ -236,7 +236,7 @@ Aig_Man_t * Ssw_SignalCorrespondenceRefine( Ssw_Man_t * p )
{
{
int
nSatProof
,
nSatCallsSat
,
nRecycles
,
nSatFailsReal
,
nUniques
;
int
nSatProof
,
nSatCallsSat
,
nRecycles
,
nSatFailsReal
,
nUniques
;
Aig_Man_t
*
pAigNew
;
Aig_Man_t
*
pAigNew
;
int
RetValue
,
nIter
=
-
1
;
int
RetValue
,
nIter
=
-
1
,
nPrev
[
4
]
=
{
0
}
;
abctime
clk
,
clkTotal
=
Abc_Clock
();
abctime
clk
,
clkTotal
=
Abc_Clock
();
// get the starting stats
// get the starting stats
p
->
nLitsBeg
=
Ssw_ClassesLitNum
(
p
->
ppClasses
);
p
->
nLitsBeg
=
Ssw_ClassesLitNum
(
p
->
ppClasses
);
...
@@ -352,7 +352,7 @@ clk = Abc_Clock();
...
@@ -352,7 +352,7 @@ clk = Abc_Clock();
{
{
printf
(
"Iterative refinement is stopped after iteration %d
\n
"
,
nIter
);
printf
(
"Iterative refinement is stopped after iteration %d
\n
"
,
nIter
);
printf
(
"because the property output is no longer a candidate constant.
\n
"
);
printf
(
"because the property output is no longer a candidate constant.
\n
"
);
// prepare to quit
e
// prepare to quit
p
->
nLitsEnd
=
p
->
nLitsBeg
;
p
->
nLitsEnd
=
p
->
nLitsBeg
;
p
->
nNodesEnd
=
p
->
nNodesBeg
;
p
->
nNodesEnd
=
p
->
nNodesBeg
;
p
->
nRegsEnd
=
p
->
nRegsBeg
;
p
->
nRegsEnd
=
p
->
nRegsBeg
;
...
@@ -381,6 +381,27 @@ clk = Abc_Clock();
...
@@ -381,6 +381,27 @@ clk = Abc_Clock();
break
;
break
;
if
(
p
->
pPars
->
pFunc
)
if
(
p
->
pPars
->
pFunc
)
((
int
(
*
)(
void
*
))
p
->
pPars
->
pFunc
)(
p
->
pPars
->
pData
);
((
int
(
*
)(
void
*
))
p
->
pPars
->
pFunc
)(
p
->
pPars
->
pData
);
if
(
p
->
pPars
->
nLimitMax
)
{
int
nCur
=
Ssw_ClassesCand1Num
(
p
->
ppClasses
);
if
(
nIter
>
4
&&
nPrev
[
0
]
-
nCur
<=
4
*
p
->
pPars
->
nLimitMax
)
{
printf
(
"Iterative refinement is stopped after iteration %d
\n
"
,
nIter
);
printf
(
"because the refinment is very slow.
\n
"
);
// prepare to quit
p
->
nLitsEnd
=
p
->
nLitsBeg
;
p
->
nNodesEnd
=
p
->
nNodesBeg
;
p
->
nRegsEnd
=
p
->
nRegsBeg
;
// cleanup
Aig_ManSetPhase
(
p
->
pAig
);
Aig_ManCleanMarkB
(
p
->
pAig
);
return
Aig_ManDupSimple
(
p
->
pAig
);
}
nPrev
[
0
]
=
nPrev
[
1
];
nPrev
[
1
]
=
nPrev
[
2
];
nPrev
[
2
]
=
nPrev
[
3
];
nPrev
[
3
]
=
nCur
;
}
}
}
finalize
:
finalize
:
...
...
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