Merge pull request #3804 from alainmarcel/alainmarcel-patch-1

task stop point
chipsalliance · Aug 23, 2023 · c1a4152 · c1a4152
2 parents f5ca5d0 + 83918cd
commit c1a4152
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 88 deletions.
diff --git a/src/DesignCompile/DesignElaboration.cpp b/src/DesignCompile/DesignElaboration.cpp
@@ -843,7 +843,8 @@ void DesignElaboration::elaborateInstance_(
       VObjectType::paBind_directive,
       VObjectType::paGenerate_region,
       VObjectType::paGenerate_begin_end_block,
-      VObjectType::paFunction_declaration};
+      VObjectType::paFunction_declaration,
+      VObjectType::paTask_declaration};
 
   std::vector<NodeId> subInstances =
       fC->sl_collect_all(nodeId, types, stopPoints);

diff --git a/tests/PpLppdr/PpLppdr.log b/tests/PpLppdr/PpLppdr.log
@@ -109,7 +109,7 @@ AST_DEBUG_END
 
 [NTE:EL0510] Nb instances: 1.
 
-[NTE:EL0511] Nb leaf instances: 0.
+[NTE:EL0511] Nb leaf instances: 1.
 
 [INF:UH0706] Creating UHDM Model...
 

diff --git a/tests/TaskDeclNoOrder/TaskDeclNoOrder.log b/tests/TaskDeclNoOrder/TaskDeclNoOrder.log
@@ -234,7 +234,7 @@ AST_DEBUG_END
 
 [NTE:EL0510] Nb instances: 1.
 
-[NTE:EL0511] Nb leaf instances: 0.
+[NTE:EL0511] Nb leaf instances: 1.
 
 [INF:UH0706] Creating UHDM Model...
 

diff --git a/tests/TaskDecls/TaskDecls.log b/tests/TaskDecls/TaskDecls.log
@@ -512,7 +512,7 @@ AST_DEBUG_END
 
 [NTE:EL0510] Nb instances: 1.
 
-[NTE:EL0511] Nb leaf instances: 0.
+[NTE:EL0511] Nb leaf instances: 1.
 
 [INF:UH0706] Creating UHDM Model...
 

diff --git a/third_party/tests/CoresSweRVMP/CoresSweRVMP.log b/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
@@ -134,17 +134,17 @@ CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
 -- Configuring done (0.0s)
 -- Generating done (0.0s)
 -- Build files have been written to: ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_preprocess
-[  6%] Generating 10_lsu_bus_intf.sv
-[ 12%] Generating 12_beh_lib.sv
+[  6%] Generating 12_beh_lib.sv
+[ 12%] Generating 11_ifu_bp_ctl.sv
 [ 18%] Generating 13_ifu_mem_ctl.sv
-[ 25%] Generating 11_ifu_bp_ctl.sv
+[ 31%] Generating 10_lsu_bus_intf.sv
 [ 31%] Generating 14_mem_lib.sv
 [ 37%] Generating 15_exu.sv
 [ 43%] Generating 16_dec_decode_ctl.sv
 [ 50%] Generating 1_lsu_stbuf.sv
 [ 56%] Generating 2_ahb_to_axi4.sv
-[ 62%] Generating 3_rvjtag_tap.sv
-[ 68%] Generating 4_dec_tlu_ctl.sv
+[ 62%] Generating 4_dec_tlu_ctl.sv
+[ 68%] Generating 3_rvjtag_tap.sv
 [ 75%] Generating 5_lsu_bus_buffer.sv
 [ 81%] Generating 6_dbg.sv
 [ 87%] Generating 7_axi4_to_ahb.sv

diff --git a/third_party/tests/Scoreboard/Scoreboard.log b/third_party/tests/Scoreboard/Scoreboard.log
@@ -776,7 +776,7 @@ PARSER CACHE USED FOR: ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/uvm_pkg.sv
 
 [NTE:EL0510] Nb instances: 1.
 
-[NTE:EL0511] Nb leaf instances: 0.
+[NTE:EL0511] Nb leaf instances: 1.
 
 [INF:UH0706] Creating UHDM Model...
 

diff --git a/third_party/tests/SimpleParserTest/SimpleParserTest.log b/third_party/tests/SimpleParserTest/SimpleParserTest.log
@@ -98,7 +98,7 @@ there are 1 more instances of this message.
 
 [NTE:EL0510] Nb instances: 22.
 
-[NTE:EL0511] Nb leaf instances: 12.
+[NTE:EL0511] Nb leaf instances: 13.
 
 [WRN:EL0512] Nb undefined modules: 1.
 

diff --git a/third_party/tests/UVMSwitch/UVMSwitch.log b/third_party/tests/UVMSwitch/UVMSwitch.log
@@ -6266,25 +6266,15 @@ Instance tree:
 [TOP] work@top work@top
 [SCO] [email protected] [email protected]
 [SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
 [I/F] work@mem_interface [email protected]_intf
 [I/F] work@input_interface [email protected]_intf
 [I/F] work@output_interface [email protected]_intf[0]
 [I/F] work@output_interface [email protected]_intf[1]
 [I/F] work@output_interface [email protected]_intf[2]
 [I/F] work@output_interface [email protected]_intf[3]
 [I/F] work@output_interface [email protected]_intf[4]
-[SCO] work@top.genblk9 work@top.genblk9
+[SCO] work@top.genblk3 work@top.genblk3
 [MOD] work@switch [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
 [SCO] [email protected] [email protected]
 [SCO] [email protected] [email protected]
 [SCO] [email protected] [email protected]
@@ -6298,13 +6288,6 @@ Instance tree:
 [SCO] [email protected] [email protected]
 [SCO] [email protected]_core [email protected]_core
 [SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
 [SCO] [email protected] [email protected]
 [SCO] [email protected] [email protected]
 [SCO] [email protected] [email protected]
@@ -6320,9 +6303,6 @@ Instance tree:
 [SCO] [email protected]_core.genblk4 [email protected]_core.genblk4
 [SCO] [email protected]_core.genblk5 [email protected]_core.genblk5
 [SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
-[SCO] [email protected] [email protected]
 [SCO] [email protected] [email protected]
 [SCO] [email protected] [email protected]
 [SCO] [email protected] [email protected]
@@ -6370,19 +6350,7 @@ Instance tree:
 
 [NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_deprecated_defines.svh:139:3: Scope "[email protected]".
 
-[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/Sequence.sv:22:17: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/Sequence.sv:41:17: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/Driver.sv:47:17: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/Driver.sv:79:38: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/Driver.sv:103:10: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/Receiver.sv:45:10: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/top.sv:37:7: Scope "[email protected]".
+[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/top.sv:37:7: Scope "[email protected]".
 
 [NTE:EL0524] ${SURELOG_DIR}/third_party/tests/UVMSwitch/top.sv:45:5: Interface Instance "[email protected]_intf".
 
@@ -6398,18 +6366,10 @@ Instance tree:
 
 [NTE:EL0524] ${SURELOG_DIR}/third_party/tests/UVMSwitch/top.sv:57:5: Interface Instance "[email protected]_intf[4]".
 
-[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/top.sv:66:9: Scope "work@top.genblk9".
+[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/top.sv:66:9: Scope "work@top.genblk3".
 
 [NTE:EL0523] ${SURELOG_DIR}/third_party/tests/UVMSwitch/top.sv:79:1: Instance "[email protected]".
 
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_sequence_defines.svh:200:3: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_sequence_defines.svh:200:3: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_sequence_defines.svh:200:3: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/Receiver.sv:47:10: Scope "[email protected]".
-
 [NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/rtl.sv:8:302: Scope "[email protected]".
 
 [NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/rtl.sv:10:260: Scope "[email protected]".
@@ -6436,20 +6396,6 @@ Instance tree:
 
 [NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/rtl.sv:30:1: Scope "[email protected]".
 
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_sequence_defines.svh:147:3: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_sequence_defines.svh:204:117: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_sequence_defines.svh:147:3: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_sequence_defines.svh:204:117: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_sequence_defines.svh:147:3: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_sequence_defines.svh:204:131: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/Receiver.sv:58:14: Scope "[email protected]".
-
 [NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/rtl.sv:10:370: Scope "[email protected]".
 
 [NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/rtl.sv:11:265: Scope "[email protected]".
@@ -6480,12 +6426,6 @@ Instance tree:
 
 [NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/rtl.sv:33:1: Scope "[email protected]".
 
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_message_defines.svh:130:4: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_message_defines.svh:130:4: Scope "[email protected]".
-
-[NTE:EL0522] ${SURELOG_DIR}/third_party/UVM/uvm-1.2/src/macros/uvm_message_defines.svh:130:4: Scope "[email protected]".
-
 [NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/rtl.sv:11:47: Scope "[email protected]".
 
 [NTE:EL0522] ${SURELOG_DIR}/third_party/tests/UVMSwitch/rtl.sv:11:516: Scope "[email protected]".
@@ -6669,4 +6609,4 @@ while_stmt                                           109
 [ SYNTAX] : 0
 [  ERROR] : 2
 [WARNING] : 10
-[   NOTE] : 101
+[   NOTE] : 81
diff --git a/third_party/tests/YosysIce40/YosysIce40.log b/third_party/tests/YosysIce40/YosysIce40.log
@@ -521,25 +521,25 @@ there are 5 more instances of this message.
 
 [INF:EL0526] Design Elaboration...
 
-[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:655:11: Compile generate block "[email protected].genblk2".
+[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:655:11: Compile generate block "[email protected].genblk1".
 
-[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:656:3: Compile generate block "[email protected].genblk2.genblk1".
+[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:656:3: Compile generate block "[email protected].genblk1.genblk1".
 
-[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:676:3: Compile generate block "[email protected].genblk3".
+[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:676:3: Compile generate block "[email protected].genblk2".
 
-[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:1604:3: Compile generate block "[email protected].genblk15".
+[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:1604:3: Compile generate block "[email protected].genblk14".
 
-[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:669:3: Compile generate block "work@picorv32_axi.picorv32_core.genblk2".
+[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:669:3: Compile generate block "work@picorv32_axi.picorv32_core.genblk1".
 
-[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:689:3: Compile generate block "work@picorv32_axi.picorv32_core.genblk3".
+[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:689:3: Compile generate block "work@picorv32_axi.picorv32_core.genblk2".
 
-[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:1604:3: Compile generate block "work@picorv32_axi.picorv32_core.genblk15".
+[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:1604:3: Compile generate block "work@picorv32_axi.picorv32_core.genblk14".
 
-[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:669:3: Compile generate block "work@picorv32_wb.picorv32_core.genblk2".
+[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:669:3: Compile generate block "work@picorv32_wb.picorv32_core.genblk1".
 
-[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:689:3: Compile generate block "work@picorv32_wb.picorv32_core.genblk3".
+[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:689:3: Compile generate block "work@picorv32_wb.picorv32_core.genblk2".
 
-[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:1604:3: Compile generate block "work@picorv32_wb.picorv32_core.genblk15".
+[INF:CP0335] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:1604:3: Compile generate block "work@picorv32_wb.picorv32_core.genblk14".
 
 [NTE:EL0503] ${SURELOG_DIR}/third_party/tests/YosysIce40/design01.v:26:1: Top level module "work@top".
 
@@ -600,7 +600,7 @@ there are 5 more instances of this message.
 
 [NTE:EL0508] Nb Top level modules: 25.
 
-[NTE:EL0509] Max instance depth: 6.
+[NTE:EL0509] Max instance depth: 5.
 
 [NTE:EL0510] Nb instances: 50.
 
@@ -636,8 +636,8 @@ for_stmt                                               2
 function                                               9
 gen_if_else                                            4
 gen_region                                             4
-gen_scope                                             20
-gen_scope_array                                       20
+gen_scope                                             19
+gen_scope_array                                       19
 if_else                                              182
 if_stmt                                              445
 indexed_part_select                                    4