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
1d89ae52
Commit
1d89ae52
authored
Jul 20, 2012
by
Alan Mishchenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correcting &gla to update status as 'sat' after CEX is found.
parent
6df122bd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
src/aig/gia/giaAbsGla.c
+1
-4
src/aig/gia/giaAbsVta.c
+1
-4
No files found.
src/aig/gia/giaAbsGla.c
View file @
1d89ae52
...
@@ -1964,10 +1964,7 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta )
...
@@ -1964,10 +1964,7 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta )
p
->
timeCex
+=
clock
()
-
clk2
;
p
->
timeCex
+=
clock
()
-
clk2
;
if
(
pCex
!=
NULL
)
if
(
pCex
!=
NULL
)
{
RetValue
=
0
;
goto
finish
;
goto
finish
;
}
// print the result (do not count it towards change)
// print the result (do not count it towards change)
if
(
p
->
pPars
->
fVerbose
)
if
(
p
->
pPars
->
fVerbose
)
Gla_ManAbsPrintFrame
(
p
,
-
1
,
f
+
1
,
sat_solver2_nconflicts
(
p
->
pSat
)
-
nConflsBeg
,
i
,
clock
()
-
clk
);
Gla_ManAbsPrintFrame
(
p
,
-
1
,
f
+
1
,
sat_solver2_nconflicts
(
p
->
pSat
)
-
nConflsBeg
,
i
,
clock
()
-
clk
);
...
@@ -2011,7 +2008,6 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta )
...
@@ -2011,7 +2008,6 @@ int Gia_GlaPerform( Gia_Man_t * pAig, Gia_ParVta_t * pPars, int fStartVta )
// make sure, there was no initial abstraction (otherwise, it was invalid)
// make sure, there was no initial abstraction (otherwise, it was invalid)
assert
(
pAig
->
vObjClasses
==
NULL
&&
f
<
p
->
pPars
->
nFramesStart
);
assert
(
pAig
->
vObjClasses
==
NULL
&&
f
<
p
->
pPars
->
nFramesStart
);
// pCex = Vga_ManDeriveCex( p );
// pCex = Vga_ManDeriveCex( p );
RetValue
=
0
;
break
;
break
;
}
}
}
}
...
@@ -2084,6 +2080,7 @@ finish:
...
@@ -2084,6 +2080,7 @@ finish:
Abc_Print
(
1
,
"Counter-example detected in frame %d. "
,
f
);
Abc_Print
(
1
,
"Counter-example detected in frame %d. "
,
f
);
p
->
pPars
->
iFrame
=
pCex
->
iFrame
-
1
;
p
->
pPars
->
iFrame
=
pCex
->
iFrame
-
1
;
Vec_IntFreeP
(
&
pAig
->
vGateClasses
);
Vec_IntFreeP
(
&
pAig
->
vGateClasses
);
RetValue
=
0
;
}
}
Abc_PrintTime
(
1
,
"Time"
,
clock
()
-
clk
);
Abc_PrintTime
(
1
,
"Time"
,
clock
()
-
clk
);
if
(
p
->
pPars
->
fVerbose
)
if
(
p
->
pPars
->
fVerbose
)
...
...
src/aig/gia/giaAbsVta.c
View file @
1d89ae52
...
@@ -1621,10 +1621,7 @@ int Gia_VtaPerformInt( Gia_Man_t * pAig, Gia_ParVta_t * pPars )
...
@@ -1621,10 +1621,7 @@ int Gia_VtaPerformInt( Gia_Man_t * pAig, Gia_ParVta_t * pPars )
pCex
=
Vta_ManRefineAbstraction
(
p
,
f
);
pCex
=
Vta_ManRefineAbstraction
(
p
,
f
);
p
->
timeCex
+=
clock
()
-
clk2
;
p
->
timeCex
+=
clock
()
-
clk2
;
if
(
pCex
!=
NULL
)
if
(
pCex
!=
NULL
)
{
RetValue
=
0
;
goto
finish
;
goto
finish
;
}
// print the result (do not count it towards change)
// print the result (do not count it towards change)
Vta_ManAbsPrintFrame
(
p
,
NULL
,
f
+
1
,
sat_solver2_nconflicts
(
p
->
pSat
)
-
nConflsBeg
,
i
,
clock
()
-
clk
,
p
->
pPars
->
fVerbose
);
Vta_ManAbsPrintFrame
(
p
,
NULL
,
f
+
1
,
sat_solver2_nconflicts
(
p
->
pSat
)
-
nConflsBeg
,
i
,
clock
()
-
clk
,
p
->
pPars
->
fVerbose
);
}
}
...
@@ -1653,7 +1650,6 @@ int Gia_VtaPerformInt( Gia_Man_t * pAig, Gia_ParVta_t * pPars )
...
@@ -1653,7 +1650,6 @@ int Gia_VtaPerformInt( Gia_Man_t * pAig, Gia_ParVta_t * pPars )
// make sure, there was no initial abstraction (otherwise, it was invalid)
// make sure, there was no initial abstraction (otherwise, it was invalid)
assert
(
pAig
->
vObjClasses
==
NULL
&&
f
<
p
->
pPars
->
nFramesStart
);
assert
(
pAig
->
vObjClasses
==
NULL
&&
f
<
p
->
pPars
->
nFramesStart
);
pCex
=
Vga_ManDeriveCex
(
p
);
pCex
=
Vga_ManDeriveCex
(
p
);
RetValue
=
0
;
break
;
break
;
}
}
// add the core
// add the core
...
@@ -1738,6 +1734,7 @@ finish:
...
@@ -1738,6 +1734,7 @@ finish:
Abc_Print
(
1
,
"Counter-example detected in frame %d. "
,
f
);
Abc_Print
(
1
,
"Counter-example detected in frame %d. "
,
f
);
p
->
pPars
->
iFrame
=
pCex
->
iFrame
-
1
;
p
->
pPars
->
iFrame
=
pCex
->
iFrame
-
1
;
Vec_IntFreeP
(
&
pAig
->
vObjClasses
);
Vec_IntFreeP
(
&
pAig
->
vObjClasses
);
RetValue
=
0
;
}
}
Abc_PrintTime
(
1
,
"Time"
,
clock
()
-
clk
);
Abc_PrintTime
(
1
,
"Time"
,
clock
()
-
clk
);
...
...
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