Changes between Version 5 and Version 6 of MjpegCourse/ClusteredNoirqMulti

Timestamp:

Mar 17, 2009, 9:08:22 AM (16 years ago)

Author:

Nicolas Pouillon

Comment:

--

MjpegCourse/ClusteredNoirqMulti

@@ -7 +7 @@
 
 def _cluster(arch, no,
-                         with_gdb,
                          ncpu, nram,
                          icache_lines, icache_words,
-                         dcache_lines, dcache_words):
+                         dcache_lines, dcache_words,
+                         with_gdb = False ):
         crossbar = arch.create('caba:vci_local_crossbar', 'lc%d'%no)
 
@@ -17 +17 @@
                 arch.cpu_num += 1
                 if with_gdb:
-                        mips = arch.create('caba:iss_wrapper', 'mips%d_%d'%(no,i), iss_t='common:gdb_iss', gdb_iss_t = 'common:mipsel', ident = cn)
+                        proc = dict( iss_t='common:gdb_iss', gdb_iss_t = 'common:mips32el' )
                 else:
-                        mips = arch.create('caba:iss_wrapper', 'mips%d_%d'%(no,i), iss_t='common:mipsel', ident = cn)
-                xcache = arch.create('caba:vci_xcache', 'xcache%d_%d'%(no,i),
-                                                   icache_lines = icache_lines,
+                        proc = dict( iss_t='common:mips32el' )
+                cpu = arch.create('caba:vci_xcache_wrapper', 'cpu%d_%d'%(no,i),
+                                                   ident = cn,
+                                                   icache_sets = icache_lines,
                                                    icache_words = icache_words,
-                                                   dcache_lines = dcache_lines,
-                                                   dcache_words = dcache_words)
-                mips.dcache // xcache.dcache
-                mips.icache // xcache.icache
+                                                   icache_ways = 1,
+                                                   dcache_sets = dcache_lines,
+                                                   dcache_words = dcache_words,
+                                                   dcache_ways = 1,
+                                                   **proc )
 
-                crossbar.to_initiator.new() // xcache.vci
+                crossbar.to_initiator.new() // cpu.vci
 
         for i in range(nram):
@@ -42 +44 @@
 
 def ClusteredNoirqMulti(
-        nbcpu = [1],
-        nbram = [1],
+        cpu_count = [1],
+        ram_count = [1],
         min_latency = 10,
         with_gdb = False,
@@ -52 +54 @@
         arch = soclib.Architecture(
                                                  cell_size = 4,
-                                                 plen_size = 1,
+                                                 plen_size = 9,
                                                  addr_size = 32,
                                                  rerror_size = 1,
@@ -69 +71 @@
                           srcid_bits = [4,4],
                           cacheability_mask = 0xc00000)
-        arch.create('common:elf_loader', 'loader')
+        arch.create('common:loader', 'loader')
 
         vgmn = arch.create('caba:vci_vgmn', 'vgmn0', min_latency = min_latency, fifo_depth = 8)
 
-        for no, ncpu, nram in zip(range(len(nbcpu)), nbcpu, nbram):
+        for no, (ncpu, nram) in enumerate(zip(cpu_count, ram_count)):
                 lc = _cluster(
                         arch, no,