Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Invalid verilog generated with constant idx into ROM #733

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/main/scala/Verilog.scala
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,18 @@ class VerilogBackend extends Backend {

def emitDecReg(node: Node): String = emitDecBase(node, "reg ")

def emitDecRom( node : ROMRead ) : String = {
if ( node.inputs.size == 2 &&
node.inputs(0).isInstanceOf[Literal] &&
node.inputs(1).isInstanceOf[ROMData]
) {
val idx = node.inputs(0).asInstanceOf[Literal].value.toInt
val litNode = node.inputs(1).asInstanceOf[ROMData].sparseLits(idx)
s" reg ${emitWidth(node)} ${emitRef(node)} = ${emitRef(litNode)};\n"
} else
emitDecReg( node )
}

override def emitDec(node: Node): String = {
val gotWidth = node.needWidth()
val res =
Expand All @@ -331,8 +343,8 @@ class VerilogBackend extends Backend {
case _: Sprintf =>
emitDecReg(node)

case _: ROMRead =>
emitDecReg(node)
case r: ROMRead =>
emitDecRom(r)

case m: Mem[_] if !m.isInline => ""
case m: Mem[_] =>
Expand Down
25 changes: 25 additions & 0 deletions src/test/resources/VecSuite_UserMod_1.v
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module VecSuite_UserMod_1(
input [3:0] io_in,
output[3:0] io_out
);

reg [3:0] T0 = 4'h5;


assign io_out = T0;
always @(*) case (2'h2)
0: T0 = 4'h3;
1: T0 = 4'h1;
2: T0 = 4'h5;
3: T0 = 4'h8;
default: begin
T0 = 4'bx;
`ifndef SYNTHESIS
// synthesis translate_off
T0 = {1{$random}};
// synthesis translate_on
`endif
end
endcase
endmodule

23 changes: 23 additions & 0 deletions src/test/scala/VecApp.scala
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,27 @@ class VecSuite extends TestSuite {
assertFalse(ChiselError.hasErrors)

}

@Test def constVecTest {
class UserMod( testCond : Boolean ) extends Module {
val io = new Bundle {
val in = UInt( INPUT, 4 )
val out = UInt( OUTPUT, 4 )
}
val myVec = Vec( List( UInt( 3, 4 ), UInt( 1, 4 ), UInt( 5, 4 ), UInt( 8, 4 ) ) )
val idx = {
if ( testCond )
UInt( 2, 4 )
else
io.in
}
io.out := myVec(idx)
}

chiselMain(Array[String]("--backend", "v",
"--targetDir", dir.getPath.toString()),
() => Module(new UserMod(true)))
assertFile("VecSuite_UserMod_1.v")
}

}