Merge branch 'cwrs_speedup'

Conflicts:
	libcelt/cwrs.c
	tests/cwrs32-test.c
This commit is contained in:
Jean-Marc Valin 2008-09-21 22:33:14 -04:00
commit b155bb8860
4 changed files with 49 additions and 94 deletions

View file

@ -13,7 +13,7 @@ int main(int _argc,char **_argv){
for(n=2;n<=NMAX;n++){
int m;
for(m=1;m<=MMAX;m++){
celt_uint32_t uu[NMAX];
celt_uint32_t uu[MMAX+2];
celt_uint32_t inc;
celt_uint32_t nc;
celt_uint32_t i;
@ -21,11 +21,11 @@ int main(int _argc,char **_argv){
inc=nc/10000;
if(inc<1)inc=1;
for(i=0;i<nc;i+=inc){
celt_uint32_t u[NMAX>MMAX+2?NMAX:MMAX+2];
celt_uint32_t u[MMAX+2];
int y[NMAX];
celt_uint32_t v;
memcpy(u,uu,n*sizeof(*u));
cwrsi32(n,m,i,nc,y,u);
memcpy(u,uu,(m+2)*sizeof(*u));
cwrsi32(n,m,i,y,u);
/*printf("%6u of %u:",i,nc);
for(k=0;k<n;k++)printf(" %+3i",y[k]);
printf(" ->");*/

View file

@ -14,7 +14,7 @@ int main(int _argc,char **_argv){
for(n=2;n<=NMAX;n+=3){
int m;
for(m=1;m<=MMAX;m++){
celt_uint64_t uu[NMAX];
celt_uint64_t uu[MMAX+2];
celt_uint64_t inc;
celt_uint64_t nc;
celt_uint64_t i;
@ -24,12 +24,12 @@ int main(int _argc,char **_argv){
if(inc<1)inc=1;
/*printf("%d/%d: %llu",n,m, nc);*/
for(i=0;i<nc;i+=inc){
celt_uint64_t u[NMAX>MMAX+2?NMAX:MMAX+2];
celt_uint64_t u[MMAX+2];
int y[NMAX];
celt_uint64_t v;
int k;
memcpy(u,uu,n*sizeof(*u));
cwrsi64(n,m,i,nc,y,u);
memcpy(u,uu,(m+2)*sizeof(*u));
cwrsi64(n,m,i,y,u);
/*printf("%llu of %llu:",i,nc);
for(k=0;k<n;k++)printf(" %+3i",y[k]);
printf(" ->");*/