(1) Adding auto generated testbench for verilog. (2) Update of the test generator. (3) Update of the Makefile to run test generator.

1 files changed, 40 insertions, 36 deletions

diff --git a/toolruns/Makefile b/toolruns/Makefile
index 835e2b0..64aed4f 100755
--- a/toolruns/Makefile
+++ b/toolruns/Makefile
@@ -2,38 +2,38 @@
 #
 # Makefile
 # --------
-# Makefile for building the modular exponentiation submodules,
-# core and top simulations.
+# Makefile for building the modular exponentiation submodules, core
+# and top simulations.
 #
 #
-# Author: Joachim Strombergson, Peter Magnusson
-# Copyright (c) 2015, NORDUnet A/S All rights reserved.
+# Author: Joachim Strombergson
+# Copyright (c) 2014, Secworks Sweden AB
+# All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-# - Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
 #
-# - Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
 #
-# - Neither the name of the NORDUnet nor the names of its contributors may
-#   be used to endorse or promote products derived from this software
-#   without specific prior written permission.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-# TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 #===================================================================
 
@@ -53,16 +53,16 @@ RESIDUE_SRC = ../src/rtl/residue.v
 MONTPROD_TB = ../src/tb/tb_montprod.v
 MONTPROD_SRC = ../src/rtl/montprod.v
 
-TOP_SRC=../src/rtl/modexp.v $(MONTPROD_SRC) $(RESIDUE_SRC) $(COMMON_SRC)
-TOP_TB=../src/tb/tb_modexp.v
+MODEXP_SRC=../src/rtl/modexp.v $(MONTPROD_SRC) $(RESIDUE_SRC) $(COMMON_SRC)
+MODEXP_TB=../src/tb/tb_modexp.v
 
 
 # Rules.
-all: top.sim montprod.sim residue.sim
+all: modexp.sim montprod.sim residue.sim
 
 
-top.sim: $(TOP_TB) $(TOP_SRC)
-	$(CC) $(CCFLAGS) -o top.sim $(TOP_TB) $(TOP_SRC)
+modexp.sim: $(MODEXP_TB) $(MODEXP_SRC)
+	$(CC) $(CCFLAGS) -o modexp.sim $(MODEXP_TB) $(MODEXP_SRC)
 
 
 montprod.sim: $(MONTPROD_TB) $(MONTPROD_SRC) $(COMMON_SRC)
@@ -73,8 +73,8 @@ residue.sim: $(RESIDUE_TB) $(RESIDUE_SRC) $(COMMON_SRC)
 	$(CC) $(CCFLAGS) -o residue.sim $(RESIDUE_TB) $(RESIDUE_SRC) $(COMMON_SRC)
 
 
-sim-top: top.sim
-	./top.sim
+sim-modexp: modexp.sim
+	./modexp.sim
 
 
 sim-montprod: montprod.sim
@@ -95,12 +95,16 @@ lint:
 	@echo ""
 
 	@echo "Linting of modexp:"
-	$(LINT) $(LINTFLAGS) --top-module modexp $(TOP_SRC)
+	$(LINT) $(LINTFLAGS) --top-module modexp $(MODEXP_SRC)
 	@echo ""
 
 
+autogenerate-tests:
+	javac -cp ../src/testgenerator/src/ -d ../src/testgenerator/bin/ ../src/testgenerator/src/org/crypttech/modexp/testgenerator/TestGenerator.java
+	java -cp ../src/testgenerator/bin/ org.crypttech.modexp.testgenerator.TestGenerator ../src
+
 clean:
-	rm -f top.sim
+	rm -f modexp.sim
 	rm -f montprod.sim
 	rm -f residue.sim
 
@@ -112,7 +116,7 @@ help:
 	@echo "------------------"
 	@echo "all:          Build all simulation targets."
 	@echo "lint:         Lint all modules and hierarchies."
-	@echo "top.sim:      Build top level simulation target."
+	@echo "modexp.sim:   Build modexp simulation target."
 	@echo "montprod.sim: Build Montgomery product simulation target."
 	@echo "residue.sim:  Build Residue calculation simulation target."
 	@echo "sim-top:      Run top level simulation."