fix util scripts and sample stack yaml

grin-compiler · May 27, 2020 · ebc4dca · ebc4dca
1 parent 5961131
commit ebc4dca
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 69 deletions.
diff --git a/ghc-grin-benchmark/c.build b/ghc-grin-benchmark/c.build
@@ -2,13 +2,4 @@ reset
 
 set -x -e
 
-#GRINGHCPATH=/home/csaba/haskell/grin-compiler/ghc-grin/ghc-8.11.0.20200215-src/_build/stage1/bin
-
-#rm -fr .stack-root/setup-exe-cache
-#rm -fr .stack-root/setup-exe-src
-
-#stack --stack-root `pwd`/.stack-root clean
-
-#rm -fr .stack-work
-
 time stack --stack-root `pwd`/.stack-root build
diff --git a/ghc-grin-benchmark/stack.yaml b/ghc-grin-benchmark/stack.yaml
@@ -2,19 +2,36 @@ resolver: lts-15.6
 
 allow-newer: true
 
+# use custom ext-stg whole program compiler GHC
+compiler:   ghc-8.11.0.20200524-ext-stg
+system-ghc: true
 extra-path:
-- /home/csaba/haskell/ghc-gitlab/ghc-8.11.0.20200222-src-git-fromSTG-Quickest/ghc-8.11.0.20200222-src/_build/stage1/bin
+  - /home/csaba/haskell/ghc-gitlab/gitlab-ghc-fresh-may21/ghc/_build/stage1/bin
 
 packages:
-- 'boquist-grin-bench'
 
+- 'Agda-2.6.1'
 
-# Turn on system GHC
-system-ghc: true
-skip-ghc-check: true
+- 'unordered-containers-0.2.10.0'
+- 'alex-3.2.5'
+- 'regex-base-0.94.0.0'
+
+extra-deps:
+- primitive-0.7.0.1
+- data-hash-0.2.0.1@sha256:0277d99cb8b535ecc375c59e55f1c91faab966d9167a946ef18445dd468ba727,1135
+- equivalence-0.3.5@sha256:aedbd070b7ab5e58dd1678cd85607bc33cb9ff62331c1fa098ca45063b3072db,1626
+- geniplate-mirror-0.7.7@sha256:6a698c1bcec25f4866999001c4de30049d4f8f00ec83f8930cda2f767489c637,1106
+- STMonadTrans-0.4.4@sha256:437eec4fdf5f56e9cd4360e08ed7f8f9f5f02ff3f1d634a14dbc71e890035387,1946
+
+flags:
+  transformers-compat:
+    five-three: true
 
-dump-logs: all
+#dump-logs: all
+#build:
+#  keep-tmp-files: true
+#  cabal-verbose: true
 
-build:
-  keep-tmp-files: true
-  cabal-verbose: true
+apply-ghc-options: everything
+ghc-options:
+  "$everything": -split-sections -O0
diff --git a/ghc-grin-benchmark/stack.yaml.idris-master b/ghc-grin-benchmark/stack.yaml.idris-master
@@ -2,27 +2,34 @@ resolver: lts-15.6
 
 allow-newer: true
 
-extra-path:
-  - /home/csaba/haskell/ghc-gitlab/ghc-8.11.0.20200222-src-git-fromSTG-Quickest/ghc-8.11.0.20200222-src/_build/stage1/bin
-
 packages:
 
 - 'Idris-dev-master'
 - 'regex-base-0.94.0.0'
 - 'unordered-containers-0.2.10.0'
 
+flags:
+  idris:
+    FFI: true
+    GMP: true
+
 extra-deps:
   - primitive-0.7.0.1
   - cheapskate-0.1.1.2@sha256:b8ae3cbb826610ea45e6840b7fde0af2c2ea6690cb311edfe9683f61c0a50d96,3072
   - base-noprelude-4.13.0.0@sha256:3cccbfda38e1422ca5cc436d58858ba51ff9114d2ed87915a6569be11e4e5a90,6842
   - jira-wiki-markup-1.3.0
 
-# Turn on system GHC
+# use custom ext-stg whole program compiler GHC
+compiler:   ghc-8.11.0.20200524-ext-stg
 system-ghc: true
-skip-ghc-check: true
+extra-path:
+  - /home/csaba/haskell/ghc-gitlab/gitlab-ghc-fresh-may21/ghc/_build/stage1/bin
 
-dump-logs: all
+#dump-logs: all
+#build:
+#  keep-tmp-files: true
+#  cabal-verbose: true
 
-build:
-  keep-tmp-files: true
-  cabal-verbose: true
+apply-ghc-options: everything
+ghc-options:
+  "$everything": -split-sections -O0
diff --git a/ghc-grin-benchmark/stack.yaml.pandoc-master b/ghc-grin-benchmark/stack.yaml.pandoc-master
@@ -2,8 +2,11 @@ resolver: lts-15.6
 
 allow-newer: true
 
+# use custom ext-stg whole program compiler GHC
+compiler:   ghc-8.11.0.20200524-ext-stg
+system-ghc: true
 extra-path:
-  - /home/csaba/haskell/ghc-gitlab/ghc-8.11.0.20200222-src-git-fromSTG-Quickest/ghc-8.11.0.20200222-src/_build/stage1/bin
+  - /home/csaba/haskell/ghc-gitlab/gitlab-ghc-fresh-may21/ghc/_build/stage1/bin
 
 packages:
 
@@ -22,12 +25,11 @@ extra-deps:
   - base-noprelude-4.13.0.0@sha256:3cccbfda38e1422ca5cc436d58858ba51ff9114d2ed87915a6569be11e4e5a90,6842
   - jira-wiki-markup-1.3.0
 
-# Turn on system GHC
-system-ghc: true
-skip-ghc-check: true
-
-dump-logs: all
+#dump-logs: all
+#build:
+#  keep-tmp-files: true
+#  cabal-verbose: true
 
-build:
-  keep-tmp-files: true
-  cabal-verbose: true
+apply-ghc-options: everything
+ghc-options:
+  "$everything": -split-sections -O0
diff --git a/ghc-grin-benchmark/stack.yaml.smallest b/ghc-grin-benchmark/stack.yaml.smallest
@@ -7,7 +7,7 @@ packages:
 - 'lib'
 
 extra-path:
-- /home/csaba/haskell/ghc-gitlab/ghc-8.11.0.20200222-src-git-fromSTG-Quickest/ghc-8.11.0.20200222-src/_build/stage1/bin
+- /home/csaba/haskell/grin-compiler/ghc-extstg-whole-program-compiler/_build/stage1/bin
 
 # Turn on system GHC
 system-ghc: true
@@ -18,3 +18,7 @@ dump-logs: all
 build:
   keep-tmp-files: true
   cabal-verbose: true
+
+apply-ghc-options: everything
+ghc-options:
+  "$everything": -split-sections -O0
diff --git a/ghc-grin/ghc-grin.cabal b/ghc-grin/ghc-grin.cabal
@@ -66,3 +66,21 @@ executable ghc-grin
                      , external-stg-util
                      , lambda-grin
   default-language:    Haskell2010
+
+executable gen-lambda
+  hs-source-dirs:      app
+  main-is:             genLambda.hs
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
+  build-depends:       base
+                     , filepath
+                     , directory
+                     , containers
+                     , ansi-wl-pprint
+                     , binary
+                     , blake2
+                     , bytestring
+                     , ghc-grin
+                     , external-stg
+                     , external-stg-util
+                     , lambda-grin
+  default-language:    Haskell2010
diff --git a/patched-lambda-to-ghc-stg/c.build b/patched-lambda-to-ghc-stg/c.build
@@ -2,13 +2,4 @@ reset
 
 set -x -e
 
-#GRINGHCPATH=/home/csaba/haskell/grin-compiler/ghc-grin/ghc-8.11.0.20200215-src/_build/stage1/bin
-
-#rm -fr .stack-root/setup-exe-cache
-#rm -fr .stack-root/setup-exe-src
-
-#stack --stack-root `pwd`/.stack-root clean
-
-#rm -fr .stack-work
-
 time stack --stack-root `pwd`/.stack-root build
diff --git a/patched-lambda-to-ghc-stg/c.install b/patched-lambda-to-ghc-stg/c.install
@@ -2,13 +2,4 @@ reset
 
 set -x -e
 
-#GRINGHCPATH=/home/csaba/haskell/grin-compiler/ghc-grin/ghc-8.11.0.20200215-src/_build/stage1/bin
-
-#rm -fr .stack-root/setup-exe-cache
-#rm -fr .stack-root/setup-exe-src
-
-#stack --stack-root `pwd`/.stack-root clean
-
-#rm -fr .stack-work
-
 time stack --stack-root `pwd`/.stack-root install
diff --git a/patched-lambda-to-ghc-stg/mini-ghc-grin/mini-ghc-grin.cabal b/patched-lambda-to-ghc-stg/mini-ghc-grin/mini-ghc-grin.cabal
@@ -15,14 +15,14 @@ cabal-version:       >=1.10
 library
   hs-source-dirs:      src
   exposed-modules:
-    Lambda.Name
+    --Lambda.Name
     --Lambda.Syntax
     --Lambda.ToStg
     Lambda.GHCSymbols
     StgLoopback
     Stg.ToStg
-    Stg.Convert
-    Stg.Syntax
+--    Stg.Convert
+--    Stg.Syntax
     Stg.Util
     Stg.Reconstruct
     Stg.DeadFunctionElimination.Analysis

diff --git a/patched-lambda-to-ghc-stg/stack.yaml b/patched-lambda-to-ghc-stg/stack.yaml
@@ -5,21 +5,22 @@ allow-newer: true
 packages:
   - 'mini-ghc-grin'
 
-extra-path:
-  - /home/csaba/haskell/ghc-gitlab/ghc-8.11.0.20200222-src-git-toSTG/ghc-8.11.0.20200222-src/_build/stage1/bin
-
-# Turn on system GHC
+# use custom ext-stg whole program compiler GHC
+compiler:   ghc-8.11.0.20200524-ext-stg
 system-ghc: true
-skip-ghc-check: true
-
-dump-logs: all
+extra-path:
+#- /home/csaba/haskell/ghc-gitlab/gitlab-ghc-fresh-may21/ghc/_build/stage1/bin
+- /home/csaba/haskell/grin-compiler/ghc-whole-program-compiler/_build/stage1/bin
+#- /home/csaba/haskell/grin-compiler/ghc-extstg-whole-program-compiler/_build/stage1/bin
 
-build:
-  keep-tmp-files: true
-  #cabal-verbose: true
+#dump-logs: all
+#build:
+#  keep-tmp-files: true
+#  cabal-verbose: true
 
 ghc-options:
-  mini-ghc-grin: -DEXT_STG_FOR_NON_PATCHED_GHC
+  #mini-ghc-grin: -DEXT_STG_FOR_NON_PATCHED_GHC
+  "$everything": -fno-stgbin -fno-stgapp
 
 extra-deps:
   - async-pool-0.9.1@sha256:4015140f896c3f1652b06a679b0ade2717d05557970c283ea2c372a71be2a6a1,1605