copilot-bluespec: Update test suite to match new input/output order. Refs #677.

The current Bluespec backend leads to Verilog code that requires manual
manipulations in order to work correctly. Specifically, Copilot externs, which
are inputs to the Copilot monitoring system, are treated as _outputs_ in
Verilog, and Copilot triggers, which can be considered outputs of the
monitoring system, are treated as _inputs_. This order of inputs and outputs is
the opposite what we would like users to work with, and of what other backends
generate (e.g., C99).

A prior commit has updated the internals of `copilot-bluespec` to invert the
order in which Verilog inputs and outputs are declared. This commit updates the
test suite to work with the new design. In addition to changing the code to
reflect the new order of inputs and outputs, this commit also updates the names
of some internal variables from "`input`" to "`input1`". This change is
necessary because "`input`" is a reserved keyword in Verilog, and giving a
Bluespec interface method the same name as a reserved Verilog keyword becomes
an error when the interface is used in the result type of a synthesized module.

Author: RyanGlScott

copilot-bluespec/tests/Test/Copilot/Compile/Bluespec.hs

@@ -157,18 +157,15 @@ testRun = once $ ioProperty $ do
           [ "package Top where"
           , ""
           , "import CopilotTest"
-          , "import CopilotTestIfc"
           , "import CopilotTestTypes"
           , ""
-          , "copilotTestIfc :: Module CopilotTestIfc"
-          , "copilotTestIfc ="
-          , "  module"
-          , "    interface"
-          , "      nop :: Action"
-          , "      nop = return ()"
-          , ""
           , "mkTop :: Module Empty"
-          , "mkTop = mkCopilotTest copilotTestIfc"
+          , "mkTop ="
+          , "  module"
+          , "    copilotTestMod <- mkCopilotTest"
+          , "    addCopilotTestRules copilotTestMod $"
+          , "      interface CopilotTestRulesIfc"
+          , "        nop_action = return ()"
           ]
 
     writeFile "Top.bs" bluespecProgram
@@ -293,7 +290,7 @@ mkRegressionTest1 op haskellFun vals =
     t1 = typeOf
     t2 = typeOf
 
-    varName = "input"
+    varName = "input1"
 
 -- | Test the behavior of a binary operation (an @'Op2' a b c@ value) against
 -- its expected behavior (as a Haskell function of type @[a] -> [b] -> [c]@)
@@ -762,7 +759,7 @@ mkTestCase1 genO gen = do
     t1 = typeOf
     t2 = typeOf
 
-    varName = "input"
+    varName = "input1"
 
 -- | Generate test cases for expressions that behave like binary functions.
 mkTestCase2 :: (Typed a, Typed b, Typed c)
@@ -1016,24 +1013,25 @@ testRunCompareArgBluespecProgram proxy inputs outputType = unlines $
     , "import Vector"
     , ""
     , "import CopilotTest"
-    , "import CopilotTestIfc"
     , "import CopilotTestTypes"
     , ""
     ]
     ++ inputVecDecls ++
     [ ""
-    , "copilotTestIfc :: Module CopilotTestIfc"
-    , "copilotTestIfc ="
+    , "mkTop :: Module Empty"
+    , "mkTop ="
     , "  module"
+    , "    copilotTestMod <- mkCopilotTest"
     ]
     ++ inputRegs ++
     [ "    i :: Reg (Bit 64) <- mkReg 0"
     , "    ready :: Reg Bool <- mkReg False"
-    , "    interface"
-    , "      printBack :: " ++ outputType ++ " -> Action"
-    , "      printBack output = $display " ++ printBackDisplayArgs
-    , "                         when ready"
     , ""
+    , "    addCopilotTestRules copilotTestMod $"
+    , "      interface CopilotTestRulesIfc"
+    , "        printBack_action :: " ++ outputType ++ " -> Action"
+    , "        printBack_action output = $display " ++ printBackDisplayArgs
+    , "                                  when ready"
     ]
     ++ inputMethods ++
     [ ""
@@ -1043,9 +1041,6 @@ testRunCompareArgBluespecProgram proxy inputs outputType = unlines $
     ++ inputUpdates ++
     [ "        i := i + 1"
     , "        ready := True"
-    , ""
-    , "mkTop :: Module Empty"
-    , "mkTop = mkCopilotTest copilotTestIfc"
     ]
   where
     printBackDisplayArgs :: String
@@ -1070,11 +1065,9 @@ testRunCompareArgBluespecProgram proxy inputs outputType = unlines $
 
     inputMethods :: [String]
     inputMethods =
-      concatMap
-        (\(bluespecType, varName, regName, _inputVecName, _inputVals) ->
-          [ "      " ++ varName ++ " :: Reg (" ++ bluespecType ++ ")"
-          , "      " ++ varName ++ " = " ++ regName
-          ])
+      map
+        (\(_bluespecType, varName, regName, _inputVecName, _inputVals) ->
+          "        " ++ varName ++ "_action = return " ++ regName)
         vars
 
     inputUpdates :: [String]