From 25f5db4b5f7840c7d1623fac39f0fbb64c456d72 Mon Sep 17 00:00:00 2001
From: Geza Lore <gezalore@gmail.com>
Date: Sat, 13 Jul 2024 12:35:09 +0100
Subject: [PATCH] DFG: Allow inlining of variabels driven from forced vars
 (#5259)

Not sure why this was disabled before, but it seems legal to me to
change

'forced A' -> 'B' -> 'C'

into

'forced A' -> 'B',
'forced A' -> 'C'

Fixes #5249
---
 src/V3DfgPasses.cpp                   |  9 +++------
 test_regress/t/t_dfg_inline_forced.pl | 17 +++++++++++++++++
 test_regress/t/t_dfg_inline_forced.v  | 24 ++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100755 test_regress/t/t_dfg_inline_forced.pl
 create mode 100644 test_regress/t/t_dfg_inline_forced.v

diff --git a/src/V3DfgPasses.cpp b/src/V3DfgPasses.cpp
index 7bef17718..d67642e8c 100644
--- a/src/V3DfgPasses.cpp
+++ b/src/V3DfgPasses.cpp
@@ -160,13 +160,10 @@ void V3DfgPasses::inlineVars(DfgGraph& dfg) {
                 DfgVertex* const driverp = varp->source(0);
 
                 // We must keep the original driver in certain cases, when swapping them would
-                // not be functionally or technically (implementation reasons) equivalent
+                // not be functionally or technically (implementation reasons) equivalent:
+                // 1. If driven from a SystemC variable (assignment is non-trivial)
                 if (DfgVertexVar* const driverVarp = driverp->cast<DfgVarPacked>()) {
-                    const AstVar* const astVarp = driverVarp->varp();
-                    // If driven from a SystemC variable
-                    if (astVarp->isSc()) continue;
-                    // If the variable is forced
-                    if (astVarp->isForced()) continue;
+                    if (driverVarp->varp()->isSc()) continue;
                 }
 
                 varp->forEachSinkEdge([=](DfgEdge& edge) { edge.relinkSource(driverp); });
diff --git a/test_regress/t/t_dfg_inline_forced.pl b/test_regress/t/t_dfg_inline_forced.pl
new file mode 100755
index 000000000..3d5530ff3
--- /dev/null
+++ b/test_regress/t/t_dfg_inline_forced.pl
@@ -0,0 +1,17 @@
+#!/usr/bin/env perl
+if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; }
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2024 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
+
+scenarios(vlt => 1);
+
+compile(
+    );
+
+ok(1);
+1;
diff --git a/test_regress/t/t_dfg_inline_forced.v b/test_regress/t/t_dfg_inline_forced.v
new file mode 100644
index 000000000..7ba47864f
--- /dev/null
+++ b/test_regress/t/t_dfg_inline_forced.v
@@ -0,0 +1,24 @@
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed under the Creative Commons Public Domain, for
+// any use, without warranty, 2024 by Wilson Snyder.
+// SPDX-License-Identifier: CC0-1.0
+
+module top(input wire clk);
+
+    logic [1:0][31:0] i;
+    logic o;
+
+    always @(posedge clk) begin
+        force i = 64'hFFFFFFFF_FFFFFFFF;
+    end
+
+    sub sub_i(.i(i), .o(o));
+endmodule
+
+module sub (
+    input  logic [63:0] i,
+    output logic o
+);
+    assign o = |i;
+endmodule