TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-13 23:06:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

improved the vhdl test bench creator

Browse Source
This commit is contained in:
hneemann 2019-07-13 12:08:58 +02:00
parent e152fbbef1
commit e30051936a
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/de/neemann/digital/hdl/vhdl2/VHDLTestBenchCreator.java
View File

@ -69,11 +69,12 @@ public class VHDLTestBenchCreator {
if (p > 0) if (p > 0)
filename = filename.substring(0, p); filename = filename.substring(0, p);
VHDLRenaming renaming = new VHDLRenaming();
for (ElementAttributes tc : testCases) { for (ElementAttributes tc : testCases) {
String testName = tc.getLabel(); String testName = tc.getLabel();
if (testName.length() > 0) if (testName.length() > 0) {
testName = filename + "_" + testName + "_tb"; testName = filename + "_" + renaming.checkName(testName) + "_tb";
else } else
testName = filename + "_tb"; testName = filename + "_tb";
File f = new File(file.getParentFile(), testName + ".vhdl"); File f = new File(file.getParentFile(), testName + ".vhdl");
@ -179,7 +180,12 @@ public class VHDLTestBenchCreator {
.print(" AND patterns(").print(loopVar).print(").").print(p.getName()).print(" = ") .print(" AND patterns(").print(loopVar).print(").").print(p.getName()).print(" = ")
.print(getSimpleValue(p.getBits(), 'Z')) .print(getSimpleValue(p.getBits(), 'Z'))
.print(")").eol(); .print(")").eol();
out.inc().print("report \"wrong value for ").print(p.getName()).print(" ").print(loopVar).print("=\" & integer'image(").print(loopVar).println(") severity error;").dec(); out.inc().print("report \"wrong value for ").print(p.getName()).print(", ").print(loopVar).print("=\" & integer'image(").print(loopVar).println(")")
.print(" & \", expected \"")
.print(" & ").print(convertFunc(p)).print("(patterns(").print(loopVar).print(").").print(p.getName()).print(")")
.print(" & \", found \"")
.print(" & ").print(convertFunc(p)).print("(").print(p.getName()).print(")")
.print(" severity error;").dec();
} }
out.dec().println("end loop;"); out.dec().println("end loop;");
@ -188,6 +194,12 @@ public class VHDLTestBenchCreator {
out.dec().println("end behav;"); out.dec().println("end behav;");
} }
private String convertFunc(HDLPort p) {
if (p.getBits()>1)
return "to_hstring";
return "std_logic'image";
}
private boolean loopVarExists(String loopVar, ArrayList<HDLPort> ports) { private boolean loopVarExists(String loopVar, ArrayList<HDLPort> ports) {
for (HDLPort p : ports) for (HDLPort p : ports)
if (p.getName().equalsIgnoreCase(loopVar)) if (p.getName().equalsIgnoreCase(loopVar))