luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Saturating floating point computation.

This commit is contained in:
Alan Mishchenko 2017-07-01 13:48:31 -07:00
parent a1dd7e3fb0
commit bf6a053c64
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/aig/gia/giaLf.c
View File

@ -1154,7 +1154,11 @@ static inline void Lf_CutParams( Lf_Man_t * p, Lf_Cut_t * pCut, int Required, fl
else
{
Index = (int)(pBest->Delay[1] + 1 <= Required && Required != ABC_INFINITY);
pCut->Flow += pBest->Flow[Index];
//pCut->Flow += pBest->Flow[Index];
if ( pCut->Flow >= (float)1e32 || pBest->Flow[Index] >= (float)1e32 )
pCut->Flow = (float)1e32;
else
pCut->Flow += pBest->Flow[Index];
}
Delay = pBest->Delay[Index];
}

6
src/aig/gia/giaNf.c
View File

@ -1147,7 +1147,11 @@ void Nf_ManCutMatchOne( Nf_Man_t * p, int iObj, int * pCut, int * pCutSet )
if ( pD->D < SCL_INFINITY && pA->D < SCL_INFINITY && ArrivalD + pC->iDelays[k] > Required )
break;
Delay = Abc_MaxInt( Delay, ArrivalD + pC->iDelays[k] );
AreaF += pBestF[iFanin]->M[fComplF][0].F;
//AreaF += pBestF[iFanin]->M[fComplF][0].F;
if ( AreaF >= (float)1e32 || pBestF[iFanin]->M[fComplF][0].F >= (float)1e32 )
AreaF = (float)1e32;
else
AreaF += pBestF[iFanin]->M[fComplF][0].F;
}
}
if ( k < nFans )

2
src/base/cmd/cmdHist.c
View File

@ -57,7 +57,7 @@ void Cmd_HistoryAddCommand( Abc_Frame_t * p, const char * command )
return;
Len = strlen(command);
strcpy( Buffer, command );
if ( Buffer[Len-1] == '\n' )
if ( Len > 0 && Buffer[Len-1] == '\n' )
Buffer[Len-1] = 0;
if ( strlen(Buffer) > 3 &&
strncmp(Buffer,"set",3) &&

10
src/map/if/ifCut.c
View File

@ -919,18 +919,22 @@ void If_CutLift( If_Cut_t * pCut )
float If_CutAreaFlow( If_Man_t * p, If_Cut_t * pCut )
{
If_Obj_t * pLeaf;
float Flow;
float Flow, AddOn;
int i;
Flow = If_CutLutArea(p, pCut);
If_CutForEachLeaf( p, pCut, pLeaf, i )
{
if ( pLeaf->nRefs == 0 || If_ObjIsConst1(pLeaf) )
Flow += If_ObjCutBest(pLeaf)->Area;
AddOn = If_ObjCutBest(pLeaf)->Area;
else
{
assert( pLeaf->EstRefs > p->fEpsilon );
Flow += If_ObjCutBest(pLeaf)->Area / pLeaf->EstRefs;
AddOn = If_ObjCutBest(pLeaf)->Area / pLeaf->EstRefs;
}
if ( Flow >= (float)1e32 || AddOn >= (float)1e32 )
Flow = (float)1e32;
else
Flow += AddOn;
}
return Flow;
}