Added "test_autotb -n <num_iter>" option

diff --git a/passes/tests/test_autotb.cc b/passes/tests/test_autotb.cc
index f121089b1037511860a26cfed304539faf67bb15..844bcbc9c0b616b1b20a18e650b312805a2d54e9 100644 (file)
--- a/passes/tests/test_autotb.cc
+++ b/passes/tests/test_autotb.cc
@@ -17,12 +17,12 @@
  *
  */
 
-#include "kernel/register.h"
-#include "kernel/log.h"
+#include "kernel/yosys.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <time.h>
 
-#define NUM_ITER 1000
+PRIVATE_NAMESPACE_BEGIN
 
 static std::string id(std::string internal_id)
 {
@@ -70,7 +70,7 @@ static std::string idy(std::string str1, std::string str2 = std::string(), std::
        return id(str1);
 }
 
-static void autotest(FILE *f, RTLIL::Design *design)
+static void autotest(FILE *f, RTLIL::Design *design, int num_iter)
 {
        fprintf(f, "module testbench;\n\n");
 
@@ -79,7 +79,7 @@ static void autotest(FILE *f, RTLIL::Design *design)
        fprintf(f, "reg [31:0] xorshift128_x = 123456789;\n");
        fprintf(f, "reg [31:0] xorshift128_y = 362436069;\n");
        fprintf(f, "reg [31:0] xorshift128_z = 521288629;\n");
-       fprintf(f, "reg [31:0] xorshift128_w = 88675123;\n");
+       fprintf(f, "reg [31:0] xorshift128_w = %u; // <-- seed value\n", int(time(NULL)));
        fprintf(f, "reg [31:0] xorshift128_t;\n\n");
        fprintf(f, "task xorshift128;\n");
        fprintf(f, "begin\n");
@@ -279,7 +279,7 @@ static void autotest(FILE *f, RTLIL::Design *design)
                fprintf(f, "begin\n");
                fprintf(f, "\t$display(\"#OUT#\\n#OUT# ==== %s ====\");\n", idy(mod->name).c_str());
                fprintf(f, "\t%s;\n", idy(mod->name, "reset").c_str());
-               fprintf(f, "\tfor (i=0; i<%d; i=i+1) begin\n", NUM_ITER);
+               fprintf(f, "\tfor (i=0; i<%d; i=i+1) begin\n", num_iter);
                fprintf(f, "\t\tif (i %% 20 == 0) %s;\n", idy(mod->name, "print_header").c_str());
                fprintf(f, "\t\t#100; %s;\n", idy(mod->name, "update_data").c_str());
                fprintf(f, "\t\t#100; %s;\n", idy(mod->name, "update_clock").c_str());
@@ -307,7 +307,7 @@ struct TestAutotbBackend : public Backend {
        {
                //   |---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|---v---|
                log("\n");
-               log("    test_autotb [filename]\n");
+               log("    test_autotb [options] [filename]\n");
                log("\n");
                log("Automatically create primitive verilog test benches for all modules in the\n");
                log("design. The generated testbenches toggle the input pins of the module in\n");
@@ -324,12 +324,30 @@ struct TestAutotbBackend : public Backend {
                log("value after initialization. This can e.g. be used to force a reset signal\n");
                log("low in order to explore more inner states in a state machine.\n");
                log("\n");
+               log("    -n <int>\n");
+               log("        number of iterations the test bench shuld run (default = 1000)\n");
+               log("\n");
        }
        virtual void execute(FILE *&f, std::string filename, std::vector<std::string> args, RTLIL::Design *design)
        {
+               int num_iter = 1000;
+
                log_header("Executing TEST_AUTOTB backend (auto-generate pseudo-random test benches).\n");
-               extra_args(f, filename, args, 1);
-               autotest(f, design);
+
+               int argidx;
+               for (argidx = 1; argidx < SIZE(args); argidx++)
+               {
+                       if (args[argidx] == "-n" && argidx+1 < SIZE(args)) {
+                               num_iter = atoi(args[++argidx].c_str());
+                               continue;
+                       }
+                       break;
+               }
+
+               extra_args(f, filename, args, argidx);
+               autotest(f, design, num_iter);
        }
 } TestAutotbBackend;
  
+PRIVATE_NAMESPACE_END
+

diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh
index 781dc16713b77be3922446ea67caca91d9a6d880..2d97e46fd8e24dcccab42a500b396df2c347c8e3 100755 (executable)
--- a/tests/tools/autotest.sh
+++ b/tests/tools/autotest.sh
@@ -9,6 +9,7 @@ keeprunning=false
 makejmode=false
 frontend="verilog"
 backend_opts="-noattr -noexpr"
+autotb_opts=""
 scriptfiles=""
 scriptopt=""
 toolsdir="$(cd $(dirname $0); pwd)"
@@ -18,7 +19,7 @@ if [ ! -f $toolsdir/cmp_tbdata -o $toolsdir/cmp_tbdata.c -nt $toolsdir/cmp_tbdat
        ( set -ex;  gcc -Wall -o $toolsdir/cmp_tbdata $toolsdir/cmp_tbdata.c; ) || exit 1
 fi
 
-while getopts xmGl:wkjvrf:s:p: opt; do
+while getopts xmGl:wkjvrf:s:p:n: opt; do
        case "$opt" in
                x)
                        use_xsim=true ;;
@@ -45,6 +46,8 @@ while getopts xmGl:wkjvrf:s:p: opt; do
                        scriptfiles="$scriptfiles $OPTARG" ;;
                p)
                        scriptopt="$OPTARG" ;;
+               n)
+                       autotb_opts="$autotb_opts -n $OPTARG" ;;
                *)
                        echo "Usage: $0 [-x|-m] [-w] [-k] [-j] [-v] [-r] [-l libs] [-f frontend] [-s script] [-p cmdstring] verilog-files\n" >&2
                        exit 1
@@ -102,7 +105,7 @@ do
                cd ${bn}.out
                cp ../$fn $fn
                if [ ! -f ../${bn}_tb.v ]; then
-                       "$toolsdir"/../../yosys -b test_autotb -o ${bn}_tb.v $fn
+                       "$toolsdir"/../../yosys -b "test_autotb $autotb_opts" -o ${bn}_tb.v $fn
                else
                        cp ../${bn}_tb.v ${bn}_tb.v
                fi