Proper tests using futhark-test.

Author: athas

main.tex

@@ -284,7 +284,7 @@ \chapter{The Futhark Language}
 this program computes the dot product $\Sigma_{i} x_{i}\cdot{}y_{i}$
 of two vectors of integers:
 
-\inplisting{src/dotprod.fut}
+\lstinputlisting[firstline=5]{src/dotprod.fut}
 
 In Futhark, the notation for an array of element type $t$ is
 \texttt{[]$t$}.  The program declares a function called \texttt{main}
@@ -796,7 +796,7 @@ \subsection{Filtering}
 But what are the corresponding indices?  We can solve this using a
 combination of \texttt{zip}, \texttt{filter}, and \texttt{unzip}:
 
-\lstinputlisting[firstline=2]{src/indices_of_nonzero.fut}
+\lstinputlisting[firstline=7]{src/indices_of_nonzero.fut}
 
 Be aware that \texttt{filter} is a somewhat expensive SOAC,
 corresponding roughly to a \texttt{scan} plus a \texttt{map}.
@@ -1148,7 +1148,7 @@ \section{Benchmarking}
 
 Consider an implementation of dot product:
 
-\inplisting{src/dotprod.fut}
+\lstinputlisting[firstline=5]{src/dotprod.fut}
 
 We previously mentioned that, for small data sets, sequential
 execution is likely to be much faster than parallel execution.  But

src/.gitignore

@@ -3,4 +3,5 @@
 *.exe
 *.out
 *-opencl
-*-c
+*-c
+*.bin

src/Makefile

@@ -4,7 +4,7 @@ FUTHARKOPENCL ?= futhark-opencl
 #FUTFILES=$(wildcard *.fut)
 
 SRCFILES=radix_sort sgm_scan reduce_contract find_idx streak sgm_streak rsort_idx maxidx
-SRCFILES_INPUT=dotprod multable primes rsort
+SRCFILES_INPUT=multable primes rsort
 
 RESFILES=$(SRCFILES:%=%.res) $(SRCFILES_INPUT:%=%_inp.res)
 RESOPENCLFILES=$(SRCFILES:%=%.resopencl)

src/dotprod.fut

@@ -1,2 +1,6 @@
+-- ==
+-- input { [1,2,3] [4,5,6] }
+-- output { 32 }
+
 fun main (x: []int) (y: []int): int =
   reduce (+) 0 (map (*) x y)

src/dotprod.inp

@@ -1,3 +1,9 @@
+-- ==
+-- input { [0,5,2,0,1] }
+-- output { [1,2,4] }
+
+fun main(xs: [n]int): []int = indices_of_nonzero xs
+
 fun indices_of_nonzero(xs: [n]int): []int =
   let xs_and_is = zip xs (iota n)
   let xs_and_is' = filter (fn (x,_) => x != 0) xs_and_is