Skip to content

Commit f9297a9

Browse files
committed
fix dereferencing mutable cursor, add nested soa examples, add colobus with redirections to test suite
1 parent 0e56216 commit f9297a9

File tree

17 files changed

+137
-161
lines changed

17 files changed

+137
-161
lines changed

gibbon-compiler/examples/simple_tests/packedBuggyTree.hs

Lines changed: 0 additions & 92 deletions
This file was deleted.
106 Bytes
Binary file not shown.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
-- test monomorphic things
2+
module MonoTree where
3+
4+
data Tree = Leaf Int
5+
| Node Int Tree Tree
6+
deriving Show
7+
8+
mkTree :: Int -> Tree
9+
mkTree d =
10+
if d == 0
11+
then Leaf 1
12+
else Node d (mkTree (d-1)) (mkTree (d-1))
13+
14+
add1Tree :: Tree -> Tree
15+
add1Tree t =
16+
case t of
17+
Leaf x -> Leaf (x + 1)
18+
Node d x1 x2 -> Node (d + 1) (add1Tree x1) (add1Tree x2)
19+
20+
sumTree :: Tree -> Int
21+
sumTree tr =
22+
case tr of
23+
Leaf n -> n
24+
Node d l r -> d + (sumTree l) + (sumTree r)
25+
26+
gibbon_main = sumTree (mkTree 18) --sumTree (add1Tree (mkTree 18))
27+
28+
main :: IO ()
29+
main = print gibbon_main

gibbon-compiler/examples/simple_tests/list.hs renamed to gibbon-compiler/examples/soa_examples/list.hs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,9 @@ sumList lst = case lst of
3434
in i + sumRst
3535

3636
gibbon_main = let
37-
lst = mkList 20000
38-
lst' = iterate (add1 lst)
39-
_ = printPacked lst'
40-
_ = printsym (quote "NEWLINE")
41-
--(val, lst'') = fieldDep lst'
42-
in sumList lst' --() --printPacked lst' --val --sumList lst'
37+
lst = mkList 100
38+
lst' = add1 lst
39+
in sumList lst'
4340

4441

4542

gibbon-compiler/examples/simple_tests/packedBinaryTree.hs renamed to gibbon-compiler/examples/soa_examples/packedBinaryTree.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ sumFloatList :: FloatList -> Int
7070
sumFloatList lst = 10
7171

7272
gibbon_main =
73-
let tree = mkTree 5
73+
let tree = mkTree 12
7474
tree' = add1Tree tree
7575
in sumTree tree'
7676

gibbon-compiler/examples/simple_tests/packedList.hs renamed to gibbon-compiler/examples/soa_examples/packedList.hs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ sumList lst = case lst of
4242

4343
gibbon_main = let
4444
pi = mkPackedInt 10
45-
lst = mkList 10
45+
lst = mkList 100
4646
lst' = add1 lst
47-
-- _ = printPacked lst'
48-
--(val, lst'') = fieldDep lst'
49-
in (sumList lst') --printPacked lst' --val --sumList lst'
47+
in (sumList lst')
5048

5149

5250

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5150
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
10300
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
919

0 commit comments

Comments
 (0)