projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e31794
)
updates to tests
author
adam
<adam@megacz.com>
Mon, 11 Feb 2008 13:09:11 +0000
(14:09 +0100)
committer
adam
<adam@megacz.com>
Mon, 11 Feb 2008 13:09:11 +0000
(14:09 +0100)
tests/memory/memory-test.fleet
patch
|
blob
|
history
tests/multiply.test
patch
|
blob
|
history
tests/pump/standing-instructions-do-not-alter-repeat-count.fleet
patch
|
blob
|
history
tests/pump/test-massacre.fleet
patch
|
blob
|
history
tests/pump/test-read-loop-counter-from-data-latch.fleet
patch
|
blob
|
history
tests/pump/test-read-loop-counter.fleet
patch
|
blob
|
history
tests/pump/test-use-loop-counter.fleet
patch
|
blob
|
history
tests/requeue/requeue-expire.fleet
patch
|
blob
|
history
tests/requeue/requeueing-literal.fleet
patch
|
blob
|
history
tests/requeue/test-kill-requeueing.fleet
patch
|
blob
|
history
tests/requeue/test-requeue.fleet
patch
|
blob
|
history
diff --git
a/tests/memory/memory-test.fleet
b/tests/memory/memory-test.fleet
index
84edfa7
..
9e12103
100644
(file)
--- a/
tests/memory/memory-test.fleet
+++ b/
tests/memory/memory-test.fleet
@@
-1,3
+1,4
@@
+#skip
// output ///////////////////////////////////////////////////////////////////
#expect 14
#expect 13
// output ///////////////////////////////////////////////////////////////////
#expect 14
#expect 13
diff --git
a/tests/multiply.test
b/tests/multiply.test
index
8d08607
..
a50cfdd
100644
(file)
--- a/
tests/multiply.test
+++ b/
tests/multiply.test
@@
-1,3
+1,4
@@
+#skip
#ship alu3 : Alu3
#ship lut3 : Lut3
#ship bitfifo : BitFifo
#ship alu3 : Alu3
#ship lut3 : Lut3
#ship bitfifo : BitFifo
@@
-14,8
+15,8
@@
// r: 111000100110111000000
bitfifo.in:
// r: 111000100110111000000
bitfifo.in:
- literal 10000;
deliver; // deliver a junk word
deliver; // deliver a junk word
+ literal 10000;
load repeat counter with 37; deliver; // deliver it 37 times (once per bit)
literal 0;
load repeat counter with 38; deliver; // deliver it 37 times
load repeat counter with 37; deliver; // deliver it 37 times (once per bit)
literal 0;
load repeat counter with 38; deliver; // deliver it 37 times
diff --git
a/tests/pump/standing-instructions-do-not-alter-repeat-count.fleet
b/tests/pump/standing-instructions-do-not-alter-repeat-count.fleet
index
c6100bf
..
9c3ac80
100644
(file)
--- a/
tests/pump/standing-instructions-do-not-alter-repeat-count.fleet
+++ b/
tests/pump/standing-instructions-do-not-alter-repeat-count.fleet
@@
-1,3
+1,4
@@
+#skip
#expect 3
#expect 3
#expect 3
#expect 3
#expect 3
#expect 3
diff --git
a/tests/pump/test-massacre.fleet
b/tests/pump/test-massacre.fleet
index
74b162d
..
1195fc3
100644
(file)
--- a/
tests/pump/test-massacre.fleet
+++ b/
tests/pump/test-massacre.fleet
@@
-1,3
+1,4
@@
+#skip
#expect 7
#expect 7
#expect 7
#expect 7
#expect 7
#expect 7
diff --git
a/tests/pump/test-read-loop-counter-from-data-latch.fleet
b/tests/pump/test-read-loop-counter-from-data-latch.fleet
index
3265ece
..
6a9c969
100644
(file)
--- a/
tests/pump/test-read-loop-counter-from-data-latch.fleet
+++ b/
tests/pump/test-read-loop-counter-from-data-latch.fleet
@@
-1,6
+1,9
@@
#expect 5
#expect 0
#expect 5
#expect 5
#expect 0
#expect 5
+#expect 0
+#expect 5
+
#ship debug : Debug
#ship memory : Memory
#ship debug : Debug
#ship memory : Memory
@@
-22,4
+25,5
@@
fifo.out:
take loop counter;
literal 5;
sendto debug.in;
take loop counter;
literal 5;
sendto debug.in;
+ load loop counter with 0;
unclog;
unclog;
diff --git
a/tests/pump/test-read-loop-counter.fleet
b/tests/pump/test-read-loop-counter.fleet
index
64e0344
..
67ffdac
100644
(file)
--- a/
tests/pump/test-read-loop-counter.fleet
+++ b/
tests/pump/test-read-loop-counter.fleet
@@
-9,11
+9,14
@@
debug.in: [*] take, deliver;
fifo.out:
literal 7;
sendto fifo.in;
fifo.out:
literal 7;
sendto fifo.in;
- load repeat counter with 2; take, sendto debug.in;
+ load repeat counter with 2;
+ take, sendto debug.in;
fifo.in:
fifo.in:
+ clog;
take;
load loop counter;
literal 0;
take loop counter;
deliver;
take;
load loop counter;
literal 0;
take loop counter;
deliver;
+ unclog;
diff --git
a/tests/pump/test-use-loop-counter.fleet
b/tests/pump/test-use-loop-counter.fleet
index
9925eb4
..
3261604
100644
(file)
--- a/
tests/pump/test-use-loop-counter.fleet
+++ b/
tests/pump/test-use-loop-counter.fleet
@@
-14,12
+14,15
@@
debug.in: [*] take, deliver;
fifo.out: [*] take, sendto debug.in;
fifo.in:
fifo.out: [*] take, sendto debug.in;
fifo.in:
+ clog;
load loop counter with 3;
literal 5;
deliver;
take, deliver;
decrement loop counter;
load loop counter with 3;
literal 5;
deliver;
take, deliver;
decrement loop counter;
+ unclog;
fifo2.out:
literal 7;
fifo2.out:
literal 7;
- load repeat counter with 4; sendto fifo.in;
+ load repeat counter with 4;
+ sendto fifo.in;
diff --git
a/tests/requeue/requeue-expire.fleet
b/tests/requeue/requeue-expire.fleet
index
562cf7c
..
9334dfa
100644
(file)
--- a/
tests/requeue/requeue-expire.fleet
+++ b/
tests/requeue/requeue-expire.fleet
@@
-5,21
+5,25
@@
#expect 7
#ship debug : Debug
#ship fifo : Fifo
#expect 7
#ship debug : Debug
#ship fifo : Fifo
+#ship fifo2 : Fifo
-fifo.in: literal 9; deliver;
-fifo.in: literal 8; deliver;
-fifo.in: literal 7; deliver;
-fifo.out: [*] take, sendto debug.in;
-
-debug.in:
+fifo.in:
clog;
load loop counter with 3;
clog;
load loop counter with 3;
- take;
- deliver;
+ take, deliver;
decrement loop counter;
take loop counter;
deliver;
unclog;
decrement loop counter;
take loop counter;
deliver;
unclog;
+fifo.out:
+ [*] take, sendto debug.in;
+
+debug.in:
+ [*] take, deliver;
+fifo2.out:
+ literal 9; sendto fifo.in;
+ literal 8; sendto fifo.in;
+ literal 7; sendto fifo.in;
diff --git
a/tests/requeue/requeueing-literal.fleet
b/tests/requeue/requeueing-literal.fleet
index
3068091
..
e888121
100644
(file)
--- a/
tests/requeue/requeueing-literal.fleet
+++ b/
tests/requeue/requeueing-literal.fleet
@@
-10,7
+10,8
@@
fifo.in:
literal 9;
fifo.in:
literal 9;
- load repeat counter with 6; deliver;
+ load repeat counter with 6;
+ deliver;
debug.in:
[*] take, deliver;
debug.in:
[*] take, deliver;
diff --git
a/tests/requeue/test-kill-requeueing.fleet
b/tests/requeue/test-kill-requeueing.fleet
index
7b783eb
..
7b7798b
100644
(file)
--- a/
tests/requeue/test-kill-requeueing.fleet
+++ b/
tests/requeue/test-kill-requeueing.fleet
@@
-1,3
+1,4
@@
+#skip
#expect 7
#expect 7
#expect 7
#expect 7
#expect 7
#expect 7
diff --git
a/tests/requeue/test-requeue.fleet
b/tests/requeue/test-requeue.fleet
index
aa80e20
..
5297117
100644
(file)
--- a/
tests/requeue/test-requeue.fleet
+++ b/
tests/requeue/test-requeue.fleet
@@
-45,22
+45,25
@@
alu.inOp: literal Alu2.inOp[ADD];
[*] deliver;
alu.inOp: literal Alu2.inOp[ADD];
[*] deliver;
-alu.out: clog;
- load loop counter with 40;
+
+alu.out: load loop counter with 40;
+ clog;
take, sendto alu.in1;
sendto debug.in;
decrement loop counter;
unclog;
take, sendto alu.in1;
sendto debug.in;
decrement loop counter;
unclog;
+
debug.in: [*] take, deliver;
alu.in2: literal 4;
[*] deliver;
debug.in: [*] take, deliver;
alu.in2: literal 4;
[*] deliver;
-alu.in1: literal 2;
- load repeat counter with 4; deliver;
- clog;
+
+alu.in1: clog;
+ literal 2;
+ load repeat counter with 4;
+ deliver;
load loop counter with 2;
take, deliver;
discard;
deliver;
unclog;
load loop counter with 2;
take, deliver;
discard;
deliver;
unclog;
-