diff options
author | David Schleef <ds@schleef.org> | 2004-12-02 21:29:47 +0000 |
---|---|---|
committer | David Schleef <ds@schleef.org> | 2004-12-02 21:29:47 +0000 |
commit | 15e2ced7e82c2f5a5c1d3e62104a46bad1ddff46 (patch) | |
tree | 2053bbd360cdf97199fa04af1186f98dc6af161a /liboil/dct | |
parent | 8da0b313ff66a50c2c70dd7a916dbfd8f8b2d11e (diff) | |
download | liboil-15e2ced7e82c2f5a5c1d3e62104a46bad1ddff46.tar.gz |
* liboil/copy/trans8x8_f32.c: Remove simdpack-ish TEST functions
* liboil/copy/trans8x8_s16.c:
* liboil/dct/dct12_f32.c:
* liboil/dct/dct36_f32.c:
* liboil/dct/fdct8_f64.c:
* liboil/dct/fdct8x8_f64.c:
* liboil/dct/fdct8x8_s16.c:
* liboil/dct/fdct8x8s_s16.c:
* liboil/dct/idct8_f64.c:
* liboil/dct/idct8x8_f64.c:
* liboil/dct/idct8x8_s16.c:
* liboil/dct/idct8x8s_s16.c:
* liboil/dct/imdct32_f32.c:
* liboil/jpeg/zigzag8x8_s16.c:
* liboil/junk/downsample1x_f64.c:
* liboil/junk/get8x8_f64.c:
Diffstat (limited to 'liboil/dct')
-rw-r--r-- | liboil/dct/dct12_f32.c | 50 | ||||
-rw-r--r-- | liboil/dct/dct36_f32.c | 48 | ||||
-rw-r--r-- | liboil/dct/fdct8_f64.c | 62 | ||||
-rw-r--r-- | liboil/dct/fdct8x8_f64.c | 57 | ||||
-rw-r--r-- | liboil/dct/fdct8x8_s16.c | 60 | ||||
-rw-r--r-- | liboil/dct/fdct8x8s_s16.c | 60 | ||||
-rw-r--r-- | liboil/dct/idct8_f64.c | 62 | ||||
-rw-r--r-- | liboil/dct/idct8x8_f64.c | 57 | ||||
-rw-r--r-- | liboil/dct/idct8x8_s16.c | 60 | ||||
-rw-r--r-- | liboil/dct/idct8x8s_s16.c | 62 | ||||
-rw-r--r-- | liboil/dct/imdct32_f32.c | 64 |
11 files changed, 0 insertions, 642 deletions
diff --git a/liboil/dct/dct12_f32.c b/liboil/dct/dct12_f32.c index 925c483..0addd03 100644 --- a/liboil/dct/dct12_f32.c +++ b/liboil/dct/dct12_f32.c @@ -233,54 +233,4 @@ OIL_DEFINE_IMPL (dct12_f32_mpglib, dct12_f32); -#ifdef TEST_dct12_f32 -int TEST_dct12_f32(void) -{ - int i; - int pass; - int failures = 0; - float *src, *dest_ref, *dest_test; - struct sl_profile_struct t; - - src = sl_malloc_f32(18); - dest_ref = sl_malloc_f32(18); - dest_test = sl_malloc_f32(18); - - sl_profile_init(t); - srand(20021001); - - printf("I: " sl_stringify(dct12_f32_FUNC) "\n"); - - for(pass=0;pass<1;pass++){ - for(i=0;i<18;i++){ - src[i]=sl_rand_f32_0_1(); - //src[i]=(i==pass+6); - } - - dct12_f32_ref(dest_ref,src); - sl_profile_start(t); - dct12_f32_FUNC(dest_test,src); - sl_profile_stop(t); - - for(i=0;i<18;i++){ - if(dest_test[i] != dest_ref[i]){ - printf("%d %g %g %g\n",i,src[i],dest_ref[i], - dest_test[i]); - } - } - } - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif diff --git a/liboil/dct/dct36_f32.c b/liboil/dct/dct36_f32.c index 81a48b8..d72087e 100644 --- a/liboil/dct/dct36_f32.c +++ b/liboil/dct/dct36_f32.c @@ -36,51 +36,3 @@ dct36_f32_ref(float *dest, int dstr, float *src, int sstr) OIL_DEFINE_IMPL_REF (dct36_f32_ref, dct36_f32); -#ifdef TEST_dct36_f32 -int TEST_dct36_f32(void) -{ - int i; - int pass; - int failures = 0; - f64 *src, *dest_ref, *dest_test; - struct sl_profile_struct t; - - src = sl_malloc_f64(N); - dest_ref = sl_malloc_f64(N); - dest_test = sl_malloc_f64(N); - - sl_profile_init(t); - srand(20021001); - - printf("I: " sl_stringify(dct36_f32_FUNC) "\n"); - - for(pass=0;pass<N_PASS;pass++){ - for(i=0;i<N;i++)src[i]=sl_rand_f64_s16(); - - dct36_f32_ref(dest_ref,src,N); - sl_profile_start(t); - dct36_f32_FUNC(dest_test,src,N); - sl_profile_stop(t); - - for(i=0;i<N;i++){ - if(dest_test[i] != dest_ref[i]){ - printf("%d %g %g %g\n",i,src[i],dest_ref[i], - dest_test[i]); - } - } - } - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif - diff --git a/liboil/dct/fdct8_f64.c b/liboil/dct/fdct8_f64.c index a65b4d6..ebefe6d 100644 --- a/liboil/dct/fdct8_f64.c +++ b/liboil/dct/fdct8_f64.c @@ -172,65 +172,3 @@ OIL_DEFINE_IMPL (fdct8_f64_fast, fdct8_f64); -#ifdef TEST_fdct8_f64 -int TEST_fdct8_f64(void) -{ - int i; - int pass; - int failures = 0; - double *src, *dest_ref, *dest_test; - double sad; - double sad_sum; - double sad_max; - struct sl_profile_struct t; - - src = sl_malloc_f64(8); - dest_ref = sl_malloc_f64(8); - dest_test = sl_malloc_f64(8); - - sl_profile_init(t); - srand(20020306); - - sad_sum = 0; - sad_max = 0; - - printf("I: " sl_stringify(fdct8_f64_FUNC) "\n"); - - for(pass=0;pass<N_PASS;pass++){ - for(i=0;i<8;i++)src[i] = sl_rand_f64_0_1(); - - //block8_dump(src); - - fdct8_f64_ref(dest_test, src, 8, 8); - //block8_dump(dest_test); - - sl_profile_start(t); - fdct8_f64_FUNC(dest_ref, src, 8, 8); - sl_profile_stop(t); - //block8_dump(dest_ref); - - sad = 0; - for(i=0;i<8;i++)sad += fabs(dest_test[i] - dest_ref[i]); - if(sad_max<sad)sad_max = sad; - sad_sum += sad; - if(sad >= 1.0){ - failures++; - } - } - printf("sad average: %g\n",sad_sum/N_PASS); - printf("sad max: %g\n",sad_max); - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif - diff --git a/liboil/dct/fdct8x8_f64.c b/liboil/dct/fdct8x8_f64.c index ef050e5..bba8c6d 100644 --- a/liboil/dct/fdct8x8_f64.c +++ b/liboil/dct/fdct8x8_f64.c @@ -133,60 +133,3 @@ fdct8x8_f64_1d (double *dest, int dstr, double *src, int sstr) OIL_DEFINE_IMPL (fdct8x8_f64_1d, fdct8x8_f64_class); -#ifdef TEST_fdct8x8_f64 -int TEST_fdct8x8_f64(void) -{ - int i; - int pass; - int failures = 0; - double *src, *dest_ref, *dest_test; - double sad; - double sad_sum; - double sad_max; - struct sl_profile_struct t; - - src = sl_malloc_f64(64); - dest_ref = sl_malloc_f64(64); - dest_test = sl_malloc_f64(64); - - sl_profile_init(t); - srand(20020306); - - sad_sum = 0; - sad_max = 0; - - printf("I: " sl_stringify(fdct8x8_f64_FUNC) "\n"); - - for(pass=0;pass<N_PASS;pass++){ - for(i=0;i<64;i++)src[i] = sl_rand_f64_0_1(); - - fdct8x8_f64_ref(dest_test, src, 8, 8); - sl_profile_start(t); - fdct8x8_f64_FUNC(dest_ref, src, 8, 8); - sl_profile_stop(t); - - sad = 0; - for(i=0;i<64;i++)sad += fabs(dest_test[i] - dest_ref[i]); - if(sad_max<sad)sad_max = sad; - sad_sum += sad; - if(sad >= 1.0){ - failures++; - } - } - printf("sad average: %g\n",sad_sum/N_PASS); - printf("sad max: %g\n",sad_max); - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif - diff --git a/liboil/dct/fdct8x8_s16.c b/liboil/dct/fdct8x8_s16.c index 4b8f045..9267035 100644 --- a/liboil/dct/fdct8x8_s16.c +++ b/liboil/dct/fdct8x8_s16.c @@ -64,63 +64,3 @@ void fdct8x8_s16_ref(s16 *dest, s16 *src, int dstr, int sstr) } #endif -#ifdef TEST_fdct8x8_s16 -int TEST_fdct8x8_s16(void) -{ - int i; - int pass; - int failures = 0; - s16 *src, *dest_ref, *dest_test; - u32 sad; - u32 sad_sum; - u32 sad_max; - struct sl_profile_struct t; - - src = sl_malloc_s16(64); - dest_ref = sl_malloc_s16(64); - dest_test = sl_malloc_s16(64); - - sl_profile_init(t); - srand(20020306); - - sad_sum = 0; - sad_max = 0; - - printf("I: " sl_stringify(fdct8x8_s16_FUNC) "\n"); - - for(pass=0;pass<N_PASS;pass++){ - for(i=0;i<64;i++)src[i] = sl_rand_s16_l9(); - - fdct8x8_s16_ref(dest_ref, src, 8*sizeof(s16), 8*sizeof(s16)); - sl_profile_start(t); - fdct8x8_s16_FUNC(dest_test, src, 8*sizeof(s16), 8*sizeof(s16)); - sl_profile_stop(t); - - sad = 0; - for(i=0;i<64;i++)sad += abs(dest_test[i] - dest_ref[i]); - if(sad_max<sad)sad_max = sad; - sad_sum += sad; - if(sad >= 64){ - block8x8_dump_s16(src, 8*sizeof(s16)); - block8x8_dump_s16(dest_test, 8*sizeof(s16)); - block8x8_dump_s16(dest_ref, 8*sizeof(s16)); - failures++; - } - } - printf("sad average: %g\n",((double)sad_sum)/N_PASS); - printf("sad max: %d\n",sad_max); - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif - diff --git a/liboil/dct/fdct8x8s_s16.c b/liboil/dct/fdct8x8s_s16.c index 4176298..6ac1aab 100644 --- a/liboil/dct/fdct8x8s_s16.c +++ b/liboil/dct/fdct8x8s_s16.c @@ -75,64 +75,4 @@ fdct8x8s_s16_ref (int16_t *dest, int dstr, int16_t *src, int sstr) OIL_DEFINE_IMPL_REF (fdct8x8s_s16_ref, fdct8x8s_s16_class); -#ifdef TEST_fdct8x8s_s16 -int TEST_fdct8x8s_s16(void) -{ - int i; - int pass; - int failures = 0; - int16_t *src, *dest_ref, *dest_test; - u32 sad; - u32 sad_sum; - u32 sad_max; - struct sl_profile_struct t; - - src = sl_malloc_s16(64); - dest_ref = sl_malloc_s16(64); - dest_test = sl_malloc_s16(64); - - sl_profile_init(t); - srand(20020306); - - sad_sum = 0; - sad_max = 0; - - printf("I: " sl_stringify(fdct8x8s_s16_FUNC) "\n"); - - for(pass=0;pass<N_PASS;pass++){ - for(i=0;i<64;i++)src[i] = sl_rand_s16_l9(); - - fdct8x8s_s16_ref(dest_ref, src, 8*sizeof(s16), 8*sizeof(s16)); - sl_profile_start(t); - fdct8x8s_s16_FUNC(dest_test, src, 8*sizeof(s16), 8*sizeof(s16)); - sl_profile_stop(t); - - sad = 0; - for(i=0;i<64;i++)sad += abs(dest_test[i] - dest_ref[i]); - if(sad_max<sad)sad_max = sad; - sad_sum += sad; - if(sad >= 128){ - //block8x8_dump_s16(src, 8*sizeof(s16)); - //block8x8_dump_s16(dest_ref, 8*sizeof(s16)); - //block8x8_dump_s16(dest_test, 8*sizeof(s16)); - //block8x8_dumpdiff_s16(dest_test, dest_ref, 8*sizeof(s16)); - failures++; - } - } - printf("sad average: %g\n",((double)sad_sum)/N_PASS); - printf("sad max: %d\n",sad_max); - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif diff --git a/liboil/dct/idct8_f64.c b/liboil/dct/idct8_f64.c index 5fd411e..e783c61 100644 --- a/liboil/dct/idct8_f64.c +++ b/liboil/dct/idct8_f64.c @@ -108,65 +108,3 @@ static void idct8_f64_fastx(double *dest, int dstr, double *src, int sstr) OIL_DEFINE_IMPL (idct8_f64_fastx, idct8_f64); -#ifdef TEST_idct8_f64 -int TEST_idct8_f64(void) -{ - int i; - int pass; - int failures = 0; - double *src, *dest_ref, *dest_test; - double sad; - double sad_sum; - double sad_max; - struct sl_profile_struct t; - - src = sl_malloc_f64(8); - dest_ref = sl_malloc_f64(8); - dest_test = sl_malloc_f64(8); - - sl_profile_init(t); - srand(20020306); - - sad_sum = 0; - sad_max = 0; - - printf("I: " sl_stringify(idct8_f64_FUNC) "\n"); - - for(pass=0;pass<N_PASS;pass++){ - for(i=0;i<8;i++)src[i] = sl_rand_f64_0_1(); - - //block8_dump(src); - - idct8_f64_ref(dest_test, src, 8, 8); - //block8_dump(dest_test); - - sl_profile_start(t); - idct8_f64_FUNC(dest_ref, src, 8, 8); - sl_profile_stop(t); - //block8_dump(dest_ref); - - sad = 0; - for(i=0;i<8;i++)sad += fabs(dest_test[i] - dest_ref[i]); - if(sad_max<sad)sad_max = sad; - sad_sum += sad; - if(sad >= 1.0){ - failures++; - } - } - printf("sad average: %g\n",sad_sum/N_PASS); - printf("sad max: %g\n",sad_max); - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif - diff --git a/liboil/dct/idct8x8_f64.c b/liboil/dct/idct8x8_f64.c index 9e46523..c49c43c 100644 --- a/liboil/dct/idct8x8_f64.c +++ b/liboil/dct/idct8x8_f64.c @@ -147,60 +147,3 @@ void idct8x8_f64_1d(f64 *dest, f64 *src, int dstr, int sstr) #endif -#ifdef TEST_idct8x8_f64 -int TEST_idct8x8_f64(void) -{ - int i; - int pass; - int failures = 0; - f64 *src, *dest_ref, *dest_test; - f64 sad; - f64 sad_sum; - f64 sad_max; - struct sl_profile_struct t; - - src = sl_malloc_f64(64); - dest_ref = sl_malloc_f64(64); - dest_test = sl_malloc_f64(64); - - sl_profile_init(t); - srand(20020306); - - sad_sum = 0; - sad_max = 0; - - printf("I: " sl_stringify(idct8x8_f64_FUNC) "\n"); - - for(pass=0;pass<N_PASS;pass++){ - for(i=0;i<64;i++)src[i] = sl_rand_f64_0_1(); - - idct8x8_f64_ref(dest_test, src, 8, 8); - sl_profile_start(t); - idct8x8_f64_FUNC(dest_ref, src, 8, 8); - sl_profile_stop(t); - - sad = 0; - for(i=0;i<64;i++)sad += fabs(dest_test[i] - dest_ref[i]); - if(sad_max<sad)sad_max = sad; - sad_sum += sad; - if(sad >= 1.0){ - failures++; - } - } - printf("sad average: %g\n",sad_sum/N_PASS); - printf("sad max: %g\n",sad_max); - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif - diff --git a/liboil/dct/idct8x8_s16.c b/liboil/dct/idct8x8_s16.c index 1e58026..d0b1449 100644 --- a/liboil/dct/idct8x8_s16.c +++ b/liboil/dct/idct8x8_s16.c @@ -82,63 +82,3 @@ void idct8x8_s16_fast(s16 *dest, s16 *src, int dstr, int sstr) } #endif -#ifdef TEST_idct8x8_s16 -int TEST_idct8x8_s16(void) -{ - int i; - int pass; - int failures = 0; - s16 *src, *dest_ref, *dest_test; - u32 sad; - u32 sad_sum; - u32 sad_max; - struct sl_profile_struct t; - - src = sl_malloc_s16(64); - dest_ref = sl_malloc_s16(64); - dest_test = sl_malloc_s16(64); - - sl_profile_init(t); - srand(20020306); - - sad_sum = 0; - sad_max = 0; - - printf("I: " sl_stringify(idct8x8_s16_FUNC) "\n"); - - for(pass=0;pass<N_PASS;pass++){ - for(i=0;i<64;i++)src[i] = sl_rand_s16_l9(); - - idct8x8_s16_ref(dest_ref, src, 8*sizeof(s16), 8*sizeof(s16)); - sl_profile_start(t); - idct8x8_s16_FUNC(dest_test, src, 8*sizeof(s16), 8*sizeof(s16)); - sl_profile_stop(t); - - sad = 0; - for(i=0;i<64;i++)sad += abs(dest_test[i] - dest_ref[i]); - if(sad_max<sad)sad_max = sad; - sad_sum += sad; - if(sad >= 64){ - block8x8_dump_s16(src, 8*sizeof(s16)); - block8x8_dump_s16(dest_test, 8*sizeof(s16)); - block8x8_dump_s16(dest_ref, 8*sizeof(s16)); - failures++; - } - } - printf("sad average: %g\n",((double)sad_sum)/N_PASS); - printf("sad max: %d\n",sad_max); - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif - diff --git a/liboil/dct/idct8x8s_s16.c b/liboil/dct/idct8x8s_s16.c index 59e9709..a099ea4 100644 --- a/liboil/dct/idct8x8s_s16.c +++ b/liboil/dct/idct8x8s_s16.c @@ -84,65 +84,3 @@ void idct8x8s_s16_ref(s16 *dest, s16 *src, int dstr, int sstr) } #endif -#ifdef TEST_idct8x8s_s16 -int TEST_idct8x8s_s16(void) -{ - int i; - int pass; - int failures = 0; - s16 *src, *dest_ref, *dest_test; - u32 sad; - u32 sad_sum; - u32 sad_max; - struct sl_profile_struct t; - - src = sl_malloc_s16(64); - dest_ref = sl_malloc_s16(64); - dest_test = sl_malloc_s16(64); - - sl_profile_init(t); - srand(20020306); - - sad_sum = 0; - sad_max = 0; - - printf("I: " sl_stringify(idct8x8s_s16_FUNC) "\n"); - - for(pass=0;pass<N_PASS;pass++){ - //for(i=0;i<64;i++)src[i] = sl_rand_s16_l9(); - for(i=0;i<64;i++)src[i] = (i==pass)*1000; - - idct8x8s_s16_ref(dest_ref, src, 8*sizeof(s16), 8*sizeof(s16)); - sl_profile_start(t); - idct8x8s_s16_FUNC(dest_test, src, 8*sizeof(s16), 8*sizeof(s16)); - sl_profile_stop(t); - - sad = 0; - for(i=0;i<64;i++)sad += abs(dest_test[i] - dest_ref[i]); - if(sad_max<sad)sad_max = sad; - sad_sum += sad; - if(sad >= 128){ - block8x8_dump_s16(src, 8*sizeof(s16)); - block8x8_dump_s16(dest_ref, 8*sizeof(s16)); - block8x8_dump_s16(dest_test, 8*sizeof(s16)); - block8x8_dumpratio_s16(dest_test, dest_ref, 8*sizeof(s16)); - failures++; - } - } - printf("sad average: %g\n",((double)sad_sum)/N_PASS); - printf("sad max: %d\n",sad_max); - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif - diff --git a/liboil/dct/imdct32_f32.c b/liboil/dct/imdct32_f32.c index 4b7e3ea..c90425a 100644 --- a/liboil/dct/imdct32_f32.c +++ b/liboil/dct/imdct32_f32.c @@ -372,67 +372,3 @@ OIL_DEFINE_IMPL (imdct32_f32_mpglib, imdct32_f32); -#ifdef TEST_imdct32_f32 -int TEST_imdct32_f32(void) -{ - int i; - int pass; - int failures = 0; - f32 *src, *dest_ref, *dest_test; - struct sl_profile_struct t; - double sad; - double sad_max = 0; - double sad_sum = 0; - - src = sl_malloc_f32(32); - dest_ref = sl_malloc_f32(32); - dest_test = sl_malloc_f32(32); - - sl_profile_init(t); - srand(20021001); - - printf("I: " sl_stringify(imdct32_f32_FUNC) "\n"); - - for(pass=0;pass<N_PASS;pass++){ - for(i=0;i<32;i++)src[i]=sl_rand_f32_0_1(); - - imdct32_f32_ref(dest_ref,src); - sl_profile_start(t); - imdct32_f32_FUNC(dest_test,src); - sl_profile_stop(t); - - sad = 0; - for(i=0;i<32;i++){ - sad += fabs(dest_test[i] - dest_ref[i]); - } - if(sad>sad_max)sad_max = sad; - sad_sum += sad; -#if 0 - if(sad>0){ - printf("sad = %g\n",sad); - } -#endif -#if 0 - if(dest_test[i] != dest_ref[i]){ - printf("%d %g %g\n",i,dest_ref[i], dest_test[i]); - } -#endif - } - - printf("sad ave = %g\n",sad_sum/N_PASS); - printf("sad max = %g\n",sad_max); - - sl_free(src); - sl_free(dest_ref); - sl_free(dest_test); - - if(failures){ - printf("E: %d failures\n",failures); - } - - sl_profile_print(t); - - return failures; -} -#endif - |