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
1332dc41
Commit
1332dc41
authored
Oct 22, 2015
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor tuning in 'satclp'.
parent
2c37498b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
8 deletions
+16
-8
src/base/abci/abc.c
+2
-2
src/base/abci/abcCollapse.c
+1
-1
src/sat/bmc/bmcClp.c
+13
-5
No files found.
src/base/abci/abc.c
View file @
1332dc41
...
...
@@ -3177,7 +3177,7 @@ int Abc_CommandSatClp( Abc_Frame_t * pAbc, int argc, char ** argv )
if
(
pNtkRes
==
NULL
)
{
Abc_Print
(
-
1
,
"Collapsing has failed.
\n
"
);
return
1
;
return
0
;
}
// replace the current network
Abc_FrameReplaceCurrentNetwork
(
pAbc
,
pNtkRes
);
...
...
@@ -8290,7 +8290,7 @@ int Abc_CommandSop( Abc_Frame_t * pAbc, int argc, char ** argv )
if
(
!
Abc_NtkToSop
(
pNtk
,
fMode
,
nCubeLimit
)
)
{
Abc_Print
(
-
1
,
"Converting to SOP has failed.
\n
"
);
return
1
;
return
0
;
}
return
0
;
src/base/abci/abcCollapse.c
View file @
1332dc41
...
...
@@ -298,7 +298,7 @@ Vec_Str_t * Abc_NtkClpOne( Abc_Ntk_t * pNtk, int iCo, int nCubeLim, int nBTLimit
extern
Vec_Str_t
*
Bmc_CollapseOne
(
Gia_Man_t
*
p
,
int
nCubeLim
,
int
nBTLimit
,
int
fCanon
,
int
fReverse
,
int
fVerbose
);
Gia_Man_t
*
pGia
=
Abc_NtkClpOneGia
(
pNtk
,
iCo
,
vSupp
);
if
(
fVerbose
)
printf
(
"Output %
d:
\n
"
,
iCo
);
printf
(
"Output %
4d: Supp = %4d. Cone =%6d.
\n
"
,
iCo
,
Vec_IntSize
(
vSupp
),
Gia_ManAndNum
(
pGia
)
);
vSop
=
Bmc_CollapseOne
(
pGia
,
nCubeLim
,
nBTLimit
,
fCanon
,
fReverse
,
fVerbose
);
Gia_ManStop
(
pGia
);
if
(
vSop
==
NULL
)
...
...
src/sat/bmc/bmcClp.c
View file @
1332dc41
...
...
@@ -624,17 +624,25 @@ cleanup:
vRes
=
vSop
[
fComplete
[
1
]];
vSop
[
fComplete
[
1
]]
=
NULL
;
if
(
iCube
>
1
)
Bmc_CollapseIrredundant
(
vRes
,
Vec_StrSize
(
vRes
)
/
(
nVars
+
3
),
nVars
);
}
if
(
fVeryVerbose
)
{
printf
(
"Processed output with %d supp vars and %d cubes.
\n
"
,
nVars
,
Vec_StrSize
(
vRes
)
/
(
nVars
+
3
)
);
int
fProfile
=
0
;
printf
(
"Processed output with %d supp vars. "
,
nVars
);
if
(
vRes
==
NULL
)
printf
(
"The resulting SOP exceeded %d cubes.
\n
"
,
nCubeLim
);
else
printf
(
"The best cover contains %d cubes.
\n
"
,
iCube
);
Abc_PrintTime
(
1
,
"Onset minterm"
,
Time
[
0
][
0
]
);
Abc_PrintTime
(
1
,
"Onset expand "
,
Time
[
0
][
1
]
);
Abc_PrintTime
(
1
,
"Offset minterm"
,
Time
[
1
][
0
]
);
Abc_PrintTime
(
1
,
"Offset expand "
,
Time
[
1
][
1
]
);
//Abc_PrintTime( 1, "Expand check1 ", clkCheck1 ); clkCheck1 = 0;
//Abc_PrintTime( 1, "Expand check2 ", clkCheck2 ); clkCheck2 = 0;
//Abc_PrintTime( 1, "Expand sat ", clkCheckS ); clkCheckS = 0;
//Abc_PrintTime( 1, "Expand unsat ", clkCheckU ); clkCheckU = 0;
if
(
fProfile
)
{
Abc_PrintTime
(
1
,
"Expand check1 "
,
clkCheck1
);
clkCheck1
=
0
;
Abc_PrintTime
(
1
,
"Expand check2 "
,
clkCheck2
);
clkCheck2
=
0
;
Abc_PrintTime
(
1
,
"Expand sat "
,
clkCheckS
);
clkCheckS
=
0
;
Abc_PrintTime
(
1
,
"Expand unsat "
,
clkCheckU
);
clkCheckU
=
0
;
}
}
Vec_StrFreeP
(
&
vSop
[
0
]
);
...
...
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