Changeset 440 for branches/v5/modules/vci_mem_cache/caba/metadata

Timestamp:

Jul 17, 2013, 9:24:48 AM (11 years ago)

Author:

cfuguet

Message:

Merging branch/v5/vci_mem_cache with trunk modifications to
start the development of new coherence protocol modifications
in this component

Location:

branches/v5/modules/vci_mem_cache

Files:

• . (modified) (1 prop)
• caba/metadata/vci_mem_cache.sd (modified) (3 diffs)

branches/v5/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd

@@ -9 +9 @@
 
         tmpl_parameters = [
-                        parameter.Module('vci_param'  , default = 'caba:vci_param')
-                ],
+            parameter.Module('vci_param_int', default = 'caba:vci_param',
+                cell_size = parameter.Reference('memc_cell_size_int')
+            ),
+            parameter.Module('vci_param_ext', default = 'caba:vci_param',
+                cell_size = parameter.Reference('memc_cell_size_ext')
+            ),
+            parameter.Int('dspin_in_width'),
+            parameter.Int('dspin_out_width'),
+        ],
 
         header_files = [
@@ -19 +26 @@
         ],
 
-        implementation_files = [ '../source/src/vci_mem_cache.cpp' ],
+        interface_files = [
+            '../../include/soclib/mem_cache.h', 
+        ],
+
+        implementation_files = [
+            '../source/src/vci_mem_cache.cpp'
+        ],
 
         uses = [
@@ -27 +40 @@
             Uses('caba:generic_fifo'),
             Uses('caba:generic_llsc_global_table'),
-                        Uses('caba:dspin_dhccp_param')
+            Uses('caba:dspin_dhccp_param')
         ],
 
         ports = [
-            Port( 'caba:vci_target'   , 'p_vci_tgt' ),
-            Port(
-                                'caba:dspin_input',
-                                'p_dspin_in',
-                                dspin_data_size = 33,
-                        ),
-                        Port(
-                                'caba:dspin_output',
-                                'p_dspin_out',
-                                dspin_data_size = 40,
-                        ),
-            Port( 'caba:vci_initiator', 'p_vci_ixr' ),
-            Port( 'caba:bit_in'       , 'p_resetn'  , auto = 'resetn' ),
-            Port( 'caba:clock_in'     , 'p_clk'     , auto = 'clock'  ),
+            Port('caba:clock_in'     , 'p_clk'      , auto = 'clock' ),
+            Port('caba:bit_in'       , 'p_resetn'   , auto = 'resetn'),
+            Port('caba:vci_target'   , 'p_vci_tgt'),
+            Port('caba:vci_initiator', 'p_vci_ixr'),
+            Port('caba:dspin_input',
+                'p_dspin_in',
+                dspin_data_size = parameter.Reference('dspin_in_width')
+            ),
+            Port('caba:dspin_output',
+                'p_dspin_out',
+                dspin_data_size = parameter.Reference('dspin_out_width')
+            ),
         ],
 
         instance_parameters = [
-            parameter.Module( 'mtp', 'common:mapping_table' ),
-            parameter.Module( 'mtc', 'common:mapping_table' ),
-            parameter.Module( 'mtx', 'common:mapping_table' ),
-            parameter.IntTab( 'vci_ixr_index' ),
-            parameter.IntTab( 'vci_ini_index' ),
-            parameter.IntTab( 'vci_tgt_index' ),
-            parameter.IntTab( 'vci_tgt_index_cleanup '),
-            parameter.Int   ( 'nways' ),
-            parameter.Int   ( 'nsets' ),
-            parameter.Int   ( 'nwords' ),
-            parameter.Int   ( 'heap_size' ),
-        ],
-
-        extensions = [
-            'dsx:get_ident='
-            'vci_ini_index:p_vci_ini:mtc,'
-            'vci_tgt_index_cleanup:p_vci_tgt_cleanup:mtc,'
-            'vci_tgt_index:p_vci_tgt:mtp,'
-            'vci_ixr_index:p_vci_ixr:mtx',
-            'dsx:addressable=vci_tgt_index,vci_tgt_index_cleanup',
+            parameter.Module('mtp', 'common:mapping_table'),
+            parameter.Module('mtc', 'common:mapping_table'),
+            parameter.Module('mtx', 'common:mapping_table'),
+            parameter.IntTab('vci_ixr_index'),
+            parameter.IntTab('vci_ini_index'),
+            parameter.IntTab('vci_tgt_index'),
+            parameter.IntTab('vci_tgt_index_cleanup'),
+            parameter.Int   ('nways'),
+            parameter.Int   ('nsets'),
+            parameter.Int   ('nwords'),
+            parameter.Int   ('heap_size'),
         ],
 )