[Math-atlas-commits] CVS: AtlasBase/Clint atlas-lvl2.base, 1.223, 1.224 atlas-parse.base, 1.108, 1.109

[R. C. W. <rw...@us...>]

Update of /cvsroot/math-atlas/AtlasBase/Clint
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22466/Clint

Modified Files:
	atlas-lvl2.base atlas-parse.base 
Log Message:


Index: atlas-lvl2.base
===================================================================
RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlas-lvl2.base,v
retrieving revision 1.223
retrieving revision 1.224
diff -C2 -d -r1.223 -r1.224
*** atlas-lvl2.base	29 Oct 2010 17:18:43 -0000	1.223
--- atlas-lvl2.base	29 Oct 2010 23:58:10 -0000	1.224
***************
*** 9224,9249 ****
   * guarantee all further alignments
   */
!    maxalign = (FAx >= FAa) ? FAx : FAa;
     maxalign = (maxalign >= FAy) ? maxalign : FAy;
!    if (MAx | MAy | MAa)
!    {
!       maxalign = (MAx >= MAa) ? MAx : MAa;
!       maxalign = (maxalign >= MAy) ? maxalign : MAy;
!    }
     if (MAx)
!    {
!       j = (FAx) ? FAx : ATL_sizeof;
!       for (i=0; (i % j != 0 || i%MAx == 0); i += ATL_sizeof);
!       pregap = i;
!    }
!    else pregap = 0;
     xgap = ATL_MulBySize(Xelts);
     if (FAy || MAy)
     {
!       j = (FAy) ? FAy : ATL_sizeof;
        if (MAy)
!          for (i=pregap+xgap; (i%j != 0 || i%MAy == 0); i += ATL_sizeof);
        else
!          for (i=pregap+xgap; (i%j != 0); i += ATL_sizeof);
        xgap = i - pregap;
     }
--- 9224,9248 ----
   * guarantee all further alignments
   */
!    maxalign = (MAx >= MAa) ? MAx : MAa;
!    maxalign = (maxalign >= MAy) ? maxalign : MAy;
     maxalign = (maxalign >= FAy) ? maxalign : FAy;
!    maxalign = (maxalign >= FAx) ? maxalign : FAx;
!    maxalign = (maxalign >= FAa) ? maxalign : FAa;
!    j = (FAx) ? FAx : sizeof(TYPE);
     if (MAx)
!       for (i=0; (i % j != 0 || i%MAx == 0); i += sizeof(TYPE));
!    else if (FAx)
!       for (i=0; i % j != 0 ; i += sizeof(TYPE));
!    else 
!       i = 0;
!    pregap = i;
     xgap = ATL_MulBySize(Xelts);
     if (FAy || MAy)
     {
!       j = (FAy) ? FAy : sizeof(TYPE);
        if (MAy)
!          for (i=pregap+xgap; (i%j != 0 || i%MAy == 0); i += sizeof(TYPE));
        else
!          for (i=pregap+xgap; (i%j != 0); i += sizeof(TYPE));
        xgap = i - pregap;
     }
***************
*** 9251,9259 ****
     if (FAa || MAa)
     {
!       j = (FAa) ? FAa : ATL_sizeof;
        if (MAa)
!          for (i=pregap+xgap+ygap; (i%j != 0 || i%MAa == 0); i += ATL_sizeof);
        else
!          for (i=pregap+xgap+ygap; (i%j != 0); i += ATL_sizeof);
        ygap = i - pregap - xgap;
     }
--- 9250,9258 ----
     if (FAa || MAa)
     {
!       j = (FAa) ? FAa : sizeof(TYPE);
        if (MAa)
!          for (i=pregap+xgap+ygap; (i%j != 0 || i%MAa == 0); i += sizeof(TYPE));
        else
!          for (i=pregap+xgap+ygap; (i%j != 0); i += sizeof(TYPE));
        ygap = i - pregap - xgap;
     }
***************
*** 9264,9271 ****
        j = pregap;
        for (i=pregap+xgap+ygap+agap; i%maxalign != 0; i++);
!       agap = i-xgap-ygap;
     }
     setspan = pregap + xgap + ygap + agap;
!    assert(setspan%ATL_sizeof == 0);
     setsz = ATL_MulBySize(M+N+M*N);
     nsets = (ATL_MulBySize(flushelts)+setsz-1)/setsz;
--- 9263,9270 ----
        j = pregap;
        for (i=pregap+xgap+ygap+agap; i%maxalign != 0; i++);
!       agap = i-pregap-xgap-ygap;
     }
     setspan = pregap + xgap + ygap + agap;
!    assert(setspan%sizeof(TYPE) == 0);
     setsz = ATL_MulBySize(M+N+M*N);
     nsets = (ATL_MulBySize(flushelts)+setsz-1)/setsz;
***************
*** 9800,9804 ****
     if (!(*N))
        *N = kp->@(nV)U;
!    *lda = *M+8;
  }
  
--- 9799,9811 ----
     if (!(*N))
        *N = kp->@(nV)U;
!    if (kp->ldamul == 0)
!       *lda = ((*M + 9)/7)*7;  /* make lda prime for worst case */
!    else
!    {
!       int i, sz = pre2size(pre);
!       i = kp->ldamul / sz;
!       assert(kp->ldamul == i*sz);
!       *lda = ((*M + 8 + i-1)/i)*i;
!    }
  }
  

Index: atlas-parse.base
===================================================================
RCS file: /cvsroot/math-atlas/AtlasBase/Clint/atlas-parse.base,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** atlas-parse.base	29 Oct 2010 17:18:43 -0000	1.108
--- atlas-parse.base	29 Oct 2010 23:58:10 -0000	1.109
***************
*** 1984,1988 ****
   */
  {
!    const int size = pre2size(pre);   /* default alignment is data size */
     int alignA, alignX, alignY, i;
  
--- 1984,1989 ----
   */
  {
!    const int size = (pre == 'd' || pre == 's') ? pre2size(pre) 
!                                                  : (pre2size(pre)>>1);
     int alignA, alignX, alignY, i;
  
***************
*** 2001,2007 ****
     }
  @ROUT atlas_r1testtime.h atlas_r2testtime.h atlas_mvtesttime.h
!    return(sprintf(str, 
!                   " align=\"-Fa %d -Fa -%d -Fx %d -Fx -%d -Fy %d -Fy -%d\"",
!                   alignA, 2*alignA, alignX, 2*alignX, alignY, 2*alignY));
  }
  
--- 2002,2018 ----
     }
  @ROUT atlas_r1testtime.h atlas_r2testtime.h atlas_mvtesttime.h
!    if (2*alignA <= ATL_Cachelen)
!       i = sprintf(str, " align=\"-Fa %d -Fa -%d", alignA, 2*alignA);
!    else
!       i = sprintf(str, " align=\"-Fa %d ", alignA);
!    if (2*alignX <= ATL_Cachelen)
!       i += sprintf(str+i, " -Fx %d -Fx -%d", alignX, 2*alignX);
!    else
!       i += sprintf(str+i, " -Fx %d", alignX);
!    if (2*alignY <= ATL_Cachelen)
!       i += sprintf(str+i, " -Fy %d -Fy -%d\"", alignY, 2*alignY);
!    else
!       i += sprintf(str+i, " -Fy %d\"", alignY);
!    return(i);
  }
  
***************
*** 2241,2245 ****
     i += sprintf(ln+i, " mu=%d nu=%d", r1p->MU, r1p->NU);
     if (verb < 3)
!       i += sprintf(ln+i, " > %s 2>&1\n", tmpnam);
     else
        i += sprintf(ln+i, "\n");
--- 2252,2256 ----
     i += sprintf(ln+i, " mu=%d nu=%d", r1p->MU, r1p->NU);
     if (verb < 3)
!       i += sprintf(ln+i, " > %s 2>&1\n", outnam);
     else
        i += sprintf(ln+i, "\n");