Add test of DeepSplitPorts with an explicit non-recursive instance

src/Libraries/Base1/SplitPorts.bs

@@ -5,12 +5,13 @@ package SplitPorts where
 import qualified List
 import Vector
 
-
-
 -- Newtype tags to indicate that a types should be split (recursively or not) into ports
 data ShallowSplit a = ShallowSplit a
 data DeepSplit a = DeepSplit a
 
+-- Tag to indicate that the DeepSplitPorts recursion should terminate
+data NoSplit a = NoSplit a
+
 instance (ShallowSplitPorts a p) => SplitPorts (ShallowSplit a) p where
   splitPorts (ShallowSplit x) = shallowSplitPorts x
   unsplitPorts = ShallowSplit ∘ shallowUnsplitPorts
@@ -21,6 +22,11 @@ instance (DeepSplitPorts a p) => SplitPorts (DeepSplit a) p where
   unsplitPorts = DeepSplit ∘ deepUnsplitPorts
   portNames _ = deepSplitPortNames (_ :: a)
 
+instance DeepSplitPorts (NoSplit a) (Port a) where
+  splitPorts (NoSplit x) = Port x
+  unsplitPorts (Port x) = NoSplit x
+  portNames _ base = List.Cons base List.Nil
+
 
 -- Helper class using generics, to split a struct or vector into a tuple of ports.
 class ShallowSplitPorts a p | a -> p where

testsuite/bsc.verilog/splitports/DeepSplit.bs

@@ -24,12 +24,28 @@ struct Baz =
   e :: Vector 0 Foo
  -- No Bits instance needed
 
+struct Quix =
+  q :: Int 3
+  v :: Bool
+ deriving (Bits)
+
+-- Don't recurse into Quix with DeepSplitPorts
+instance DeepSplitPorts Quix (Port Quix) where
+  deepSplitPorts x = Port x
+  deepUnsplitPorts (Port x) = x
+  deepSplitPortNames _ base = Cons (base) Nil
+
+struct Zug =
+  qs :: Vector 2 Quix
+  blob :: Bool
+
 interface SplitTest =
   putFoo :: DeepSplit Foo -> Action
   putBar :: DeepSplit Bar -> Action {-# prefix = "PUT_BAR" #-}
   putFooBar :: DeepSplit Foo -> DeepSplit Bar -> Action {-# arg_names = ["fooIn", "barIn"] #-}
   putFoos :: DeepSplit (Vector 50 Foo) -> Action
   putBaz :: DeepSplit Baz -> Action
+  putZug :: DeepSplit Zug -> Action
 
 
 {-# synthesize mkDeepSplitTest #-}
@@ -42,6 +58,7 @@ mkDeepSplitTest =
       putFooBar (DeepSplit x) (DeepSplit y) = $display "putFooBar: " (cshow x) " " (cshow y)
       putFoos (DeepSplit x) = $display "putFoos: " (cshow x)
       putBaz (DeepSplit x) = $display "putBaz: " (cshow x)
+      putZug (DeepSplit x) = $display "putZug: " (cshow x)
 
 {-# synthesize sysDeepSplit #-}
 sysDeepSplit :: Module Empty
@@ -56,4 +73,5 @@ sysDeepSplit =
       when i == 2 ==> s.putFooBar (DeepSplit $ Foo { x = 5; y = 6; }) (DeepSplit $ Bar { v = vec False True False; w = (False, 0x5678); z = Foo { x = 7; y = 8; } })
       when i == 3 ==> s.putFoos $ DeepSplit $ genWith $ \ j -> Foo { x = fromInteger $ 9 + j / 2; y = fromInteger $ 10 - 2*j / 3; }
       when i == 4 ==> s.putBaz $ DeepSplit $ Baz { a = Just $ Foo { x = 9; y = 10; }; b = Bar { v = vec True False False; w = (True, 0x1234); z = Foo { x = 3; y = 4; }; }; c = vec (vec (Foo { x = 11; y = 12; }) (Foo { x = 13; y = 14; }) (Foo { x = 15; y = 16; }) (Foo { x = 17; y = 18; }) (Foo { x = 19; y = 20; }) (Foo { x = 21; y = 22; }) (Foo { x = 23; y = 24; }) (Foo { x = 25; y = 26; }), Bar { v = vec True False True; w = (True, 0xBEEF); z = Foo { x = 3; y = 4; } }) (vec (Foo { x = 27; y = 28; }) (Foo { x = 29; y = 30; }) (Foo { x = 31; y = 32; }) (Foo { x = 33; y = 34; }) (Foo { x = 35; y = 36; }) (Foo { x = 37; y = 38; }) (Foo { x = 39; y = 40; }) (Foo { x = 41; y = 42; }), Bar { v = vec True False True; w = (True, 0x4321); z = Foo { x = 123; y = 42; } }) (vec (Foo { x = 43; y = 44; }) (Foo { x = 45; y = 46; }) (Foo { x = 47; y = 48; }) (Foo { x = 49; y = 50; }) (Foo { x = 51; y = 52; }) (Foo { x = 53; y = 54; }) (Foo { x = 55; y = 56; }) (Foo { x = 57; y = 58; }), Bar { v = vec True True True; w = (True, 0xAABB); z = Foo { x = 3; y = 4; } }); d = (); e = nil; }
-      when i == 5 ==> $finish
+      when i == 5 ==> s.putZug $ DeepSplit $ Zug { qs = vec (Quix { q = 1; v = True }) (Quix { q = 2; v = False }); blob = False; }
+      when i == 6 ==> $finish

testsuite/bsc.verilog/splitports/splitports.exp

@@ -23,6 +23,7 @@ if { $vtest == 1 } {
     find_regexp mkDeepSplitTest.v {input  \[16 : 0\] putBaz_1_a;}
     find_regexp mkDeepSplitTest.v {input  \[7 : 0\] putBaz_1_c_2_1_7_y;}
     find_regexp mkDeepSplitTest.v {input  \[15 : 0\] putBaz_1_c_2_2_w_2;}
+    find_regexp mkDeepSplitTest.v {input  \[3 : 0\] putZug_1_qs_1;}
 }
 
 test_c_veri InstanceSplit

testsuite/bsc.verilog/splitports/sysDeepSplit.out.expected

@@ -3,3 +3,4 @@ putBar: Bar {v=[True, False, True]; w=(True,  4660); z=Foo {x=   3; y=   4}}
 putFooBar: Foo {x=   5; y=   6} Bar {v=[False, True, False]; w=(False, 22136); z=Foo {x=   7; y=   8}}
 putFoos: [Foo {x=   9; y=  10}, Foo {x=   9; y=  10}, Foo {x=  10; y=   9}, Foo {x=  10; y=   8}, Foo {x=  11; y=   8}, Foo {x=  11; y=   7}, Foo {x=  12; y=   6}, Foo {x=  12; y=   6}, Foo {x=  13; y=   5}, Foo {x=  13; y=   4}, Foo {x=  14; y=   4}, Foo {x=  14; y=   3}, Foo {x=  15; y=   2}, Foo {x=  15; y=   2}, Foo {x=  16; y=   1}, Foo {x=  16; y=   0}, Foo {x=  17; y=   0}, Foo {x=  17; y=  -1}, Foo {x=  18; y=  -2}, Foo {x=  18; y=  -2}, Foo {x=  19; y=  -3}, Foo {x=  19; y=  -4}, Foo {x=  20; y=  -4}, Foo {x=  20; y=  -5}, Foo {x=  21; y=  -6}, Foo {x=  21; y=  -6}, Foo {x=  22; y=  -7}, Foo {x=  22; y=  -8}, Foo {x=  23; y=  -8}, Foo {x=  23; y=  -9}, Foo {x=  24; y= -10}, Foo {x=  24; y= -10}, Foo {x=  25; y= -11}, Foo {x=  25; y= -12}, Foo {x=  26; y= -12}, Foo {x=  26; y= -13}, Foo {x=  27; y= -14}, Foo {x=  27; y= -14}, Foo {x=  28; y= -15}, Foo {x=  28; y= -16}, Foo {x=  29; y= -16}, Foo {x=  29; y= -17}, Foo {x=  30; y= -18}, Foo {x=  30; y= -18}, Foo {x=  31; y= -19}, Foo {x=  31; y= -20}, Foo {x=  32; y= -20}, Foo {x=  32; y= -21}, Foo {x=  33; y= -22}, Foo {x=  33; y= -22}]
 putBaz: Baz {a=Valid (Foo {x=   9; y=  10}); b=Bar {v=[True, False, False]; w=(True,  4660); z=Foo {x=   3; y=   4}}; c=[([Foo {x=  11; y=  12}, Foo {x=  13; y=  14}, Foo {x=  15; y=  16}, Foo {x=  17; y=  18}, Foo {x=  19; y=  20}, Foo {x=  21; y=  22}, Foo {x=  23; y=  24}, Foo {x=  25; y=  26}], Bar {v=[True, False, True]; w=(True, 48879); z=Foo {x=   3; y=   4}}), ([Foo {x=  27; y=  28}, Foo {x=  29; y=  30}, Foo {x=  31; y=  32}, Foo {x=  33; y=  34}, Foo {x=  35; y=  36}, Foo {x=  37; y=  38}, Foo {x=  39; y=  40}, Foo {x=  41; y=  42}], Bar {v=[True, False, True]; w=(True, 17185); z=Foo {x= 123; y=  42}}), ([Foo {x=  43; y=  44}, Foo {x=  45; y=  46}, Foo {x=  47; y=  48}, Foo {x=  49; y=  50}, Foo {x=  51; y=  52}, Foo {x=  53; y=  54}, Foo {x=  55; y=  56}, Foo {x=  57; y=  58}], Bar {v=[True, True, True]; w=(True, 43707); z=Foo {x=   3; y=   4}})]; d=(); e=[]}
+putZug: Zug {qs=[Quix {q= 1; v=True}, Quix {q= 2; v=False}]; blob=False}