Changeset 129 for trunk/Softwares

Timestamp:

Jun 29, 2009, 6:38:40 PM (16 years ago)

Author:

rosiere

Message:

1) Debug_Signal

Location:

trunk/Softwares/MiBench

Files:

• Makefile (modified) (1 diff)
• Makefile.defs (modified) (1 diff)
• src/c/benchmark.c (modified) (18 diffs)

trunk/Softwares/MiBench/Makefile

@@ -25 +25 @@
 MIBENCH_DATA_PATH               = $(MORPHEO_TOPLEVEL)/Softwares/MiBench/data
 
-FLAGS                           = -DMIBENCH_DATA_PATH=\"$(MIBENCH_DATA_PATH)\" -DNB_THREAD_MAX=$(NB_THREAD_MAX)
+FLAGS                           = -DMIBENCH_DATA_PATH=\"$(MIBENCH_DATA_PATH)\" -DNB_THREAD_MAX=$(NB_THREAD_MAX) $(BENCHS_TYPE)
 
 #-----[ Files ]-------------------------------------------------------------------

trunk/Softwares/MiBench/Makefile.defs

@@ -18 +18 @@
                         security.sha        \
                         none
+
+BENCHS_TYPE             = -DMIBENCH_SMALL

trunk/Softwares/MiBench/src/c/benchmark.c

@@ -9 +9 @@
 #endif
 
-  #define MiBench_small
-//#define MiBench_large
+#if !defined(MIBENCH_SMALL) && !defined(MIBENCH_LARGE)
+# error "MIBENCH_SMALL or MIBENCH_LARGE must be defined"
+#endif
 
 //-----[ automative ]-----------------------------
@@ -43 +44 @@
   printf("***** automative.basicmath - Begin *****\n");
 
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
   main_basicmath_small ();
 #endif
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
   main_basicmath_large ();
 #endif
@@ -56 +57 @@
 //                                                       [ run_automative_bitcount ]
 //=======================================================================================
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
 void main_bitcount_small (void)
 {
@@ -81 +82 @@
 #endif
 
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
 void main_bitcount_large (void)
 {
@@ -110 +111 @@
   printf("***** automative.bitcount - Begin *****\n");
   
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
   main_bitcount_small ();
 #endif
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
   main_bitcount_large ();
 #endif
@@ -123 +124 @@
 //                                                       [ run_automative_qsort ]
 //=======================================================================================
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
 void _main_qsort_small (void)
 {
@@ -150 +151 @@
 #endif
 
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
 void _main_qsort_large (void)
 {
@@ -181 +182 @@
   printf("***** automative.qsort - Begin *****\n");
   
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
   _main_qsort_small ();
 #endif
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
   _main_qsort_large ();
 #endif
@@ -194 +195 @@
 //                                                       [ run_automative_susan ]
 //=======================================================================================
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
 void main_susan_small (void)
 {
@@ -261 +262 @@
 #endif
 
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
 void main_susan_large (void)
 {
@@ -332 +333 @@
   printf("***** automative.susan - Begin *****\n");
   
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
   main_susan_small ();
 #endif
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
   main_susan_large ();
 #endif
@@ -346 +347 @@
 //=======================================================================================
 
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
 void main_dijkstra_small (void)
 {
@@ -379 +380 @@
 
 
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
 void main_dijkstra_large (void)
 {
@@ -415 +416 @@
   printf("***** network.dijkstra - Begin *****\n");
   
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
   main_dijkstra_small ();
 #endif
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
   main_dijkstra_large ();
 #endif
@@ -432 +433 @@
   printf("***** office.stringsearch - Begin *****\n");
 
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
   main_stringsearch_small ();
 #endif
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
   main_stringsearch_large ();
 #endif
@@ -445 +446 @@
 //                                                       [ run_security_sha ]
 //=======================================================================================
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
 void main_sha_small (void)
 {
@@ -472 +473 @@
 #endif
 
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
 void main_sha_large (void)
 {
@@ -503 +504 @@
   printf("***** security.sha - Begin *****\n");
   
-#ifdef MiBench_small
+#ifdef MIBENCH_SMALL
   main_sha_small ();
 #endif
-#ifdef MiBench_large
+#ifdef MIBENCH_LARGE
   main_sha_large ();
 #endif