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
fcd3133a
Commit
fcd3133a
authored
Dec 27, 2016
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates to delay optimization project.
parent
398c4ec9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
src/opt/sbd/sbdCore.c
+3
-2
src/opt/sbd/sbdLut.c
+1
-1
No files found.
src/opt/sbd/sbdCore.c
View file @
fcd3133a
...
@@ -75,6 +75,8 @@ static inline word * Sbd_ObjSim1( Sbd_Man_t * p, int i ) { return Vec_WrdEntryP(
...
@@ -75,6 +75,8 @@ static inline word * Sbd_ObjSim1( Sbd_Man_t * p, int i ) { return Vec_WrdEntryP(
static
inline
word
*
Sbd_ObjSim2
(
Sbd_Man_t
*
p
,
int
i
)
{
return
Vec_WrdEntryP
(
p
->
vSims
[
2
],
p
->
pPars
->
nWords
*
i
);
}
static
inline
word
*
Sbd_ObjSim2
(
Sbd_Man_t
*
p
,
int
i
)
{
return
Vec_WrdEntryP
(
p
->
vSims
[
2
],
p
->
pPars
->
nWords
*
i
);
}
static
inline
word
*
Sbd_ObjSim3
(
Sbd_Man_t
*
p
,
int
i
)
{
return
Vec_WrdEntryP
(
p
->
vSims
[
3
],
p
->
pPars
->
nWords
*
i
);
}
static
inline
word
*
Sbd_ObjSim3
(
Sbd_Man_t
*
p
,
int
i
)
{
return
Vec_WrdEntryP
(
p
->
vSims
[
3
],
p
->
pPars
->
nWords
*
i
);
}
extern
word
Sbd_ManSolve
(
sat_solver
*
pSat
,
int
PivotVar
,
int
FreeVar
,
Vec_Int_t
*
vDivSet
,
Vec_Int_t
*
vDivVars
,
Vec_Int_t
*
vDivValues
,
Vec_Int_t
*
vTemp
);
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
/// FUNCTION DEFINITIONS ///
/// FUNCTION DEFINITIONS ///
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
...
@@ -975,7 +977,6 @@ int Sbd_ManExplore( Sbd_Man_t * p, int Pivot, word * pTruth )
...
@@ -975,7 +977,6 @@ int Sbd_ManExplore( Sbd_Man_t * p, int Pivot, word * pTruth )
int
fVerbose
=
0
;
int
fVerbose
=
0
;
abctime
clk
,
clkSat
=
0
,
clkEnu
=
0
,
clkAll
=
Abc_Clock
();
abctime
clk
,
clkSat
=
0
,
clkEnu
=
0
,
clkAll
=
Abc_Clock
();
int
nIters
,
nItersMax
=
32
;
int
nIters
,
nItersMax
=
32
;
extern
word
Sbd_ManSolve
(
sat_solver
*
pSat
,
int
PivotVar
,
int
FreeVar
,
Vec_Int_t
*
vDivSet
,
Vec_Int_t
*
vDivVars
,
Vec_Int_t
*
vDivValues
,
Vec_Int_t
*
vTemp
);
word
MatrS
[
64
]
=
{
0
},
MatrC
[
2
][
64
]
=
{{
0
}},
Cubes
[
2
][
2
][
64
]
=
{{{
0
}}},
Cover
[
64
]
=
{
0
},
Cube
,
CubeNew
[
2
];
word
MatrS
[
64
]
=
{
0
},
MatrC
[
2
][
64
]
=
{{
0
}},
Cubes
[
2
][
2
][
64
]
=
{{{
0
}}},
Cover
[
64
]
=
{
0
},
Cube
,
CubeNew
[
2
];
int
i
,
k
,
n
,
Node
,
Index
,
nCubes
[
2
]
=
{
0
},
nRows
=
0
,
nRowsOld
;
int
i
,
k
,
n
,
Node
,
Index
,
nCubes
[
2
]
=
{
0
},
nRows
=
0
,
nRowsOld
;
...
@@ -1147,7 +1148,7 @@ int Sbd_ManExplore2( Sbd_Man_t * p, int Pivot, word * pTruth )
...
@@ -1147,7 +1148,7 @@ int Sbd_ManExplore2( Sbd_Man_t * p, int Pivot, word * pTruth )
extern
int
Sbd_ManCollectConstantsNew
(
sat_solver
*
pSat
,
Vec_Int_t
*
vDivVars
,
int
nConsts
,
int
PivotVar
,
word
*
pOnset
,
word
*
pOffset
);
extern
int
Sbd_ManCollectConstantsNew
(
sat_solver
*
pSat
,
Vec_Int_t
*
vDivVars
,
int
nConsts
,
int
PivotVar
,
word
*
pOnset
,
word
*
pOffset
);
abctime
clk
=
Abc_Clock
();
abctime
clk
=
Abc_Clock
();
word
Onset
[
64
]
=
{
0
},
Offset
[
64
]
=
{
0
},
Cube
;
word
Onset
[
64
]
=
{
0
},
Offset
[
64
]
=
{
0
},
Cube
;
word
CoverRows
[
256
]
=
{
0
},
CoverCols
[
64
]
=
{{
0
}
};
word
CoverRows
[
64
]
=
{
0
},
CoverCols
[
64
]
=
{
0
};
int
nIters
,
nItersMax
=
32
;
int
nIters
,
nItersMax
=
32
;
int
i
,
k
,
nRows
=
0
;
int
i
,
k
,
nRows
=
0
;
...
...
src/opt/sbd/sbdLut.c
View file @
fcd3133a
...
@@ -197,7 +197,7 @@ int Sbd_ProblemSolve( Gia_Man_t * p, Vec_Int_t * vMirrors,
...
@@ -197,7 +197,7 @@ int Sbd_ProblemSolve( Gia_Man_t * p, Vec_Int_t * vMirrors,
sat_solver
*
pSatCec
=
Sbd_ManSatSolver
(
NULL
,
p
,
vMirrors
,
Pivot
,
vWinObjs
,
vObj2Var
,
vTfo
,
vRoots
,
1
);
sat_solver
*
pSatCec
=
Sbd_ManSatSolver
(
NULL
,
p
,
vMirrors
,
Pivot
,
vWinObjs
,
vObj2Var
,
vTfo
,
vRoots
,
1
);
sat_solver
*
pSatQbf
=
sat_solver_new
();
sat_solver
*
pSatQbf
=
sat_solver_new
();
int
PivotVar
=
Vec_IntEntry
(
vObj2Var
,
Pivot
);
//
int PivotVar = Vec_IntEntry(vObj2Var, Pivot);
int
nVars
=
Vec_IntSize
(
vDivSet
);
int
nVars
=
Vec_IntSize
(
vDivSet
);
int
nPars
=
Sbd_ProblemCountParams
(
nStrs
,
pStr0
);
int
nPars
=
Sbd_ProblemCountParams
(
nStrs
,
pStr0
);
...
...
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