--- xvid_bench.c	2005/06/15 06:07:28	1.22
+++ xvid_bench.c	2006/12/21 23:27:35	1.35
@@ -19,7 +19,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: xvid_bench.c,v 1.22 2005/06/15 06:07:28 Skal Exp $
+ * $Id: xvid_bench.c,v 1.35 2006/12/21 23:27:35 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -58,6 +58,7 @@
 #include "utils/timer.h"
 #include "quant/quant_matrix.c"
 #include "bitstream/cbp.h"
+#include "bitstream/bitstream.h"
 
 #include <math.h>
 
@@ -518,10 +519,50 @@
 			   (iCrc!=8107)?"| ERROR": "" );
 #endif
 
+    /* New functions for field prediction by CK 1.10.2005 */
+#pragma NEW8X4
+		TEST_MB(interpolate8x4_halfpel_h, 0);
+		printf("%s - interpfield-h -round0 %.3f usec       crc32=0x%08x %s\n",
+			   cpu->name, t, iCrc,
+			   (iCrc!=0x9538d6df)?"| ERROR": "" );
+
+		TEST_MB(interpolate8x4_halfpel_h, 1);
+		printf("%s -                round1 %.3f usec       crc32=0x%08x %s\n",
+			   cpu->name, t, iCrc,
+			   (iCrc!=0xde5f1db4)?"| ERROR": "" );
+
+
+		TEST_MB(interpolate8x4_halfpel_v, 0);
+		printf("%s - interpfield- v-round0 %.3f usec       crc32=0x%08x %s\n",
+			   cpu->name, t, iCrc,
+			   (iCrc!=0xea5a69ef)?"| ERROR": "" );
+
+		TEST_MB(interpolate8x4_halfpel_v, 1);
+		printf("%s -                round1 %.3f usec       crc32=0x%08x %s\n",
+			   cpu->name, t, iCrc,
+			   (iCrc!=0x4f10ec0f)?"| ERROR": "" );
+
+
+		TEST_MB(interpolate8x4_halfpel_hv, 0);
+		printf("%s - interpfield-hv-round0 %.3f usec       crc32=0x%08x %s\n",
+			   cpu->name, t, iCrc,
+			   (iCrc!=0xf97ee367)?"| ERROR": "" );
+
+		TEST_MB(interpolate8x4_halfpel_hv, 1);
+		printf("%s -                round1 %.3f usec       crc32=0x%08x %s\n",
+			   cpu->name, t, iCrc,
+			   (iCrc!=0xb6a9f581)?"| ERROR": "" );
+/* End of 8x4 functions */
+
 		printf( " --- \n" );
 	}
 }
 
+#undef ENTER
+#undef LEAVE
+#undef TEST_MB
+#undef TEST_MB2
+
 /*********************************************************************
  * test transfer
  *********************************************************************/
@@ -625,6 +666,14 @@
 				cpu->name, t, s,
 				(s!=0xee7ccbb4)?"| ERROR": "");
 
+    /* New functions for field prediction by CK 1.10.2005 */
+#pragma NEW8X4
+		TEST_TRANSFER(transfer8x4_copy, Dst8, Src8);
+		printf("%s - 8to4      %.3f usec       crc32=0x%08x %s\n",
+			   cpu->name, t, s,
+			   (s!=0xbb9c3db5)?"| ERROR": "");
+/* End of new functions */
+
 		TEST_TRANSFER(transfer8x8_copy, Dst8, Src8);
 		printf("%s - 8to8      %.3f usec       crc32=0x%08x %s\n",
 			   cpu->name, t, s,
@@ -905,10 +954,10 @@
  * test non-zero AC counting
  *********************************************************************/
 
-#define TEST_CBP(FUNC, SRC)               \
+#define TEST_CBP(FUNC, SRC, NB)           \
 t = gettime_usec();                       \
 emms();                                   \
-for(tst=0; tst<nb_tests; ++tst) {         \
+for(tst=0; tst<NB; ++tst) {         \
   cbp = (FUNC)((SRC));                    \
 }                                         \
 emms();                                   \
@@ -917,12 +966,13 @@
 void test_cbp()
 {
 	const int nb_tests = 10000*speed_ref;
-	int i;
+	int i, n, m;
 	CPU *cpu;
 	DECLARE_ALIGNED_MATRIX(Src1, 6, 64, int16_t, 16);
 	DECLARE_ALIGNED_MATRIX(Src2, 6, 64, int16_t, 16);
 	DECLARE_ALIGNED_MATRIX(Src3, 6, 64, int16_t, 16);
 	DECLARE_ALIGNED_MATRIX(Src4, 6, 64, int16_t, 16);
+  DECLARE_ALIGNED_MATRIX(Src5, 6, 64, int16_t, 16);
 
 	printf( "\n =====  test cbp =====\n" );
 
@@ -931,6 +981,7 @@
 		Src2[i] = (i<3*64);               /* half-full */
 		Src3[i] = ((i+32)>3*64);
 		Src4[i] = (i==(3*64+2) || i==(5*64+9));
+    Src5[i] = ieee_rand(0,1) ? -1 : 1;  /* +/- test */
 	}
 
 	for(cpu = cpu_list; cpu->name!=0; ++cpu)
@@ -941,20 +992,53 @@
 		if (!init_cpu(cpu))
 			continue;
 
-		TEST_CBP(calc_cbp, Src1);
+		TEST_CBP(calc_cbp, Src1, nb_tests);
 		printf("%s -   calc_cbp#1 %.3f usec       cbp=0x%02x %s\n",
 			   cpu->name, t, cbp, (cbp!=0x15)?"| ERROR": "");
-		TEST_CBP(calc_cbp, Src2);
+		TEST_CBP(calc_cbp, Src2, nb_tests);
 		printf("%s -   calc_cbp#2 %.3f usec       cbp=0x%02x %s\n",
 			   cpu->name, t, cbp, (cbp!=0x38)?"| ERROR": "");
-		TEST_CBP(calc_cbp, Src3);
+		TEST_CBP(calc_cbp, Src3, nb_tests);
 		printf("%s -   calc_cbp#3 %.3f usec       cbp=0x%02x %s\n",
 			   cpu->name, t, cbp, (cbp!=0x0f)?"| ERROR": "" );
-		TEST_CBP(calc_cbp, Src4);
+		TEST_CBP(calc_cbp, Src4, nb_tests);
 		printf("%s -   calc_cbp#4 %.3f usec       cbp=0x%02x %s\n",
 			   cpu->name, t, cbp, (cbp!=0x05)?"| ERROR": "" );
+		TEST_CBP(calc_cbp, Src5, nb_tests);
+		printf("%s -   calc_cbp#4 %.3f usec       cbp=0x%02x %s\n",
+			   cpu->name, t, cbp, (cbp!=0x3f)?"| ERROR": "" );
 		printf( " --- \n" );
 	}
+
+	for(cpu = cpu_list; cpu->name!=0; ++cpu)  /* bench suggested by Carlo (carlo dot bramix at libero dot it) */
+	{
+		double t;
+		int tst, cbp, err;
+
+		if (!init_cpu(cpu))
+			continue;
+
+    err = 0;
+    for(n=0; n<6; ++n)
+    {
+      for(m=0; m<64; ++m)
+      {
+        for(i=0; i<6*64; ++i)
+          Src1[i] = (i== (m + n*64));
+
+        TEST_CBP(calc_cbp, Src1, 1);
+        if (cbp!= (((m!=0)<<(5-n))))
+        {
+          printf( "%s -   calc_cbp#5: ERROR at pos %d / %d!\n", cpu->name, n, m);
+          err = 1;
+          break;
+        }
+      }
+    }
+    if (!err)
+      printf( " %s -    calc_cbp#5 : OK\n", cpu->name );
+
+	}
 }
 
 /*********************************************************************
@@ -1417,8 +1501,8 @@
 		xframe.bitstream = buf + pos;
 		xframe.length = buf_size - pos;
 		xframe.output.plane[0] = (uint8_t*)(((size_t)yuv_out + 15) & ~15);
-		xframe.output.plane[1] = xframe.output.plane[0] + bps*height;
-		xframe.output.plane[2] = xframe.output.plane[1] + bps/2;
+		xframe.output.plane[1] = (uint8_t*)xframe.output.plane[0] + bps*height;
+		xframe.output.plane[2] = (uint8_t*)xframe.output.plane[1] + bps/2;
 		xframe.output.stride[0] = bps;
 		xframe.output.stride[1] = bps;
 		xframe.output.stride[2] = bps;
@@ -1436,10 +1520,10 @@
 		nb++;
 
     for(y=0; y<height/2; ++y) {
-		  chksum = calc_crc(xframe.output.plane[0] + (2*y+0)*bps, width, chksum);
-			chksum = calc_crc(xframe.output.plane[0] + (2*y+1)*bps, width, chksum);
-			chksum = calc_crc(xframe.output.plane[1] + y*bps, width/2, chksum);
-			chksum = calc_crc(xframe.output.plane[2] + y*bps, width/2, chksum);
+		  chksum = calc_crc((uint8_t*)xframe.output.plane[0] + (2*y+0)*bps, width, chksum);
+			chksum = calc_crc((uint8_t*)xframe.output.plane[0] + (2*y+1)*bps, width, chksum);
+			chksum = calc_crc((uint8_t*)xframe.output.plane[1] + y*bps, width/2, chksum);
+			chksum = calc_crc((uint8_t*)xframe.output.plane[2] + y*bps, width/2, chksum);
 		}
 		if (pos==buf_size)
 			break;
@@ -1622,6 +1706,145 @@
 	}
 #endif
 }
+
+/*********************************************************************
+ * test some YUV func
+ *********************************************************************/
+  
+#define ENTER \
+for(i=0; i<(int)sizeof(Dst0); ++i) Dst0[0][i] = 0;   \
+t = gettime_usec();                   \
+emms();
+
+#define LEAVE \
+emms();                             \
+t = (gettime_usec() - t) / nb_tests;  \
+	iCrc = calc_crc((uint8_t*)Dst0, sizeof(Dst0), CRC32_INITIAL)
+
+#define TEST_YUYV(FUNC, S)                \
+ENTER                               \
+for(tst=0; tst<nb_tests; ++tst) (FUNC)(Dst0[0], S*WIDTH, Src0[0], Src0[1], Src0[2], WIDTH, WIDTH/2, WIDTH, HEIGHT, 0); \
+LEAVE
+
+#define WIDTH 128
+#define HEIGHT 32
+void test_yuv()
+{
+	const int nb_tests = 200*speed_ref;
+	CPU *cpu;
+	uint8_t Src0[3][WIDTH*HEIGHT];
+	uint8_t Dst0[4][WIDTH*HEIGHT];
+	int i, j;
+	double t;
+	int tst, iCrc;
+
+	colorspace_init();
+	ieee_reseed(1);
+	for(i=0; i<(int)sizeof(Src0); ++i) Src0[0][i] = ieee_rand(0,255);
+	for(i=0; i<(int)sizeof(Dst0); ++i) Dst0[0][i] = 0x5a;
+
+	printf( "\n ===  test YUV ===\n" );
+
+	init_cpu(&cpu_list[0]);
+	TEST_YUYV(yv12_to_yuyv_c, 4);
+	printf(" yv12_to_yuyv_c %.3f usec       crc32=0x%08x %s\n",
+		   t, iCrc, (iCrc!=0xeb1a0b0a)?"| ERROR": "" );
+	TEST_YUYV(yv12_to_uyvy_c, 4);
+	printf(" yv12_to_uyvy_c %.3f usec       crc32=0x%08x %s\n",
+		   t, iCrc, (iCrc!=0x6e82f55b)?"| ERROR": "" );
+
+#ifdef ARCH_IS_IA32
+	init_cpu(&cpu_list[1]);
+	TEST_YUYV(yv12_to_yuyv_mmx, 4);
+	printf(" yv12_to_yuyv_mmx %.3f usec       crc32=0x%08x %s\n",
+		t, iCrc, (iCrc!=0xeb1a0b0a)?"| ERROR": "" );
+
+	TEST_YUYV(yv12_to_uyvy_mmx, 4);
+	printf(" yv12_to_uyvy_mmx %.3f usec       crc32=0x%08x %s\n",
+		t, iCrc, (iCrc!=0x6e82f55b)?"| ERROR": "" );
+#endif
+
+#ifdef ARCH_IS_PPC
+	init_cpu(&cpu_list[1]);
+	TEST_YUYV(yv12_to_yuyv_altivec_c, 4);
+	printf(" yv12_to_yuyv_altivec_c %.3f usec       crc32=0x%08x %s\n",
+		t, iCrc, (iCrc!=0xeb1a0b0a)?"| ERROR": "" );
+
+	TEST_YUYV(yv12_to_uyvy_altivec_c, 4);
+	printf(" yv12_to_uyvy_altivec_c %.3f usec       crc32=0x%08x %s\n",
+		t, iCrc, (iCrc!=0x6e82f55b)?"| ERROR": "" );
+#endif
+	printf( " --- \n" );
+}
+
+#define TEST_YV2(FUNC, WITH_UV, WITH_FLIP)        \
+ENTER                               \
+for(tst=0; tst<nb_tests; ++tst) (FUNC)(Dst0[0], Dst0[1], Dst0[2], WIDTH, WIDTH, \
+	Src0[0], (WITH_UV) ? Src0[1] : 0, (WITH_UV) ? Src0[2] : 0,  WIDTH, WIDTH, \
+	WIDTH-2, HEIGHT-2, WITH_FLIP); \
+LEAVE
+
+#define PRINT_NxN(DATA,W,H,STR)   {   \
+	int i,j; \
+	for(j=0; j<(H); ++j) { \
+		for(i=0; i<(W); ++i) printf( "0x%.2x ", (DATA)[i+j*(STR)] );\
+		printf("\n"); \
+	} \
+	printf("---\n"); \
+}
+
+static const int yv12_CRCs[2][2] = { 
+	{0x5cab7cf0,0xdab46541} 
+,       {0xe8bae865,0x1faf77b7}
+};
+
+void test_yuv2()
+{
+	const int nb_tests = 800*speed_ref;
+	CPU *cpu;
+	uint8_t Src0[3][WIDTH*HEIGHT];
+	uint8_t Dst0[3][WIDTH*HEIGHT];
+	int with_uv, with_flip;
+	int i, j;
+	double t;
+	int tst, iCrc;
+
+	colorspace_init();
+	ieee_reseed(1);
+	for(i=0; i<(int)sizeof(Src0); ++i) Src0[0][i] = ieee_rand(0,255);
+
+	printf( "\n ===  test YV2 ===\n" );
+        for(with_flip=0; with_flip<=1; ++with_flip) {
+        	for(with_uv=0; with_uv<=1; ++with_uv) {
+			init_cpu(&cpu_list[0]);
+			TEST_YV2(yv12_to_yv12_c, with_uv, with_flip);
+			printf(" yv12_to_yv12_c   %.3f usec      \tcrc32=0x%08x %s\n",
+				t, iCrc, (iCrc!=yv12_CRCs[with_flip][with_uv])?"| ERROR": "" );
+			/* if (!with_uv) PRINT_NxN(Dst0[1], WIDTH/2, HEIGHT/2, WIDTH ); */
+
+#ifdef ARCH_IS_IA32
+			init_cpu(&cpu_list[1]);
+			TEST_YV2(yv12_to_yv12_mmx, with_uv, with_flip);
+			printf(" yv12_to_yv12_mmx %.3f usec     \tcrc32=0x%08x %s\n",
+				t, iCrc, (iCrc!=yv12_CRCs[with_flip][with_uv])?"| ERROR": "" );
+			/* if (!with_uv) PRINT_NxN(Dst0[1], WIDTH/2, HEIGHT/2, WIDTH ); */
+
+			TEST_YV2(yv12_to_yv12_xmm, with_uv, with_flip);
+			printf(" yv12_to_yv12_xmm %.3f usec     \tcrc32=0x%08x %s\n",
+				t, iCrc, (iCrc!=yv12_CRCs[with_flip][with_uv])?"| ERROR": "" );
+#endif
+		}
+
+		printf( " --- \n" );
+	}
+	printf( " ===== \n" );
+}
+
+#undef WIDTH
+#undef HEIGHT
+#undef ENTER
+#undef LEAVE
+
 /*********************************************************************/
 
 static uint32_t __inline log2bin_v1(uint32_t value)
@@ -1710,7 +1933,7 @@
 
 void test_gcd()
 {
-	const int nb_tests = 10*speed_ref;
+  const int nb_tests = 10*speed_ref;
   int i;
   uint32_t crc1=0, crc2=0;
   uint32_t n0, n, d0, d;
@@ -1744,6 +1967,195 @@
 }
 
 /*********************************************************************
+ * test compiler
+ *********************************************************************/
+
+void test_compiler() {
+  int nb_err = 0;
+  int32_t v;
+  if (sizeof(uint16_t)<2) {
+    printf( "ERROR: sizeof(uint16_t)<2 !!\n" );
+    nb_err++;
+  }
+  if (sizeof(int16_t)<2) {
+    printf( "ERROR: sizeof(int16_t)<2 !!\n" );
+    nb_err++;
+  }
+  if (sizeof(uint8_t)!=1) {
+    printf( "ERROR: sizeof(uint8_t)!=1 !!\n" );
+    nb_err++;
+  }
+  if (sizeof(int8_t)!=1) {
+    printf( "ERROR: sizeof(int8_t)!=1 !!\n" );
+    nb_err++;
+  }
+  if (sizeof(uint32_t)<4) {
+    printf( "ERROR: sizeof(uint32_t)<4 !!\n" );
+    nb_err++;
+  }
+  if (sizeof(int32_t)<4) {
+    printf( "ERROR: sizeof(int32_t)<4 !!\n" );
+    nb_err++;
+  }
+         /* yes, i know, this test is silly. But better be safe than sorry. :) */
+  for(v=1000; v>=0; v--) {
+    if ( (v>>2) != v/4)
+      nb_err++;
+  }
+  for(v=-1000; v!=-1; v++) {
+    if ( (v>>2) != (v/4)-!!(v%4))
+      nb_err++;
+  }
+  if (nb_err!=0) {
+    printf( "ERROR! please post your platform/compiler specs to xvid-devel@xvid.org !\n" );
+  }
+}
+
+/*********************************************************************
+ * test SSIM functions
+ *********************************************************************/
+
+typedef int (*lumfunc)(uint8_t* ptr, int stride);
+typedef void (*csfunc)(uint8_t* ptro, uint8_t* ptrc, int stride, int lumo, int lumc, int* pdevo, int* pdevc, int* pcorr);
+
+extern int lum_8x8_c(uint8_t* ptr, int stride);
+extern int lum_8x8_mmx(uint8_t* ptr, int stride);
+extern int lum_2x8_c(uint8_t* ptr, int stride);
+extern void consim_c(uint8_t* ptro, uint8_t* ptrc, int stride, int lumo, int lumc, int* pdevo, int* pdevc, int* pcorr);
+extern void consim_mmx(uint8_t* ptro, uint8_t* ptrc, int stride, int lumo, int lumc, int* pdevo, int* pdevc, int* pcorr);
+extern void consim_sse2(uint8_t* ptro, uint8_t* ptrc, int stride, int lumo, int lumc, int* pdevo, int* pdevc, int* pcorr);
+
+void test_SSIM()
+{
+	const int nb_tests = 3000*speed_ref;
+	int tst;
+	CPU *cpu;
+	int i;
+	int devs[3];
+	long lumo, lumc;
+	DECLARE_ALIGNED_MATRIX(Ref1, 16, 16, uint8_t, 16);
+	DECLARE_ALIGNED_MATRIX(Ref2, 16, 16, uint8_t, 16);
+	lumfunc lum8x8;
+	lumfunc lum2x8;
+	csfunc  csim;
+
+	ieee_reseed(1);
+	printf( "\n ======  test SSIM ======\n" );
+	for(i=0; i<16*16;++i) {
+		long v1, v2;
+		v1 = ieee_rand(-256, 511);
+		v2 = ieee_rand(-256, 511);
+		Ref1[i] = (v1<0) ? 0 : (v1>255) ? 255 : v1;
+		Ref2[i] = (v2<0) ? 0 : (v2>255) ? 255 : v2;
+	}
+	lumc = ieee_rand(0, 255);
+	lumo = ieee_rand(0, 255);
+
+	for(cpu = cpu_list; cpu->name!=0; ++cpu)
+	{
+		double t;
+		int m;
+		if (!init_cpu(cpu))
+			continue;
+		lum8x8 = lum_8x8_c;
+		lum2x8 = lum_2x8_c;
+		csim   = consim_c;
+#ifdef ARCH_IS_IA32
+		if (cpu->cpu & XVID_CPU_MMX){
+			lum8x8 = lum_8x8_mmx;
+			csim = consim_mmx;
+		}
+		if (cpu->cpu & XVID_CPU_MMX){
+			csim = consim_sse2;
+		}
+#endif
+		t = gettime_usec();
+		emms();
+		for(tst=0; tst<nb_tests; ++tst) m = lum8x8(Ref1, 16);
+		emms();
+		t = (gettime_usec() - t) / nb_tests;
+		printf("%s - ssim-lum8x8    %.3f usec       m=%d %s\n",
+			   cpu->name, t, m,
+			   (m!=8230)?"| ERROR": "" );
+
+		t = gettime_usec();
+		emms();
+		for(tst=0; tst<nb_tests; ++tst) m = lum2x8(Ref1+8, 16);
+		emms();
+		t = (gettime_usec() - t) / nb_tests;
+		printf("%s - ssim-lum2x8    %.3f usec       m=%d %s\n",
+			   cpu->name, t, m,
+			   (m!=681)?"| ERROR": "" );
+
+		t = gettime_usec();
+		emms();
+		for(tst=0; tst<nb_tests; ++tst) csim(Ref1, Ref2, 16, lumo, lumc, devs+0, devs+1, devs+2);
+		emms();
+		t = (gettime_usec() - t) / nb_tests;
+		printf("%s - ssim-consim    %.3f usec       devs=[0x%x 0x%x 0x%x] %s\n",
+			   cpu->name, t, devs[0], devs[1], devs[2],
+			   (devs[0]!=0x1bdf0f || devs[1]!=0x137258 ||  devs[2]!=0xcdb13)?"| ERROR": "" );
+		printf( " --- \n" );
+	}
+}
+
+/*********************************************************************
+ * test bitstream functions
+ *********************************************************************/
+
+#define BIT_BUF_SIZE 2000
+
+static void test_bits()
+{
+  const int nb_tests = 50*speed_ref;
+  int tst;
+  uint32_t Crc;
+  uint8_t Buf[BIT_BUF_SIZE];
+  uint32_t Extracted[BIT_BUF_SIZE*8]; /* worst case: bits read 1 by 1 */
+  int Lens[BIT_BUF_SIZE*8];     
+  double t1;
+
+
+  printf( "\n ===  test bitstream ===\n" );
+  ieee_reseed(1);
+  Crc = 0;
+
+  t1 = gettime_usec();
+  for(tst=0; tst<nb_tests; ++tst) {
+  	Bitstream bs;
+  	int m, m2, l, l2;
+
+	for(l=0; l<BIT_BUF_SIZE; ++l)
+		Buf[l] = (uint8_t)ieee_rand(0,255);
+
+  	l = BIT_BUF_SIZE - ieee_rand(1,BIT_BUF_SIZE/10);
+  	BitstreamInit(&bs, (void*)(Buf+BIT_BUF_SIZE-l), l);
+
+
+	BitstreamReset(&bs);
+	for(l2=l*8, m=0; l2>0; m++) {
+		const int b = ieee_rand(1,32);
+		Lens[m] = b;
+		l2 -= b;
+		if (l2<0) break;
+		Extracted[m] = BitstreamShowBits(&bs, b);
+		BitstreamSkip(&bs, b);
+//		printf( "<= %d: %d 0x%x\n", m, b, Extracted[m]);
+	}
+
+	BitstreamReset(&bs);
+	for(m2=0; m2<m; ++m2) {
+		const int b = Lens[m2];
+		const uint32_t v = BitstreamGetBits(&bs, b);
+		Crc |= (v!=Extracted[m2]);
+//		printf( "=> %d: %d 0x%x %c\n", m2, b, v, " *"[Crc]);
+	}
+  }
+  t1 = (gettime_usec() - t1) / nb_tests;
+  printf(" test_bits   %.3f usec   %s\n", t1, (Crc!=0)?"| ERROR": "" );
+}
+
+/*********************************************************************
  * main
  *********************************************************************/
 
@@ -1758,7 +2170,7 @@
 	int c, what = 0;
 	int width, height;
 	uint32_t chksum = 0;
-  const char * test_bitstream = 0;
+	const char * test_bitstream = 0;
 
 	cpu_mask = 0;  // default => will use autodectect
 	for(c=1; c<argc; ++c)
@@ -1811,7 +2223,11 @@
 	if (what==0 || what==10) test_sse();
 	if (what==0 || what==11) test_log2bin();
 	if (what==0 || what==12) test_gcd();
-
+	if (what==0 || what==13) test_compiler();
+	if (what==0 || what==14) test_yuv();
+	if (what==0 || what==15) test_SSIM();
+	if (what==0 || what==16) test_yuv2();
+	if (what==0 || what==17) test_bits();
 
 	if (what==7) {
 		test_IEEE1180_compliance(-256, 255, 1);