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
74d0ffee
Commit
74d0ffee
authored
Apr 22, 2012
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Misc changes.
parent
c4911370
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
src/aig/gia/gia.h
+5
-1
src/misc/tim/tim.c
+3
-2
src/proof/cec/cecCec.c
+3
-3
No files found.
src/aig/gia/gia.h
View file @
74d0ffee
...
@@ -439,6 +439,8 @@ static inline int Gia_ManAppendCi( Gia_Man_t * p )
...
@@ -439,6 +439,8 @@ static inline int Gia_ManAppendCi( Gia_Man_t * p )
static
inline
int
Gia_ManAppendAnd
(
Gia_Man_t
*
p
,
int
iLit0
,
int
iLit1
)
static
inline
int
Gia_ManAppendAnd
(
Gia_Man_t
*
p
,
int
iLit0
,
int
iLit1
)
{
{
Gia_Obj_t
*
pObj
=
Gia_ManAppendObj
(
p
);
Gia_Obj_t
*
pObj
=
Gia_ManAppendObj
(
p
);
assert
(
iLit0
>=
0
&&
Abc_Lit2Var
(
iLit0
)
<
Gia_ManObjNum
(
p
)
);
assert
(
iLit1
>=
0
&&
Abc_Lit2Var
(
iLit1
)
<
Gia_ManObjNum
(
p
)
);
assert
(
iLit0
!=
iLit1
);
assert
(
iLit0
!=
iLit1
);
if
(
iLit0
<
iLit1
)
if
(
iLit0
<
iLit1
)
{
{
...
@@ -463,7 +465,9 @@ static inline int Gia_ManAppendAnd( Gia_Man_t * p, int iLit0, int iLit1 )
...
@@ -463,7 +465,9 @@ static inline int Gia_ManAppendAnd( Gia_Man_t * p, int iLit0, int iLit1 )
}
}
static
inline
int
Gia_ManAppendCo
(
Gia_Man_t
*
p
,
int
iLit0
)
static
inline
int
Gia_ManAppendCo
(
Gia_Man_t
*
p
,
int
iLit0
)
{
{
Gia_Obj_t
*
pObj
=
Gia_ManAppendObj
(
p
);
Gia_Obj_t
*
pObj
;
assert
(
iLit0
>=
0
&&
Abc_Lit2Var
(
iLit0
)
<
Gia_ManObjNum
(
p
)
);
pObj
=
Gia_ManAppendObj
(
p
);
pObj
->
fTerm
=
1
;
pObj
->
fTerm
=
1
;
pObj
->
iDiff0
=
Gia_ObjId
(
p
,
pObj
)
-
Abc_Lit2Var
(
iLit0
);
pObj
->
iDiff0
=
Gia_ObjId
(
p
,
pObj
)
-
Abc_Lit2Var
(
iLit0
);
pObj
->
fCompl0
=
Abc_LitIsCompl
(
iLit0
);
pObj
->
fCompl0
=
Abc_LitIsCompl
(
iLit0
);
...
...
src/misc/tim/tim.c
View file @
74d0ffee
...
@@ -582,6 +582,7 @@ void Tim_ManCreateBoxFirst( Tim_Man_t * p, int firstIn, int nIns, int firstOut,
...
@@ -582,6 +582,7 @@ void Tim_ManCreateBoxFirst( Tim_Man_t * p, int firstIn, int nIns, int firstOut,
{
{
Tim_Box_t
*
pBox
;
Tim_Box_t
*
pBox
;
int
i
;
int
i
;
// printf( "Creating %d x %d box with first inputs (%d and %d).\n", nIns, nOuts, firstIn, firstOut );
pBox
=
(
Tim_Box_t
*
)
Mem_FlexEntryFetch
(
p
->
pMemObj
,
sizeof
(
Tim_Box_t
)
+
sizeof
(
int
)
*
(
nIns
+
nOuts
)
);
pBox
=
(
Tim_Box_t
*
)
Mem_FlexEntryFetch
(
p
->
pMemObj
,
sizeof
(
Tim_Box_t
)
+
sizeof
(
int
)
*
(
nIns
+
nOuts
)
);
memset
(
pBox
,
0
,
sizeof
(
Tim_Box_t
)
);
memset
(
pBox
,
0
,
sizeof
(
Tim_Box_t
)
);
...
@@ -847,7 +848,7 @@ float Tim_ManGetCoRequired( Tim_Man_t * p, int iCo )
...
@@ -847,7 +848,7 @@ float Tim_ManGetCoRequired( Tim_Man_t * p, int iCo )
if
(
p
->
fUseTravId
)
if
(
p
->
fUseTravId
)
Tim_ManBoxForEachOutput
(
p
,
pBox
,
pObj
,
i
)
Tim_ManBoxForEachOutput
(
p
,
pBox
,
pObj
,
i
)
if
(
pObj
->
TravId
!=
p
->
nTravIds
)
if
(
pObj
->
TravId
!=
p
->
nTravIds
)
printf
(
"Tim_ManGetCoRequired(): Output required times of
the box are not up to date!
\n
"
);
printf
(
"Tim_ManGetCoRequired(): Output required times of
output %d the box %d are not up to date!
\n
"
,
i
,
pBox
->
iBox
);
// compute the required times for each input of the box (POs)
// compute the required times for each input of the box (POs)
Tim_ManBoxForEachInput
(
p
,
pBox
,
pObjRes
,
i
)
Tim_ManBoxForEachInput
(
p
,
pBox
,
pObjRes
,
i
)
{
{
...
@@ -855,7 +856,7 @@ float Tim_ManGetCoRequired( Tim_Man_t * p, int iCo )
...
@@ -855,7 +856,7 @@ float Tim_ManGetCoRequired( Tim_Man_t * p, int iCo )
Tim_ManBoxForEachOutput
(
p
,
pBox
,
pObj
,
k
)
Tim_ManBoxForEachOutput
(
p
,
pBox
,
pObj
,
k
)
{
{
pDelays
=
pBox
->
pDelayTable
+
k
*
pBox
->
nInputs
;
pDelays
=
pBox
->
pDelayTable
+
k
*
pBox
->
nInputs
;
DelayBest
=
Abc_Min
In
t
(
DelayBest
,
pObj
->
timeReq
-
pDelays
[
i
]
);
DelayBest
=
Abc_Min
Floa
t
(
DelayBest
,
pObj
->
timeReq
-
pDelays
[
i
]
);
}
}
pObjRes
->
timeReq
=
DelayBest
;
pObjRes
->
timeReq
=
DelayBest
;
pObjRes
->
TravId
=
p
->
nTravIds
;
pObjRes
->
TravId
=
p
->
nTravIds
;
...
...
src/proof/cec/cecCec.c
View file @
74d0ffee
...
@@ -143,7 +143,7 @@ int Cec_ManHandleSpecialCases( Gia_Man_t * p, Cec_ParCec_t * pPars )
...
@@ -143,7 +143,7 @@ int Cec_ManHandleSpecialCases( Gia_Man_t * p, Cec_ParCec_t * pPars )
// (for example, when they have the same driver but complemented)
// (for example, when they have the same driver but complemented)
if
(
Gia_ObjPhase
(
pObj1
)
!=
Gia_ObjPhase
(
pObj2
)
)
if
(
Gia_ObjPhase
(
pObj1
)
!=
Gia_ObjPhase
(
pObj2
)
)
{
{
Abc_Print
(
1
,
"Networks are NOT EQUIVALENT. Outputs %d trivially differ. "
,
i
/
2
);
Abc_Print
(
1
,
"Networks are NOT EQUIVALENT. Outputs %d trivially differ
(different phase)
. "
,
i
/
2
);
Abc_PrintTime
(
1
,
"Time"
,
clock
()
-
clk
);
Abc_PrintTime
(
1
,
"Time"
,
clock
()
-
clk
);
pPars
->
iOutFail
=
i
/
2
;
pPars
->
iOutFail
=
i
/
2
;
Cec_ManTransformPattern
(
p
,
i
/
2
,
NULL
);
Cec_ManTransformPattern
(
p
,
i
/
2
,
NULL
);
...
@@ -155,7 +155,7 @@ int Cec_ManHandleSpecialCases( Gia_Man_t * p, Cec_ParCec_t * pPars )
...
@@ -155,7 +155,7 @@ int Cec_ManHandleSpecialCases( Gia_Man_t * p, Cec_ParCec_t * pPars )
// drivers are different PIs
// drivers are different PIs
if
(
Gia_ObjIsPi
(
p
,
pDri1
)
&&
Gia_ObjIsPi
(
p
,
pDri2
)
&&
pDri1
!=
pDri2
)
if
(
Gia_ObjIsPi
(
p
,
pDri1
)
&&
Gia_ObjIsPi
(
p
,
pDri2
)
&&
pDri1
!=
pDri2
)
{
{
Abc_Print
(
1
,
"Networks are NOT EQUIVALENT. Outputs %d trivially differ. "
,
i
/
2
);
Abc_Print
(
1
,
"Networks are NOT EQUIVALENT. Outputs %d trivially differ
(different PIs)
. "
,
i
/
2
);
Abc_PrintTime
(
1
,
"Time"
,
clock
()
-
clk
);
Abc_PrintTime
(
1
,
"Time"
,
clock
()
-
clk
);
pPars
->
iOutFail
=
i
/
2
;
pPars
->
iOutFail
=
i
/
2
;
Cec_ManTransformPattern
(
p
,
i
/
2
,
NULL
);
Cec_ManTransformPattern
(
p
,
i
/
2
,
NULL
);
...
@@ -168,7 +168,7 @@ int Cec_ManHandleSpecialCases( Gia_Man_t * p, Cec_ParCec_t * pPars )
...
@@ -168,7 +168,7 @@ int Cec_ManHandleSpecialCases( Gia_Man_t * p, Cec_ParCec_t * pPars )
if
(
(
Gia_ObjIsPi
(
p
,
pDri1
)
&&
Gia_ObjIsConst0
(
pDri2
))
||
if
(
(
Gia_ObjIsPi
(
p
,
pDri1
)
&&
Gia_ObjIsConst0
(
pDri2
))
||
(
Gia_ObjIsPi
(
p
,
pDri2
)
&&
Gia_ObjIsConst0
(
pDri1
))
)
(
Gia_ObjIsPi
(
p
,
pDri2
)
&&
Gia_ObjIsConst0
(
pDri1
))
)
{
{
Abc_Print
(
1
,
"Networks are NOT EQUIVALENT. Outputs %d trivially differ. "
,
i
/
2
);
Abc_Print
(
1
,
"Networks are NOT EQUIVALENT. Outputs %d trivially differ
(PI vs. constant)
. "
,
i
/
2
);
Abc_PrintTime
(
1
,
"Time"
,
clock
()
-
clk
);
Abc_PrintTime
(
1
,
"Time"
,
clock
()
-
clk
);
pPars
->
iOutFail
=
i
/
2
;
pPars
->
iOutFail
=
i
/
2
;
Cec_ManTransformPattern
(
p
,
i
/
2
,
NULL
);
Cec_ManTransformPattern
(
p
,
i
/
2
,
NULL
);
...
...
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