Changeset 140 for trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/benchmark/benchmark.c

Timestamp:

Mar 9, 2011, 4:11:43 PM (13 years ago)

Author:

kane

Message:

yAjout du multi_cache : plusieurs processeur peuvent ce partager le même cache L1.
2 remarques, (1) deux nouveaux paramètres : nb_cpu, nb_cache. Pour avoir un cache dont le comportement est identique à la version d'avant, mettre ces paramètres à 1.
(2) le port d'interruption est maintenant un tableau dépendant du nombre de processeur.
Voir le fichier "platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp" pour plus de détails.

--Cette ligne, et les suivantes ci-dessous, seront ignorées--

M platforms/tsarv4_dspin_generic_32/tsarv4_dspin_generic_32_top.cpp
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/segmentation.h
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/default.cfg
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/gen_config.sh
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/dhrystone/dhry21a.c
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/define.h
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/matrix_multiplication/matrix_multiplication.c
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/common/common.c
A platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/self_code_modifying
A platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/self_code_modifying/self_code_modifying.c
A platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/self_code_modifying/self_code_modifying.h
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/benchmark/benchmark.h
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/benchmark/benchmark_sort.c
A platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/benchmark/benchmark_self_code_modifying.c
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/benchmark/benchmark.c
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/benchmark/benchmark_matrix_multiplication.c
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/Makefile
M platforms/caba-ring-ccxcachev4_memcachev4-mips32el/Makefile
M platforms/tsarv4_vgmn_generic_32/tsarv4_vgmn_generic_32_top.cpp
M modules/vci_cc_xcache_wrapper_v4/caba/source/include/vci_cc_xcache_wrapper_v4.h
M modules/vci_cc_xcache_wrapper_v4/caba/source/src/vci_cc_xcache_wrapper_v4.cpp
M modules/vci_mem_cache_v4/caba/source/include/vci_mem_cache_v4.h
M modules/vci_mem_cache_v4/caba/source/include/mem_cache_directory_v4.h
M modules/vci_mem_cache_v4/caba/source/src/vci_mem_cache_v4.cpp

File:

• trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/benchmark/benchmark.c (modified) (1 diff)

trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/soft/benchmark/benchmark.c

@@ -6 +6 @@
 void benchmark (void)
 {
-  /* if(procnum() != 0) */
-  /*   EXIT(0); */
-
-  int result = 0;
+  int result      = 0;
+  int num_cpu     = procnum();
   int cycle_begin = cycle_begin = cpu_cycles();
-
-  switch (procnum())
-    {
-    default :
-      {
+  
+  if (num_cpu < BENCHMARK_NB_THREAD)
+   switch (num_cpu)
+     {
+     default :
+        {
 #if BENCHMARK_MATRIX_MULTIPLICATION_MT
-        int result_mm_mt = benchmark_matrix_multiplication_mt();
-        result += result_mm_mt;
+          int result_mm_mt = benchmark_matrix_multiplication_mt();
+          result += result_mm_mt;
 #endif
 #if BENCHMARK_DHRYSTONE
-        int result_dhrystone = benchmark_dhrystone();
-        result += result_dhrystone;
+          int result_dhrystone = benchmark_dhrystone();
+          result += result_dhrystone;
 #endif
-#if BENCHMARK_SORT
-        int result_sort = benchmark_sort();
-        result += result_sort;
+#if BENCHMARK_SORT_ALL
+          int result_sort_all = benchmark_sort_all();
+          result += result_sort_all;
+#endif
+#if BENCHMARK_SORT_BUBBLE
+          int result_sort_bubble = benchmark_sort_bubble();
+          result += result_sort_bubble;
+#endif
+#if BENCHMARK_SORT_INSERTION
+          int result_sort_insertion = benchmark_sort_insertion();
+          result += result_sort_insertion;
+#endif
+#if BENCHMARK_SORT_SELECTION
+          int result_sort_selection = benchmark_sort_selection();
+          result += result_sort_selection;
+#endif
+#if BENCHMARK_SORT_SHELL
+          int result_sort_shell = benchmark_sort_shell();
+          result += result_sort_shell;
 #endif
 #if BENCHMARK_MATRIX_MULTIPLICATION_ST
-        int result_mm_st = benchmark_matrix_multiplication_st();
-        result += result_mm_st;
+          int result_mm_st = benchmark_matrix_multiplication_st();
+          result += result_mm_st;
 #endif
-
-        printf("\n");
-        printf("--------------------------------\n");
-        printf( "Partial results :\n");
+#if BENCHMARK_SELF_CODE_MODIFYING
+          int result_self_code_modifying = benchmark_self_code_modifying();
+          result += result_self_code_modifying;
+#endif
+          
+          printf("\n");
+          printf("--------------------------------\n");
+          printf( "Partial results :\n");
 #if BENCHMARK_MATRIX_MULTIPLICATION_MT
-        printf(" * MM MT           : %d\n",result_mm_mt);
+          printf(" * MM MT               : %d\n",result_mm_mt);
 #endif
 #if BENCHMARK_DHRYSTONE
-        printf(" * DHRYSTONE       : %d\n",result_dhrystone);
+          printf(" * DHRYSTONE           : %d\n",result_dhrystone);
 #endif
-#if BENCHMARK_SORT
-        printf(" * SORT            : %d\n",result_sort);
+#if BENCHMARK_SORT_ALL
+          printf(" * SORT_ALL            : %d\n",result_sort_all);
+#endif
+#if BENCHMARK_SORT_BUBBLE
+          printf(" * SORT_BUBBLE         : %d\n",result_sort_bubble);
+#endif
+#if BENCHMARK_SORT_INSERTION
+          printf(" * SORT_INSERTION      : %d\n",result_sort_insertion);
+#endif
+#if BENCHMARK_SORT_SELECTION
+          printf(" * SORT_SELECTION      : %d\n",result_sort_selection);
+#endif
+#if BENCHMARK_SORT_SHELL
+          printf(" * SORT_SHELL          : %d\n",result_sort_shell);
 #endif
 #if BENCHMARK_MATRIX_MULTIPLICATION_ST
-        printf(" * MM ST           : %d\n",result_mm_st);
+          printf(" * MM ST               : %d\n",result_mm_st);
 #endif 
-        printf("--------------------------------\n");
-       break;
+#if BENCHMARK_SELF_CODE_MODIFYING
+          printf(" * SELF_CODE_MODIFYING : %d\n",result_self_code_modifying);
+#endif
+          printf("--------------------------------\n");
+          break;
+        }
       }
-    }
 
   printf("\n");