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
bc288a76
Commit
bc288a76
authored
Mar 04, 2019
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Suggested white-space changes for fewer gcc warnings.
parent
9842e823
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
24 additions
and
22 deletions
+24
-22
src/aig/ivy/ivyCheck.c
+1
-1
src/base/io/ioWriteBlif.c
+1
-1
src/bool/kit/kitTruth.c
+1
-1
src/bool/lucky/lucky.c
+2
-2
src/misc/bar/bar.h
+3
-1
src/opt/ret/retDelay.c
+5
-5
src/opt/sfm/sfmSat.c
+1
-1
src/opt/sim/simSupp.c
+5
-5
src/proof/fraig/fraigSat.c
+4
-4
src/sat/glucose/Options.cpp
+1
-1
No files found.
src/aig/ivy/ivyCheck.c
View file @
bc288a76
...
@@ -97,7 +97,7 @@ int Ivy_ManCheck( Ivy_Man_t * p )
...
@@ -97,7 +97,7 @@ int Ivy_ManCheck( Ivy_Man_t * p )
pObj2
=
Ivy_TableLookup
(
p
,
pObj
);
pObj2
=
Ivy_TableLookup
(
p
,
pObj
);
if
(
pObj2
!=
pObj
)
if
(
pObj2
!=
pObj
)
printf
(
"Ivy_ManCheck: Latch with ID
\"
%d
\"
is not in the structural hashing table.
\n
"
,
pObj
->
Id
);
printf
(
"Ivy_ManCheck: Latch with ID
\"
%d
\"
is not in the structural hashing table.
\n
"
,
pObj
->
Id
);
continue
;
continue
;
}
}
// consider the AND node
// consider the AND node
if
(
!
Ivy_ObjFanin0
(
pObj
)
||
!
Ivy_ObjFanin1
(
pObj
)
)
if
(
!
Ivy_ObjFanin0
(
pObj
)
||
!
Ivy_ObjFanin1
(
pObj
)
)
...
...
src/base/io/ioWriteBlif.c
View file @
bc288a76
...
@@ -948,7 +948,7 @@ void Io_NtkWriteNodeInt( FILE * pFile, Abc_Obj_t * pNode, Vec_Int_t * vCover )
...
@@ -948,7 +948,7 @@ void Io_NtkWriteNodeInt( FILE * pFile, Abc_Obj_t * pNode, Vec_Int_t * vCover )
fprintf
(
pFile
,
" %s_cascade"
,
Abc_ObjName
(
Abc_ObjFanout0
(
pNode
))
);
fprintf
(
pFile
,
" %s_cascade"
,
Abc_ObjName
(
Abc_ObjFanout0
(
pNode
))
);
else
else
fprintf
(
pFile
,
" %s"
,
Abc_ObjName
(
Abc_ObjFanin
(
pNode
,
pVars
[
c
][
i
]))
);
fprintf
(
pFile
,
" %s"
,
Abc_ObjName
(
Abc_ObjFanin
(
pNode
,
pVars
[
c
][
i
]))
);
fprintf
(
pFile
,
" %s%s
\n
"
,
Abc_ObjName
(
Abc_ObjFanout0
(
pNode
)),
c
?
""
:
"_cascade"
);
fprintf
(
pFile
,
" %s%s
\n
"
,
Abc_ObjName
(
Abc_ObjFanout0
(
pNode
)),
c
?
""
:
"_cascade"
);
// write SOP
// write SOP
pSop
=
Io_NtkDeriveSop
(
(
Mem_Flex_t
*
)
Abc_ObjNtk
(
pNode
)
->
pManFunc
,
pSop
=
Io_NtkDeriveSop
(
(
Mem_Flex_t
*
)
Abc_ObjNtk
(
pNode
)
->
pManFunc
,
...
...
src/bool/kit/kitTruth.c
View file @
bc288a76
...
@@ -639,7 +639,7 @@ int Kit_TruthVarIsVacuous( unsigned * pOnset, unsigned * pOffset, int nVars, int
...
@@ -639,7 +639,7 @@ int Kit_TruthVarIsVacuous( unsigned * pOnset, unsigned * pOffset, int nVars, int
for
(
i
=
0
;
i
<
nWords
;
i
++
)
for
(
i
=
0
;
i
<
nWords
;
i
++
)
if
(
((
pOnset
[
i
]
&
(
pOffset
[
i
]
>>
2
))
|
(
pOffset
[
i
]
&
(
pOnset
[
i
]
>>
2
)))
&
0x33333333
)
if
(
((
pOnset
[
i
]
&
(
pOffset
[
i
]
>>
2
))
|
(
pOffset
[
i
]
&
(
pOnset
[
i
]
>>
2
)))
&
0x33333333
)
return
0
;
return
0
;
return
1
;
return
1
;
case
2
:
case
2
:
for
(
i
=
0
;
i
<
nWords
;
i
++
)
for
(
i
=
0
;
i
<
nWords
;
i
++
)
if
(
((
pOnset
[
i
]
&
(
pOffset
[
i
]
>>
4
))
|
(
pOffset
[
i
]
&
(
pOnset
[
i
]
>>
4
)))
&
0x0F0F0F0F
)
if
(
((
pOnset
[
i
]
&
(
pOffset
[
i
]
>>
4
))
|
(
pOffset
[
i
]
&
(
pOnset
[
i
]
>>
4
)))
&
0x0F0F0F0F
)
...
...
src/bool/lucky/lucky.c
View file @
bc288a76
...
@@ -56,7 +56,7 @@ int memCompare(word* x, word* y, int nVars)
...
@@ -56,7 +56,7 @@ int memCompare(word* x, word* y, int nVars)
tempWord
=
a
[
i
];
tempWord
=
a
[
i
];
count
++
;
count
++
;
}
}
p
->
nFuncs
=
count
;
p
->
nFuncs
=
count
;
}
}
//////////sort Word** a//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////sort Word** a//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
int
compareWords2
(
const
void
**
x
,
const
void
**
y
)
int
compareWords2
(
const
void
**
x
,
const
void
**
y
)
...
@@ -94,7 +94,7 @@ void sortAndUnique(word** a, Abc_TtStore_t* p)
...
@@ -94,7 +94,7 @@ void sortAndUnique(word** a, Abc_TtStore_t* p)
tempWordPtr
=
a
[
i
];
tempWordPtr
=
a
[
i
];
count
++
;
count
++
;
}
}
p
->
nFuncs
=
count
;
p
->
nFuncs
=
count
;
}
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...
...
src/misc/bar/bar.h
View file @
bc288a76
...
@@ -61,7 +61,9 @@ extern void Bar_ProgressStop( Bar_Progress_t * p );
...
@@ -61,7 +61,9 @@ extern void Bar_ProgressStop( Bar_Progress_t * p );
extern
void
Bar_ProgressUpdate_int
(
Bar_Progress_t
*
p
,
int
nItemsCur
,
char
*
pString
);
extern
void
Bar_ProgressUpdate_int
(
Bar_Progress_t
*
p
,
int
nItemsCur
,
char
*
pString
);
static
inline
void
Bar_ProgressUpdate
(
Bar_Progress_t
*
p
,
int
nItemsCur
,
char
*
pString
)
{
static
inline
void
Bar_ProgressUpdate
(
Bar_Progress_t
*
p
,
int
nItemsCur
,
char
*
pString
)
{
if
(
BAR_PROGRESS_USE
&&
p
&&
(
nItemsCur
<
*
((
int
*
)
p
))
)
return
;
Bar_ProgressUpdate_int
(
p
,
nItemsCur
,
pString
);
}
if
(
BAR_PROGRESS_USE
&&
p
&&
(
nItemsCur
<
*
((
int
*
)
p
))
)
return
;
Bar_ProgressUpdate_int
(
p
,
nItemsCur
,
pString
);
}
...
...
src/opt/ret/retDelay.c
View file @
bc288a76
...
@@ -96,8 +96,8 @@ int Abc_NtkRetimeMinDelayTry( Abc_Ntk_t * pNtk, int nDelayLim, int fForward, int
...
@@ -96,8 +96,8 @@ int Abc_NtkRetimeMinDelayTry( Abc_Ntk_t * pNtk, int nDelayLim, int fForward, int
}
}
}
}
if
(
fVerbose
&&
!
fInitial
)
if
(
fVerbose
&&
!
fInitial
)
printf
(
"Performing analysis:
\n
"
);
printf
(
"Performing analysis:
\n
"
);
// find the best iteration
// find the best iteration
DelayBest
=
ABC_INFINITY
;
IterBest
=
0
;
LatchesBest
=
Abc_NtkLatchNum
(
pNtk
);
DelayBest
=
ABC_INFINITY
;
IterBest
=
0
;
LatchesBest
=
Abc_NtkLatchNum
(
pNtk
);
vCritical
=
Vec_PtrAlloc
(
100
);
vCritical
=
Vec_PtrAlloc
(
100
);
...
@@ -150,9 +150,9 @@ if ( fVerbose && !fInitial )
...
@@ -150,9 +150,9 @@ if ( fVerbose && !fInitial )
Vec_IntFree
(
vValues
);
Vec_IntFree
(
vValues
);
}
}
}
}
if
(
fVerbose
&&
!
fInitial
)
if
(
fVerbose
&&
!
fInitial
)
printf
(
"%s : Starting delay = %3d. Final delay = %3d. IterBest = %2d (out of %2d).
\n
"
,
printf
(
"%s : Starting delay = %3d. Final delay = %3d. IterBest = %2d (out of %2d).
\n
"
,
fForward
?
"Forward "
:
"Backward"
,
DelayStart
,
DelayBest
,
IterBest
,
nIterLimit
);
fForward
?
"Forward "
:
"Backward"
,
DelayStart
,
DelayBest
,
IterBest
,
nIterLimit
);
*
pIterBest
=
(
nIterLimit
==
1
)
?
1
:
IterBest
;
*
pIterBest
=
(
nIterLimit
==
1
)
?
1
:
IterBest
;
return
DelayBest
;
return
DelayBest
;
}
}
...
...
src/opt/sfm/sfmSat.c
View file @
bc288a76
...
@@ -260,7 +260,7 @@ void Sfm_ComputeInterpolantCheck( Sfm_Ntk_t * p )
...
@@ -260,7 +260,7 @@ void Sfm_ComputeInterpolantCheck( Sfm_Ntk_t * p )
else
if
(
uTruth
==
SFM_SAT_UNDEC
)
else
if
(
uTruth
==
SFM_SAT_UNDEC
)
printf
(
"The problem is UNDEC.
\n
"
);
printf
(
"The problem is UNDEC.
\n
"
);
else
else
Kit_DsdPrintFromTruth
(
(
unsigned
*
)
&
uTruth
,
2
)
;
printf
(
"
\n
"
);
Kit_DsdPrintFromTruth
(
(
unsigned
*
)
&
uTruth
,
2
)
,
printf
(
"
\n
"
);
}
}
}
}
...
...
src/opt/sim/simSupp.c
View file @
bc288a76
...
@@ -118,8 +118,8 @@ Vec_Ptr_t * Sim_ComputeFunSupp( Abc_Ntk_t * pNtk, int fVerbose )
...
@@ -118,8 +118,8 @@ Vec_Ptr_t * Sim_ComputeFunSupp( Abc_Ntk_t * pNtk, int fVerbose )
// set the support targets
// set the support targets
Sim_ComputeSuppSetTargets
(
p
);
Sim_ComputeSuppSetTargets
(
p
);
if
(
fVerbose
)
if
(
fVerbose
)
printf
(
"Number of support targets after simulation = %5d.
\n
"
,
Vec_VecSizeSize
(
p
->
vSuppTargs
)
);
printf
(
"Number of support targets after simulation = %5d.
\n
"
,
Vec_VecSizeSize
(
p
->
vSuppTargs
)
);
if
(
Vec_VecSizeSize
(
p
->
vSuppTargs
)
==
0
)
if
(
Vec_VecSizeSize
(
p
->
vSuppTargs
)
==
0
)
goto
exit
;
goto
exit
;
...
@@ -131,9 +131,9 @@ if ( fVerbose )
...
@@ -131,9 +131,9 @@ if ( fVerbose )
if
(
Vec_VecSizeSize
(
p
->
vSuppTargs
)
==
0
)
if
(
Vec_VecSizeSize
(
p
->
vSuppTargs
)
==
0
)
goto
exit
;
goto
exit
;
if
(
fVerbose
)
if
(
fVerbose
)
printf
(
"Targets = %5d. Solved = %5d. Fifo = %5d.
\n
"
,
printf
(
"Targets = %5d. Solved = %5d. Fifo = %5d.
\n
"
,
Vec_VecSizeSize
(
p
->
vSuppTargs
),
nSolved
,
Vec_PtrSize
(
p
->
vFifo
)
);
Vec_VecSizeSize
(
p
->
vSuppTargs
),
nSolved
,
Vec_PtrSize
(
p
->
vFifo
)
);
}
}
// try to solve the support targets
// try to solve the support targets
...
...
src/proof/fraig/fraigSat.c
View file @
bc288a76
...
@@ -358,8 +358,8 @@ p->timeTrav += Abc_Clock() - clk;
...
@@ -358,8 +358,8 @@ p->timeTrav += Abc_Clock() - clk;
// printf( "The number of MUXes detected = %d (%5.2f %% of logic). ", nMuxes, 300.0*nMuxes/(p->vNodes->nSize - p->vInputs->nSize) );
// printf( "The number of MUXes detected = %d (%5.2f %% of logic). ", nMuxes, 300.0*nMuxes/(p->vNodes->nSize - p->vInputs->nSize) );
// ABC_PRT( "Time", Abc_Clock() - clk );
// ABC_PRT( "Time", Abc_Clock() - clk );
if
(
fVerbose
)
if
(
fVerbose
)
printf
(
"%d(%d) - "
,
Fraig_CountPis
(
p
,
p
->
vVarsInt
),
Msat_IntVecReadSize
(
p
->
vVarsInt
)
);
printf
(
"%d(%d) - "
,
Fraig_CountPis
(
p
,
p
->
vVarsInt
),
Msat_IntVecReadSize
(
p
->
vVarsInt
)
);
// prepare variable activity
// prepare variable activity
...
@@ -574,8 +574,8 @@ clk = Abc_Clock();
...
@@ -574,8 +574,8 @@ clk = Abc_Clock();
// Fraig_PrepareCones( p, pOld, pNew );
// Fraig_PrepareCones( p, pOld, pNew );
p
->
timeTrav
+=
Abc_Clock
()
-
clk
;
p
->
timeTrav
+=
Abc_Clock
()
-
clk
;
if
(
fVerbose
)
if
(
fVerbose
)
printf
(
"%d(%d) - "
,
Fraig_CountPis
(
p
,
p
->
vVarsInt
),
Msat_IntVecReadSize
(
p
->
vVarsInt
)
);
printf
(
"%d(%d) - "
,
Fraig_CountPis
(
p
,
p
->
vVarsInt
),
Msat_IntVecReadSize
(
p
->
vVarsInt
)
);
// get the complemented attribute
// get the complemented attribute
...
...
src/sat/glucose/Options.cpp
View file @
bc288a76
...
@@ -65,7 +65,7 @@ void Gluco::printUsageAndExit (int argc, char** argv, bool verbose)
...
@@ -65,7 +65,7 @@ void Gluco::printUsageAndExit (int argc, char** argv, bool verbose)
if
(
usage
!=
NULL
)
if
(
usage
!=
NULL
)
fprintf
(
stderr
,
usage
,
argv
[
0
]);
fprintf
(
stderr
,
usage
,
argv
[
0
]);
sort
(
Option
::
getOptionList
(),
Option
::
OptionLt
());
sort
(
Option
::
getOptionList
(),
Option
::
OptionLt
());
const
char
*
prev_cat
=
NULL
;
const
char
*
prev_cat
=
NULL
;
const
char
*
prev_type
=
NULL
;
const
char
*
prev_type
=
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