From bbf89c4dc68475b57709897ab0728e31963a1ddb Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Fri, 2 Jan 2015 13:59:47 +0100
Subject: Progress in memory_bram

---
 tests/bram/generate.py   | 17 ++++++-----------
 tests/bram/run-single.sh |  5 ++++-
 tests/bram/run-test.sh   |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'tests')

diff --git a/tests/bram/generate.py b/tests/bram/generate.py
index 37b23a52..b03d1529 100644
--- a/tests/bram/generate.py
+++ b/tests/bram/generate.py
@@ -15,10 +15,6 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
         dbits  = random.randrange(1, 8)
         groups = random.randrange(1, 5)
 
-        # XXX
-        init = 0
-        groups = 2
-
         if random.randrange(2):
             abits = 2 ** random.randrange(1, 4)
         if random.randrange(2):
@@ -32,12 +28,10 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
         clkpol = [ random.randrange(4) for i in range(groups) ]
 
         # XXX
-        ports  = [ 1 for i in range(groups) ]
-        wrmode = [ 1 for i in range(groups) ]
+        init = 0
         transp = [ 0 for i in range(groups) ]
         clocks = [ 1 for i in range(groups) ]
         clkpol = [ 1 for i in range(groups) ]
-        wrmode[0] = 0
 
         for p1 in range(groups):
             if wrmode[p1] == 0:
@@ -187,7 +181,7 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
 
     if debug_mode:
         print("    $dumpfile(`vcd_file);", file=tb_f)
-        print("    $dumpvars(2, bram_%02d_%02d_tb);" % (k1, k2), file=tb_f)
+        print("    $dumpvars(0, bram_%02d_%02d_tb);" % (k1, k2), file=tb_f)
 
     for p in (tb_clocks + tb_addr + tb_din):
         if p[-2:] == "EN":
@@ -205,13 +199,14 @@ def create_bram(dsc_f, sim_f, ref_f, tb_f, k1, k2):
         if len(tb_clocks):
             c = random.choice(tb_clocks)
             print("    %s = !%s;" % (c, c), file=tb_f)
+        print("    #100;", file=tb_f)
+        print("    $display(\"bram_%02d_%02d %3d: %%b %%b %%s\", %s, %s, error ? \"ERROR\" : \"OK\");" %
+                (k1, k2, i, expr_dout, expr_dout_ref), file=tb_f)
         for p in tb_din:
             print("    %s <= %d;" % (p, random.randrange(1048576)), file=tb_f)
         for p in tb_addr:
             print("    %s <= %d;" % (p, random.choice(tb_addrlist)), file=tb_f)
-        print("    #1000;", file=tb_f)
-        print("    $display(\"bram_%02d_%02d %3d: %%b %%b %%s\", %s, %s, error ? \"ERROR\" : \"OK\");" %
-                (k1, k2, i, expr_dout, expr_dout_ref), file=tb_f)
+        print("    #900;", file=tb_f)
 
     print("  end", file=tb_f)
     print("endmodule", file=tb_f)
diff --git a/tests/bram/run-single.sh b/tests/bram/run-single.sh
index 254e8518..8a022e59 100644
--- a/tests/bram/run-single.sh
+++ b/tests/bram/run-single.sh
@@ -5,5 +5,8 @@ set -e
 iverilog -Dvcd_file=\"temp/tb_${1}_${2}.vcd\" -o temp/tb_${1}_${2}.tb temp/brams_${1}_tb.v temp/brams_${1}_ref.v \
 		temp/synth_${1}_${2}.v temp/brams_${2}.v ../../techlibs/common/simlib.v
 temp/tb_${1}_${2}.tb > temp/tb_${1}_${2}.txt
-if grep -H -C1 ERROR temp/tb_${1}_${2}.txt; then exit 1; fi
+if grep -q ERROR temp/tb_${1}_${2}.txt; then
+	grep -HC2 ERROR temp/tb_${1}_${2}.txt | head
+	exit 1
+fi
 exit 0
diff --git a/tests/bram/run-test.sh b/tests/bram/run-test.sh
index 68523740..cdf7d61b 100755
--- a/tests/bram/run-test.sh
+++ b/tests/bram/run-test.sh
@@ -21,7 +21,7 @@ python generate.py
 	for j in $( ls temp/brams_*.txt | sed 's,.*_,,; s,\..*,,;' | grep -v $i ); do
 		echo "temp/job_${i}_${j}.ok:"
 		echo "	@bash run-single.sh ${i} ${j}"
-		echo "	@echo 'Passed test ${i}_${j}.'"
+		echo "	@echo 'Passed memory_bram test ${i}_${j}.'"
 		echo "	@touch \$@"
 	done; done
 } > temp/makefile
-- 
cgit v1.2.3