From 2575a5d6836c5bd8160b8e965c622e358b2dc742 Mon Sep 17 00:00:00 2001 From: Alan Mishchenko Date: Mon, 10 Dec 2012 13:56:40 -0800 Subject: Unifification of custom extensions. --- src/proof/abs/absGla.c | 4 ++-- src/proof/abs/absGlaOld.c | 2 +- src/proof/abs/absVta.c | 2 +- src/proof/cec/cecCec.c | 2 +- src/proof/cec/cecCore.c | 4 ++-- src/proof/cec/cecCorr.c | 2 +- src/proof/cec/cecSeq.c | 4 ++-- src/proof/cec/cecSolve.c | 2 +- src/proof/cec/cecSynth.c | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/proof') diff --git a/src/proof/abs/absGla.c b/src/proof/abs/absGla.c index 0ed9f450..3e933fa0 100644 --- a/src/proof/abs/absGla.c +++ b/src/proof/abs/absGla.c @@ -1451,7 +1451,7 @@ void Ga2_GlaDumpAbsracted( Ga2_Man_t * p, int fVerbose ) // dump abstraction map Vec_IntFreeP( &p->pGia->vGateClasses ); p->pGia->vGateClasses = Ga2_ManAbsTranslate( p ); - Gia_WriteAiger( p->pGia, pFileName, 0, 0 ); + Gia_AigerWrite( p->pGia, pFileName, 0, 0 ); } else if ( p->pPars->fDumpVabs ) { @@ -1464,7 +1464,7 @@ void Ga2_GlaDumpAbsracted( Ga2_Man_t * p, int fVerbose ) vGateClasses = Ga2_ManAbsTranslate( p ); pAbs = Gia_ManDupAbsGates( p->pGia, vGateClasses ); Gia_ManCleanValue( p->pGia ); - Gia_WriteAiger( pAbs, pFileName, 0, 0 ); + Gia_AigerWrite( pAbs, pFileName, 0, 0 ); Gia_ManStop( pAbs ); Vec_IntFreeP( &vGateClasses ); } diff --git a/src/proof/abs/absGlaOld.c b/src/proof/abs/absGlaOld.c index 0a0315c2..343ec935 100644 --- a/src/proof/abs/absGlaOld.c +++ b/src/proof/abs/absGlaOld.c @@ -1620,7 +1620,7 @@ void Gia_GlaDumpAbsracted( Gla_Man_t * p, int fVerbose ) pAbs = Gia_ManDupAbsGates( p->pGia0, vGateClasses ); Vec_IntFreeP( &vGateClasses ); // write into file - Gia_WriteAiger( pAbs, pFileName, 0, 0 ); + Gia_AigerWrite( pAbs, pFileName, 0, 0 ); Gia_ManStop( pAbs ); } diff --git a/src/proof/abs/absVta.c b/src/proof/abs/absVta.c index b217ef13..d94a93e5 100644 --- a/src/proof/abs/absVta.c +++ b/src/proof/abs/absVta.c @@ -1440,7 +1440,7 @@ void Gia_VtaDumpAbsracted( Vta_Man_t * p, int fVerbose ) pAbs = Gia_ManDupAbsGates( p->pGia, p->pGia->vGateClasses ); Vec_IntFreeP( &p->pGia->vGateClasses ); // send it out - Gia_WriteAiger( pAbs, pFileName, 0, 0 ); + Gia_AigerWrite( pAbs, pFileName, 0, 0 ); Gia_ManStop( pAbs ); } diff --git a/src/proof/cec/cecCec.c b/src/proof/cec/cecCec.c index 30c930a0..72c3e7db 100644 --- a/src/proof/cec/cecCec.c +++ b/src/proof/cec/cecCec.c @@ -263,7 +263,7 @@ int Cec_ManVerify( Gia_Man_t * pInit, Cec_ParCec_t * pPars ) { ABC_FREE( pNew->pReprs ); ABC_FREE( pNew->pNexts ); - Gia_WriteAiger( pNew, "gia_cec_undecided.aig", 0, 0 ); + Gia_AigerWrite( pNew, "gia_cec_undecided.aig", 0, 0 ); Abc_Print( 1, "The result is written into file \"%s\".\n", "gia_cec_undecided.aig" ); } if ( pPars->TimeLimit && (clock() - clkTotal)/CLOCKS_PER_SEC >= pPars->TimeLimit ) diff --git a/src/proof/cec/cecCore.c b/src/proof/cec/cecCore.c index c45bd974..40d5fba6 100644 --- a/src/proof/cec/cecCore.c +++ b/src/proof/cec/cecCore.c @@ -398,7 +398,7 @@ p->timeSim += clock() - clk; } pSrm = Cec_ManFraSpecReduction( p ); -// Gia_WriteAiger( pSrm, "gia_srm.aig", 0, 0 ); +// Gia_AigerWrite( pSrm, "gia_srm.aig", 0, 0 ); if ( pPars->fVeryVerbose ) Gia_ManPrintStats( pSrm, 0, 0, 0 ); @@ -481,7 +481,7 @@ p->timeSat += clock() - clk; Abc_Print( 1, "Increasing conflict limit to %d.\n", pParsSat->nBTLimit ); if ( fOutputResult ) { - Gia_WriteAiger( p->pAig, "gia_cec_temp.aig", 0, 0 ); + Gia_AigerWrite( p->pAig, "gia_cec_temp.aig", 0, 0 ); Abc_Print( 1,"The result is written into file \"%s\".\n", "gia_cec_temp.aig" ); } } diff --git a/src/proof/cec/cecCorr.c b/src/proof/cec/cecCorr.c index f3a84d3a..ed5f9a8e 100644 --- a/src/proof/cec/cecCorr.c +++ b/src/proof/cec/cecCorr.c @@ -1124,7 +1124,7 @@ Gia_Man_t * Cec_ManLSCorrespondence( Gia_Man_t * pAig, Cec_ParCor_t * pPars ) pNew = Gia_ManCorrReduce( pAig ); pNew = Gia_ManSeqCleanup( pTemp = pNew ); Gia_ManStop( pTemp ); - //Gia_WriteAiger( pNew, "reduced.aig", 0, 0 ); + //Gia_AigerWrite( pNew, "reduced.aig", 0, 0 ); } // report the results if ( pPars->fVerbose ) diff --git a/src/proof/cec/cecSeq.c b/src/proof/cec/cecSeq.c index da60de1d..43bfa99c 100644 --- a/src/proof/cec/cecSeq.c +++ b/src/proof/cec/cecSeq.c @@ -401,14 +401,14 @@ int Cec_ManSeqSemiformal( Gia_Man_t * pAig, Cec_ParSmf_t * pPars ) } // write equivalence classes - Gia_WriteAiger( pAig, "gore.aig", 0, 0 ); + Gia_AigerWrite( pAig, "gore.aig", 0, 0 ); // reduce the model pReduce = Gia_ManSpecReduce( pAig, 0, 0, 1, 0, 0 ); if ( pReduce ) { pReduce = Gia_ManSeqStructSweep( pAux = pReduce, 1, 1, 0 ); Gia_ManStop( pAux ); - Gia_WriteAiger( pReduce, "gsrm.aig", 0, 0 ); + Gia_AigerWrite( pReduce, "gsrm.aig", 0, 0 ); // Abc_Print( 1, "Speculatively reduced model was written into file \"%s\".\n", "gsrm.aig" ); // Gia_ManPrintStatsShort( pReduce ); Gia_ManStop( pReduce ); diff --git a/src/proof/cec/cecSolve.c b/src/proof/cec/cecSolve.c index 41053cf0..d560c37a 100644 --- a/src/proof/cec/cecSolve.c +++ b/src/proof/cec/cecSolve.c @@ -710,7 +710,7 @@ clk2 = clock(); if ( status == -1 ) { Gia_Man_t * pTemp = Gia_ManDupDfsCone( pAig, pObj ); - Gia_WriteAiger( pTemp, "gia_hard.aig", 0, 0 ); + Gia_AigerWrite( pTemp, "gia_hard.aig", 0, 0 ); Gia_ManStop( pTemp ); Abc_Print( 1, "Dumping hard cone into file \"%s\".\n", "gia_hard.aig" ); } diff --git a/src/proof/cec/cecSynth.c b/src/proof/cec/cecSynth.c index 6fc991a8..6ab88cbe 100644 --- a/src/proof/cec/cecSynth.c +++ b/src/proof/cec/cecSynth.c @@ -309,7 +309,7 @@ int Cec_SequentialSynthesisPart( Gia_Man_t * p, Cec_ParSeq_t * pPars ) { pTemp = Gia_ManRegCreatePart( p, vPart, &nCountPis, &nCountRegs, NULL ); sprintf( Buffer, "part%03d.aig", i ); - Gia_WriteAiger( pTemp, Buffer, 0, 0 ); + Gia_AigerWrite( pTemp, Buffer, 0, 0 ); Abc_Print( 1, "part%03d.aig : Reg = %4d. PI = %4d. (True = %4d. Regs = %4d.) And = %5d.\n", i, Vec_IntSize(vPart), Gia_ManCiNum(pTemp)-Vec_IntSize(vPart), nCountPis, nCountRegs, Gia_ManAndNum(pTemp) ); Gia_ManStop( pTemp ); -- cgit v1.2.3