Skip to content

Commit 929f3bb

Browse files
committed
[Infra]: - remove constant output drivers in mcml
- fix multiple conflicting drivers error in boundtop Signed-off-by: Seyed Alireza Damghani <[email protected]>
1 parent 17a768b commit 929f3bb

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

ODIN_II/regression_test/benchmark/verilog/full/mcml.v

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,7 +1776,7 @@ wire [31:0] dont_care_out;
17761776

17771777
assign const_zero = 1'b0;
17781778
assign const_zero_data = 32'b00000000000000000000000000000000;
1779-
assign dont_care_out = 32'b00000000000000000000000000000000;
1779+
// assign dont_care_out = 32'b00000000000000000000000000000000;
17801780

17811781
defparam dpram1.ADDR_WIDTH = 13;
17821782
defparam dpram1.DATA_WIDTH = 32;
@@ -1813,7 +1813,7 @@ wire [31:0] dont_care_out;
18131813

18141814
assign const_zero = 1'b0;
18151815
assign const_zero_data = 32'b00000000000000000000000000000000;
1816-
assign dont_care_out = 32'b00000000000000000000000000000000;
1816+
// assign dont_care_out = 32'b00000000000000000000000000000000;
18171817

18181818
defparam dpram1.ADDR_WIDTH = 13;
18191819
defparam dpram1.DATA_WIDTH = 32;
@@ -1850,7 +1850,7 @@ wire [31:0] dont_care_out;
18501850

18511851
assign const_zero = 1'b0;
18521852
assign const_zero_data = 32'b00000000000000000000000000000000;
1853-
assign dont_care_out = 32'b00000000000000000000000000000000;
1853+
// assign dont_care_out = 32'b00000000000000000000000000000000;
18541854

18551855
defparam dpram1.ADDR_WIDTH = 13;
18561856
defparam dpram1.DATA_WIDTH = 32;
@@ -1887,7 +1887,7 @@ wire [31:0] dont_care_out;
18871887

18881888
assign const_zero = 1'b0;
18891889
assign const_zero_data = 32'b00000000000000000000000000000000;
1890-
assign dont_care_out = 32'b00000000000000000000000000000000;
1890+
// assign dont_care_out = 32'b00000000000000000000000000000000;
18911891

18921892
defparam dpram1.ADDR_WIDTH = 13;
18931893
defparam dpram1.DATA_WIDTH = 32;
@@ -1923,7 +1923,7 @@ wire [35:0] dont_care_out;
19231923

19241924
assign const_zero = 1'b0;
19251925
assign const_zero_data = 36'b000000000000000000000000000000000000;
1926-
assign dont_care_out = 36'b000000000000000000000000000000000000;
1926+
// assign dont_care_out = 36'b000000000000000000000000000000000000;
19271927

19281928
defparam dpram1.ADDR_WIDTH = 16;
19291929
defparam dpram1.DATA_WIDTH = 36;
@@ -1959,7 +1959,7 @@ wire [17:0] dont_care_out;
19591959

19601960
assign const_zero = 1'b0;
19611961
assign const_zero_data = 18'b000000000000000000;
1962-
assign dont_care_out = 18'b000000000000000000;
1962+
// assign dont_care_out = 18'b000000000000000000;
19631963

19641964
defparam dpram1.ADDR_WIDTH = 16;
19651965
defparam dpram1.DATA_WIDTH = 18;
@@ -1995,7 +1995,7 @@ wire [7:0] dont_care_out;
19951995

19961996
assign const_zero = 1'b0;
19971997
assign const_zero_data = 8'b00000000;
1998-
assign dont_care_out = 8'b00000000;
1998+
// assign dont_care_out = 8'b00000000;
19991999

20002000
defparam dpram1.ADDR_WIDTH = 16;
20012001
defparam dpram1.DATA_WIDTH = 8;

vtr_flow/benchmarks/verilog/boundtop.v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ wire[63:0] tldata;
222222
resultinterface ri (t1i, t2i, t3i, u1i, u2i, u3i, v1i, v2i, v3i, id1i, id2i, id3i, hit1i, hit2i, hit3i, resultid, newresult, resultready, resultdata, pglobalreset, tm3_clk_v0);
223223
rayinterface rayint (raygroupout, raygroupwe, raygroupid, enablenear, rgData, rgAddr, rgWE, rgAddrValid, rgDone, raydata, rayaddr, raywe, pglobalreset, tm3_clk_v0);
224224
boundcontroller boundcont01(raygroupout01, raygroupwe01, raygroupid01, enablenear01, raygroup01, raygroupvalid01, busy01, triIDvalid01, triID01, wanttriID, reset01, baseaddress01, newresult, BoundNodeID01, resultid, hitmask01, dataready01, empty01, level01, boundnodeIDout01, ack01, lhreset01, addrind01, addrindvalid01, ostdata, ostdatavalid, tladdr01, tladdrvalid01, tldata, tldatavalid, t1i, t2i, t3i, u1i, u2i, u3i, v1i, v2i, v3i, id1i, id2i, id3i, hit1i, hit2i, hit3i, t1_01, t2_01, t3_01, u1_01, u2_01, u3_01, v1_01, v2_01, v3_01, id1_01, id2_01, id3_01, hit1_01, hit2_01, hit3_01, bcvalid01, done, cntreset01, passCTS01, passCTS10, pglobalreset, tm3_clk_v0, state01, debugsubcount01, debugcount01);
225-
boundcontroller boundcont10(raygroupout10, raygroupwe10, raygroupid10, enablenear10, raygroup10, raygroupvalid10, busy10, triIDvalid10, triID10, wanttriID, reset10, baseaddress10, newresult, BoundNodeID10, resultid, hitmask10, dataready10, empty10, level10, boundnodeIDout10, ack10, lhreset10, addrind10, addrindvalid10, ostdata, ostdatavalid, tladdr10, tladdrvalid10, tldata, tldatavalid, t1i, t2i, t3i, u1i, u2i, u3i, v1i, v2i, v3i, id1i, id2i, id3i, hit1i, hit2i, hit3i, t1_10, t2_10, t3_10, u1_10, u2_10, u3_10, v1_10, v2_10, v3_10, id1_10, id2_10, id3_10, hit1_10, hit2_10, hit3_10, bcvalid10, done, cntreset10, passCTS10, passCTS01, pglobalreset, tm3_clk_v0, state10, debugsubcount10, debugcount01);
225+
boundcontroller boundcont10(raygroupout10, raygroupwe10, raygroupid10, enablenear10, raygroup10, raygroupvalid10, busy10, triIDvalid10, triID10, wanttriID, reset10, baseaddress10, newresult, BoundNodeID10, resultid, hitmask10, dataready10, empty10, level10, boundnodeIDout10, ack10, lhreset10, addrind10, addrindvalid10, ostdata, ostdatavalid, tladdr10, tladdrvalid10, tldata, tldatavalid, t1i, t2i, t3i, u1i, u2i, u3i, v1i, v2i, v3i, id1i, id2i, id3i, hit1i, hit2i, hit3i, t1_10, t2_10, t3_10, u1_10, u2_10, u3_10, v1_10, v2_10, v3_10, id1_10, id2_10, id3_10, hit1_10, hit2_10, hit3_10, bcvalid10, done, cntreset10, passCTS10, passCTS01, pglobalreset, tm3_clk_v0, state10, debugsubcount10, debugcount10);
226226
resulttransmit restransinst (bcvalid01, bcvalid10, id1_01, id2_01, id3_01, id1_10, id2_10, id3_10, hit1_01, hit2_01, hit3_01, hit1_10, hit2_10, hit3_10, u1_01, u2_01, u3_01, v1_01, v2_01, v3_01, u1_10, u2_10, u3_10, v1_10, v2_10, v3_10, rgResultData, rgResultReady, rgResultSource, pglobalreset, tm3_clk_v0);
227227

228228
assign raygroupout = raygroupout01 | raygroupout10 ;

vtr_flow/benchmarks/verilog/mcml.v

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,7 +1776,7 @@ wire [31:0] dont_care_out;
17761776

17771777
assign const_zero = 1'b0;
17781778
assign const_zero_data = 32'b00000000000000000000000000000000;
1779-
assign dont_care_out = 32'b00000000000000000000000000000000;
1779+
// assign dont_care_out = 32'b00000000000000000000000000000000;
17801780

17811781
defparam dpram1.ADDR_WIDTH = 13;
17821782
defparam dpram1.DATA_WIDTH = 32;
@@ -1813,7 +1813,7 @@ wire [31:0] dont_care_out;
18131813

18141814
assign const_zero = 1'b0;
18151815
assign const_zero_data = 32'b00000000000000000000000000000000;
1816-
assign dont_care_out = 32'b00000000000000000000000000000000;
1816+
// assign dont_care_out = 32'b00000000000000000000000000000000;
18171817

18181818
defparam dpram1.ADDR_WIDTH = 13;
18191819
defparam dpram1.DATA_WIDTH = 32;
@@ -1850,7 +1850,7 @@ wire [31:0] dont_care_out;
18501850

18511851
assign const_zero = 1'b0;
18521852
assign const_zero_data = 32'b00000000000000000000000000000000;
1853-
assign dont_care_out = 32'b00000000000000000000000000000000;
1853+
// assign dont_care_out = 32'b00000000000000000000000000000000;
18541854

18551855
defparam dpram1.ADDR_WIDTH = 13;
18561856
defparam dpram1.DATA_WIDTH = 32;
@@ -1887,7 +1887,7 @@ wire [31:0] dont_care_out;
18871887

18881888
assign const_zero = 1'b0;
18891889
assign const_zero_data = 32'b00000000000000000000000000000000;
1890-
assign dont_care_out = 32'b00000000000000000000000000000000;
1890+
// assign dont_care_out = 32'b00000000000000000000000000000000;
18911891

18921892
defparam dpram1.ADDR_WIDTH = 13;
18931893
defparam dpram1.DATA_WIDTH = 32;
@@ -1923,7 +1923,7 @@ wire [35:0] dont_care_out;
19231923

19241924
assign const_zero = 1'b0;
19251925
assign const_zero_data = 36'b000000000000000000000000000000000000;
1926-
assign dont_care_out = 36'b000000000000000000000000000000000000;
1926+
// assign dont_care_out = 36'b000000000000000000000000000000000000;
19271927

19281928
defparam dpram1.ADDR_WIDTH = 16;
19291929
defparam dpram1.DATA_WIDTH = 36;
@@ -1959,7 +1959,7 @@ wire [17:0] dont_care_out;
19591959

19601960
assign const_zero = 1'b0;
19611961
assign const_zero_data = 18'b000000000000000000;
1962-
assign dont_care_out = 18'b000000000000000000;
1962+
// assign dont_care_out = 18'b000000000000000000;
19631963

19641964
defparam dpram1.ADDR_WIDTH = 16;
19651965
defparam dpram1.DATA_WIDTH = 18;
@@ -1995,7 +1995,7 @@ wire [7:0] dont_care_out;
19951995

19961996
assign const_zero = 1'b0;
19971997
assign const_zero_data = 8'b00000000;
1998-
assign dont_care_out = 8'b00000000;
1998+
// assign dont_care_out = 8'b00000000;
19991999

20002000
defparam dpram1.ADDR_WIDTH = 16;
20012001
defparam dpram1.DATA_WIDTH = 8;

0 commit comments

Comments
 (0)