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
86b3cb3d
Commit
86b3cb3d
authored
Feb 26, 2017
by
Yen-Sheng Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added an option -L to %pdra for limiting the number of muxes
parent
27bdffd5
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
84 additions
and
2 deletions
+84
-2
src/base/wlc/wlc.h
+1
-0
src/base/wlc/wlcAbs.c
+68
-0
src/base/wlc/wlcCom.c
+14
-2
src/base/wlc/wlcNtk.c
+1
-0
No files found.
src/base/wlc/wlc.h
View file @
86b3cb3d
...
@@ -169,6 +169,7 @@ struct Wlc_Par_t_
...
@@ -169,6 +169,7 @@ struct Wlc_Par_t_
int
nBitsMux
;
// MUX bit-width
int
nBitsMux
;
// MUX bit-width
int
nBitsFlop
;
// flop bit-width
int
nBitsFlop
;
// flop bit-width
int
nIterMax
;
// the max number of iterations
int
nIterMax
;
// the max number of iterations
int
nMuxLimit
;
// the max number of muxes
int
fXorOutput
;
// XOR outputs of word-level miter
int
fXorOutput
;
// XOR outputs of word-level miter
int
fCheckClauses
;
// Check clauses in the reloaded trace
int
fCheckClauses
;
// Check clauses in the reloaded trace
int
fPushClauses
;
// Push clauses in the reloaded trace
int
fPushClauses
;
// Push clauses in the reloaded trace
...
...
src/base/wlc/wlcAbs.c
View file @
86b3cb3d
...
@@ -34,6 +34,18 @@ extern Vec_Vec_t * IPdr_ManSaveClauses( Pdr_Man_t * p, int fDropLast );
...
@@ -34,6 +34,18 @@ extern Vec_Vec_t * IPdr_ManSaveClauses( Pdr_Man_t * p, int fDropLast );
extern
int
IPdr_ManRestore
(
Pdr_Man_t
*
p
,
Vec_Vec_t
*
vClauses
,
Vec_Int_t
*
vMap
);
extern
int
IPdr_ManRestore
(
Pdr_Man_t
*
p
,
Vec_Vec_t
*
vClauses
,
Vec_Int_t
*
vMap
);
extern
int
IPdr_ManSolveInt
(
Pdr_Man_t
*
p
,
int
fCheckClauses
,
int
fPushClauses
);
extern
int
IPdr_ManSolveInt
(
Pdr_Man_t
*
p
,
int
fCheckClauses
,
int
fPushClauses
);
typedef
struct
Int_Pair_t_
Int_Pair_t
;
struct
Int_Pair_t_
{
int
first
;
int
second
;
};
int
IntPairPtrCompare
(
Int_Pair_t
**
a
,
Int_Pair_t
**
b
)
{
return
(
*
a
)
->
second
<
(
*
b
)
->
second
;
}
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
/// FUNCTION DEFINITIONS ///
/// FUNCTION DEFINITIONS ///
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
...
@@ -455,10 +467,59 @@ static int Wlc_NtkUpdateBlacks( Wlc_Ntk_t * p, Wlc_Par_t * pPars, Vec_Int_t ** p
...
@@ -455,10 +467,59 @@ static int Wlc_NtkUpdateBlacks( Wlc_Ntk_t * p, Wlc_Par_t * pPars, Vec_Int_t ** p
return
0
;
return
0
;
}
}
static
Vec_Bit_t
*
Wlc_NtkMarkMuxes
(
Wlc_Ntk_t
*
p
,
Wlc_Par_t
*
pPars
)
{
Vec_Bit_t
*
vMuxMark
=
NULL
;
Vec_Ptr_t
*
vMuxes
=
Vec_PtrAlloc
(
1000
);
Wlc_Obj_t
*
pObj
;
int
i
;
Int_Pair_t
*
pPair
;
if
(
pPars
->
nMuxLimit
==
ABC_INFINITY
)
return
NULL
;
vMuxMark
=
Vec_BitStart
(
Wlc_NtkObjNumMax
(
p
)
);
Wlc_NtkForEachObj
(
p
,
pObj
,
i
)
{
if
(
pObj
->
Type
==
WLC_OBJ_MUX
)
{
if
(
Wlc_ObjRange
(
pObj
)
>=
pPars
->
nBitsMux
)
{
pPair
=
ABC_ALLOC
(
Int_Pair_t
,
1
);
pPair
->
first
=
i
;
pPair
->
second
=
Wlc_ObjRange
(
pObj
);
Vec_PtrPush
(
vMuxes
,
pPair
);
}
}
}
Vec_PtrSort
(
vMuxes
,
(
int
(
*
)(
void
))
IntPairPtrCompare
)
;
Vec_PtrForEachEntry
(
Int_Pair_t
*
,
vMuxes
,
pPair
,
i
)
{
if
(
i
>=
pPars
->
nMuxLimit
)
break
;
Vec_BitWriteEntry
(
vMuxMark
,
pPair
->
first
,
1
);
}
if
(
i
&&
pPars
->
fVerbose
)
Abc_Print
(
1
,
"%%PDRA: %d-th MUX has width = %d
\n
"
,
i
,
pPair
->
second
);
Vec_PtrForEachEntry
(
Int_Pair_t
*
,
vMuxes
,
pPair
,
i
)
ABC_FREE
(
pPair
);
Vec_PtrFree
(
vMuxes
);
return
vMuxMark
;
}
static
Vec_Int_t
*
Wlc_NtkGetBlacks
(
Wlc_Ntk_t
*
p
,
Wlc_Par_t
*
pPars
,
Vec_Bit_t
*
vUnmark
)
static
Vec_Int_t
*
Wlc_NtkGetBlacks
(
Wlc_Ntk_t
*
p
,
Wlc_Par_t
*
pPars
,
Vec_Bit_t
*
vUnmark
)
{
{
Vec_Int_t
*
vBlacks
=
Vec_IntAlloc
(
100
)
;
Vec_Int_t
*
vBlacks
=
Vec_IntAlloc
(
100
)
;
Wlc_Obj_t
*
pObj
;
int
i
,
Count
[
4
]
=
{
0
};
Wlc_Obj_t
*
pObj
;
int
i
,
Count
[
4
]
=
{
0
};
Vec_Bit_t
*
vMuxMark
=
NULL
;
vMuxMark
=
Wlc_NtkMarkMuxes
(
p
,
pPars
)
;
Wlc_NtkForEachObj
(
p
,
pObj
,
i
)
Wlc_NtkForEachObj
(
p
,
pObj
,
i
)
{
{
if
(
vUnmark
&&
Vec_BitEntry
(
vUnmark
,
i
)
)
// not allow this object to be abstracted away
if
(
vUnmark
&&
Vec_BitEntry
(
vUnmark
,
i
)
)
// not allow this object to be abstracted away
...
@@ -479,7 +540,12 @@ static Vec_Int_t * Wlc_NtkGetBlacks( Wlc_Ntk_t * p, Wlc_Par_t * pPars, Vec_Bit_t
...
@@ -479,7 +540,12 @@ static Vec_Int_t * Wlc_NtkGetBlacks( Wlc_Ntk_t * p, Wlc_Par_t * pPars, Vec_Bit_t
if
(
pObj
->
Type
==
WLC_OBJ_MUX
)
if
(
pObj
->
Type
==
WLC_OBJ_MUX
)
{
{
if
(
Wlc_ObjRange
(
pObj
)
>=
pPars
->
nBitsMux
)
if
(
Wlc_ObjRange
(
pObj
)
>=
pPars
->
nBitsMux
)
{
if
(
vMuxMark
==
NULL
)
Vec_IntPush
(
vBlacks
,
Wlc_ObjId
(
p
,
pObj
)
),
Count
[
2
]
++
;
Vec_IntPush
(
vBlacks
,
Wlc_ObjId
(
p
,
pObj
)
),
Count
[
2
]
++
;
else
if
(
Vec_BitEntry
(
vMuxMark
,
i
)
)
Vec_IntPush
(
vBlacks
,
Wlc_ObjId
(
p
,
pObj
)
),
Count
[
2
]
++
;
}
continue
;
continue
;
}
}
if
(
Wlc_ObjIsCi
(
pObj
)
&&
!
Wlc_ObjIsPi
(
pObj
)
)
if
(
Wlc_ObjIsCi
(
pObj
)
&&
!
Wlc_ObjIsPi
(
pObj
)
)
...
@@ -489,6 +555,8 @@ static Vec_Int_t * Wlc_NtkGetBlacks( Wlc_Ntk_t * p, Wlc_Par_t * pPars, Vec_Bit_t
...
@@ -489,6 +555,8 @@ static Vec_Int_t * Wlc_NtkGetBlacks( Wlc_Ntk_t * p, Wlc_Par_t * pPars, Vec_Bit_t
continue
;
continue
;
}
}
}
}
if
(
vMuxMark
)
Vec_BitFree
(
vMuxMark
);
if
(
pPars
->
fVerbose
)
if
(
pPars
->
fVerbose
)
printf
(
"Abstraction engine marked %d adds/subs, %d muls/divs, %d muxes, and %d flops to be abstracted away.
\n
"
,
Count
[
0
],
Count
[
1
],
Count
[
2
],
Count
[
3
]
);
printf
(
"Abstraction engine marked %d adds/subs, %d muls/divs, %d muxes, and %d flops to be abstracted away.
\n
"
,
Count
[
0
],
Count
[
1
],
Count
[
2
],
Count
[
3
]
);
return
vBlacks
;
return
vBlacks
;
...
...
src/base/wlc/wlcCom.c
View file @
86b3cb3d
...
@@ -462,7 +462,7 @@ int Abc_CommandPdrAbs( Abc_Frame_t * pAbc, int argc, char ** argv )
...
@@ -462,7 +462,7 @@ int Abc_CommandPdrAbs( Abc_Frame_t * pAbc, int argc, char ** argv )
int
c
;
int
c
;
Wlc_ManSetDefaultParams
(
pPars
);
Wlc_ManSetDefaultParams
(
pPars
);
Extra_UtilGetoptReset
();
Extra_UtilGetoptReset
();
while
(
(
c
=
Extra_UtilGetopt
(
argc
,
argv
,
"AMXFIabcpmxvwh"
)
)
!=
EOF
)
while
(
(
c
=
Extra_UtilGetopt
(
argc
,
argv
,
"AMXFI
L
abcpmxvwh"
)
)
!=
EOF
)
{
{
switch
(
c
)
switch
(
c
)
{
{
...
@@ -521,6 +521,17 @@ int Abc_CommandPdrAbs( Abc_Frame_t * pAbc, int argc, char ** argv )
...
@@ -521,6 +521,17 @@ int Abc_CommandPdrAbs( Abc_Frame_t * pAbc, int argc, char ** argv )
if
(
pPars
->
nIterMax
<
0
)
if
(
pPars
->
nIterMax
<
0
)
goto
usage
;
goto
usage
;
break
;
break
;
case
'L'
:
if
(
globalUtilOptind
>=
argc
)
{
Abc_Print
(
-
1
,
"Command line switch
\"
-L
\"
should be followed by an integer.
\n
"
);
goto
usage
;
}
pPars
->
nMuxLimit
=
atoi
(
argv
[
globalUtilOptind
]);
globalUtilOptind
++
;
if
(
pPars
->
nMuxLimit
<
0
)
goto
usage
;
break
;
case
'a'
:
case
'a'
:
pPars
->
fPdra
^=
1
;
pPars
->
fPdra
^=
1
;
break
;
break
;
...
@@ -559,13 +570,14 @@ int Abc_CommandPdrAbs( Abc_Frame_t * pAbc, int argc, char ** argv )
...
@@ -559,13 +570,14 @@ int Abc_CommandPdrAbs( Abc_Frame_t * pAbc, int argc, char ** argv )
Wlc_NtkPdrAbs
(
pNtk
,
pPars
);
Wlc_NtkPdrAbs
(
pNtk
,
pPars
);
return
0
;
return
0
;
usage:
usage:
Abc_Print
(
-
2
,
"usage: %%pdra [-AMXFI num] [-abcpmxvwh]
\n
"
);
Abc_Print
(
-
2
,
"usage: %%pdra [-AMXFI
L
num] [-abcpmxvwh]
\n
"
);
Abc_Print
(
-
2
,
"
\t
abstraction for word-level networks
\n
"
);
Abc_Print
(
-
2
,
"
\t
abstraction for word-level networks
\n
"
);
Abc_Print
(
-
2
,
"
\t
-A num : minimum bit-width of an adder/subtractor to abstract [default = %d]
\n
"
,
pPars
->
nBitsAdd
);
Abc_Print
(
-
2
,
"
\t
-A num : minimum bit-width of an adder/subtractor to abstract [default = %d]
\n
"
,
pPars
->
nBitsAdd
);
Abc_Print
(
-
2
,
"
\t
-M num : minimum bit-width of a multiplier to abstract [default = %d]
\n
"
,
pPars
->
nBitsMul
);
Abc_Print
(
-
2
,
"
\t
-M num : minimum bit-width of a multiplier to abstract [default = %d]
\n
"
,
pPars
->
nBitsMul
);
Abc_Print
(
-
2
,
"
\t
-X num : minimum bit-width of a MUX operator to abstract [default = %d]
\n
"
,
pPars
->
nBitsMux
);
Abc_Print
(
-
2
,
"
\t
-X num : minimum bit-width of a MUX operator to abstract [default = %d]
\n
"
,
pPars
->
nBitsMux
);
Abc_Print
(
-
2
,
"
\t
-F num : minimum bit-width of a flip-flop to abstract [default = %d]
\n
"
,
pPars
->
nBitsFlop
);
Abc_Print
(
-
2
,
"
\t
-F num : minimum bit-width of a flip-flop to abstract [default = %d]
\n
"
,
pPars
->
nBitsFlop
);
Abc_Print
(
-
2
,
"
\t
-I num : maximum number of CEGAR iterations [default = %d]
\n
"
,
pPars
->
nIterMax
);
Abc_Print
(
-
2
,
"
\t
-I num : maximum number of CEGAR iterations [default = %d]
\n
"
,
pPars
->
nIterMax
);
Abc_Print
(
-
2
,
"
\t
-L num : maximum number of muxes [default = %d]
\n
"
,
pPars
->
nMuxLimit
);
Abc_Print
(
-
2
,
"
\t
-x : toggle XORing outputs of word-level miter [default = %s]
\n
"
,
pPars
->
fXorOutput
?
"yes"
:
"no"
);
Abc_Print
(
-
2
,
"
\t
-x : toggle XORing outputs of word-level miter [default = %s]
\n
"
,
pPars
->
fXorOutput
?
"yes"
:
"no"
);
Abc_Print
(
-
2
,
"
\t
-a : toggle running pdr with -nct [default = %s]
\n
"
,
pPars
->
fPdra
?
"yes"
:
"no"
);
Abc_Print
(
-
2
,
"
\t
-a : toggle running pdr with -nct [default = %s]
\n
"
,
pPars
->
fPdra
?
"yes"
:
"no"
);
Abc_Print
(
-
2
,
"
\t
-b : toggle using proof-based refinement [default = %s]
\n
"
,
pPars
->
fProofRefine
?
"yes"
:
"no"
);
Abc_Print
(
-
2
,
"
\t
-b : toggle using proof-based refinement [default = %s]
\n
"
,
pPars
->
fProofRefine
?
"yes"
:
"no"
);
...
...
src/base/wlc/wlcNtk.c
View file @
86b3cb3d
...
@@ -113,6 +113,7 @@ void Wlc_ManSetDefaultParams( Wlc_Par_t * pPars )
...
@@ -113,6 +113,7 @@ void Wlc_ManSetDefaultParams( Wlc_Par_t * pPars )
pPars
->
nBitsMux
=
ABC_INFINITY
;
// MUX bit-width
pPars
->
nBitsMux
=
ABC_INFINITY
;
// MUX bit-width
pPars
->
nBitsFlop
=
ABC_INFINITY
;
// flop bit-width
pPars
->
nBitsFlop
=
ABC_INFINITY
;
// flop bit-width
pPars
->
nIterMax
=
1000
;
// the max number of iterations
pPars
->
nIterMax
=
1000
;
// the max number of iterations
pPars
->
nMuxLimit
=
ABC_INFINITY
;
// the max number of muxes
pPars
->
fXorOutput
=
1
;
// XOR outputs of word-level miter
pPars
->
fXorOutput
=
1
;
// XOR outputs of word-level miter
pPars
->
fCheckClauses
=
1
;
// Check clauses in the reloaded trace
pPars
->
fCheckClauses
=
1
;
// Check clauses in the reloaded trace
pPars
->
fPushClauses
=
0
;
// Push clauses in the reloaded trace
pPars
->
fPushClauses
=
0
;
// Push clauses in the reloaded trace
...
...
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