--- trunk/xvidcore/examples/xvid_bench.c	2005/09/23 12:53:35	1641
+++ trunk/xvidcore/examples/xvid_bench.c	2006/10/11 14:55:28	1731
@@ -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.29 2006-10-11 14:55:28 Skal Exp $
  *
  ****************************************************************************/
 
@@ -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,
@@ -1657,6 +1705,80 @@
 	}
 #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 64
+#define HEIGHT 64
+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);
+
+	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" );
+}
+#undef WIDTH
+#undef HEIGHT
+#undef ENTER
+#undef LEAVE
+
 /*********************************************************************/
 
 static uint32_t __inline log2bin_v1(uint32_t value)
@@ -1779,6 +1901,138 @@
 }
 
 /*********************************************************************
+ * 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 iconsim_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   = iconsim_c;
+		if (cpu->cpu & XVID_CPU_MMX){
+			lum8x8 = lum_8x8_mmx;
+			csim = consim_mmx;
+		}
+		if (cpu->cpu & XVID_CPU_MMX){
+			csim = consim_sse2;
+		}
+
+		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, 16);
+		emms();
+		t = (gettime_usec() - t) / nb_tests;
+		printf("%s - ssim-lum2x8    %.3f usec       m=%d %s\n",
+			   cpu->name, t, m,
+			   (m!=-841)?"| 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-lum2x8    %.3f usec       devs=[0x%x 0x%x 0x%x] %s\n",
+			   cpu->name, t, devs[0], devs[1], devs[2],
+			   (devs[0]!=0xeba80 || devs[1]!=0x1053e7 ||  devs[2]!=0x51215)?"| ERROR": "" );
+
+		printf( " --- \n" );
+	}
+}
+
+/*********************************************************************
  * main
  *********************************************************************/
 
@@ -1846,6 +2100,9 @@
 	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==7) {