Fix input sampling of clocking block signals (#6788)

src/V3AssertPre.cpp

@@ -267,11 +267,14 @@ private:
             AstVarRef* const refp = new AstVarRef{flp, varp, VAccess::WRITE};
             refp->user1(true);
             if (skewp->num().is1Step()) {
-                // Assign the sampled expression to the clockvar (IEEE 1800-2023 14.13)
+                // #1step means the value that is sampled is always the signal's last value
+                // before the clock edge (IEEE 1800-2023 14.4)
                 AstSampled* const sampledp = new AstSampled{flp, exprp->cloneTreePure(false)};
                 sampledp->dtypeFrom(exprp);
-                AstAssignW* const ap = new AstAssignW{flp, refp, sampledp};
+                AstAssign* const assignp = new AstAssign{flp, refp, sampledp};
-                m_clockingp->addNextHere(new AstAlways{ap});
+                m_clockingp->addNextHere(new AstAlways{
+                    flp, VAlwaysKwd::ALWAYS,
+                    new AstSenTree{flp, m_clockingp->sensesp()->cloneTree(false)}, assignp});
             } else if (skewp->isZero()) {
                 // #0 means the var has to be sampled in Observed (IEEE 1800-2023 14.13)
                 AstAssign* const assignp = new AstAssign{flp, refp, exprp->cloneTreePure(false)};

test_regress/t/t_clocking_inout.v

@@ -27,7 +27,7 @@ module t;
 
        #1
        if (foo != 0 || cb.foo != 0) $stop;
-       if (cb.bar != 1) $stop;
+       if (cb.bar == 1) $stop;
 
        @(posedge foo)
        if ($time != 7) $stop;

test_regress/t/t_clocking_input_0_delay.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2025 by Wilson Snyder. This program is free software; you
+# can redistribute it and/or modify it under the terms of either the GNU
+# Lesser General Public License Version 3 or the Perl Artistic License
+# Version 2.0.
+# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
+
+import vltest_bootstrap
+
+test.scenarios('simulator')
+
+test.compile(verilator_flags2=["--binary"], make_main=False)
+
+test.execute()
+
+test.passes()

test_regress/t/t_clocking_input_0_delay.v

@@ -0,0 +1,33 @@
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed under the Creative Commons Public Domain, for
+// any use, without warranty, 2025 by Antmicro.
+// SPDX-License-Identifier: CC0-1.0
+
+`timescale 1ms/1ns
+module t;
+  bit clk = 0;
+  bit data = 1;
+  bit cb_data;
+
+  initial forever #5 clk = ~clk;
+  assign cb_data = cb.data;
+  clocking cb @(posedge clk);
+    input #0 data;
+  endclocking
+
+  initial begin
+    @(posedge clk) data = 0;
+  end
+
+  initial begin
+    #4
+    if (data != 1) $stop;
+    if (cb.data != 0) $stop;
+    #1;
+    #1step;
+    if(cb.data != 0) $stop;
+    $write("*-* All Finished *-*\n");
+    $finish;
+  end
+endmodule

test_regress/t/t_clocking_input_default.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python3
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2025 by Wilson Snyder. This program is free software; you
+# can redistribute it and/or modify it under the terms of either the GNU
+# Lesser General Public License Version 3 or the Perl Artistic License
+# Version 2.0.
+# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
+
+import vltest_bootstrap
+
+test.scenarios('simulator')
+
+test.compile(verilator_flags2=["--binary"], make_main=False)
+
+test.execute()
+
+test.passes()

test_regress/t/t_clocking_input_default.v

@@ -0,0 +1,33 @@
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed under the Creative Commons Public Domain, for
+// any use, without warranty, 2025 by Antmicro.
+// SPDX-License-Identifier: CC0-1.0
+
+`timescale 1ms/1ns
+module t;
+  bit clk = 0;
+  bit data = 1;
+  bit cb_data;
+
+  initial forever #5 clk = ~clk;
+  assign cb_data = cb.data;
+  clocking cb @(posedge clk);
+    input data;
+  endclocking
+
+  initial begin
+    @(posedge clk) data = 0;
+  end
+
+  initial begin
+    #4
+    if(data != 1 ) $stop;
+    if(cb.data != 0) $stop;
+    #1;
+    #1step;
+    if(cb.data != 1) $stop;
+    $write("*-* All Finished *-*\n");
+    $finish;
+  end
+endmodule

test_regress/t/t_clocking_virtual.v

@@ -29,8 +29,8 @@ module main;
       if (t.mod0.io != 1'b1) $stop;
       if (t.mod1.cb.io != 1'b0) $stop;
       #1
-      if (t.mod0.cb.io != 1'b1) $stop;
+      if (t.mod0.cb.io != 1'b0) $stop;
-      if (t.mod1.cb.io != 1'b1) $stop;
+      if (t.mod1.cb.io != 1'b0) $stop;
       if (t.mod1.cb.inp != 1'b1) $stop;
       #8;
       t.mod0.inp = 1'b0;