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
fbb12a06
Commit
fbb12a06
authored
Aug 04, 2011
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix in PBA.
parent
825b0b5e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
7 deletions
+15
-7
src/aig/gia/giaAbs.c
+10
-5
src/aig/saig/saigAbsPba.c
+5
-2
No files found.
src/aig/gia/giaAbs.c
View file @
fbb12a06
...
@@ -320,6 +320,7 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nFrames, int nConfLimit, int fVerbo
...
@@ -320,6 +320,7 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nFrames, int nConfLimit, int fVerbo
Gia_Man_t
*
pAbs
;
Gia_Man_t
*
pAbs
;
Aig_Man_t
*
pAig
,
*
pOrig
;
Aig_Man_t
*
pAig
,
*
pOrig
;
Vec_Int_t
*
vFlops
,
*
vFlopsNew
,
*
vSelected
;
Vec_Int_t
*
vFlops
,
*
vFlopsNew
,
*
vSelected
;
int
RetValue
;
if
(
pGia
->
vFlopClasses
==
NULL
)
if
(
pGia
->
vFlopClasses
==
NULL
)
{
{
printf
(
"Gia_ManPbaPerform(): Abstraction flop map is missing.
\n
"
);
printf
(
"Gia_ManPbaPerform(): Abstraction flop map is missing.
\n
"
);
...
@@ -331,10 +332,12 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nFrames, int nConfLimit, int fVerbo
...
@@ -331,10 +332,12 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nFrames, int nConfLimit, int fVerbo
pAig
=
Gia_ManToAigSimple
(
pAbs
);
pAig
=
Gia_ManToAigSimple
(
pAbs
);
Gia_ManStop
(
pAbs
);
Gia_ManStop
(
pAbs
);
vFlopsNew
=
Saig_ManPbaDerive
(
pAig
,
Gia_ManPiNum
(
pGia
),
nFrames
,
nConfLimit
,
fVerbose
);
vFlopsNew
=
Saig_ManPbaDerive
(
pAig
,
Gia_ManPiNum
(
pGia
),
nFrames
,
nConfLimit
,
fVerbose
);
Aig_ManStop
(
pAig
);
// derive new classes
// derive new classes
if
(
pAig
->
pSeqModel
==
NULL
)
if
(
pAig
->
pSeqModel
==
NULL
)
{
{
// check if there is no timeout
if
(
vFlopsNew
!=
NULL
)
{
// the problem is UNSAT
// the problem is UNSAT
vFlops
=
Gia_ManClasses2Flops
(
pGia
->
vFlopClasses
);
vFlops
=
Gia_ManClasses2Flops
(
pGia
->
vFlopClasses
);
vSelected
=
Gia_ManFlopsSelect
(
vFlops
,
vFlopsNew
);
vSelected
=
Gia_ManFlopsSelect
(
vFlops
,
vFlopsNew
);
...
@@ -344,7 +347,8 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nFrames, int nConfLimit, int fVerbo
...
@@ -344,7 +347,8 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nFrames, int nConfLimit, int fVerbo
Vec_IntFree
(
vFlopsNew
);
Vec_IntFree
(
vFlopsNew
);
Vec_IntFree
(
vFlops
);
Vec_IntFree
(
vFlops
);
return
-
1
;
}
RetValue
=
-
1
;
}
}
else
if
(
vFlopsNew
==
NULL
)
else
if
(
vFlopsNew
==
NULL
)
{
{
...
@@ -356,8 +360,7 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nFrames, int nConfLimit, int fVerbo
...
@@ -356,8 +360,7 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nFrames, int nConfLimit, int fVerbo
pOrig
=
Gia_ManToAigSimple
(
pGia
);
pOrig
=
Gia_ManToAigSimple
(
pGia
);
pGia
->
pCexSeq
=
Saig_ManCexRemap
(
pOrig
,
pAig
,
pAig
->
pSeqModel
);
pGia
->
pCexSeq
=
Saig_ManCexRemap
(
pOrig
,
pAig
,
pAig
->
pSeqModel
);
Aig_ManStop
(
pOrig
);
Aig_ManStop
(
pOrig
);
Aig_ManStop
(
pAig
);
RetValue
=
0
;
return
0
;
}
}
else
else
{
{
...
@@ -366,8 +369,10 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nFrames, int nConfLimit, int fVerbo
...
@@ -366,8 +369,10 @@ int Gia_ManPbaPerform( Gia_Man_t * pGia, int nFrames, int nConfLimit, int fVerbo
Vec_Int_t
*
vAbsFfsToAdd
=
vFlopsNew
;
Vec_Int_t
*
vAbsFfsToAdd
=
vFlopsNew
;
Gia_ManFlopsAddToClasses
(
pGia
->
vFlopClasses
,
vAbsFfsToAdd
);
Gia_ManFlopsAddToClasses
(
pGia
->
vFlopClasses
,
vAbsFfsToAdd
);
Vec_IntFree
(
vAbsFfsToAdd
);
Vec_IntFree
(
vAbsFfsToAdd
);
return
-
1
;
RetValue
=
-
1
;
}
}
Aig_ManStop
(
pAig
);
return
RetValue
;
}
}
...
...
src/aig/saig/saigAbsPba.c
View file @
fbb12a06
...
@@ -201,7 +201,7 @@ Abc_Cex_t * Saig_ManPbaDeriveCex( Aig_Man_t * pAig, sat_solver * pSat, Cnf_Dat_t
...
@@ -201,7 +201,7 @@ Abc_Cex_t * Saig_ManPbaDeriveCex( Aig_Man_t * pAig, sat_solver * pSat, Cnf_Dat_t
***********************************************************************/
***********************************************************************/
Vec_Int_t
*
Saig_ManPbaDerive
(
Aig_Man_t
*
pAig
,
int
nInputs
,
int
nFrames
,
int
nConfLimit
,
int
fVerbose
)
Vec_Int_t
*
Saig_ManPbaDerive
(
Aig_Man_t
*
pAig
,
int
nInputs
,
int
nFrames
,
int
nConfLimit
,
int
fVerbose
)
{
{
Vec_Int_t
*
vFlops
,
*
vMapVar2FF
,
*
vAssumps
,
*
vPiVarMap
;
Vec_Int_t
*
vFlops
=
NULL
,
*
vMapVar2FF
,
*
vAssumps
,
*
vPiVarMap
;
Aig_Man_t
*
pFrames
;
Aig_Man_t
*
pFrames
;
sat_solver
*
pSat
;
sat_solver
*
pSat
;
Cnf_Dat_t
*
pCnf
;
Cnf_Dat_t
*
pCnf
;
...
@@ -248,6 +248,8 @@ Abc_PrintTime( 1, "Solving", clock() - clk );
...
@@ -248,6 +248,8 @@ Abc_PrintTime( 1, "Solving", clock() - clk );
{
{
if
(
RetValue
==
l_True
)
if
(
RetValue
==
l_True
)
{
{
printf
(
"Saig_ManPerformPba(): The eproblem is SAT. Abstraction refinement is still not enabled.
\n
"
);
/*
Vec_Int_t * vAbsFfsToAdd;
Vec_Int_t * vAbsFfsToAdd;
ABC_FREE( pAig->pSeqModel );
ABC_FREE( pAig->pSeqModel );
pAig->pSeqModel = Saig_ManPbaDeriveCex( pAig, pSat, pCnf, nFrames, vPiVarMap );
pAig->pSeqModel = Saig_ManPbaDeriveCex( pAig, pSat, pCnf, nFrames, vPiVarMap );
...
@@ -263,7 +265,8 @@ Abc_PrintTime( 1, "Solving", clock() - clk );
...
@@ -263,7 +265,8 @@ Abc_PrintTime( 1, "Solving", clock() - clk );
printf( "Adding %d registers to the abstraction. ", Vec_IntSize(vAbsFfsToAdd) );
printf( "Adding %d registers to the abstraction. ", Vec_IntSize(vAbsFfsToAdd) );
Abc_PrintTime( 0, "Time", clock() - clk );
Abc_PrintTime( 0, "Time", clock() - clk );
}
}
return
vAbsFfsToAdd
;
vFlops = vAbsFfsToAdd;
*/
}
}
else
else
{
{
...
...
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