--- trunk/xvidcore/examples/xvid_bench.c	2005/09/23 12:53:35	1641
+++ trunk/xvidcore/examples/xvid_bench.c	2008/11/26 09:31:06	1801
@@ -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.25 2005-09-23 12:53:35 suxen_drol Exp $
+ * $Id: xvid_bench.c,v 1.37 2008-11-26 09:31:06 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>
 
@@ -114,19 +115,18 @@
 
 CPU cpu_list[] = {
 	{ "PLAINC ", 0 },
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 	{ "MMX    ", XVID_CPU_MMX },
 	{ "MMXEXT ", XVID_CPU_MMXEXT | XVID_CPU_MMX },
 	{ "SSE2   ", XVID_CPU_SSE2 | XVID_CPU_MMX },
+	{ "SSE3   ", XVID_CPU_SSE3 | XVID_CPU_SSE2 | XVID_CPU_MMX },
+	{ "SSE41  ", XVID_CPU_SSE41| XVID_CPU_SSE3 | XVID_CPU_SSE2 | XVID_CPU_MMX },
 	{ "3DNOW  ", XVID_CPU_3DNOW },
 	{ "3DNOWE ", XVID_CPU_3DNOW | XVID_CPU_3DNOWEXT },
 #endif
 #ifdef ARCH_IS_PPC
 	{ "ALTIVEC", XVID_CPU_ALTIVEC },
 #endif
-#ifdef ARCH_IS_X86_64
-	{ "X86_64 ", XVID_CPU_ASM},
-#endif
 #ifdef ARCH_IS_IA64
 //	{ "IA64   ", XVID_CPU_IA64 },
 #endif
@@ -518,10 +518,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 +665,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,
@@ -682,6 +730,7 @@
   set_intra_matrix( mpeg_quant_matrices, Quant );                \
   emms();                                   \
   for(q=1; q<=max_Q; ++q) {                 \
+	init_intra_matrix( mpeg_quant_matrices, q ); \
 	for(tst=0; tst<nb_tests; ++tst)         \
 	  (FUNC)((DST), (SRC), q, q, mpeg_quant_matrices);           \
 	byte_swap((uint8_t*)(DST), 64*sizeof((DST)[0]), sizeof((DST)[0]));  \
@@ -692,7 +741,7 @@
 t = (gettime_usec()-t-overhead)/nb_tests/qm
 
 #define TEST_INTRA(REFFUNC, NEWFUNC, RANGE)              \
-{ int i,q,s;\
+{ int32_t i,q,s;\
 	DECLARE_ALIGNED_MATRIX(Src, 8, 8, int16_t, 16); \
   DECLARE_ALIGNED_MATRIX(Dst, 8, 8, int16_t, 16); \
   DECLARE_ALIGNED_MATRIX(Dst2,8, 8, int16_t, 16); \
@@ -724,11 +773,11 @@
 
 void test_quant()
 {
-	const int nb_tests = 1*speed_ref;
-	const int max_Q = 31;
+	const int32_t nb_tests = 1*speed_ref;
+	const int32_t max_Q = 31;
 	DECLARE_ALIGNED_MATRIX(mpeg_quant_matrices, 8, 64, uint16_t, 16);
 
-	int i, qm;
+	int32_t i, qm;
 	CPU *cpu;
 	DECLARE_ALIGNED_MATRIX(Src, 8, 8, int16_t, 16);
 	DECLARE_ALIGNED_MATRIX(Dst, 8, 8, int16_t, 16);
@@ -747,7 +796,7 @@
 	for(cpu = cpu_list; cpu->name!=0; ++cpu)
 	{
 		double t, overhead;
-		int tst, q;
+		int32_t tst, q;
 		uint32_t s;
 
 		if (!init_cpu(cpu))
@@ -771,7 +820,7 @@
 		TEST_QUANT2(quant_mpeg_intra, Dst, Src);
 		printf("%s -   quant_mpeg_intra %.3f usec       crc32=0x%08x %s\n",
 			   cpu->name, t, s,
-			   (s!=0xfd6a21a4)? "| ERROR": "");
+			   (s!=0x3b999af6)? "| ERROR": "");
 
 		TEST_QUANT(quant_mpeg_inter, Dst, Src);
 		printf("%s -   quant_mpeg_inter %.3f usec       crc32=0x%08x %s\n",
@@ -1657,6 +1706,170 @@
 	}
 #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, FLIP)                \
+ENTER                               \
+for(tst=0; tst<nb_tests; ++tst) (FUNC)(Dst0[0], S*WIDTH, Src0[0], Src0[1], Src0[2], WIDTH, WIDTH/2, WIDTH, HEIGHT, (FLIP)); \
+LEAVE
+
+static const int yuv_CRCs[6][2] = {
+	{0x0f4fb96b,0x780b6a68}
+,	{0xa986b289,0x65e49b76}
+,	{0x7f19c152,0xd539b86e}
+,	{0x0f4fb96b,0x780b6a68}
+,	{0xa986b289,0x65e49b76}
+,	{0x36ab8b57,0x1cd92fee}
+};
+
+#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, with_flip;
+	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" );
+
+        for(with_flip=0; with_flip<=1; ++with_flip) {
+
+		init_cpu(&cpu_list[0]);
+		TEST_YUYV(yv12_to_yuyv_c, 4, with_flip);
+		printf(" yv12_to_yuyv_c %.3f usec       crc32=0x%08x %s\n",
+			   t, iCrc, (iCrc!=yuv_CRCs[0][with_flip])?"| ERROR": "" );
+		TEST_YUYV(yv12_to_uyvy_c, 4, with_flip);
+		printf(" yv12_to_uyvy_c %.3f usec       crc32=0x%08x %s\n",
+		   	t, iCrc, (iCrc!=yuv_CRCs[1][with_flip])?"| ERROR": "" );
+ 
+        	TEST_YUYV(yv12_to_bgra_c, 4, with_flip);
+        	printf(" yv12_to_bgra_c %.3f usec       crc32=0x%08x %s\n",
+               		t, iCrc, (iCrc!=yuv_CRCs[2][with_flip])?"| ERROR": "" );
+
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
+		init_cpu(&cpu_list[1]);
+		TEST_YUYV(yv12_to_yuyv_mmx, 4, with_flip);
+		printf(" yv12_to_yuyv_mmx %.3f usec       crc32=0x%08x %s\n",
+			t, iCrc, (iCrc!=yuv_CRCs[3][with_flip])?"| ERROR": "" );
+
+		TEST_YUYV(yv12_to_uyvy_mmx, 4, with_flip);
+		printf(" yv12_to_uyvy_mmx %.3f usec       crc32=0x%08x %s\n",
+			t, iCrc, (iCrc!=yuv_CRCs[4][with_flip])?"| ERROR": "" );
+
+        	TEST_YUYV(yv12_to_bgra_mmx, 4, with_flip);
+        	printf(" yv12_to_bgra_mmx %.3f usec       crc32=0x%08x %s\n",
+                	t, iCrc, (iCrc!=yuv_CRCs[5][with_flip])?"| ERROR": "" );
+
+#endif
+
+#ifdef ARCH_IS_PPC
+		init_cpu(&cpu_list[1]);
+		TEST_YUYV(yv12_to_yuyv_altivec_c, 4, with_flip);
+		printf(" yv12_to_yuyv_altivec_c %.3f usec       crc32=0x%08x %s\n",
+			t, iCrc, (iCrc!=yuv_CRCs[3][with_flip])?"| ERROR": "" );
+
+		TEST_YUYV(yv12_to_uyvy_altivec_c, 4, with_flip);
+		printf(" yv12_to_uyvy_altivec_c %.3f usec       crc32=0x%08x %s\n",
+			t, iCrc, (iCrc!=yuv_CRCs[4][with_flip])?"| ERROR": "" );
+
+         	TEST_YUYV(yv12_to_bgra_altivec_c, 4, with_flip);
+		printf(" yv12_to_bgra_altivec_c %.3f usec       crc32=0x%08x %s\n",
+                        t, iCrc, (iCrc!=yuv_CRCs[5][with_flip])?"| 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 ); */
+
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
+			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)
@@ -1745,7 +1958,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;
@@ -1779,6 +1992,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;
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
+		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
  *********************************************************************/
 
@@ -1793,7 +2195,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)
@@ -1803,7 +2205,9 @@
 	  else if (!strcmp(argv[c], "-mmx"))    cpu_mask = XVID_CPU_MMX    | XVID_CPU_FORCE;
 	  else if (!strcmp(argv[c], "-mmxext")) cpu_mask = XVID_CPU_MMXEXT | XVID_CPU_MMX | XVID_CPU_FORCE;
 	  else if (!strcmp(argv[c], "-sse2"))   cpu_mask = XVID_CPU_SSE2   | XVID_CPU_MMXEXT | XVID_CPU_MMX | XVID_CPU_FORCE;
-	  else if (!strcmp(argv[c], "-3dnow"))  cpu_mask = XVID_CPU_3DNOW  | XVID_CPU_FORCE;
+	  else if (!strcmp(argv[c], "-sse3"))   cpu_mask = XVID_CPU_SSE3   | XVID_CPU_SSE2 | XVID_CPU_MMXEXT | XVID_CPU_MMX | XVID_CPU_FORCE;
+	  else if (!strcmp(argv[c], "-sse4"))   cpu_mask = XVID_CPU_SSE41  | XVID_CPU_SSE3 | XVID_CPU_SSE2 | XVID_CPU_MMXEXT | XVID_CPU_MMX | XVID_CPU_FORCE;
+      else if (!strcmp(argv[c], "-3dnow"))  cpu_mask = XVID_CPU_3DNOW  | XVID_CPU_FORCE;
 	  else if (!strcmp(argv[c], "-3dnowe")) cpu_mask = XVID_CPU_3DNOW  | XVID_CPU_3DNOWEXT | XVID_CPU_FORCE;
 	  else if (!strcmp(argv[c], "-altivec")) cpu_mask = XVID_CPU_ALTIVEC | XVID_CPU_FORCE;
 	  else if (!strcmp(argv[c], "-spd")) {
@@ -1846,7 +2250,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);
@@ -1874,7 +2282,7 @@
 			   "    may appear to be slow.\n");
 	}
 
-#ifdef ARCH_IS_IA32
+#if defined(ARCH_IS_IA32) || defined(ARCH_IS_X86_64)
 	if (what == 0 || what == 5) {
 		printf("\n"
 			   "NB: MMX mpeg4 quantization is known to have very small errors (+/-1 magnitude)\n"