From 25895686abdabd9d63342d26b19baabf936de7f9 Mon Sep 17 00:00:00 2001
From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 8 Jul 2019 13:59:09 +0100
Subject: [PATCH] add single-arg option to fp tests

---
 src/ieee754/fpcommon/test/case_gen.py | 59 ++++++++++++++++++---------
 src/ieee754/fpcommon/test/fpmux.py    |  5 ++-
 2 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/src/ieee754/fpcommon/test/case_gen.py b/src/ieee754/fpcommon/test/case_gen.py
index 26b6cd62..f7a6e125 100644
--- a/src/ieee754/fpcommon/test/case_gen.py
+++ b/src/ieee754/fpcommon/test/case_gen.py
@@ -10,11 +10,13 @@ def corner_cases(mod):
             mod.inf(1), mod.inf(0),
             mod.nan(1), mod.nan(0)]
 
-def get_corner_cases(mod):
+def get_corner_cases(mod, single_op=False):
     #corner cases
     from itertools import permutations
     cc = corner_cases(mod)
     stimulus_a = [i[0] for i in permutations(cc, 2)]
+    if single_op:
+        return stimulus_a
     stimulus_b = [i[1] for i in permutations(cc, 2)]
     return zip(stimulus_a, stimulus_b)
 
@@ -29,59 +31,71 @@ def get_rval(width):
     mval = (1<<width)-1
     return randint(0, mval)
 
-def get_rand1(mod, fixed_num, maxcount, width):
-    stimulus_a = replicate(fixed_num, maxcount)
+def get_rand1(mod, fixed_num, maxcount, width, single_op=False):
     stimulus_b = [get_rval(width) for i in range(maxcount)]
+    if single_op:
+        return stimulus_b
+    stimulus_a = replicate(fixed_num, maxcount)
     yield from zip(stimulus_a, stimulus_b)
     yield from zip(stimulus_b, stimulus_a)
 
 
-def get_nan_noncan(mod, fixed_num, maxcount, width):
-    stimulus_a = replicate(fixed_num, maxcount)
+def get_nan_noncan(mod, fixed_num, maxcount, width, single_op=False):
     # non-canonical NaNs.
     stimulus_b = [mod.set_exponent(get_rval(width), mod.max_e) \
                         for i in range(maxcount)]
+    if single_op:
+        return stimulus_b
+    stimulus_a = replicate(fixed_num, maxcount)
     yield from zip(stimulus_a, stimulus_b)
     yield from zip(stimulus_b, stimulus_a)
 
 
-def get_n127(mod, fixed_num, maxcount, width):
-    stimulus_a = replicate(fixed_num, maxcount)
+def get_n127(mod, fixed_num, maxcount, width, single_op=False):
     # -127
     stimulus_b = [mod.set_exponent(get_rval(width), -mod.max_e+1) \
                         for i in range(maxcount)]
+    if single_op:
+        return stimulus_b
+    stimulus_a = replicate(fixed_num, maxcount)
     yield from zip(stimulus_a, stimulus_b)
     yield from zip(stimulus_b, stimulus_a)
 
 
-def get_nearly_zero(mod, fixed_num, maxcount, width):
-    stimulus_a = replicate(fixed_num, maxcount)
+def get_nearly_zero(mod, fixed_num, maxcount, width, single_op=False):
     # nearly zero
     stimulus_b = [mod.set_exponent(get_rval(width), -mod.max_e+2) \
                         for i in range(maxcount)]
+    if single_op:
+        return stimulus_b
+    stimulus_a = replicate(fixed_num, maxcount)
     yield from zip(stimulus_a, stimulus_b)
     yield from zip(stimulus_b, stimulus_a)
 
 
-def get_nearly_inf(mod, fixed_num, maxcount, width):
-    stimulus_a = replicate(fixed_num, maxcount)
+def get_nearly_inf(mod, fixed_num, maxcount, width, single_op=False):
     # nearly inf
     stimulus_b = [mod.set_exponent(get_rval(width), mod.max_e-1) \
                         for i in range(maxcount)]
+    if single_op:
+        return stimulus_b
+    stimulus_a = replicate(fixed_num, maxcount)
     yield from zip(stimulus_a, stimulus_b)
     yield from zip(stimulus_b, stimulus_a)
 
 
-def get_corner_rand(mod, fixed_num, maxcount, width):
-    stimulus_a = replicate(fixed_num, maxcount)
+def get_corner_rand(mod, fixed_num, maxcount, width, single_op=False):
     # random
     stimulus_b = [get_rval(width) for i in range(maxcount)]
+    if single_op:
+        return stimulus_b
+    stimulus_a = replicate(fixed_num, maxcount)
     yield from zip(stimulus_a, stimulus_b)
     yield from zip(stimulus_b, stimulus_a)
 
 
 class PipeFPCase:
-    def __init__(self, dut, name, mod, fmod, width, fpfn, count):
+    def __init__(self, dut, name, mod, fmod, width, fpfn, count, single_op):
         self.dut = dut
         self.name = name
         self.mod = mod
@@ -89,31 +103,36 @@ class PipeFPCase:
         self.width = width
         self.fpfn = fpfn
         self.count = count
+        self.single_op = single_op
 
     def run(self, name, fn):
         name = "%s_%s" % (self.name, name)
         pipe_cornercases_repeat(self.dut, name, self.mod, self.fmod,
                                 self.width, fn, corner_cases, self.fpfn,
-                                self.count)
+                                self.count, self.single_op)
 
     def run_cornercases(self):
         vals = repeat(self.dut.num_rows, get_corner_cases(self.mod))
         tname = "test_fp%s_pipe_fp%d_cornercases" % (self.name, self.width)
-        runfp(self.dut, self.width, tname, self.fmod, self.fpfn, vals=vals)
+        runfp(self.dut, self.width, tname, self.fmod, self.fpfn, vals=vals,
+              single_op=self.single_op)
 
     def run_regressions(self, regressions_fn):
         vals = repeat(self.dut.num_rows, regressions_fn())
         print ("regressions", vals)
         tname = "test_fp%s_pipe_fp%d_regressions" % (self.name, self.width)
-        runfp(self.dut, self.width, tname, self.fmod, self.fpfn, vals=vals)
+        runfp(self.dut, self.width, tname, self.fmod, self.fpfn, vals=vals,
+              single_op=self.single_op)
 
     def run_random(self):
         tname = "test_fp%s_pipe_fp%d_rand" % (self.name, self.width)
-        runfp(self.dut, self.width, tname, self.fmod, self.fpfn)
+        runfp(self.dut, self.width, tname, self.fmod, self.fpfn,
+              single_op=self.single_op)
 
 
-def run_pipe_fp(dut, width, name, mod, fmod, regressions, fpfn, count):
-    pc = PipeFPCase(dut, name, mod, fmod, width, fpfn, count)
+def run_pipe_fp(dut, width, name, mod, fmod, regressions, fpfn, count,
+                single_op=False):
+    pc = PipeFPCase(dut, name, mod, fmod, width, fpfn, count, single_op)
     pc.run_regressions(regressions)
     pc.run_cornercases()
     pc.run("rand1", get_rand1)
diff --git a/src/ieee754/fpcommon/test/fpmux.py b/src/ieee754/fpcommon/test/fpmux.py
index 90db317f..74612802 100644
--- a/src/ieee754/fpcommon/test/fpmux.py
+++ b/src/ieee754/fpcommon/test/fpmux.py
@@ -160,13 +160,14 @@ def repeat(num_rows, vals):
     return vals + [vals[-1]] * n_to_repeat
 
 
-def pipe_cornercases_repeat(dut, name, mod, fmod, width, fn, cc, fpfn, count):
+def pipe_cornercases_repeat(dut, name, mod, fmod, width, fn, cc, fpfn, count,
+                            single_op=False):
     for i, fixed_num in enumerate(cc(mod)):
         vals = fn(mod, fixed_num, count, width)
         vals = repeat(dut.num_rows, vals)
         fmt = "test_pipe_fp%d_%s_cornercases_%d"
         runfp(dut, width, fmt % (width, name, i),
-                   fmod, fpfn, vals=vals)
+                   fmod, fpfn, vals=vals, single_op=single_op)
 
 
 def runfp(dut, width, name, fpkls, fpop, single_op=False, n_vals=10, vals=None):
-- 
2.30.2