Mercurial > libavcodec.hg
comparison dct-test.c @ 633:e7b72c1dfa1b libavcodec
dct-test update
test simple-idct and ijg int DCT too
do tests with random & sparse matrixes
print systematic error matrixes
author | michaelni |
---|---|
date | Sun, 01 Sep 2002 09:33:05 +0000 |
parents | 11dbd00682fc |
children | 3e0f62e5eed6 |
comparison
equal
deleted
inserted
replaced
632:f5e68f32069f | 633:e7b72c1dfa1b |
---|---|
9 #include <getopt.h> | 9 #include <getopt.h> |
10 | 10 |
11 #include "dsputil.h" | 11 #include "dsputil.h" |
12 | 12 |
13 #include "i386/mmx.h" | 13 #include "i386/mmx.h" |
14 #include "simple_idct.h" | |
14 | 15 |
15 /* reference fdct/idct */ | 16 /* reference fdct/idct */ |
16 extern void fdct(DCTELEM *block); | 17 extern void fdct(DCTELEM *block); |
17 extern void idct(DCTELEM *block); | 18 extern void idct(DCTELEM *block); |
18 extern void init_fdct(); | 19 extern void init_fdct(); |
19 | 20 |
20 extern void j_rev_dct(DCTELEM *data); | 21 extern void j_rev_dct(DCTELEM *data); |
21 extern void ff_mmx_idct(DCTELEM *data); | 22 extern void ff_mmx_idct(DCTELEM *data); |
22 extern void ff_mmxext_idct(DCTELEM *data); | 23 extern void ff_mmxext_idct(DCTELEM *data); |
24 | |
25 extern void odivx_idct_c (short *block); | |
23 | 26 |
24 #define AANSCALE_BITS 12 | 27 #define AANSCALE_BITS 12 |
25 static const unsigned short aanscales[64] = { | 28 static const unsigned short aanscales[64] = { |
26 /* precomputed values scaled up by 14 bits */ | 29 /* precomputed values scaled up by 14 bits */ |
27 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, | 30 16384, 22725, 21407, 19266, 16384, 12873, 8867, 4520, |
32 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552, | 35 12873, 17855, 16819, 15137, 12873, 10114, 6967, 3552, |
33 8867, 12299, 11585, 10426, 8867, 6967, 4799, 2446, | 36 8867, 12299, 11585, 10426, 8867, 6967, 4799, 2446, |
34 4520, 6270, 5906, 5315, 4520, 3552, 2446, 1247 | 37 4520, 6270, 5906, 5315, 4520, 3552, 2446, 1247 |
35 }; | 38 }; |
36 | 39 |
40 UINT8 cropTbl[256 + 2 * MAX_NEG_CROP]; | |
41 | |
37 INT64 gettime(void) | 42 INT64 gettime(void) |
38 { | 43 { |
39 struct timeval tv; | 44 struct timeval tv; |
40 gettimeofday(&tv,NULL); | 45 gettimeofday(&tv,NULL); |
41 return (INT64)tv.tv_sec * 1000000 + tv.tv_usec; | 46 return (INT64)tv.tv_sec * 1000000 + tv.tv_usec; |
44 #define NB_ITS 20000 | 49 #define NB_ITS 20000 |
45 #define NB_ITS_SPEED 50000 | 50 #define NB_ITS_SPEED 50000 |
46 | 51 |
47 static short idct_mmx_perm[64]; | 52 static short idct_mmx_perm[64]; |
48 | 53 |
54 static short idct_simple_mmx_perm[64]={ | |
55 0x00, 0x08, 0x04, 0x09, 0x01, 0x0C, 0x05, 0x0D, | |
56 0x10, 0x18, 0x14, 0x19, 0x11, 0x1C, 0x15, 0x1D, | |
57 0x20, 0x28, 0x24, 0x29, 0x21, 0x2C, 0x25, 0x2D, | |
58 0x12, 0x1A, 0x16, 0x1B, 0x13, 0x1E, 0x17, 0x1F, | |
59 0x02, 0x0A, 0x06, 0x0B, 0x03, 0x0E, 0x07, 0x0F, | |
60 0x30, 0x38, 0x34, 0x39, 0x31, 0x3C, 0x35, 0x3D, | |
61 0x22, 0x2A, 0x26, 0x2B, 0x23, 0x2E, 0x27, 0x2F, | |
62 0x32, 0x3A, 0x36, 0x3B, 0x33, 0x3E, 0x37, 0x3F, | |
63 }; | |
64 | |
49 void idct_mmx_init(void) | 65 void idct_mmx_init(void) |
50 { | 66 { |
51 int i; | 67 int i; |
52 | 68 |
53 /* the mmx/mmxext idct uses a reordered input, so we patch scan tables */ | 69 /* the mmx/mmxext idct uses a reordered input, so we patch scan tables */ |
54 for (i = 0; i < 64; i++) { | 70 for (i = 0; i < 64; i++) { |
55 idct_mmx_perm[i] = (i & 0x38) | ((i & 6) >> 1) | ((i & 1) << 2); | 71 idct_mmx_perm[i] = (i & 0x38) | ((i & 6) >> 1) | ((i & 1) << 2); |
72 // idct_simple_mmx_perm[i] = simple_block_permute_op(i); | |
56 } | 73 } |
57 } | 74 } |
58 | 75 |
59 static DCTELEM block[64] __attribute__ ((aligned (8))); | 76 static DCTELEM block[64] __attribute__ ((aligned (8))); |
60 static DCTELEM block1[64] __attribute__ ((aligned (8))); | 77 static DCTELEM block1[64] __attribute__ ((aligned (8))); |
78 static DCTELEM block_org[64] __attribute__ ((aligned (8))); | |
61 | 79 |
62 void dct_error(const char *name, int is_idct, | 80 void dct_error(const char *name, int is_idct, |
63 void (*fdct_func)(DCTELEM *block), | 81 void (*fdct_func)(DCTELEM *block), |
64 void (*fdct_ref)(DCTELEM *block)) | 82 void (*fdct_ref)(DCTELEM *block), int test) |
65 { | 83 { |
66 int it, i, scale; | 84 int it, i, scale; |
67 int err_inf, v; | 85 int err_inf, v; |
68 INT64 err2, ti, ti1, it1; | 86 INT64 err2, ti, ti1, it1; |
87 INT64 sysErr[64], sysErrMax=0; | |
88 int maxout=0; | |
89 int max_sum=0; | |
90 int blockSumErrMax=0, blockSumErr; | |
69 | 91 |
70 srandom(0); | 92 srandom(0); |
71 | 93 |
72 err_inf = 0; | 94 err_inf = 0; |
73 err2 = 0; | 95 err2 = 0; |
96 for(i=0; i<64; i++) sysErr[i]=0; | |
74 for(it=0;it<NB_ITS;it++) { | 97 for(it=0;it<NB_ITS;it++) { |
75 for(i=0;i<64;i++) | 98 for(i=0;i<64;i++) |
76 block1[i] = random() % 256; | 99 block1[i] = 0; |
77 | 100 switch(test){ |
78 /* for idct test, generate inverse idct data */ | 101 case 0: |
79 if (is_idct) | 102 for(i=0;i<64;i++) |
80 fdct(block1); | 103 block1[i] = (random() % 512) -256; |
104 if (is_idct) | |
105 fdct(block1); | |
106 break; | |
107 case 1:{ | |
108 int num= (random()%10)+1; | |
109 for(i=0;i<num;i++) | |
110 block1[random()%64] = (random() % 512) -256; | |
111 }break; | |
112 case 2: | |
113 block1[0]= (random()%4096)-2048; | |
114 block1[63]= (block1[0]&1)^1; | |
115 break; | |
116 } | |
117 | |
118 #if 0 // simulate mismatch control | |
119 { int sum=0; | |
120 for(i=0;i<64;i++) | |
121 sum+=block1[i]; | |
122 | |
123 if((sum&1)==0) block1[63]^=1; | |
124 } | |
125 #endif | |
126 | |
127 for(i=0; i<64; i++) | |
128 block_org[i]= block1[i]; | |
81 | 129 |
82 if (fdct_func == ff_mmx_idct || | 130 if (fdct_func == ff_mmx_idct || |
83 fdct_func == j_rev_dct) { | 131 fdct_func == j_rev_dct || fdct_func == ff_mmxext_idct) { |
84 for(i=0;i<64;i++) | 132 for(i=0;i<64;i++) |
85 block[idct_mmx_perm[i]] = block1[i]; | 133 block[idct_mmx_perm[i]] = block1[i]; |
86 } else { | 134 } else if(fdct_func == simple_idct_mmx ) { |
87 memcpy(block, block1, sizeof(DCTELEM) * 64); | 135 for(i=0;i<64;i++) |
88 } | 136 block[idct_simple_mmx_perm[i]] = block1[i]; |
137 | |
138 } else { | |
139 for(i=0; i<64; i++) | |
140 block[i]= block1[i]; | |
141 } | |
142 #if 0 // simulate mismatch control for tested IDCT but not the ref | |
143 { int sum=0; | |
144 for(i=0;i<64;i++) | |
145 sum+=block[i]; | |
146 | |
147 if((sum&1)==0) block[63]^=1; | |
148 } | |
149 #endif | |
89 | 150 |
90 fdct_func(block); | 151 fdct_func(block); |
91 emms(); /* for ff_mmx_idct */ | 152 emms(); /* for ff_mmx_idct */ |
92 | 153 |
93 if (fdct_func == fdct_ifast) { | 154 if (fdct_func == fdct_ifast) { |
94 for(i=0; i<64; i++) { | 155 for(i=0; i<64; i++) { |
95 scale = (1 << (AANSCALE_BITS + 11)) / aanscales[i]; | 156 scale = (1 << (AANSCALE_BITS + 11)) / aanscales[i]; |
96 block[i] = (block[i] * scale) >> AANSCALE_BITS; | 157 block[i] = (block[i] * scale /*+ (1<<(AANSCALE_BITS-1))*/) >> AANSCALE_BITS; |
97 } | 158 } |
98 } | 159 } |
99 | 160 |
161 if (fdct_func == ff_jpeg_fdct_islow) { | |
162 for(i=0; i<64; i++) { | |
163 block[i] = (block[i]+3)>>3; | |
164 } | |
165 } | |
166 | |
100 fdct_ref(block1); | 167 fdct_ref(block1); |
101 | 168 |
169 blockSumErr=0; | |
102 for(i=0;i<64;i++) { | 170 for(i=0;i<64;i++) { |
103 v = abs(block[i] - block1[i]); | 171 v = abs(block[i] - block1[i]); |
104 if (v > err_inf) | 172 if (v > err_inf) |
105 err_inf = v; | 173 err_inf = v; |
106 err2 += v * v; | 174 err2 += v * v; |
107 } | 175 sysErr[i] += block[i] - block1[i]; |
108 } | 176 blockSumErr += v; |
109 printf("%s %s: err_inf=%d err2=%0.2f\n", | 177 if( abs(block[i])>maxout) maxout=abs(block[i]); |
178 } | |
179 if(blockSumErrMax < blockSumErr) blockSumErrMax= blockSumErr; | |
180 #if 0 // print different matrix pairs | |
181 if(blockSumErr){ | |
182 printf("\n"); | |
183 for(i=0; i<64; i++){ | |
184 if((i&7)==0) printf("\n"); | |
185 printf("%4d ", block_org[i]); | |
186 } | |
187 for(i=0; i<64; i++){ | |
188 if((i&7)==0) printf("\n"); | |
189 printf("%4d ", block[i] - block1[i]); | |
190 } | |
191 } | |
192 #endif | |
193 } | |
194 for(i=0; i<64; i++) sysErrMax= MAX(sysErrMax, ABS(sysErr[i])); | |
195 | |
196 #if 1 // dump systematic errors | |
197 for(i=0; i<64; i++){ | |
198 if(i%8==0) printf("\n"); | |
199 printf("%5d ", (int)sysErr[i]); | |
200 } | |
201 printf("\n"); | |
202 #endif | |
203 | |
204 printf("%s %s: err_inf=%d err2=%0.8f syserr=%0.8f maxout=%d blockSumErr=%d\n", | |
110 is_idct ? "IDCT" : "DCT", | 205 is_idct ? "IDCT" : "DCT", |
111 name, err_inf, (double)err2 / NB_ITS / 64.0); | 206 name, err_inf, (double)err2 / NB_ITS / 64.0, (double)sysErrMax / NB_ITS, maxout, blockSumErrMax); |
112 | 207 #if 1 //Speed test |
113 /* speed test */ | 208 /* speed test */ |
114 for(i=0;i<64;i++) | 209 for(i=0;i<64;i++) |
115 block1[i] = 255 - 63 + i; | 210 block1[i] = 0; |
116 | 211 switch(test){ |
117 /* for idct test, generate inverse idct data */ | 212 case 0: |
118 if (is_idct) | 213 for(i=0;i<64;i++) |
119 fdct(block1); | 214 block1[i] = (random() % 512) -256; |
215 if (is_idct) | |
216 fdct(block1); | |
217 break; | |
218 case 1:{ | |
219 case 2: | |
220 block1[0] = (random() % 512) -256; | |
221 block1[1] = (random() % 512) -256; | |
222 block1[2] = (random() % 512) -256; | |
223 block1[3] = (random() % 512) -256; | |
224 }break; | |
225 } | |
226 | |
120 if (fdct_func == ff_mmx_idct || | 227 if (fdct_func == ff_mmx_idct || |
121 fdct_func == j_rev_dct) { | 228 fdct_func == j_rev_dct || fdct_func == ff_mmxext_idct) { |
122 for(i=0;i<64;i++) | 229 for(i=0;i<64;i++) |
123 block[idct_mmx_perm[i]] = block1[i]; | 230 block[idct_mmx_perm[i]] = block1[i]; |
231 } else if(fdct_func == simple_idct_mmx ) { | |
232 for(i=0;i<64;i++) | |
233 block[idct_simple_mmx_perm[i]] = block1[i]; | |
234 } else { | |
235 for(i=0; i<64; i++) | |
236 block[i]= block1[i]; | |
124 } | 237 } |
125 | 238 |
126 ti = gettime(); | 239 ti = gettime(); |
127 it1 = 0; | 240 it1 = 0; |
128 do { | 241 do { |
129 for(it=0;it<NB_ITS_SPEED;it++) { | 242 for(it=0;it<NB_ITS_SPEED;it++) { |
130 memcpy(block, block1, sizeof(DCTELEM) * 64); | 243 for(i=0; i<64; i++) |
244 block[i]= block1[i]; | |
245 // memcpy(block, block1, sizeof(DCTELEM) * 64); | |
246 // dont memcpy especially not fastmemcpy because it does movntq !!! | |
131 fdct_func(block); | 247 fdct_func(block); |
132 } | 248 } |
133 it1 += NB_ITS_SPEED; | 249 it1 += NB_ITS_SPEED; |
134 ti1 = gettime() - ti; | 250 ti1 = gettime() - ti; |
135 } while (ti1 < 1000000); | 251 } while (ti1 < 1000000); |
136 emms(); | 252 emms(); |
137 | 253 |
138 printf("%s %s: %0.1f kdct/s\n", | 254 printf("%s %s: %0.1f kdct/s\n", |
139 is_idct ? "IDCT" : "DCT", | 255 is_idct ? "IDCT" : "DCT", |
140 name, (double)it1 * 1000.0 / (double)ti1); | 256 name, (double)it1 * 1000.0 / (double)ti1); |
257 #endif | |
141 } | 258 } |
142 | 259 |
143 void help(void) | 260 void help(void) |
144 { | 261 { |
145 printf("dct-test [-i]\n" | 262 printf("dct-test [-i] [<test-number>]\n" |
146 "test DCT implementations\n"); | 263 "test-number 0 -> test with random matrixes\n" |
264 " 1 -> test with random sparse matrixes\n" | |
265 " 2 -> do 3. test from mpeg4 std\n" | |
266 "-i test IDCT implementations\n"); | |
147 exit(1); | 267 exit(1); |
148 } | 268 } |
149 | 269 |
150 int main(int argc, char **argv) | 270 int main(int argc, char **argv) |
151 { | 271 { |
152 int test_idct = 0; | 272 int test_idct = 0; |
153 int c; | 273 int c,i; |
274 int test=1; | |
154 | 275 |
155 init_fdct(); | 276 init_fdct(); |
156 idct_mmx_init(); | 277 idct_mmx_init(); |
157 | 278 |
279 for(i=0;i<256;i++) cropTbl[i + MAX_NEG_CROP] = i; | |
280 for(i=0;i<MAX_NEG_CROP;i++) { | |
281 cropTbl[i] = 0; | |
282 cropTbl[i + MAX_NEG_CROP + 256] = 255; | |
283 } | |
284 | |
158 for(;;) { | 285 for(;;) { |
159 c = getopt(argc, argv, "ih"); | 286 c = getopt(argc, argv, "ih"); |
160 if (c == -1) | 287 if (c == -1) |
161 break; | 288 break; |
162 switch(c) { | 289 switch(c) { |
163 case 'i': | 290 case 'i': |
164 test_idct = 1; | 291 test_idct = 1; |
165 break; | 292 break; |
293 default : | |
166 case 'h': | 294 case 'h': |
167 help(); | 295 help(); |
168 break; | 296 break; |
169 } | 297 } |
170 } | 298 } |
299 | |
300 if(optind <argc) test= atoi(argv[optind]); | |
171 | 301 |
172 printf("ffmpeg DCT/IDCT test\n"); | 302 printf("ffmpeg DCT/IDCT test\n"); |
173 | 303 |
174 if (!test_idct) { | 304 if (!test_idct) { |
175 dct_error("REF", 0, fdct, fdct); /* only to verify code ! */ | 305 dct_error("REF-DBL", 0, fdct, fdct, test); /* only to verify code ! */ |
176 dct_error("AAN", 0, fdct_ifast, fdct); | 306 dct_error("IJG-AAN-INT", 0, fdct_ifast, fdct, test); |
177 dct_error("MMX", 0, fdct_mmx, fdct); | 307 dct_error("IJG-LLM-INT", 0, ff_jpeg_fdct_islow, fdct, test); |
308 dct_error("MMX", 0, fdct_mmx, fdct, test); | |
178 } else { | 309 } else { |
179 dct_error("REF", 1, idct, idct); | 310 dct_error("REF-DBL", 1, idct, idct, test); |
180 dct_error("INT", 1, j_rev_dct, idct); | 311 dct_error("INT", 1, j_rev_dct, idct, test); |
181 dct_error("MMX", 1, ff_mmx_idct, idct); | 312 dct_error("LIBMPEG2-MMX", 1, ff_mmx_idct, idct, test); |
182 // dct_error("MMX", 1, ff_mmxext_idct, idct); | 313 dct_error("LIBMPEG2-MMXEXT", 1, ff_mmxext_idct, idct, test); |
314 dct_error("SIMPLE-C", 1, simple_idct, idct, test); | |
315 dct_error("SIMPLE-MMX", 1, simple_idct_mmx, idct, test); | |
316 // dct_error("ODIVX-C", 1, odivx_idct_c, idct); | |
317 //printf(" test against odivx idct\n"); | |
318 // dct_error("REF", 1, idct, odivx_idct_c); | |
319 // dct_error("INT", 1, j_rev_dct, odivx_idct_c); | |
320 // dct_error("MMX", 1, ff_mmx_idct, odivx_idct_c); | |
321 // dct_error("MMXEXT", 1, ff_mmxext_idct, odivx_idct_c); | |
322 // dct_error("SIMPLE-C", 1, simple_idct, odivx_idct_c); | |
323 // dct_error("SIMPLE-MMX", 1, simple_idct_mmx, odivx_idct_c); | |
324 // dct_error("ODIVX-C", 1, odivx_idct_c, odivx_idct_c); | |
183 } | 325 } |
184 return 0; | 326 return 0; |
185 } | 327 } |