[#83775] Add a pass that removes labels

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

Author: ArturBieniek4

CMakeLists.txt

@@ -11,7 +11,7 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(slang)
 
-add_executable(sv-bugpoint source/SvBugpoint.cpp source/Utils.cpp source/PairRemovers.cpp source/BodyRemover.cpp
+add_executable(sv-bugpoint source/SvBugpoint.cpp source/Utils.cpp source/PairRemovers.cpp source/BodyRemover.cpp source/LabelRemover.cpp
   source/BodyPartsRemover.cpp source/DeclRemover.cpp source/InstantationRemover.cpp source/BindRemover.cpp source/ModportRemover.cpp source/ContAssignRemover.cpp source/ParamAssignRemover.cpp source/ModuleRemover.cpp
   source/StatementsRemover.cpp source/MemberRemover.cpp source/ImportsRemover.cpp source/TypeSimplifier.cpp)
 

source/LabelRemover.cpp

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+#include "OneTimeRewriter.hpp"
+
+class LabelRemover : public OneTimeRewriter<LabelRemover> {
+   public:
+    ShouldVisitChildren handle(const NamedBlockClauseSyntax& node, bool isNodeRemovable) {
+        removeNode(node, isNodeRemovable);
+        return DONT_VISIT_CHILDREN;
+    }
+};
+
+template bool rewriteLoop<LabelRemover>(std::shared_ptr<SyntaxTree>& tree,
+                                        std::string stageName,
+                                        std::string passIdx,
+                                        SvBugpoint* svBugpoint);

source/OneTimeRewritersFwd.hpp

@@ -7,6 +7,7 @@ using namespace slang::syntax;
 // forward declarations of simple code removers that try to remove nodes one-by-one
 class BodyPartsRemover;
 class BodyRemover;
+class LabelRemover;
 class DeclRemover;
 class StatementsRemover;
 class ImportsRemover;

source/SvBugpoint.cpp

@@ -226,6 +226,7 @@ bool SvBugpoint::pass(const std::string& passIdx) {
         commited |= rewriteLoop(makeStructFieldRemover(tree), tree, "structRemover", passIdx, this);
         commited |= rewriteLoop<ModuleRemover>(tree, "moduleRemover", passIdx, this);
         commited |= rewriteLoop<TypeSimplifier>(tree, "typeSimplifier", passIdx, this);
+        commited |= rewriteLoop<LabelRemover>(tree, "LabelRemover", passIdx, this);
     }
 
     return commited;

tests/Makefile

@@ -52,7 +52,11 @@ test_empty:
 
 .PHONY: test_comment_dir
 test_comment_dir:
-	@./run_test comment_dir checkverilator_run.sh ${INPUT_DIR}/comment_dir_in.sv
+	@./run_test comment_dir checkverilator_run_finish.sh ${INPUT_DIR}/comment_dir_in.sv
+
+.PHONY: test_labels
+test_labels:
+	@./run_test labels checkverilator_run_finish.sh ${INPUT_DIR}/labels.sv
 
 .PHONY: test_caliptra
 test_caliptra: test_caliptra_exit0 test_caliptra_grep

tests/checkverilator_lint.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+verilator --lint-only "$1" || exit 1

tests/checkverilator_run.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+filename=$(basename "$1")
+name="${filename%.*}"
+verilator --binary "$1" > /dev/null 2> /dev/null && timeout 15s "obj_dir/V$name" | grep "Verilog \$finish"