Changeset 140 for trunk/platforms/tsarv4_vgmn_generic_32/tsarv4_vgmn_generic_32_top.cpp

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/tsarv4_vgmn_generic_32/tsarv4_vgmn_generic_32_top.cpp (modified) (4 diffs)

trunk/platforms/tsarv4_vgmn_generic_32/tsarv4_vgmn_generic_32_top.cpp

@@ -372 +372 @@
    
     // IRQ signals (one signal per proc)
-    sc_signal<bool>***  signal_proc_it =
-        alloc_elems<sc_signal<bool> >("signal_proc_it", xmax, ymax, nprocs);
+    sc_signal<bool>**** signal_proc_it =
+      alloc_elems<sc_signal<bool> >("signal_proc_it", 1,xmax, ymax, nprocs);
 
     sc_signal<bool>*    signal_irq_mtty = 
@@ -539 +539 @@
                     IntTab(cluster(x,y), PROC_SRCID+p),         // SRCID_C
                     IntTab(cluster(x,y), PROC_SRCID+p),         // TGTID_C
+                    1,1,
                     4,64,16,4,64,16                             // Icache and Dcache sizes
                     ,4,8,16
@@ -715 +716 @@
                 proc[x][y][p]->p_vci_ini_c              (signal_vci_ini_c_proc[x][y][p]);
                 proc[x][y][p]->p_vci_tgt                (signal_vci_tgt_c_proc[x][y][p]);
-                proc[x][y][p]->p_irq[0]                 (signal_proc_it[x][y][p]);
+                proc[x][y][p]->p_irq[0][0]              (signal_proc_it[0][x][y][p]);
                 for ( size_t j = 1 ; j < 6 ; j++ )
                 {
-                    proc[x][y][p]->p_irq[j]             (signal_false); 
+                    proc[x][y][p]->p_irq[0][j]          (signal_false); 
                 }
             }
@@ -728 +729 @@
             for ( size_t p = 0 ; p < nprocs ; p++ )
             {
-                xicu[x][y]->p_irq[p]                    (signal_proc_it[x][y][p]);
+                xicu[x][y]->p_irq[p]                    (signal_proc_it[0][x][y][p]);
             }