summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Mishchenko <alanmi@berkeley.edu>2017-04-27 22:08:17 -0700
committerAlan Mishchenko <alanmi@berkeley.edu>2017-04-27 22:08:17 -0700
commit1faab72a6c4433027e691fb8547a994f56993f67 (patch)
tree3af98ce0e9efa40b27572c68ed24e63ea4ec4925
parent0de189f4db57906339dfa778dfd1b541c86a74f2 (diff)
downloadabc-1faab72a6c4433027e691fb8547a994f56993f67.tar.gz
abc-1faab72a6c4433027e691fb8547a994f56993f67.tar.bz2
abc-1faab72a6c4433027e691fb8547a994f56993f67.zip
Experiments with support minimization.
-rw-r--r--abclib.dsp4
-rw-r--r--src/aig/gia/gia.h6
-rw-r--r--src/aig/gia/giaSupp.c338
-rw-r--r--src/aig/gia/module.make1
-rw-r--r--src/bdd/extrab/extraBddMisc.c32
-rw-r--r--src/misc/extra/extraUtilCube.c4
-rw-r--r--src/misc/extra/extraUtilEnum.c4
7 files changed, 369 insertions, 20 deletions
diff --git a/abclib.dsp b/abclib.dsp
index bbbc0fae..c069e7e2 100644
--- a/abclib.dsp
+++ b/abclib.dsp
@@ -4807,6 +4807,10 @@ SOURCE=.\src\aig\gia\giaSupMin.c
# End Source File
# Begin Source File
+SOURCE=.\src\aig\gia\giaSupp.c
+# End Source File
+# Begin Source File
+
SOURCE=.\src\aig\gia\giaSweep.c
# End Source File
# Begin Source File
diff --git a/src/aig/gia/gia.h b/src/aig/gia/gia.h
index 5ad87008..5e89e89a 100644
--- a/src/aig/gia/gia.h
+++ b/src/aig/gia/gia.h
@@ -577,6 +577,7 @@ static inline int Gia_ObjIsTravIdCurrent( Gia_Man_t * p, Gia_Obj_t * pO
static inline int Gia_ObjIsTravIdPrevious( Gia_Man_t * p, Gia_Obj_t * pObj ) { assert( Gia_ObjId(p, pObj) < p->nTravIdsAlloc ); return (p->pTravIds[Gia_ObjId(p, pObj)] == p->nTravIds - 1); }
static inline void Gia_ObjSetTravIdCurrentId( Gia_Man_t * p, int Id ) { assert( Id < p->nTravIdsAlloc ); p->pTravIds[Id] = p->nTravIds; }
static inline int Gia_ObjIsTravIdCurrentId( Gia_Man_t * p, int Id ) { assert( Id < p->nTravIdsAlloc ); return (p->pTravIds[Id] == p->nTravIds); }
+static inline int Gia_ObjIsTravIdPreviousId( Gia_Man_t * p, int Id ) { assert( Id < p->nTravIdsAlloc ); return (p->pTravIds[Id] == p->nTravIds - 1); }
static inline void Gia_ManTimeClean( Gia_Man_t * p ) { int i; assert( p->vTiming != NULL ); Vec_FltFill(p->vTiming, 3*Gia_ManObjNum(p), 0); for ( i = 0; i < Gia_ManObjNum(p); i++ ) Vec_FltWriteEntry( p->vTiming, 3*i+1, (float)(ABC_INFINITY) ); }
static inline void Gia_ManTimeStart( Gia_Man_t * p ) { assert( p->vTiming == NULL ); p->vTiming = Vec_FltAlloc(0); Gia_ManTimeClean( p ); }
@@ -1464,6 +1465,11 @@ extern int Gia_ManComputeOneWin( Gia_Man_t * p, int iPivot, Vec_
/*=== giaStg.c ============================================================*/
extern void Gia_ManStgPrint( FILE * pFile, Vec_Int_t * vLines, int nIns, int nOuts, int nStates );
extern Gia_Man_t * Gia_ManStgRead( char * pFileName, int kHot, int fVerbose );
+/*=== giaSupp.c ============================================================*/
+typedef struct Gia_ManMin_t_ Gia_ManMin_t;
+extern Gia_ManMin_t * Gia_ManSuppStart( Gia_Man_t * pGia );
+extern void Gia_ManSuppStop( Gia_ManMin_t * p );
+extern int Gia_ManSupportAnd( Gia_ManMin_t * p, int iLit0, int iLit1 );
/*=== giaSweep.c ============================================================*/
extern Gia_Man_t * Gia_ManFraigSweepSimple( Gia_Man_t * p, void * pPars );
extern Gia_Man_t * Gia_ManSweepWithBoxes( Gia_Man_t * p, void * pParsC, void * pParsS, int fConst, int fEquiv, int fVerbose, int fVerbEquivs );
diff --git a/src/aig/gia/giaSupp.c b/src/aig/gia/giaSupp.c
new file mode 100644
index 00000000..110fccfb
--- /dev/null
+++ b/src/aig/gia/giaSupp.c
@@ -0,0 +1,338 @@
+/**CFile****************************************************************
+
+ FileName [giaSupp.c]
+
+ SystemName [ABC: Logic synthesis and verification system.]
+
+ PackageName [Scalable AIG package.]
+
+ Synopsis [Support minimization for AIGs.]
+
+ Author [Alan Mishchenko]
+
+ Affiliation [UC Berkeley]
+
+ Date [Ver. 1.0. Started - June 20, 2005.]
+
+ Revision [$Id: giaSupp.c,v 1.00 2005/06/20 00:00:00 alanmi Exp $]
+
+***********************************************************************/
+
+#include "gia.h"
+
+#ifdef ABC_USE_CUDD
+#include "bdd/extrab/extraBdd.h"
+#endif
+
+ABC_NAMESPACE_IMPL_START
+
+////////////////////////////////////////////////////////////////////////
+/// DECLARATIONS ///
+////////////////////////////////////////////////////////////////////////
+
+#ifdef ABC_USE_CUDD
+
+struct Gia_ManMin_t_
+{
+ // problem formulation
+ Gia_Man_t * pGia;
+ int iLits[2];
+ // structural information
+ Vec_Int_t * vCis[2];
+ Vec_Int_t * vObjs[2];
+ Vec_Int_t * vCleared;
+ // intermediate functions
+ DdManager * dd;
+ Vec_Ptr_t * vFuncs;
+ Vec_Int_t * vSupp;
+};
+
+////////////////////////////////////////////////////////////////////////
+/// FUNCTION DEFINITIONS ///
+////////////////////////////////////////////////////////////////////////
+
+/**Function*************************************************************
+
+ Synopsis [Create/delete the data representation manager.]
+
+ Description []
+
+ SideEffects []
+
+ SeeAlso []
+
+***********************************************************************/
+Gia_ManMin_t * Gia_ManSuppStart( Gia_Man_t * pGia )
+{
+ Gia_ManMin_t * p;
+ p = ABC_CALLOC( Gia_ManMin_t, 1 );
+ p->pGia = pGia;
+ p->vCis[0] = Vec_IntAlloc( 512 );
+ p->vCis[1] = Vec_IntAlloc( 512 );
+ p->vObjs[0] = Vec_IntAlloc( 512 );
+ p->vObjs[1] = Vec_IntAlloc( 512 );
+ p->vCleared = Vec_IntAlloc( 512 );
+ p->dd = Cudd_Init( 0, 0, CUDD_UNIQUE_SLOTS, CUDD_CACHE_SLOTS, 0 );
+// Cudd_AutodynEnable( p->dd, CUDD_REORDER_SYMM_SIFT );
+ Cudd_AutodynDisable( p->dd );
+ p->vFuncs = Vec_PtrAlloc( 10000 );
+ p->vSupp = Vec_IntAlloc( 10000 );
+ return p;
+}
+void Gia_ManSuppStop( Gia_ManMin_t * p )
+{
+ Vec_IntFreeP( &p->vCis[0] );
+ Vec_IntFreeP( &p->vCis[1] );
+ Vec_IntFreeP( &p->vObjs[0] );
+ Vec_IntFreeP( &p->vObjs[1] );
+ Vec_IntFreeP( &p->vCleared );
+ Vec_PtrFreeP( &p->vFuncs );
+ Vec_IntFreeP( &p->vSupp );
+ printf( "Refs = %d. \n", Cudd_CheckZeroRef( p->dd ) );
+ Cudd_Quit( p->dd );
+ ABC_FREE( p );
+}
+
+/**Function*************************************************************
+
+ Synopsis [Compute variables, which are not in the support.]
+
+ Description []
+
+ SideEffects []
+
+ SeeAlso []
+
+***********************************************************************/
+int Gia_ManFindRemoved( Gia_ManMin_t * p )
+{
+ extern void ddSupportStep2( DdNode * f, int * support );
+ extern void ddClearFlag2( DdNode * f );
+
+ //int fVerbose = 1;
+ int nBddLimit = 100000;
+ int nPart0 = Vec_IntSize(p->vCis[0]);
+ int n, i, iObj, nVars = 0;
+ DdNode * bFunc0, * bFunc1, * bFunc;
+ Vec_PtrFillExtra( p->vFuncs, Gia_ManObjNum(p->pGia), NULL );
+ // assign variables
+ for ( n = 0; n < 2; n++ )
+ Vec_IntForEachEntry( p->vCis[n], iObj, i )
+ Vec_PtrWriteEntry( p->vFuncs, iObj, Cudd_bddIthVar(p->dd, nVars++) );
+ // create nodes
+ for ( n = 0; n < 2; n++ )
+ Vec_IntForEachEntry( p->vObjs[n], iObj, i )
+ {
+ Gia_Obj_t * pObj = Gia_ManObj( p->pGia, iObj );
+ bFunc0 = Cudd_NotCond( (DdNode *)Vec_PtrEntry(p->vFuncs, Gia_ObjFaninId0(pObj, iObj)), Gia_ObjFaninC0(pObj) );
+ bFunc1 = Cudd_NotCond( (DdNode *)Vec_PtrEntry(p->vFuncs, Gia_ObjFaninId1(pObj, iObj)), Gia_ObjFaninC1(pObj) );
+ bFunc = Cudd_bddAndLimit( p->dd, bFunc0, bFunc1, nBddLimit );
+ assert( bFunc != NULL );
+ Cudd_Ref( bFunc );
+ Vec_PtrWriteEntry( p->vFuncs, iObj, bFunc );
+ }
+ // create new node
+ bFunc0 = Cudd_NotCond( (DdNode *)Vec_PtrEntry(p->vFuncs, Abc_Lit2Var(p->iLits[0])), Abc_LitIsCompl(p->iLits[0]) );
+ bFunc1 = Cudd_NotCond( (DdNode *)Vec_PtrEntry(p->vFuncs, Abc_Lit2Var(p->iLits[1])), Abc_LitIsCompl(p->iLits[1]) );
+ bFunc = Cudd_bddAndLimit( p->dd, bFunc0, bFunc1, nBddLimit );
+ assert( bFunc != NULL );
+ Cudd_Ref( bFunc );
+ //if ( fVerbose ) Extra_bddPrint( p->dd, bFunc ), printf( "\n" );
+ // collect support
+ Vec_IntFill( p->vSupp, nVars, 0 );
+ ddSupportStep2( Cudd_Regular(bFunc), Vec_IntArray(p->vSupp) );
+ ddClearFlag2( Cudd_Regular(bFunc) );
+ // find variables not present in the support
+ Vec_IntClear( p->vCleared );
+ for ( i = 0; i < nVars; i++ )
+ if ( Vec_IntEntry(p->vSupp, i) == 0 )
+ Vec_IntPush( p->vCleared, i < nPart0 ? Vec_IntEntry(p->vCis[0], i) : Vec_IntEntry(p->vCis[1], i-nPart0) );
+ //printf( "%d(%d)%d ", Cudd_SupportSize(p->dd, bFunc), Vec_IntSize(p->vCleared), Cudd_DagSize(bFunc) );
+ // deref results
+ Cudd_RecursiveDeref( p->dd, bFunc );
+ for ( n = 0; n < 2; n++ )
+ Vec_IntForEachEntry( p->vObjs[n], iObj, i )
+ Cudd_RecursiveDeref( p->dd, (DdNode *)Vec_PtrEntry(p->vFuncs, iObj) );
+ //Vec_IntPrint( p->vCleared );
+ return Vec_IntSize(p->vCleared);
+}
+
+/**Function*************************************************************
+
+ Synopsis [Compute variables, which are not in the support.]
+
+ Description []
+
+ SideEffects []
+
+ SeeAlso []
+
+***********************************************************************/
+int Gia_ManRebuildOne( Gia_ManMin_t * p, int n )
+{
+ int i, iObj, iGiaLitNew = -1;
+ Vec_Int_t * vTempIns = p->vCis[n];
+ Vec_Int_t * vTempNds = p->vObjs[n];
+ Vec_Int_t * vCopies = &p->pGia->vCopies;
+ Vec_IntFillExtra( vCopies, Gia_ManObjNum(p->pGia), -1 );
+ assert( p->iLits[n] >= 2 );
+ // process inputs
+ Vec_IntForEachEntry( vTempIns, iObj, i )
+ Vec_IntWriteEntry( vCopies, iObj, Abc_Var2Lit(iObj, 0) );
+ // process constants
+ assert( Vec_IntSize(p->vCleared) > 0 );
+ Vec_IntForEachEntry( p->vCleared, iObj, i )
+ Vec_IntWriteEntry( vCopies, iObj, 0 );
+ if ( Vec_IntSize(vTempNds) == 0 )
+ iGiaLitNew = Vec_IntEntry( vCopies, Abc_Lit2Var(p->iLits[n]) );
+ else
+ {
+ Vec_IntForEachEntry( vTempNds, iObj, i )
+ {
+ Gia_Obj_t * pObj = Gia_ManObj( p->pGia, iObj );
+ int iGiaLit0 = Vec_IntEntry( vCopies, Gia_ObjFaninId0p(p->pGia, pObj) );
+ int iGiaLit1 = Vec_IntEntry( vCopies, Gia_ObjFaninId1p(p->pGia, pObj) );
+ iGiaLit0 = Abc_LitNotCond( iGiaLit0, Gia_ObjFaninC0(pObj) );
+ iGiaLit1 = Abc_LitNotCond( iGiaLit1, Gia_ObjFaninC1(pObj) );
+ iGiaLitNew = Gia_ManHashAnd( p->pGia, iGiaLit0, iGiaLit1 );
+ Vec_IntWriteEntry( vCopies, iObj, iGiaLitNew );
+ }
+ assert( Abc_Lit2Var(p->iLits[n]) == iObj );
+ }
+ return Abc_LitNotCond( iGiaLitNew, Abc_LitIsCompl(p->iLits[n]) );
+}
+
+/**Function*************************************************************
+
+ Synopsis [Collect nodes.]
+
+ Description []
+
+ SideEffects []
+
+ SeeAlso []
+
+***********************************************************************/
+static inline int Gia_ManGatherSupp_rec( Gia_Man_t * p, int iObj, Vec_Int_t * vCis, Vec_Int_t * vObjs )
+{
+ int Val0, Val1;
+ Gia_Obj_t * pObj;
+ if ( Gia_ObjIsTravIdPreviousId(p, iObj) )
+ return 1;
+ if ( Gia_ObjIsTravIdCurrentId(p, iObj) )
+ return 0;
+ Gia_ObjSetTravIdCurrentId(p, iObj);
+ pObj = Gia_ManObj( p, iObj );
+ if ( Gia_ObjIsCi(pObj) )
+ {
+ Vec_IntPush( vCis, iObj );
+ return 0;
+ }
+ assert( Gia_ObjIsAnd(pObj) );
+ Val0 = Gia_ManGatherSupp_rec( p, Gia_ObjFaninId0(pObj, iObj), vCis, vObjs );
+ Val1 = Gia_ManGatherSupp_rec( p, Gia_ObjFaninId1(pObj, iObj), vCis, vObjs );
+ Vec_IntPush( vObjs, iObj );
+ return Val0 || Val1;
+}
+int Gia_ManGatherSupp( Gia_ManMin_t * p )
+{
+ int n, Overlap = 0;
+ Gia_ManIncrementTravId( p->pGia );
+ for ( n = 0; n < 2; n++ )
+ {
+ Vec_IntClear( p->vCis[n] );
+ Vec_IntClear( p->vObjs[n] );
+ Gia_ManIncrementTravId( p->pGia );
+ Overlap = Gia_ManGatherSupp_rec( p->pGia, Abc_Lit2Var(p->iLits[n]), p->vCis[n], p->vObjs[n] );
+ assert( n || !Overlap );
+ }
+ return Overlap;
+}
+
+/**Function*************************************************************
+
+ Synopsis [Takes a literal and returns a support-minized literal.]
+
+ Description []
+
+ SideEffects []
+
+ SeeAlso []
+
+***********************************************************************/
+int Gia_ManSupportAnd( Gia_ManMin_t * p, int iLit0, int iLit1 )
+{
+ int iLitNew0, iLitNew1;
+ p->iLits[0] = iLit0;
+ p->iLits[1] = iLit1;
+ if ( iLit0 < 2 || iLit1 < 2 || !Gia_ManGatherSupp(p) || !Gia_ManFindRemoved(p) )
+ return Gia_ManHashAnd( p->pGia, iLit0, iLit1 );
+ iLitNew0 = Gia_ManRebuildOne( p, 0 );
+ iLitNew1 = Gia_ManRebuildOne( p, 1 );
+ return Gia_ManHashAnd( p->pGia, iLitNew0, iLitNew1 );
+}
+
+
+#else
+
+Gia_ManMin_t * Gia_ManSuppStart( Gia_Man_t * pGia ) { return NULL; }
+int Gia_ManSupportAnd( Gia_ManMin_t * p, int iLit0, int iLit1 ) { return 0; }
+void Gia_ManSuppStop( Gia_ManMin_t * p ) {}
+
+#endif
+
+
+/**Function*************************************************************
+
+ Synopsis [Testbench.]
+
+ Description []
+
+ SideEffects []
+
+ SeeAlso []
+
+***********************************************************************/
+Gia_Man_t * Gia_ManSupportAndTest( Gia_Man_t * pGia )
+{
+ Gia_ManMin_t * pMan;
+ Gia_Man_t * pNew, * pTemp;
+ Gia_Obj_t * pObj;
+ int i;
+ Gia_ManFillValue( pGia );
+ pNew = Gia_ManStart( Gia_ManObjNum(pGia) );
+ pNew->pName = Abc_UtilStrsav( pGia->pName );
+ pNew->pSpec = Abc_UtilStrsav( pGia->pSpec );
+ Gia_ManHashAlloc( pNew );
+ Gia_ManConst0(pGia)->Value = 0;
+ pMan = Gia_ManSuppStart( pNew );
+ Gia_ManForEachObj1( pGia, pObj, i )
+ {
+ if ( Gia_ObjIsAnd(pObj) )
+ {
+// pObj->Value = Gia_ManAppendAnd( pNew, Gia_ObjFanin0Copy(pObj), Gia_ObjFanin1Copy(pObj) );
+ pObj->Value = Gia_ManSupportAnd( pMan, Gia_ObjFanin0Copy(pObj), Gia_ObjFanin1Copy(pObj) );
+ }
+ else if ( Gia_ObjIsCi(pObj) )
+ pObj->Value = Gia_ManAppendCi( pNew );
+ else if ( Gia_ObjIsCo(pObj) )
+ pObj->Value = Gia_ManAppendCo( pNew, Gia_ObjFanin0Copy(pObj) );
+ else assert( 0 );
+
+ if ( i % 10000 == 0 )
+ printf( "%d\n", i );
+ }
+ Gia_ManSuppStop( pMan );
+ Gia_ManSetRegNum( pNew, Gia_ManRegNum(pGia) );
+ pNew = Gia_ManCleanup( pTemp = pNew );
+ Gia_ManStop( pTemp );
+ return pNew;
+}
+
+////////////////////////////////////////////////////////////////////////
+/// END OF FILE ///
+////////////////////////////////////////////////////////////////////////
+
+
+ABC_NAMESPACE_IMPL_END
+
diff --git a/src/aig/gia/module.make b/src/aig/gia/module.make
index 1f4c4c07..7ffd6bc5 100644
--- a/src/aig/gia/module.make
+++ b/src/aig/gia/module.make
@@ -76,6 +76,7 @@ SRC += src/aig/gia/giaAig.c \
src/aig/gia/giaStg.c \
src/aig/gia/giaStr.c \
src/aig/gia/giaSupMin.c \
+ src/aig/gia/giaSupp.c \
src/aig/gia/giaSweep.c \
src/aig/gia/giaSweeper.c \
src/aig/gia/giaSwitch.c \
diff --git a/src/bdd/extrab/extraBddMisc.c b/src/bdd/extrab/extraBddMisc.c
index bc4d8a7a..a5cda242 100644
--- a/src/bdd/extrab/extraBddMisc.c
+++ b/src/bdd/extrab/extraBddMisc.c
@@ -58,8 +58,8 @@ static DdNode * cuddBddPermuteRecur ARGS( ( DdManager * manager, DdHashTable * t
static DdNode * extraBddAndPermute( DdHashTable * table, DdManager * ddF, DdNode * bF, DdManager * ddG, DdNode * bG, int * pPermute );
// file "cuddUtils.c"
-static void ddSupportStep(DdNode *f, int *support);
-static void ddClearFlag(DdNode *f);
+void ddSupportStep2(DdNode *f, int *support);
+void ddClearFlag2(DdNode *f);
static DdNode* extraZddPrimes( DdManager *dd, DdNode* F );
@@ -547,8 +547,8 @@ Extra_SupportArray(
support[i] = 0;
/* Compute support and clean up markers. */
- ddSupportStep(Cudd_Regular(f),support);
- ddClearFlag(Cudd_Regular(f));
+ ddSupportStep2(Cudd_Regular(f),support);
+ ddClearFlag2(Cudd_Regular(f));
return(support);
@@ -584,9 +584,9 @@ Extra_VectorSupportArray(
/* Compute support and clean up markers. */
for ( i = 0; i < n; i++ )
- ddSupportStep( Cudd_Regular(F[i]), support );
+ ddSupportStep2( Cudd_Regular(F[i]), support );
for ( i = 0; i < n; i++ )
- ddClearFlag( Cudd_Regular(F[i]) );
+ ddClearFlag2( Cudd_Regular(F[i]) );
return support;
}
@@ -782,8 +782,8 @@ DdNode * Extra_bddSupportNegativeCube( DdManager * dd, DdNode * f )
}
/* Compute support and clean up markers. */
- ddSupportStep( Cudd_Regular( f ), support );
- ddClearFlag( Cudd_Regular( f ) );
+ ddSupportStep2( Cudd_Regular( f ), support );
+ ddClearFlag2( Cudd_Regular( f ) );
/* Transform support from array to cube. */
do
@@ -1689,8 +1689,8 @@ extraTransferPermuteRecur(
SeeAlso [ddClearFlag]
******************************************************************************/
-static void
-ddSupportStep(
+void
+ddSupportStep2(
DdNode * f,
int * support)
{
@@ -1699,8 +1699,8 @@ ddSupportStep(
}
support[f->index] = 1;
- ddSupportStep(cuddT(f),support);
- ddSupportStep(Cudd_Regular(cuddE(f)),support);
+ ddSupportStep2(cuddT(f),support);
+ ddSupportStep2(Cudd_Regular(cuddE(f)),support);
/* Mark as visited. */
f->next = Cudd_Not(f->next);
return;
@@ -1720,8 +1720,8 @@ ddSupportStep(
SeeAlso [ddSupportStep ddDagInt]
******************************************************************************/
-static void
-ddClearFlag(
+void
+ddClearFlag2(
DdNode * f)
{
if (!Cudd_IsComplement(f->next)) {
@@ -1732,8 +1732,8 @@ ddClearFlag(
if (cuddIsConstant(f)) {
return;
}
- ddClearFlag(cuddT(f));
- ddClearFlag(Cudd_Regular(cuddE(f)));
+ ddClearFlag2(cuddT(f));
+ ddClearFlag2(Cudd_Regular(cuddE(f)));
return;
} /* end of ddClearFlag */
diff --git a/src/misc/extra/extraUtilCube.c b/src/misc/extra/extraUtilCube.c
index c053e23a..f518405b 100644
--- a/src/misc/extra/extraUtilCube.c
+++ b/src/misc/extra/extraUtilCube.c
@@ -159,8 +159,8 @@ Iter 12 -> 3674160 Time = 70.48 sec
SeeAlso []
***********************************************************************/
-static inline int Abc_DataHasBit( word * p, word i ) { return (p[(i)>>6] & (1<<((i) & 63))) > 0; }
-static inline void Abc_DataXorBit( word * p, word i ) { p[(i)>>6] ^= (1<<((i) & 63)); }
+static inline int Abc_DataHasBit( word * p, word i ) { return (p[(i)>>6] & (((word)1)<<((i) & 63))) > 0; }
+static inline void Abc_DataXorBit( word * p, word i ) { p[(i)>>6] ^= (((word)1)<<((i) & 63)); }
static inline int Abc_DataGetCube( word w, int i ) { return (w >> (5*i)) & 31; }
static inline word Abc_DataXorCube( word w, int i, int c ) { return w ^ (((word)c) << (5*i)); }
static inline word Abc_CubeGenerateSign( char * pState )
diff --git a/src/misc/extra/extraUtilEnum.c b/src/misc/extra/extraUtilEnum.c
index 31364a16..84b0b089 100644
--- a/src/misc/extra/extraUtilEnum.c
+++ b/src/misc/extra/extraUtilEnum.c
@@ -298,8 +298,8 @@ void Abc_EnumPrint( Vec_Int_t * vGates, int i, int nVars )
SeeAlso []
***********************************************************************/
-static inline int Abc_DataHasBit( word * p, word i ) { return (p[(i)>>6] & (1<<((i) & 63))) > 0; }
-static inline void Abc_DataXorBit( word * p, word i ) { p[(i)>>6] ^= (1<<((i) & 63)); }
+static inline int Abc_DataHasBit( word * p, word i ) { return (p[(i)>>6] & (((word)1)<<((i) & 63))) > 0; }
+static inline void Abc_DataXorBit( word * p, word i ) { p[(i)>>6] ^= (((word)1)<<((i) & 63)); }
/**Function*************************************************************