From 98c2cf1dc64b43eb19d22753e508cc4079e0ca17 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 23 Mar 2026 09:16:08 +0100 Subject: [PATCH] Convert realmath --- tests/Makefile | 2 +- tests/realmath/.gitignore | 2 +- .../realmath/{generate.py => generate_mk.py} | 48 ++++++++++++------- tests/realmath/run-test.sh | 36 -------------- 4 files changed, 33 insertions(+), 55 deletions(-) rename tests/realmath/{generate.py => generate_mk.py} (77%) delete mode 100755 tests/realmath/run-test.sh diff --git a/tests/Makefile b/tests/Makefile index 48ea1774f..63551ecaa 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -56,7 +56,7 @@ MK_TEST_DIRS += ./simple MK_TEST_DIRS += ./simple_abc9 MK_TEST_DIRS += ./hana MK_TEST_DIRS += ./asicworld -#SH_TEST_DIRS += ./realmath +MK_TEST_DIRS += ./realmath MK_TEST_DIRS += ./share MK_TEST_DIRS += ./opt_share MK_TEST_DIRS += ./fsm diff --git a/tests/realmath/.gitignore b/tests/realmath/.gitignore index 9c595a6fb..941856205 100644 --- a/tests/realmath/.gitignore +++ b/tests/realmath/.gitignore @@ -1 +1 @@ -temp +uut_* diff --git a/tests/realmath/generate.py b/tests/realmath/generate_mk.py similarity index 77% rename from tests/realmath/generate.py rename to tests/realmath/generate_mk.py index 2bedf38e4..b56340335 100644 --- a/tests/realmath/generate.py +++ b/tests/realmath/generate_mk.py @@ -1,17 +1,12 @@ #!/usr/bin/env python3 +import sys +sys.path.append("..") +import gen_tests_makefile import argparse import sys import random -from contextlib import contextmanager -@contextmanager -def redirect_stdout(new_target): - old_target, sys.stdout = sys.stdout, new_target - try: - yield new_target - finally: - sys.stdout = old_target def random_expression(depth = 3, maxparam = 0): def recursion(): @@ -42,13 +37,15 @@ parser.add_argument('-S', '--seed', type = int, help = 'seed for PRNG') parser.add_argument('-c', '--count', type = int, default = 100, help = 'number of test cases to generate') args = parser.parse_args() -if args.seed is not None: - print("PRNG seed: %d" % args.seed) - random.seed(args.seed) +seed = args.seed +if seed is None: + seed = random.randrange(sys.maxsize) +print("realmath PRNG seed: %d" % seed) +random.seed(seed) for idx in range(args.count): - with open('temp/uut_%05d.v' % idx, 'w') as f: - with redirect_stdout(f): + with open('uut_%05d.v' % idx, 'w') as f: + with gen_tests_makefile.redirect_stdout(f): print('module uut_%05d(output [63:0] %s);\n' % (idx, ', '.join(['y%02d' % i for i in range(100)]))) for i in range(30): if idx < 10: @@ -63,13 +60,13 @@ for idx in range(args.count): for i in range(100): print('assign y%02d = 65536 * (%s);' % (i, random_expression(maxparam = 60))) print('endmodule') - with open('temp/uut_%05d.ys' % idx, 'w') as f: - with redirect_stdout(f): + with open('uut_%05d.ys' % idx, 'w') as f: + with gen_tests_makefile.redirect_stdout(f): print('read_verilog uut_%05d.v' % idx) print('rename uut_%05d uut_%05d_syn' % (idx, idx)) print('write_verilog uut_%05d_syn.v' % idx) - with open('temp/uut_%05d_tb.v' % idx, 'w') as f: - with redirect_stdout(f): + with open('uut_%05d_tb.v' % idx, 'w') as f: + with gen_tests_makefile.redirect_stdout(f): print('module uut_%05d_tb;\n' % idx) print('wire [63:0] %s;' % (', '.join(['r%02d' % i for i in range(100)]))) print('wire [63:0] %s;' % (', '.join(['s%02d' % i for i in range(100)]))) @@ -99,3 +96,20 @@ for idx in range(args.count): print('end') print('endmodule') + +def create_tests(): + for idx in range(args.count): + cmd = [ + f"$(YOSYS) -qq uut_{idx:05d}.ys >/dev/null 2>&1 &&", + f"iverilog -o uut_{idx:05d}_tb uut_{idx:05d}_tb.v uut_{idx:05d}.v uut_{idx:05d}_syn.v >/dev/null 2>&1 &&", + f"./uut_{idx:05d}_tb" +# f"./uut_{idx:05d}_tb | tee uut_{idx:05d}.err;", +# f"if test -s uut_{idx:05d}.err; then", +# " echo \"Note: Make sure that iverilog is an up-to-date git checkout of Icarus Verilog.\";", +# " exit 1;", +# "fi;", +# f"rm -f uut_{idx:05d}.err" + ] + gen_tests_makefile.generate_cmd_test(f"uut_{idx:05d}", cmd) + +gen_tests_makefile.generate_custom(create_tests) diff --git a/tests/realmath/run-test.sh b/tests/realmath/run-test.sh deleted file mode 100755 index 918c93a9f..000000000 --- a/tests/realmath/run-test.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bash -set -e - -OPTIND=1 -count=100 -seed="" # default to no seed specified -while getopts "c:S:" opt -do - case "$opt" in - c) count="$OPTARG" ;; - S) seed="-S $OPTARG" ;; - esac -done -shift "$((OPTIND-1))" - -rm -rf temp -mkdir -p temp -echo "generating tests.." -python3 generate.py -c $count $seed - -cd temp -echo "running tests.." -for ((i = 0; i < $count; i++)); do - echo -n "[$i]" - idx=$( printf "%05d" $i ) - ../../../yosys -qq uut_${idx}.ys >/dev/null 2>&1 - iverilog -o uut_${idx}_tb uut_${idx}_tb.v uut_${idx}.v uut_${idx}_syn.v >/dev/null 2>&1 - ./uut_${idx}_tb | tee uut_${idx}.err - if test -s uut_${idx}.err; then - echo "Note: Make sure that 'iverilog' is an up-to-date git checkout of Icarus Verilog." - exit 1 - fi - rm -f uut_${idx}.err -done -echo -