Changeset 114 for trunk/Softwares/Dhrystone/src

Timestamp:

Apr 17, 2009, 12:35:37 AM (16 years ago)

Author:

rosiere

Message:

1) Fix bug with previous commit
2) Add test libc
3) Change Dhrystone

Location:

trunk/Softwares/Dhrystone/src

Files:

• c/dhry21a.c (modified) (3 diffs)
• c/dtime.c (modified) (2 diffs)
• c/main.c (modified) (1 diff)
• include/dhry.h (modified) (1 diff)

trunk/Softwares/Dhrystone/src/c/dhry21a.c

@@ -255 +255 @@
   User_Time = End_Time - Begin_Time;
 
-  if (User_Time < Too_Small_Time)
+//  if (User_Time < Too_Small_Time)
+//  {
+//#ifdef HAVE_DOUBLE
+//    printf ("Measured time too small to obtain meaningful results : %f\n",User_Time);
+//#else
+//    printf ("Measured time too small to obtain meaningful results : %d\n",User_Time);
+//#endif
+//    printf ("Please increase number of runs\n");
+//    printf ("\n");
+//  }
+//  else
   {
-    printf ("Measured time too small to obtain meaningful results : %f\n",User_Time);
-    printf ("Please increase number of runs\n");
-    printf ("\n");
-  }
-  else
-  {
+#ifdef HAVE_DOUBLE
     Microseconds          = User_Time * Mic_secs_Per_Second / (DOUBLE) Number_Of_Runs;
     Dhrystones_Per_Second = (DOUBLE) Number_Of_Runs / User_Time;
     Vax_Mips              = Dhrystones_Per_Second / 1757.0;
+#else
+    Microseconds          = User_Time                       / (DOUBLE) Number_Of_Runs;
+#endif
 
 #ifdef ROPT
@@ -274 +282 @@
 #endif
 
+#ifdef HAVE_DOUBLE
     printf ("Microseconds for one run through Dhrystone : %.1lf  \n",Microseconds);
     printf ("Dhrystones per Second                      : %.1lf \n",Dhrystones_Per_Second);
     printf ("VAX MIPS rating                            : %.3lf \n",Vax_Mips);
+#else
+    printf ("Begin_Time : %d\n",Begin_Time);
+    printf ("End_Time   : %d\n",End_Time  );
+    printf ("User_Time  : %d\n",User_Time );
+    printf ("Numbers of cycle for one run through Dhrystone : %d  \n",Microseconds);
+#endif
     printf ("\n");
   
@@ -283 +298 @@
   fprintf(Ap,"%s\n",Reg_Define);
 
+#ifdef HAVE_DOUBLE
   fprintf(Ap,"Microseconds for one loop : %.1lf\n",Microseconds);
   fprintf(Ap,"Dhrystones per second     : %.1lf\n",Dhrystones_Per_Second);
   fprintf(Ap,"VAX MIPS rating           : %.3lf\n",Vax_Mips);
+#else
+  fprintf(Ap,"Numbers of cycle for one loop : %.1d\n",Microseconds);
+#endif
   }
   fclose(Ap);
   return 0;
-  
 }
 

trunk/Softwares/Dhrystone/src/c/dtime.c

@@ -65 +65 @@
 
 #ifndef MHZ
-#define MHZ (1000000)
+#define MHZ (1000000.0)
 #endif //!MHZ
 
@@ -72 +72 @@
 #endif //!FRQ
 
-#ifndef DOUBLE
-#define double
-#endif
-
 DOUBLE dtime()
 {
   DOUBLE q;
 
-/*   q = (DOUBLE)(my_times())/(DOUBLE)FRQ; */
+#ifdef HAVE_DOUBLE
+  q = (DOUBLE)(my_times())/(DOUBLE)FRQ;
+#else
   q = (DOUBLE)(my_times());
-  
+#endif
+
   return (q);
 }

trunk/Softwares/Dhrystone/src/c/main.c

@@ -12 +12 @@
 int main()
 {
-  printf("cycle : %f\n",dtime());
-  
-/*   dhry21(100); */
-  
-  
+  dhry21(100);
+    
   exit (0);
 

trunk/Softwares/Dhrystone/src/include/dhry.h

@@ -338 +338 @@
 /* Compiler and system dependent definitions: */
 
-#define DOUBLE float
-#define Mic_secs_Per_Second     1000000.0
+#ifndef Morpheo
+# define HAVE_DOUBLE
+#endif
+
+#ifdef HAVE_DOUBLE
+# define DOUBLE float
+# define Mic_secs_Per_Second     1000000.0
+#else
+# define DOUBLE unsigned int
+# define Mic_secs_Per_Second     1000000
+#endif
 
 DOUBLE dtime ();