update test cases to am33

[fleet.git] / tests / memory / memory-test.fleet

diff --git a/tests/memory/memory-test.fleet b/tests/memory/memory-test.fleet
index 747e5ae..84edfa7 100644 (file)
--- a/tests/memory/memory-test.fleet
+++ b/tests/memory/memory-test.fleet
@@ -12,34 +12,35 @@
 // dumb configurations
 debug.in:           [*] take, deliver;
 memory.inAddrRead:  [*] take, deliver;
-memory.inAddrWrite: [*] take, deliver;
-memory.inDataWrite: [*] take, deliver;
-fifo.in:            [*] take, deliver;
 
 // send write-completion tokens to the fifo output
 memory.out:
-  [4] take, notify fifo.out;
+  load repeat counter with 4;  take, notify fifo.out;
   [*] take, sendto debug.in;
 
-// addresses and values to initialize the memory with
-1:  sendto memory.inAddrWrite;
-2:  sendto memory.inAddrWrite;
-3:  sendto memory.inAddrWrite;
-4:  sendto memory.inAddrWrite;
-11: sendto memory.inDataWrite;
-12: sendto memory.inDataWrite;
-13: sendto memory.inDataWrite;
-14: sendto memory.inDataWrite;
+memory.inAddrWrite: literal 1; deliver;
+memory.inDataWrite: literal 11; deliver;
+
+memory.inAddrWrite:  literal 2; deliver;
+memory.inDataWrite:  literal 12; deliver;
+
+memory.inAddrWrite:  literal 3; deliver;
+memory.inDataWrite:  literal 13; deliver;
+
+memory.inAddrWrite:  literal 4; deliver;
+memory.inDataWrite:  literal 14; deliver;
 
 // when the write-completion tokens accumulate, unleash
 // the read addresses
 fifo.out:
-  [4] wait;
-  [4] take, sendto memory.inAddrRead;
-
-// read addresses
-4:  sendto fifo.in;
-3:  sendto fifo.in;
-2:  sendto fifo.in;
-1:  sendto fifo.in;
+  load repeat counter with 4;  wait;
+  load repeat counter with 4;  take, sendto memory.inAddrRead;
+
+fifo.in:
+  literal 4; deliver;
+  literal 3; deliver;
+  literal 2; deliver;
+  literal 1; deliver;
+
+