Remove EVENTEXPR and EVENTMT warnings

Signed-off-by: Krzysztof Boronski <[email protected]>
antmicro · Oct 23, 2023 · e7abbeb · e7abbeb
1 parent fd3e1bb
commit e7abbeb
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 141 deletions.
diff --git a/src/V3Error.h b/src/V3Error.h
@@ -98,8 +98,6 @@ class V3ErrorCode final {
         ENDLABEL,       // End lable name mismatch
         ENUMVALUE,      // Error: enum type needs explicit cast
         EOFNEWLINE,     // End-of-file missing newline
-        EVENTEXPR,      // Non-identifier expression used to send an event
-        EVENTMT,        // Dangerous event operation in multithreaded simulation
         GENCLK,         // Generated Clock. Historical, never issued.
         GENUNNAMED,     // Generate unnamed, without label
         HIERBLOCK,      // Ignored hierarchical block setting
@@ -197,7 +195,7 @@ class V3ErrorCode final {
             "CASEINCOMPLETE", "CASEOVERLAP", "CASEWITHX", "CASEX", "CASTCONST", "CDCRSTLOGIC", "CLKDATA",
             "CMPCONST", "COLONPLUS", "COMBDLY", "CONSTRAINTIGN", "CONTASSREG",
             "DECLFILENAME", "DEFPARAM", "DEPRECATED",
-            "ENCAPSULATED", "ENDLABEL", "ENUMVALUE", "EOFNEWLINE", "EVENTEXPR", "EVENTMT", "GENCLK",
+            "ENCAPSULATED", "ENDLABEL", "ENUMVALUE", "EOFNEWLINE", "GENCLK",
             "GENUNNAMED", "HIERBLOCK",
             "IFDEPTH", "IGNOREDRETURN",
             "IMPERFECTSCH", "IMPLICIT", "IMPLICITSTATIC", "IMPORTSTAR", "IMPURE",

diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp
@@ -2269,25 +2269,6 @@ class LinkDotResolveVisitor final : public VNVisitor {
         if (nodep && nodep->isParam()) nodep->usedParam(true);
     }
 
-    static bool isTreeHierarchicalIdentExpr(AstNode* nodep) {
-        while (true) {
-            if (const AstMemberSel* mselp = VN_CAST(nodep, MemberSel)) {
-                nodep = mselp->fromp();
-                continue;
-            }
-            if (const AstSelBit* selbp = VN_CAST(nodep, SelBit)) {
-                if (VN_IS(selbp->bitp(), Const)) {
-                    nodep = selbp->fromp();
-                    continue;
-                } else {
-                    return false;
-                }
-            }
-            break;
-        }
-        return VN_IS(nodep, VarRef);
-    }
-
     // VISITs
     void visit(AstNetlist* nodep) override {
         // Recurse..., backward as must do packages before using packages
@@ -3407,14 +3388,6 @@ class LinkDotResolveVisitor final : public VNVisitor {
         }
         m_ds.m_dotSymp = VL_RESTORER_PREV(m_curSymp);
     }
-    void visit(AstFireEvent* nodep) override {
-        visit(static_cast<AstNodeStmt*>(nodep));
-        if (!isTreeHierarchicalIdentExpr(nodep->operandp())) {
-            nodep->operandp()->v3warn(EVENTEXPR,
-                                      "Non-identifier expression used to reference an event to "
-                                      "be sent. This is not a part of IEEE 1800-2017.");
-        }
-    }
     void visit(AstWith* nodep) override {
         UINFO(5, "   " << nodep << endl);
         checkNoDot(nodep);

diff --git a/src/V3Width.cpp b/src/V3Width.cpp
@@ -4808,11 +4808,6 @@ class WidthVisitor final : public VNVisitor {
         if (nodep->hasDType() && nodep->dtypep()->isEvent()) {
             checkEventAssignement(nodep);
             v3Global.setAssignsEvents();
-            if (v3Global.opt.threads() > 1) {
-                nodep->v3warn(EVENTMT,
-                              "Event assignements might cause issues in multithreaded simulation. "
-                              "Use at your own risk.");
-            }
         }
     }
 

diff --git a/test_regress/t/t_event_control_assign_mt.out b/test_regress/t/t_event_control_assign_mt.out
diff --git a/test_regress/t/t_event_control_assign_mt.pl b/test_regress/t/t_event_control_assign_mt.pl
diff --git a/test_regress/t/t_event_control_assign_mt.v b/test_regress/t/t_event_control_assign_mt.v
diff --git a/test_regress/t/t_event_control_eventexpr_bad.out b/test_regress/t/t_event_control_eventexpr_bad.out
diff --git a/test_regress/t/t_event_control_eventexpr_bad.pl b/test_regress/t/t_event_control_eventexpr_bad.pl
diff --git a/test_regress/t/t_event_control_eventexpr_bad.v b/test_regress/t/t_event_control_eventexpr_bad.v
diff --git a/test_regress/t/t_event_control_pass.pl b/test_regress/t/t_event_control_pass.pl
@@ -11,7 +11,7 @@
 scenarios(simulator => 1);
 
 compile(
-    verilator_flags2 => ["--exe --main --timing -Wno-EVENTEXPR"],
+    verilator_flags2 => ["--exe --main --timing"],
     make_main => 0,
     threads => 1,
     );

diff --git a/test_regress/t/t_uvm_todo.pl b/test_regress/t/t_uvm_todo.pl
@@ -14,7 +14,6 @@
     v_flags2 => ["--timing",
                  "-Wno-PKGNODECL -Wno-IMPLICITSTATIC -Wno-CONSTRAINTIGN -Wno-MISINDENT",
                  "-Wno-CASEINCOMPLETE -Wno-CASTCONST -Wno-SYMRSVDWORD -Wno-WIDTHEXPAND -Wno-WIDTHTRUNC",
-                 "-Wno-EVENTEXPR",
                  "-Wno-REALCVT", # TODO note mostly related to $realtime - could suppress or fix upstream
                  "-Wno-ZERODLY", # TODO issue #4494, add support
                  ],