Major audit of all Mesa's x86 assembly code. This round is basically

general cleanups - more to come.

Added P6 architecture timing to debug_xform routines.  Still need to add
test_all_vertex_functions test for the v16 asm.  Dynamic reconfiguration
of counter overhead for more accurate benchmarking.

1 files changed, 84 insertions, 70 deletions

diff --git a/src/mesa/x86/x86.c b/src/mesa/x86/x86.c
index 2db200df05b..fcd097867c4 100644
--- a/src/mesa/x86/x86.c
+++ b/src/mesa/x86/x86.c
@@ -1,21 +1,21 @@
-/* $Id: x86.c,v 1.8 2000/06/27 22:10:01 brianp Exp $ */
+/* $Id: x86.c,v 1.9 2000/10/23 00:16:28 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
- * 
+ * Version:  3.5
+ *
  * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -28,7 +28,6 @@
  * Intel x86 assembly code by Josh Vanderhoof
  */
 
-
 #include "glheader.h"
 #include "context.h"
 #include "types.h"
@@ -36,89 +35,104 @@
 #include "xform.h"
 #include "x86.h"
 
-#ifdef USE_X86_ASM
-extern void _ASMAPI gl_v16_x86_cliptest_points4( GLfloat *first_vert,
-					GLfloat *last_vert,
-					GLubyte *or_mask,
-					GLubyte *and_mask,
-					GLubyte *clip_mask );
-
-  
-extern void _ASMAPI gl_v16_x86_general_xform( GLfloat *dest,
-				     const GLfloat *m,
-				     const GLfloat *src,
-				     GLuint src_stride,
-					      GLuint count );
+#ifdef DEBUG
+#include "debug_xform.h"
 #endif
 
 
-#define XFORM_ARGS 	GLvector4f *to_vec, 		\
-			const GLfloat m[16], 		\
-			const GLvector4f *from_vec, 	\
-			const GLubyte *mask, 		\
+#define XFORM_ARGS 	GLvector4f *to_vec, 				\
+			const GLfloat m[16], 				\
+			const GLvector4f *from_vec, 			\
+			const GLubyte *mask, 				\
 			const GLubyte flag
 
-#define DECLARE_XFORM_GROUP(pfx, vsize, masked) \
- extern void _ASMAPI gl_##pfx##_transform_points##vsize##_general_##masked(XFORM_ARGS);     \
- extern void _ASMAPI gl_##pfx##_transform_points##vsize##_identity_##masked(XFORM_ARGS);    \
- extern void _ASMAPI gl_##pfx##_transform_points##vsize##_3d_no_rot_##masked(XFORM_ARGS);   \
- extern void _ASMAPI gl_##pfx##_transform_points##vsize##_perspective_##masked(XFORM_ARGS);     \
- extern void _ASMAPI gl_##pfx##_transform_points##vsize##_2d_##masked(XFORM_ARGS);      \
- extern void _ASMAPI gl_##pfx##_transform_points##vsize##_2d_no_rot_##masked(XFORM_ARGS);   \
- extern void _ASMAPI gl_##pfx##_transform_points##vsize##_3d_##masked(XFORM_ARGS);
-
-#define ASSIGN_XFORM_GROUP( pfx, cma, vsize, masked ) 		\
- gl_transform_tab[cma][vsize][MATRIX_GENERAL] 			\
-  = gl_##pfx##_transform_points##vsize##_general_##masked; 	\
- gl_transform_tab[cma][vsize][MATRIX_IDENTITY] 			\
-  = gl_##pfx##_transform_points##vsize##_identity_##masked; 	\
- gl_transform_tab[cma][vsize][MATRIX_3D_NO_ROT] 		\
-  = gl_##pfx##_transform_points##vsize##_3d_no_rot_##masked; 	\
- gl_transform_tab[cma][vsize][MATRIX_PERSPECTIVE] 		\
-  = gl_##pfx##_transform_points##vsize##_perspective_##masked; 	\
- gl_transform_tab[cma][vsize][MATRIX_2D] 			\
-  = gl_##pfx##_transform_points##vsize##_2d_##masked; 		\
- gl_transform_tab[cma][vsize][MATRIX_2D_NO_ROT] 		\
-  = gl_##pfx##_transform_points##vsize##_2d_no_rot_##masked; 	\
- gl_transform_tab[cma][vsize][MATRIX_3D] 			\
-  = gl_##pfx##_transform_points##vsize##_3d_##masked;
+
+#define DECLARE_XFORM_GROUP( pfx, sz, masked ) \
+ extern void _ASMAPI gl_##pfx##_transform_points##sz##_general_##masked( XFORM_ARGS );	    \
+ extern void _ASMAPI gl_##pfx##_transform_points##sz##_identity_##masked( XFORM_ARGS );	    \
+ extern void _ASMAPI gl_##pfx##_transform_points##sz##_3d_no_rot_##masked( XFORM_ARGS );    \
+ extern void _ASMAPI gl_##pfx##_transform_points##sz##_perspective_##masked( XFORM_ARGS );  \
+ extern void _ASMAPI gl_##pfx##_transform_points##sz##_2d_##masked( XFORM_ARGS );	    \
+ extern void _ASMAPI gl_##pfx##_transform_points##sz##_2d_no_rot_##masked( XFORM_ARGS );    \
+ extern void _ASMAPI gl_##pfx##_transform_points##sz##_3d_##masked( XFORM_ARGS );
+
+
+#define ASSIGN_XFORM_GROUP( pfx, cma, sz, masked )			\
+   gl_transform_tab[cma][sz][MATRIX_GENERAL] =				\
+      gl_##pfx##_transform_points##sz##_general_##masked;		\
+   gl_transform_tab[cma][sz][MATRIX_IDENTITY] =				\
+      gl_##pfx##_transform_points##sz##_identity_##masked;		\
+   gl_transform_tab[cma][sz][MATRIX_3D_NO_ROT] =			\
+      gl_##pfx##_transform_points##sz##_3d_no_rot_##masked;		\
+   gl_transform_tab[cma][sz][MATRIX_PERSPECTIVE] =			\
+      gl_##pfx##_transform_points##sz##_perspective_##masked;		\
+   gl_transform_tab[cma][sz][MATRIX_2D] =				\
+      gl_##pfx##_transform_points##sz##_2d_##masked;			\
+   gl_transform_tab[cma][sz][MATRIX_2D_NO_ROT] =			\
+      gl_##pfx##_transform_points##sz##_2d_no_rot_##masked;		\
+   gl_transform_tab[cma][sz][MATRIX_3D] =				\
+      gl_##pfx##_transform_points##sz##_3d_##masked;
 
 
 #ifdef USE_X86_ASM
-   DECLARE_XFORM_GROUP( x86, 2, raw )
-   DECLARE_XFORM_GROUP( x86, 3, raw )
-   DECLARE_XFORM_GROUP( x86, 4, raw )
-   DECLARE_XFORM_GROUP( x86, 2, masked )
-   DECLARE_XFORM_GROUP( x86, 3, masked )
-   DECLARE_XFORM_GROUP( x86, 4, masked )
-
-   extern GLvector4f  * _ASMAPI gl_x86_cliptest_points4( GLvector4f *clip_vec, 
-                                               GLvector4f *proj_vec, 
-                                               GLubyte clipMask[],
-                                               GLubyte *orMask, 
-                                               GLubyte *andMask );
+DECLARE_XFORM_GROUP( x86, 2, raw )
+DECLARE_XFORM_GROUP( x86, 3, raw )
+DECLARE_XFORM_GROUP( x86, 4, raw )
+DECLARE_XFORM_GROUP( x86, 2, masked )
+DECLARE_XFORM_GROUP( x86, 3, masked )
+DECLARE_XFORM_GROUP( x86, 4, masked )
+
+
+extern GLvector4f * _ASMAPI gl_x86_cliptest_points4( GLvector4f *clip_vec,
+						     GLvector4f *proj_vec,
+						     GLubyte clipMask[],
+						     GLubyte *orMask,
+						     GLubyte *andMask );
+
+
+extern void _ASMAPI gl_v16_x86_cliptest_points4( GLfloat *first_vert,
+						 GLfloat *last_vert,
+						 GLubyte *or_mask,
+						 GLubyte *and_mask,
+						 GLubyte *clip_mask );
+
+
+extern void _ASMAPI gl_v16_x86_general_xform( GLfloat *dest,
+					      const GLfloat *m,
+					      const GLfloat *src,
+					      GLuint src_stride,
+					      GLuint count );
 #endif
 
 
-void gl_init_x86_asm_transforms( void )
+void gl_init_x86_transform_asm( void )
 {
 #ifdef USE_X86_ASM
-   ASSIGN_XFORM_GROUP( x86, 0, 2, raw )
-   ASSIGN_XFORM_GROUP( x86, 0, 3, raw )
-   ASSIGN_XFORM_GROUP( x86, 0, 4, raw )
+   ASSIGN_XFORM_GROUP( x86, 0, 2, raw );
+   ASSIGN_XFORM_GROUP( x86, 0, 3, raw );
+   ASSIGN_XFORM_GROUP( x86, 0, 4, raw );
 
-   ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 2, masked )
-   ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 3, masked )
-   ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 4, masked )
+   ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 2, masked );
+   ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 3, masked );
+   ASSIGN_XFORM_GROUP( x86, CULL_MASK_ACTIVE, 4, masked );
 
    /* XXX this function has been found to cause FP overflow exceptions */
    gl_clip_tab[4] = gl_x86_cliptest_points4;
 
 #ifdef DEBUG
-   gl_test_all_transform_functions("x86");
+   gl_test_all_transform_functions( "x86" );
+#endif
 #endif
+}
 
-   gl_cliptest_points4_v16 = gl_v16_x86_cliptest_points4;
-   gl_xform_points3_v16_general = gl_v16_x86_general_xform;
+void gl_init_x86_vertex_asm( void )
+{
+#ifdef USE_X86_ASM
+   gl_xform_points3_v16_general	= gl_v16_x86_general_xform;
+   gl_cliptest_points4_v16	= gl_v16_x86_cliptest_points4;
+
+#if 0
+   gl_test_all_vertex_functions( "x86" );
+#endif
 #endif
 }