split out common unit test code

diff --git a/src/add/test_add.py b/src/add/test_add.py
index f752372d3b36796328182a3e1c8e421c6554bbdd..69c5e4775e94117d7080bb947f9c16325c63b8a9 100644 (file)
--- a/src/add/test_add.py
+++ b/src/add/test_add.py
@@ -2,122 +2,15 @@ import sys
 import subprocess
 from random import randint
 from random import seed
-from sfpy import Float32
 
 from nmigen import Module, Signal
 from nmigen.compat.sim import run_simulation
 
 from nmigen_add_experiment import FPADD
 
-def get_mantissa(x):
-    return 0x7fffff & x
-
-def get_exponent(x):
-    return ((x & 0x7f800000) >> 23) - 127
-
-def get_sign(x):
-    return ((x & 0x80000000) >> 31)
-
-def is_nan(x):
-    return get_exponent(x) == 128 and get_mantissa(x) != 0
-
-def is_inf(x):
-    return get_exponent(x) == 128 and get_mantissa(x) == 0
-
-def is_pos_inf(x):
-    return is_inf(x) and not get_sign(x)
-
-def is_neg_inf(x):
-    return is_inf(x) and get_sign(x)
-
-def match(x, y):
-    return (
-        (is_pos_inf(x) and is_pos_inf(y)) or
-        (is_neg_inf(x) and is_neg_inf(y)) or
-        (is_nan(x) and is_nan(y)) or
-        (x == y)
-        )
-
-def get_case(dut, a, b):
-    yield dut.in_a.v.eq(a)
-    yield dut.in_a.stb.eq(1)
-    yield
-    yield
-    a_ack = (yield dut.in_a.ack)
-    assert a_ack == 0
-    yield dut.in_b.v.eq(b)
-    yield dut.in_b.stb.eq(1)
-    b_ack = (yield dut.in_b.ack)
-    assert b_ack == 0
-
-    while True:
-        yield
-        out_z_stb = (yield dut.out_z.stb)
-        if not out_z_stb:
-            continue
-        yield dut.in_a.stb.eq(0)
-        yield dut.in_b.stb.eq(0)
-        yield dut.out_z.ack.eq(1)
-        yield
-        yield dut.out_z.ack.eq(0)
-        yield
-        yield
-        break
-
-    out_z = yield dut.out_z.v
-    return out_z
-
-def check_case(dut, a, b, z):
-    out_z = yield from get_case(dut, a, b)
-    assert out_z == z, "Output z 0x%x not equal to expected 0x%x" % (out_z, z)
-
-
-def run_test(dut, stimulus_a, stimulus_b):
-
-    expected_responses = []
-    actual_responses = []
-    for a, b in zip(stimulus_a, stimulus_b):
-        af = Float32.from_bits(a)
-        bf = Float32.from_bits(b)
-        z = af + bf
-        expected_responses.append(z.get_bits())
-        #print (af, bf, z)
-        actual = yield from get_case(dut, a, b)
-        actual_responses.append(actual)
-
-    if len(actual_responses) < len(expected_responses):
-        print ("Fail ... not enough results")
-        exit(0)
-
-    for expected, actual, a, b in zip(expected_responses, actual_responses,
-                                      stimulus_a, stimulus_b):
-        passed = match(expected, actual)
-
-        if not passed:
-
-            print ("Fail ... expected:", hex(expected), "actual:", hex(actual))
-
-            print (hex(a))
-            print ("a mantissa:", a & 0x7fffff)
-            print ("a exponent:", ((a & 0x7f800000) >> 23) - 127)
-            print ("a sign:", ((a & 0x80000000) >> 31))
-
-            print (hex(b))
-            print ("b mantissa:", b & 0x7fffff)
-            print ("b exponent:", ((b & 0x7f800000) >> 23) - 127)
-            print ("b sign:", ((b & 0x80000000) >> 31))
-
-            print (hex(expected))
-            print ("expected mantissa:", expected & 0x7fffff)
-            print ("expected exponent:", ((expected & 0x7f800000) >> 23) - 127)
-            print ("expected sign:", ((expected & 0x80000000) >> 31))
-
-            print (hex(actual))
-            print ("actual mantissa:", actual & 0x7fffff)
-            print ("actual exponent:", ((actual & 0x7f800000) >> 23) - 127)
-            print ("actual sign:", ((actual & 0x80000000) >> 31))
-
-            sys.exit(0)
+from unit_test_single import (get_mantissa, get_exponent, get_sign, is_nan,
+                                is_inf, is_pos_inf, is_neg_inf,
+                                match, get_case, check_case, run_test)
 
 def testbench(dut):
     yield from check_case(dut, 0xfe34f995, 0xff5d59ad, 0xff800000)

diff --git a/src/add/unit_test_single.py b/src/add/unit_test_single.py
index ef5b2ff8f112445c973ff8669d43687454346a2a..328da10c771173f581b93e31194adb7e3f31cd18 100644 (file)
--- a/src/add/unit_test_single.py
+++ b/src/add/unit_test_single.py
@@ -1,3 +1,5 @@
+from sfpy import Float32
+
 def get_mantissa(x):
     return 0x7fffff & x