[commit: nofib] master: spectral: enable mate (02c8ea5)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/nofib

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/02c8ea5755b50569e977bc30ab490a8ea575cd6c/nofib

>---------------------------------------------------------------

commit 02c8ea5755b50569e977bc30ab490a8ea575cd6c
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Mon Mar 13 18:34:12 2017 -0400

    spectral: enable mate
    
    Summary:
    This also adds the `mate.stdout` file with the expected result.
    
    Signed-off-by: Michal Terepeta <michal.terepeta at gmail.com>
    
    Test Plan: compile & run nofib
    
    Reviewers: bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D3161


>---------------------------------------------------------------

02c8ea5755b50569e977bc30ab490a8ea575cd6c
 spectral/Makefile                              |  6 +++---
 spectral/mate/Makefile                         |  5 ++++-
 spectral/mate/README                           | 11 +++++++++++
 spectral/mate/{holzhausen.soln => mate.stdout} |  0
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/spectral/Makefile b/spectral/Makefile
index 6187c33..c056f4c 100644
--- a/spectral/Makefile
+++ b/spectral/Makefile
@@ -4,12 +4,12 @@ include $(TOP)/mk/boilerplate.mk
 SUBDIRS = ansi atom awards banner boyer boyer2 calendar cichelli circsim \
           clausify constraints cryptarithm1 cryptarithm2 cse eliza expert \
           fft2 fibheaps fish gcd hartel integer knights lambda last-piece lcss life \
-	  mandel mandel2 minimax multiplier para power pretty primetest puzzle \
-          rewrite scc simple sorting sphere treejoin
+	  mandel mandel2 mate minimax multiplier para power pretty primetest \
+	  puzzle rewrite scc simple sorting sphere treejoin
 
 # compreals	no suitable test data
 # salishan	no Haskell code!
-OTHER_SUBDIRS = compreals lambda last-piece mate salishan secretary triangle
+OTHER_SUBDIRS = compreals lambda last-piece salishan secretary triangle
 
 include $(TOP)/mk/target.mk
 
diff --git a/spectral/mate/Makefile b/spectral/mate/Makefile
index 4775ac0..d2812b9 100644
--- a/spectral/mate/Makefile
+++ b/spectral/mate/Makefile
@@ -1,7 +1,10 @@
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
-# Arguments for the test program
+# It's necessary to specify those manually so that the current make-based system
+# compiles them in the right order.
+# TODO(michalt): This should go away once we move to the Shake-based system.
+HS_SRCS = Board.hs Move.hs Problem.hs Solution.hs Main.hs
 PROG_ARGS = holzhausen.prob
 
 # 	Other problems
diff --git a/spectral/mate/README b/spectral/mate/README
index 79911b7..c378cec 100644
--- a/spectral/mate/README
+++ b/spectral/mate/README
@@ -1,3 +1,14 @@
+UPDATE(2017.02)
+---------------
+
+Currently `make` will run the `holzhausen.prob` (specified in the `Makefile`),
+the output is simply copied to `mate.stdout`
+(`cp holzhausen.soln mate.stdout`).
+If you want to change the benchmark, you need to update both of these.
+
+ORIGINAL README
+---------------
+
 Mate solves chess end-game problems of the form "White to move
 and mate in N".  For example problems (standard input) and
 solutions (standard output) see *.in and *.out.
diff --git a/spectral/mate/holzhausen.soln b/spectral/mate/mate.stdout
similarity index 100%
copy from spectral/mate/holzhausen.soln
copy to spectral/mate/mate.stdout