X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=makefile;h=2bbe57668e1a0bb5f8a262d88b35853ac77b85e2;hb=922f93eb2aa9d8ef1747289f5973de25bd346edc;hp=402f95667a4c404a13787998e0f9a88d56366521;hpb=a680bef0a99be6555dc0ddfed2ee0080cbf6f0b9;p=spline3.git

diff --git a/makefile b/makefile
index 402f956..2bbe576 100644
--- a/makefile
+++ b/makefile
@@ -1,3 +1,6 @@
+BIN := spline3
+TMPDIR := /tmp
+
 GHC_WARNINGS := -Wall
 GHC_WARNINGS += -fwarn-hi-shadowing
 GHC_WARNINGS += -fwarn-missing-signatures
@@ -9,28 +12,37 @@ GHC_WARNINGS += -fwarn-incomplete-record-updates
 GHC_WARNINGS += -fwarn-monomorphism-restriction
 GHC_WARNINGS += -fwarn-unused-do-bind
 
-BIN := spline3
-TMPDIR := /tmp
-GHC_OPTS := $(GHC_WARNINGS)  \
-            -odir $(TMPDIR)  \
-            -hidir $(TMPDIR) \
-            --make           \
-            -rtsopts         \
-            -o bin/${BIN}
+OPTIMIZATIONS := -O2
+OPTIMIZATIONS += -funbox-strict-fields
+OPTIMIZATIONS += -fexcess-precision
+OPTIMIZATIONS += -fno-spec-constr-count
+
+GHC_OPTS += $(OPTIMIZATIONS)
+GHC_OPTS += $(GHC_WARNINGS)
+GHC_OPTS += -odir $(TMPDIR)
+GHC_OPTS += -hidir $(TMPDIR)
+GHC_OPTS += --make
+GHC_OPTS += -rtsopts
+GHC_OPTS += -threaded
+GHC_OPTS += -o bin/${BIN}
 
 
 .PHONY : test publish_doc doc src_html hlint
 
 $(BIN): src/*.hs
-	ghc -O2 $(GHC_OPTS) src/*.hs
-
-all: $(BIN) test_src
+	ghc -optc-O3 -optc-march=native $(GHC_OPTS) src/*.hs
 
-test_src: src/Tests/*.hs
-	ghc -O2 $(GHC_OPTS) src/*.hs src/Tests/*.hs
+llvm: src/*.hs
+	ghc -fllvm -optlo-O3 -optlc-O3 $(GHC_OPTS) src/*.hs
 
 profile: src/*.hs
-	ghc -O2 $(GHC_OPTS) -prof -auto-all src/*.hs
+	GHC_OPTS="-prof -auto-all -caf-all" make
+
+profile-llvm: src/*.hs
+	GHC_OPTS="-fllvm -prof -auto-all -caf-all" make llvm
+
+hpc: src/*.hs
+	GHC_OPTS="-fhpc" make
 
 clean:
 	rm -f bin/$(BIN)
@@ -50,10 +62,11 @@ src_html:
 DOCS := -i /usr/share/doc/ghc-*/html/libraries/base-*/base.haddock
 DOCS += -i /usr/share/doc/ghc-*/html/libraries/ghc-prim-*/ghc-prim.haddock
 DOCS += -i /usr/share/doc/ghc-*/html/libraries/haskell98-*/haskell98.haddock
-DOCS += -i /usr/share/doc/storable-complex-*/html/storable-complex.haddock
 DOCS += -i /usr/share/doc/quickcheck-*/html/QuickCheck.haddock
-DOCS += -i /usr/share/doc/hmatrix-*/html/hmatrix.haddock
 DOCS += -i /usr/share/doc/hunit-*/html/HUnit.haddock
+DOCS += -i /usr/share/doc/test-framework-*/html/test-framework.haddock
+DOCS += -i /usr/share/doc/repa-*/html/repa.haddock
+DOCS += -i /usr/share/doc/vector-*/html/vector.haddock
 
 
 HTMLS := /usr/share/doc/ghc-*/html/libraries/base-*/*.html
@@ -61,13 +74,16 @@ HTMLS += /usr/share/doc/ghc-*/html/libraries/ghc-prim-*/*.html
 HTMLS += /usr/share/doc/ghc-*/html/libraries/haskell98-*/*.html
 HTMLS += /usr/share/doc/quickcheck-*/html/*.html
 HTMLS += /usr/share/doc/hunit-*/html/*.html
-HTMLS += /usr/share/doc/storable-complex-*/html/*.html
-HTMLS += /usr/share/doc/hmatrix-*/html/*.html
+HTMLS += /usr/share/doc/test-framework-*/html/*.html
+HTMLS += /usr/share/doc/vector-*/html/*.html
+HTMLS += /usr/share/doc/repa-*/html/*.html
 
 HSCOLOUR_SRCS := /usr/share/doc/ghc-*/html/libraries/base-*/src/*
 HSCOLOUR_SRCS += /usr/share/doc/ghc-*/html/libraries/ghc-prim-*/src/*
 HSCOLOUR_SRCS += /usr/share/doc/ghc-*/html/libraries/haskell98-*/src/*
-HSCOLOUR_SRCS += /usr/share/doc/hmatrix-*/html/src/*
+HSCOLOUR_SRCS += /usr/share/doc/test-framework-*/html/src/*
+HSCOLOUR_SRCS += /usr/share/doc/vector-*/html/src/*
+HSCOLOUR_SRCS += /usr/share/doc/repa-*/html/src/*.html
 
 doc: src_html
 	cp -n $(HTMLS) ./doc/html/
@@ -76,7 +92,7 @@ doc: src_html
 	  --odir=doc/html/ --title="spline3"               \
 	  --source-module="src/%{MODULE/.//}.html"         \
 	  --source-entity="src/%{MODULE/.//}.html#%{NAME}" \
-	  src/*.hs src/Tests/*.hs
+	  src/*.hs
 
 SSH_USER=root@michael.orlitzky.com
 PUBLIC_DOCDIR=/var/www/orlitzky.com/michael/public/spline3/