summaryrefslogtreecommitdiffstats
path: root/src/opt
diff options
context:
space:
mode:
Diffstat (limited to 'src/opt')
-rw-r--r--src/opt/cgt/cgtAig.c28
-rw-r--r--src/opt/csw/cswCore.c6
-rw-r--r--src/opt/csw/cswMan.c2
-rw-r--r--src/opt/dar/darBalance.c12
-rw-r--r--src/opt/dar/darCore.c2
-rw-r--r--src/opt/mfs/mfsStrash.c22
-rw-r--r--src/opt/nwk/nwkAig.c4
-rw-r--r--src/opt/nwk/nwkStrash.c4
8 files changed, 40 insertions, 40 deletions
diff --git a/src/opt/cgt/cgtAig.c b/src/opt/cgt/cgtAig.c
index b2cfd36f..96f6a289 100644
--- a/src/opt/cgt/cgtAig.c
+++ b/src/opt/cgt/cgtAig.c
@@ -223,13 +223,13 @@ Aig_Obj_t * Cgt_ManConstructCareCondition( Cgt_Man_t * p, Aig_Man_t * pNew, Aig_
assert( Aig_ObjIsNode(pObj) );
if ( Saig_ObjIsPi(p->pAig, Aig_ObjFanin0(pObj)) && Vec_PtrEntry(vCopy0, Aig_ObjFaninId0(pObj)) == NULL )
{
- pTemp = Aig_ObjCreatePi( pNew );
+ pTemp = Aig_ObjCreateCi( pNew );
Vec_PtrWriteEntry( vCopy0, Aig_ObjFaninId0(pObj), pTemp );
Vec_PtrWriteEntry( vCopy1, Aig_ObjFaninId0(pObj), pTemp );
}
if ( Saig_ObjIsPi(p->pAig, Aig_ObjFanin1(pObj)) && Vec_PtrEntry(vCopy0, Aig_ObjFaninId1(pObj)) == NULL )
{
- pTemp = Aig_ObjCreatePi( pNew );
+ pTemp = Aig_ObjCreateCi( pNew );
Vec_PtrWriteEntry( vCopy0, Aig_ObjFaninId1(pObj), pTemp );
Vec_PtrWriteEntry( vCopy1, Aig_ObjFaninId1(pObj), pTemp );
}
@@ -274,12 +274,12 @@ Aig_Man_t * Cgt_ManDeriveAigForGating( Cgt_Man_t * p )
pNew->pName = Abc_UtilStrsav( "CG_miter" );
// build the first frame
Aig_ManConst1(p->pAig)->pData = Aig_ManConst1(pNew);
- Aig_ManForEachPi( p->pAig, pObj, i )
- pObj->pData = Aig_ObjCreatePi( pNew );
+ Aig_ManForEachCi( p->pAig, pObj, i )
+ pObj->pData = Aig_ObjCreateCi( pNew );
Aig_ManForEachNode( p->pAig, pObj, i )
pObj->pData = Aig_And( pNew, Aig_ObjChild0Copy(pObj), Aig_ObjChild1Copy(pObj) );
// Saig_ManForEachPo( p->pAig, pObj, i )
-// pObj->pData = Aig_ObjCreatePo( pNew, Aig_ObjChild0Copy(pObj) );
+// pObj->pData = Aig_ObjCreateCo( pNew, Aig_ObjChild0Copy(pObj) );
if ( p->pPars->nOdcMax > 0 )
{
// create storage for observability conditions
@@ -305,7 +305,7 @@ Aig_Man_t * Cgt_ManDeriveAigForGating( Cgt_Man_t * p )
// compute the miter
pMiter = Aig_Exor( pNew, (Aig_Obj_t *)pObjLo->pData, Aig_ObjChild0Copy(pObjLi) );
pMiter = Aig_And( pNew, pMiter, pCare );
- pObjLi->pData = Aig_ObjCreatePo( pNew, pMiter );
+ pObjLi->pData = Aig_ObjCreateCo( pNew, pMiter );
}
Vec_PtrFree( vCopy0 );
Vec_PtrFree( vCopy1 );
@@ -316,7 +316,7 @@ Aig_Man_t * Cgt_ManDeriveAigForGating( Cgt_Man_t * p )
Saig_ManForEachLiLo( p->pAig, pObjLi, pObjLo, i )
{
pMiter = Aig_Exor( pNew, (Aig_Obj_t *)pObjLo->pData, Aig_ObjChild0Copy(pObjLi) );
- pObjLi->pData = Aig_ObjCreatePo( pNew, pMiter );
+ pObjLi->pData = Aig_ObjCreateCo( pNew, pMiter );
}
}
Aig_ManCleanup( pNew );
@@ -395,7 +395,7 @@ void Cgt_ManConstructCare( Aig_Man_t * pNew, Aig_Man_t * pCare, Vec_Vec_t * vSup
if ( pObjAig == NULL )
continue;
pObjAig = Aig_NotCond( pObjAig, Aig_ObjFaninC0(pPo) );
- Aig_ObjCreatePo( pNew, pObjAig );
+ Aig_ObjCreateCo( pNew, pObjAig );
}
}
}
@@ -418,7 +418,7 @@ Aig_Obj_t * Cgt_ManDupPartition_rec( Aig_Man_t * pNew, Aig_Man_t * pAig, Aig_Obj
Aig_ObjSetTravIdCurrent(pAig, pObj);
if ( Aig_ObjIsPi(pObj) )
{
- pObj->pData = Aig_ObjCreatePi( pNew );
+ pObj->pData = Aig_ObjCreateCi( pNew );
Vec_PtrPush( vLeaves, pObj );
return (Aig_Obj_t *)pObj->pData;
}
@@ -473,7 +473,7 @@ Aig_Man_t * Cgt_ManDupPartition( Aig_Man_t * pFrame, int nVarsMin, int nFlopsMin
Cgt_ManConstructCare( pNew, pCare, vSuppsInv, vLeaves );
// create POs
Vec_PtrForEachEntry( Aig_Obj_t *, vPos, pObj, i )
- pObj->pData = (Aig_Obj_t *)Aig_ObjCreatePo( pNew, (Aig_Obj_t *)Vec_PtrEntry(vRoots, i) );
+ pObj->pData = (Aig_Obj_t *)Aig_ObjCreateCo( pNew, (Aig_Obj_t *)Vec_PtrEntry(vRoots, i) );
if ( pnOutputs != NULL )
*pnOutputs = Vec_PtrSize( vPos );
Vec_PtrFree( vRoots );
@@ -542,8 +542,8 @@ Aig_Man_t * Cgt_ManDeriveGatedAig( Aig_Man_t * pAig, Vec_Vec_t * vGates, int fRe
pNew->pName = Abc_UtilStrsav( pAig->pName );
pNew->pSpec = Abc_UtilStrsav( pAig->pSpec );
Aig_ManConst1(pAig)->pData = Aig_ManConst1(pNew);
- Aig_ManForEachPi( pAig, pObj, i )
- pObj->pData = Aig_ObjCreatePi( pNew );
+ Aig_ManForEachCi( pAig, pObj, i )
+ pObj->pData = Aig_ObjCreateCi( pNew );
if ( fReduce )
{
Aig_ManForEachNode( pAig, pObj, i )
@@ -570,7 +570,7 @@ Aig_Man_t * Cgt_ManDeriveGatedAig( Aig_Man_t * pAig, Vec_Vec_t * vGates, int fRe
if ( pnUsedNodes != NULL )
*pnUsedNodes = Aig_ManNodeNum(pNew);
Saig_ManForEachPo( pAig, pObj, i )
- pObj->pData = Aig_ObjCreatePo( pNew, Aig_ObjChild0Copy(pObj) );
+ pObj->pData = Aig_ObjCreateCo( pNew, Aig_ObjChild0Copy(pObj) );
Saig_ManForEachLiLo( pAig, pObjLi, pObjLo, i )
{
vOne = Vec_VecEntry( vGates, i );
@@ -582,7 +582,7 @@ Aig_Man_t * Cgt_ManDeriveGatedAig( Aig_Man_t * pAig, Vec_Vec_t * vGates, int fRe
pGateNew = Cgt_ManBuildClockGate( pNew, vOne );
pObjNew = Aig_Mux( pNew, pGateNew, (Aig_Obj_t *)pObjLo->pData, Aig_ObjChild0Copy(pObjLi) );
}
- pObjLi->pData = Aig_ObjCreatePo( pNew, pObjNew );
+ pObjLi->pData = Aig_ObjCreateCo( pNew, pObjNew );
}
Aig_ManCleanup( pNew );
Aig_ManSetRegNum( pNew, Aig_ManRegNum(pAig) );
diff --git a/src/opt/csw/cswCore.c b/src/opt/csw/cswCore.c
index e1bdca00..9159417f 100644
--- a/src/opt/csw/cswCore.c
+++ b/src/opt/csw/cswCore.c
@@ -52,7 +52,7 @@ clk = clock();
// start the manager
p = Csw_ManStart( pAig, nCutsMax, nLeafMax, fVerbose );
// set elementary cuts at the PIs
- Aig_ManForEachPi( p->pManRes, pObj, i )
+ Aig_ManForEachCi( p->pManRes, pObj, i )
{
Csw_ObjPrepareCuts( p, pObj, 1 );
Csw_ObjAddRefs( p, pObj, Aig_ManPi(p->pManAig,i)->nRefs );
@@ -77,8 +77,8 @@ clk = clock();
Csw_ObjAddRefs( p, Aig_Regular(pObjRes), pObj->nRefs );
}
// add the POs
- Aig_ManForEachPo( pAig, pObj, i )
- Aig_ObjCreatePo( p->pManRes, Csw_ObjChild0Equiv(p, pObj) );
+ Aig_ManForEachCo( pAig, pObj, i )
+ Aig_ObjCreateCo( p->pManRes, Csw_ObjChild0Equiv(p, pObj) );
// remove dangling nodes
Aig_ManCleanup( p->pManRes );
// return the resulting manager
diff --git a/src/opt/csw/cswMan.c b/src/opt/csw/cswMan.c
index 5df69492..0f0d79f9 100644
--- a/src/opt/csw/cswMan.c
+++ b/src/opt/csw/cswMan.c
@@ -75,7 +75,7 @@ Csw_Man_t * Csw_ManStart( Aig_Man_t * pMan, int nCutsMax, int nLeafMax, int fVer
memset( p->pTable, 0, sizeof(Aig_Obj_t *) * p->nTableSize );
// set the pointers to the available fraig nodes
Csw_ObjSetEquiv( p, Aig_ManConst1(p->pManAig), Aig_ManConst1(p->pManRes) );
- Aig_ManForEachPi( p->pManAig, pObj, i )
+ Aig_ManForEachCi( p->pManAig, pObj, i )
Csw_ObjSetEquiv( p, pObj, Aig_ManPi(p->pManRes, i) );
// room for temporary truth tables
p->puTemp[0] = ABC_ALLOC( unsigned, 4 * p->nTruthWords );
diff --git a/src/opt/dar/darBalance.c b/src/opt/dar/darBalance.c
index 56ec51fa..a0a17311 100644
--- a/src/opt/dar/darBalance.c
+++ b/src/opt/dar/darBalance.c
@@ -503,7 +503,7 @@ Aig_Man_t * Dar_ManBalance( Aig_Man_t * p, int fUpdateLevel )
if ( Aig_ObjIsPi(pObj) )
{
// copy the PI
- pObjNew = Aig_ObjCreatePi(pNew);
+ pObjNew = Aig_ObjCreateCi(pNew);
pObj->pData = pObjNew;
pObjNew->pHaig = pObj->pHaig;
// set the arrival time of the new PI
@@ -520,7 +520,7 @@ Aig_Man_t * Dar_ManBalance( Aig_Man_t * p, int fUpdateLevel )
arrTime = (float)Aig_Regular(pObjNew)->Level;
Tim_ManSetCoArrival( (Tim_Man_t *)p->pManTime, Aig_ObjPioNum(pObj), arrTime );
// create PO
- pObjNew = Aig_ObjCreatePo( pNew, pObjNew );
+ pObjNew = Aig_ObjCreateCo( pNew, pObjNew );
pObjNew->pHaig = pObj->pHaig;
}
else
@@ -531,19 +531,19 @@ Aig_Man_t * Dar_ManBalance( Aig_Man_t * p, int fUpdateLevel )
}
else
{
- Aig_ManForEachPi( p, pObj, i )
+ Aig_ManForEachCi( p, pObj, i )
{
- pObjNew = Aig_ObjCreatePi(pNew);
+ pObjNew = Aig_ObjCreateCi(pNew);
pObjNew->Level = pObj->Level;
pObj->pData = pObjNew;
pObjNew->pHaig = pObj->pHaig;
}
- Aig_ManForEachPo( p, pObj, i )
+ Aig_ManForEachCo( p, pObj, i )
{
pDriver = Aig_ObjReal_rec( Aig_ObjChild0(pObj) );
pObjNew = Dar_Balance_rec( pNew, Aig_Regular(pDriver), vStore, 0, fUpdateLevel );
pObjNew = Aig_NotCond( pObjNew, Aig_IsComplement(pDriver) );
- pObjNew = Aig_ObjCreatePo( pNew, pObjNew );
+ pObjNew = Aig_ObjCreateCo( pNew, pObjNew );
pObjNew->pHaig = pObj->pHaig;
}
}
diff --git a/src/opt/dar/darCore.c b/src/opt/dar/darCore.c
index adc41035..54e9cf84 100644
--- a/src/opt/dar/darCore.c
+++ b/src/opt/dar/darCore.c
@@ -302,7 +302,7 @@ Aig_MmFixed_t * Dar_ManComputeCuts( Aig_Man_t * pAig, int nCutsMax, int fVerbose
// Dar_ManCutsStart( p );
Aig_MmFixedRestart( p->pMemCuts );
Dar_ObjPrepareCuts( p, Aig_ManConst1(p->pAig) );
- Aig_ManForEachPi( pAig, pObj, i )
+ Aig_ManForEachCi( pAig, pObj, i )
Dar_ObjPrepareCuts( p, pObj );
// compute cuts for each nodes in the topological order
Aig_ManForEachNode( pAig, pObj, i )
diff --git a/src/opt/mfs/mfsStrash.c b/src/opt/mfs/mfsStrash.c
index 922af3a8..b70b3e9b 100644
--- a/src/opt/mfs/mfsStrash.c
+++ b/src/opt/mfs/mfsStrash.c
@@ -75,7 +75,7 @@ Hop_Obj_t * Abc_MfsConvertAigToHop( Aig_Man_t * pMan, Hop_Man_t * pHop )
return Hop_NotCond( Hop_ManConst1(pHop), Aig_ObjFaninC0(pRoot) );
// set the PI mapping
Aig_ManCleanData( pMan );
- Aig_ManForEachPi( pMan, pObj, i )
+ Aig_ManForEachCi( pMan, pObj, i )
pObj->pData = Hop_IthVar( pHop, i );
// construct the AIG
Abc_MfsConvertAigToHop_rec( Aig_ObjFanin0(pRoot), pHop );
@@ -170,7 +170,7 @@ Aig_Obj_t * Abc_NtkConstructAig_rec( Mfs_Man_t * p, Abc_Obj_t * pNode, Aig_Man_t
int i;
// assign AIG nodes to the leaves
Vec_PtrForEachEntry( Abc_Obj_t *, p->vSupp, pObj, i )
- pObj->pCopy = pObj->pNext = (Abc_Obj_t *)Aig_ObjCreatePi( pMan );
+ pObj->pCopy = pObj->pNext = (Abc_Obj_t *)Aig_ObjCreateCi( pMan );
// strash intermediate nodes
Abc_NtkIncrementTravId( pNode->pNtk );
Vec_PtrForEachEntry( Abc_Obj_t *, p->vNodes, pObj, i )
@@ -242,7 +242,7 @@ Aig_Man_t * Abc_NtkConstructAig( Mfs_Man_t * p, Abc_Obj_t * pNode )
// construct the root node's AIG cone
pObjAig = Abc_NtkConstructAig_rec( p, pNode, pMan );
// assert( Aig_ManConst1(pMan) == pObjAig );
- Aig_ObjCreatePo( pMan, pObjAig );
+ Aig_ObjCreateCo( pMan, pObjAig );
if ( p->pCare )
{
// mark the care set
@@ -269,11 +269,11 @@ Aig_Man_t * Abc_NtkConstructAig( Mfs_Man_t * p, Abc_Obj_t * pNode )
if ( pObjAig == NULL )
continue;
pObjAig = Aig_NotCond( pObjAig, Aig_ObjFaninC0(pPo) );
- Aig_ObjCreatePo( pMan, pObjAig );
+ Aig_ObjCreateCo( pMan, pObjAig );
}
}
/*
- Aig_ManForEachPo( p->pCare, pPo, i )
+ Aig_ManForEachCo( p->pCare, pPo, i )
{
// assert( Aig_ObjFanin0(pPo) != Aig_ManConst1(p->pCare) );
if ( Aig_ObjFanin0(pPo) == Aig_ManConst1(p->pCare) )
@@ -282,7 +282,7 @@ Aig_Man_t * Abc_NtkConstructAig( Mfs_Man_t * p, Abc_Obj_t * pNode )
if ( pObjAig == NULL )
continue;
pObjAig = Aig_NotCond( pObjAig, Aig_ObjFaninC0(pPo) );
- Aig_ObjCreatePo( pMan, pObjAig );
+ Aig_ObjCreateCo( pMan, pObjAig );
}
*/
}
@@ -290,12 +290,12 @@ Aig_Man_t * Abc_NtkConstructAig( Mfs_Man_t * p, Abc_Obj_t * pNode )
{
// construct the node
pObjAig = (Aig_Obj_t *)pNode->pCopy;
- Aig_ObjCreatePo( pMan, pObjAig );
+ Aig_ObjCreateCo( pMan, pObjAig );
// construct the divisors
Vec_PtrForEachEntry( Abc_Obj_t *, p->vDivs, pFanin, i )
{
pObjAig = (Aig_Obj_t *)pFanin->pCopy;
- Aig_ObjCreatePo( pMan, pObjAig );
+ Aig_ObjCreateCo( pMan, pObjAig );
}
}
else
@@ -304,7 +304,7 @@ Aig_Man_t * Abc_NtkConstructAig( Mfs_Man_t * p, Abc_Obj_t * pNode )
Abc_ObjForEachFanin( pNode, pFanin, i )
{
pObjAig = (Aig_Obj_t *)pFanin->pCopy;
- Aig_ObjCreatePo( pMan, pObjAig );
+ Aig_ObjCreateCo( pMan, pObjAig );
}
}
Aig_ManCleanup( pMan );
@@ -338,7 +338,7 @@ Aig_Man_t * Abc_NtkAigForConstraints( Mfs_Man_t * p, Abc_Obj_t * pNode )
{
pPi = Aig_ManPi( p->pCare, (int)(ABC_PTRUINT_T)pFanin->pData );
Aig_ObjSetTravIdCurrent( p->pCare, pPi );
- pPi->pData = Aig_ObjCreatePi(pMan);
+ pPi->pData = Aig_ObjCreateCi(pMan);
}
// construct the constraints
pObjRoot = Aig_ManConst1(pMan);
@@ -360,7 +360,7 @@ Aig_Man_t * Abc_NtkAigForConstraints( Mfs_Man_t * p, Abc_Obj_t * pNode )
pObjRoot = Aig_And( pMan, pObjRoot, pObjAig );
}
}
- Aig_ObjCreatePo( pMan, pObjRoot );
+ Aig_ObjCreateCo( pMan, pObjRoot );
Aig_ManCleanup( pMan );
return pMan;
}
diff --git a/src/opt/nwk/nwkAig.c b/src/opt/nwk/nwkAig.c
index 7dae0dca..6254bc41 100644
--- a/src/opt/nwk/nwkAig.c
+++ b/src/opt/nwk/nwkAig.c
@@ -55,7 +55,7 @@ Nwk_Man_t * Nwk_ManDeriveFromAig( Aig_Man_t * p )
pNtk->pSpec = Abc_UtilStrsav( p->pSpec );
pObj = Aig_ManConst1(p);
pObj->pData = Nwk_ManCreateNode( pNtk, 0, pObj->nRefs );
- Aig_ManForEachPi( p, pObj, i )
+ Aig_ManForEachCi( p, pObj, i )
pObj->pData = Nwk_ManCreateCi( pNtk, pObj->nRefs );
Aig_ManForEachNode( p, pObj, i )
{
@@ -63,7 +63,7 @@ Nwk_Man_t * Nwk_ManDeriveFromAig( Aig_Man_t * p )
Nwk_ObjAddFanin( (Nwk_Obj_t *)pObj->pData, (Nwk_Obj_t *)Aig_ObjFanin0(pObj)->pData );
Nwk_ObjAddFanin( (Nwk_Obj_t *)pObj->pData, (Nwk_Obj_t *)Aig_ObjFanin1(pObj)->pData );
}
- Aig_ManForEachPo( p, pObj, i )
+ Aig_ManForEachCo( p, pObj, i )
{
pObj->pData = Nwk_ManCreateCo( pNtk );
Nwk_ObjAddFanin( (Nwk_Obj_t *)pObj->pData, (Nwk_Obj_t *)Aig_ObjFanin0(pObj)->pData );
diff --git a/src/opt/nwk/nwkStrash.c b/src/opt/nwk/nwkStrash.c
index 74fc4d56..26fba57f 100644
--- a/src/opt/nwk/nwkStrash.c
+++ b/src/opt/nwk/nwkStrash.c
@@ -116,13 +116,13 @@ Aig_Man_t * Nwk_ManStrash( Nwk_Man_t * pNtk )
{
if ( Nwk_ObjIsCi(pObj) )
{
- pObjNew = Aig_ObjCreatePi(pMan);
+ pObjNew = Aig_ObjCreateCi(pMan);
Level = Tim_ManGetCiArrival( (Tim_Man_t *)pMan->pManTime, pObj->PioId );
Aig_ObjSetLevel( pObjNew, Level );
}
else if ( Nwk_ObjIsCo(pObj) )
{
- pObjNew = Aig_ObjCreatePo( pMan, Aig_NotCond((Aig_Obj_t *)Nwk_ObjFanin0(pObj)->pCopy, pObj->fInvert) );
+ pObjNew = Aig_ObjCreateCo( pMan, Aig_NotCond((Aig_Obj_t *)Nwk_ObjFanin0(pObj)->pCopy, pObj->fInvert) );
Level = Aig_ObjLevel( pObjNew );
Tim_ManSetCoArrival( (Tim_Man_t *)pMan->pManTime, pObj->PioId, (float)Level );
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-11 18:10:43 +0000