[#93434] Remove generate blocks and genvars

Signed-off-by: Artur Bieniek <abieniek@antmicro.com>

Author: ArturBieniek4

source/BodyRemover.cpp

@@ -22,6 +22,16 @@ class BodyRemover : public OneTimeRewriter<BodyRemover> {
         removeChildList(node, node.items);
         return VISIT_CHILDREN;
     }
+
+    ShouldVisitChildren handle(const GenerateBlockSyntax& node, bool isNodeRemovable) {
+        removeNode(node, isNodeRemovable);
+        return VISIT_CHILDREN;
+    }
+
+    ShouldVisitChildren handle(const GenerateRegionSyntax& node, bool isNodeRemovable) {
+        removeNode(node, isNodeRemovable);
+        return VISIT_CHILDREN;
+    }
 };
 
 template bool rewriteLoop<BodyRemover>(std::shared_ptr<SyntaxTree>& tree,

source/MemberRemover.cpp

@@ -13,6 +13,11 @@ class MemberRemover : public OneTimeRewriter<MemberRemover> {
         return VISIT_CHILDREN;
     }
 
+    ShouldVisitChildren handle(const GenvarDeclarationSyntax& node, bool isNodeRemovable) {
+        removeNode(node, isNodeRemovable);
+        return DONT_VISIT_CHILDREN;
+    }
+
     ShouldVisitChildren handle(const StructUnionMemberSyntax& node, bool isNodeRemovable) {
         removeNode(node, isNodeRemovable);
         return DONT_VISIT_CHILDREN;

tests/Makefile

@@ -8,7 +8,7 @@ test_dont_abort_after_err:
 test: test_short test_caliptra test_comment_dir test_tricky_missing_newline test_irremovable_verilator_config test_comment_dir2
 
 .PHONY: test_short
-test_short: test_short_exit0 test_truncator test_short_exit1 test_short_grep test_short_verilator_errmsg test_short_multi_file_verilator_errmsg test_short_multi_file_flag_y_verilator_errmsg test_short_multi_file_flag_f_verilator_errmsg
+test_short: test_short_exit0 test_truncator test_short_exit1 test_short_grep test_short_verilator_errmsg test_short_multi_file_verilator_errmsg test_short_multi_file_flag_y_verilator_errmsg test_short_multi_file_flag_f_verilator_errmsg test_generate
 
 .PHONY: test_short_exit0
 test_short_exit0:
@@ -47,6 +47,10 @@ test_short_multi_file_flag_f_verilator_errmsg:
 test_short_exit1:
 	@./run_test short_exit1 checkexit1.sh ${INPUT_DIR}/short_in.sv
 
+.PHONY: test_generate
+test_generate:
+	@./run_test generate checkverilator_run_finish.sh ${INPUT_DIR}/generate.sv
+
 .PHONY: test_short_grep
 test_short_grep:
 	@./run_test short_grep checkgrep.sh ${INPUT_DIR}/short_in.sv

tests/golden/generate/sv-bugpoint-combined.sv

@@ -0,0 +1,5 @@
+module t;
+    initial begin
+        $finish;
+    end
+endmodule

tests/golden/short_multifile_flag_f_verilator_errmsg/sv-bugpoint-combined.sv

@@ -3,8 +3,6 @@ typedef struct {
 } struct_foo;
 module serial_adder #() ();
     wire [32:0] m;
-    generate
-    endgenerate
     struct_foo foo = '{5,m};
     assign foo.c = 0;
 endmodule

tests/golden/short_multifile_flag_y_verilator_errmsg/sv-bugpoint-combined.sv

@@ -3,8 +3,6 @@ typedef struct {
 } struct_foo;
 module serial_adder #() ();
     wire [32:0] m;
-    generate
-    endgenerate
     struct_foo foo = '{5,m};
     assign foo.c = 0;
 endmodule

tests/golden/short_multifile_verilator_errmsg/sv-bugpoint-combined.sv

@@ -3,8 +3,6 @@ typedef struct {
 } struct_foo;
 module serial_adder #() ();
     wire [32:0] m;
-    generate
-    endgenerate
     struct_foo foo = '{5,m};
     assign foo.c = 0;
 endmodule

tests/golden/short_verilator_errmsg/sv-bugpoint-combined.sv

@@ -3,8 +3,6 @@ typedef struct {
 } struct_foo;
 module serial_adder #() ();
     wire [32:0] m;
-    generate
-    endgenerate
     struct_foo foo = '{5,m};
     assign foo.c = 0;
 endmodule

tests/input_files/generate.sv

@@ -0,0 +1,8 @@
+module t;
+    genvar i;
+    generate
+    endgenerate
+    initial begin
+        $finish;
+    end
+endmodule