scope refactoring: adding modules definitions to VCD trace

hw/rtl/VX_scope.vh

@@ -1,4 +1,3 @@
-
 `ifndef VX_SCOPE
 `define VX_SCOPE
 
@@ -6,86 +5,76 @@
 
 `include "scope-defs.vh"
 
-`define SCOPE_ASSIGN(d,s) \
-    `IGNORE_WARNINGS_BEGIN \
-    assign d = s \
-    `IGNORE_WARNINGS_END
+`define SCOPE_ASSIGN(d,s) assign d = s
 
 `else
 
-`define SCOPE_SIGNALS_ISTAGE_TOP_IO
-`define SCOPE_SIGNALS_ISTAGE_TOP_BIND
-`define SCOPE_SIGNALS_ISTAGE_CLUSTER_IO
-`define SCOPE_SIGNALS_ISTAGE_CLUSTER_BIND
-`define SCOPE_SIGNALS_ISTAGE_IO
-`define SCOPE_SIGNALS_ISTAGE_BIND
-`define SCOPE_SIGNALS_ISTAGE_CLUSTER_SELECT(__i__)
-`define SCOPE_SIGNALS_ISTAGE_SELECT(__i__)
-`define SCOPE_SIGNALS_LSU_TOP_IO
-`define SCOPE_SIGNALS_LSU_TOP_BIND
-`define SCOPE_SIGNALS_LSU_CLUSTER_IO
-`define SCOPE_SIGNALS_LSU_CLUSTER_BIND
-`define SCOPE_SIGNALS_LSU_IO
-`define SCOPE_SIGNALS_LSU_BIND
-`define SCOPE_SIGNALS_LSU_CLUSTER_SELECT(__i__)
-`define SCOPE_SIGNALS_LSU_SELECT(__i__)
-`define SCOPE_SIGNALS_ISSUE_TOP_IO
-`define SCOPE_SIGNALS_ISSUE_TOP_BIND
-`define SCOPE_SIGNALS_ISSUE_CLUSTER_IO
-`define SCOPE_SIGNALS_ISSUE_CLUSTER_BIND
-`define SCOPE_SIGNALS_ISSUE_IO
-`define SCOPE_SIGNALS_ISSUE_BIND
-`define SCOPE_SIGNALS_ISSUE_CLUSTER_SELECT(__i__)
-`define SCOPE_SIGNALS_ISSUE_SELECT(__i__)
-`define SCOPE_SIGNALS_EXECUTE_TOP_IO
-`define SCOPE_SIGNALS_EXECUTE_TOP_BIND
-`define SCOPE_SIGNALS_EXECUTE_CLUSTER_IO
-`define SCOPE_SIGNALS_EXECUTE_CLUSTER_BIND
-`define SCOPE_SIGNALS_EXECUTE_IO
-`define SCOPE_SIGNALS_EXECUTE_BIND
-`define SCOPE_SIGNALS_EXECUTE_CLUSTER_SELECT(__i__)
-`define SCOPE_SIGNALS_EXECUTE_SELECT(__i__)
-`define SCOPE_SIGNALS_BANK_L3_TOP_IO
-`define SCOPE_SIGNALS_BANK_L3_TOP_BIND
-`define SCOPE_SIGNALS_BANK_L2_TOP_IO
-`define SCOPE_SIGNALS_BANK_L2_TOP_BIND
-`define SCOPE_SIGNALS_BANK_L1D_TOP_IO
-`define SCOPE_SIGNALS_BANK_L1D_TOP_BIND
-`define SCOPE_SIGNALS_BANK_L1I_TOP_IO
-`define SCOPE_SIGNALS_BANK_L1I_TOP_BIND
-`define SCOPE_SIGNALS_BANK_L1S_TOP_IO
-`define SCOPE_SIGNALS_BANK_L1S_TOP_BIND
-`define SCOPE_SIGNALS_BANK_L2_CLUSTER_IO
-`define SCOPE_SIGNALS_BANK_L2_CLUSTER_BIND
-`define SCOPE_SIGNALS_BANK_L1D_CLUSTER_IO
-`define SCOPE_SIGNALS_BANK_L1D_CLUSTER_BIND
-`define SCOPE_SIGNALS_BANK_L1I_CLUSTER_IO
-`define SCOPE_SIGNALS_BANK_L1I_CLUSTER_BIND
-`define SCOPE_SIGNALS_BANK_L1S_CLUSTER_IO
-`define SCOPE_SIGNALS_BANK_L1S_CLUSTER_BIND
-`define SCOPE_SIGNALS_BANK_L1D_CORE_IO
-`define SCOPE_SIGNALS_BANK_L1D_CORE_BIND
-`define SCOPE_SIGNALS_BANK_L1I_CORE_IO
-`define SCOPE_SIGNALS_BANK_L1I_CORE_BIND
-`define SCOPE_SIGNALS_BANK_L1S_CORE_IO
-`define SCOPE_SIGNALS_BANK_L1S_CORE_BIND
-`define SCOPE_SIGNALS_BANK_CACHE_IO
-`define SCOPE_SIGNALS_BANK_CACHE_BIND
-`define SCOPE_SIGNALS_BANK_IO
-`define SCOPE_SIGNALS_BANK_BIND
-`define SCOPE_SIGNALS_BANK_L2_CLUSTER_SELECT(__i__)
-`define SCOPE_SIGNALS_BANK_L1D_CLUSTER_SELECT(__i__)
-`define SCOPE_SIGNALS_BANK_L1I_CLUSTER_SELECT(__i__)
-`define SCOPE_SIGNALS_BANK_L1S_CLUSTER_SELECT(__i__)
-`define SCOPE_SIGNALS_BANK_L1D_CORE_SELECT(__i__)
-`define SCOPE_SIGNALS_BANK_L1I_CORE_SELECT(__i__)
-`define SCOPE_SIGNALS_BANK_L1S_CORE_SELECT(__i__)
-`define SCOPE_SIGNALS_BANK_L3_CACHE_BIND
-`define SCOPE_SIGNALS_BANK_L2_CACHE_BIND
-`define SCOPE_SIGNALS_BANK_L1D_CACHE_BIND
-`define SCOPE_SIGNALS_BANK_L1I_CACHE_BIND
-`define SCOPE_SIGNALS_BANK_L1S_CACHE_BIND
-`define SCOPE_SIGNALS_BANK_SELECT(__i__)
+`define SCOPE_IO_vortex_afu
+
+`define SCOPE_IO_VX_icache_stage
+
+`define SCOPE_IO_VX_fetch
+
+`define SCOPE_BIND_VX_fetch_icache_stage()
+
+`define SCOPE_IO_VX_pipeline
+
+`define SCOPE_BIND_VX_pipeline_fetch()
+
+`define SCOPE_IO_VX_core
+
+`define SCOPE_BIND_VX_core_pipeline()
+
+`define SCOPE_IO_VX_cluster
+
+`define SCOPE_BIND_VX_cluster_core(__i__)
+
+`define SCOPE_IO_Vortex
+
+`define SCOPE_BIND_Vortex_cluster(__i__)
+
+`define SCOPE_BIND_vortex_afu_vortex()
+
+`define SCOPE_IO_VX_lsu_unit
+
+`define SCOPE_IO_VX_execute
+
+`define SCOPE_BIND_VX_execute_lsu_unit()
+
+`define SCOPE_BIND_VX_pipeline_execute()
+
+`define SCOPE_IO_VX_issue
+
+`define SCOPE_BIND_VX_pipeline_issue()
+
+`define SCOPE_IO_VX_bank
+
+`define SCOPE_IO_VX_cache
+
+`define SCOPE_BIND_VX_cache_bank(__i__)
+
+`define SCOPE_BIND_Vortex_l3cache()
+
+`define SCOPE_BIND_VX_cluster_l2cache()
+
+`define SCOPE_IO_VX_mem_unit
+
+`define SCOPE_BIND_VX_mem_unit_dcache()
+
+`define SCOPE_BIND_VX_core_mem_unit()
+
+`define SCOPE_BIND_VX_mem_unit_icache()
+
+`define SCOPE_BIND_VX_mem_unit_smem()
+
+`define SCOPE_DECL_SIGNALS
+
+`define SCOPE_DATA_LIST
+
+`define SCOPE_UPDATE_LIST
+
+`define SCOPE_TRIGGER
+
 `define SCOPE_ASSIGN(d,s)
 
 `endif