improve simulation egornomics a bit

bs/Tests/TagEngineTester.bs

@@ -2,6 +2,10 @@ package TagEngineTester(mkTagEngineTester) where
 
 import TagEngine
 import ActionSeq
+import Printf
+import Util
+
+type NumTags = 5
 
 mkTagEngineTester :: Module Empty
 mkTagEngineTester = do
@@ -26,39 +30,44 @@ mkTagEngineTester = do
 
     in
       actionSeq $
-      do requestTagAction
-      |> do requestTagAction
-      |> do requestTagAction
-      |> do requestTagAction
-      |> do requestTagAction
+      do
+        let expectedTag = 4
+        tag <- tagEngine.requestTag
+        dynamicAssert (tag == expectedTag) ""
+      |> do
+        let expectedTag = 3
+        tag <- tagEngine.requestTag
+        dynamicAssert (tag == expectedTag) ""
+      |> do
+        let expectedTag = 2
+        tag <- tagEngine.requestTag
+        dynamicAssert (tag == expectedTag) ""
+      |> do
+        let expectedTag = 1
+        tag <- tagEngine.requestTag
+        dynamicAssert (tag == expectedTag) ""
+      |> do
+        let expectedTag = 0
+        tag <- tagEngine.requestTag
+        dynamicAssert (tag == expectedTag) ""
       |> do retireTagAction 2
-      -- |> do $display "BEGIN TRY SIMULTANEOUS RETIRE and REQUEST"
       |> do
-          retireTagAction 4
-          requestTagAction
-      -- |> do $display "END TRY SIMULTANEOUS RETIRE and REQUEST"
-      -- |> do $display "BEGIN TRY SIMULTANEOUS RETIRE and REQUEST"
+        retireTagAction 4
+        let expectedTag :: MkTagType NumTags
+            expectedTag = 2
+        tag <- tagEngine.requestTag
+        dynamicAssert (tag == expectedTag) ""
       |> do
-          retireTagAction 4
-          requestTagAction
-      -- |> do $display "END TRY SIMULTANEOUS RETIRE and REQUEST"
-      |> do $finish
-      -- |> do retireTagAction 4
-      -- |> do retireTagAction 4
-      -- |> do retireTagAction 0
-      -- |> do requestTagAction
-      -- |> do requestTagAction
-      -- |> do retireTagAction 1
-      -- |> do requestTagAction
-      -- |> do $finish
+        retireTagAction 2
+        let expectedTag = 3
+        tag <- tagEngine.requestTag
+        dynamicAssert (tag == expectedTag) ""
+      |> do
+        terminateSimNoError
 
   addRules $
     rules
-      -- "counter": when True ==>
-      --   do
-      --     count := count + 1
-      --     $display "count : " (fshow count)
-      "testIncrement": when (runOnce == False) ==>
+      "start unit test": when (runOnce == False) ==>
         do
           s.start
           runOnce := True