Upgrade to LLVM 15, support Apple M1.

- Upgrade to GHC 9.2.x.
  - Apple M1 support seems to be mostly mature starting in GHC 9.2.1:
    https://www.haskell.org/ghc/blog/20210309-apple-m1-story.html.
- Upgrade to LLVM 15.
  - Use the same resolver in stack*.yaml files as llvm-hs:llvm-15 for
    consistency.

`make` now works on Apple M1, albeit with compiler warnings, some of which seem
significant.

Author: dan-zheng

.github/workflows/haskell-ci.yaml

@@ -21,11 +21,11 @@ jobs:
         os: [ubuntu-20.04, macos-latest]
         include:
           - os: macos-latest
-            install_deps: brew install llvm@12 pkg-config wget gzip coreutils
-            path_extension: $(brew --prefix llvm@12)/bin
+            install_deps: brew install llvm@15 pkg-config wget gzip coreutils
+            path_extension: $(brew --prefix llvm@15)/bin
           - os: ubuntu-20.04
-            install_deps: sudo apt-get install llvm-12-tools llvm-12-dev pkg-config wget gzip wamerican
-            path_extension: /usr/lib/llvm-12/bin
+            install_deps: deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main; deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main; sudo apt-get install llvm-15-tools llvm-15-dev pkg-config wget gzip wamerican
+            path_extension: /usr/lib/llvm-15/bin
 
     steps:
     - name: Checkout the repository
@@ -36,7 +36,7 @@ jobs:
       with:
         path: |
           ~/.stack
-          ~/.ghcup/ghc/8.10.7
+          ~/.ghcup/ghc/9.2.6
           $GITHUB_WORKSPACE/.stack-work
           $GITHUB_WORKSPACE/.stack-work-test
           $GITHUB_WORKSPACE/examples/t10k-images-idx3-ubyte
@@ -48,7 +48,7 @@ jobs:
     - name: Install system dependencies
       run: |
         ${{ matrix.install_deps }}
-        if [[ "$OSTYPE" == "darwin"* ]]; then ghcup install ghc 8.10.7; fi
+        if [[ "$OSTYPE" == "darwin"* ]]; then ghcup install ghc 9.2.6; fi
         echo "${{ matrix.path_extension }}" >> $GITHUB_PATH
 
     # This step is a workaround.

README.md

@@ -36,12 +36,12 @@ development. Expect monstrous bugs and razor-sharp edges!**
 ## Dependencies
 
   * Install [stack](https://www.haskellstack.org)
-  * Install LLVM 12
-    * Ubuntu/Debian: `apt-get install llvm-12-dev`
-    * macOS: `brew install llvm@12`
-      * Make sure `llvm@12` is on your `PATH` before building. Example: `export PATH="$(brew --prefix llvm@12)/bin:$PATH"`
-  * Install clang 12 (may be installed together with llvm)
-    * Ubuntu/Debian: `apt-get install clang-12`
+  * Install LLVM 15
+    * Ubuntu/Debian: `apt-get install llvm-15-dev`
+    * macOS: `brew install llvm@15`
+      * Make sure `llvm@15` is on your `PATH` before building. Example: `export PATH="$(brew --prefix llvm@15)/bin:$PATH"`
+  * Install clang 15 (may be installed together with llvm)
+    * Ubuntu/Debian: `apt-get install clang-15`
     * macOS: installs with llvm
   * Install libpng (often included by default in *nix platforms)
     * Ubuntu/Debian: `apt-get install libpng-dev`

dex.cabal

@@ -132,8 +132,6 @@ library
                        -- Serialization
                      , aeson
                      , store
-                       -- Floating-point pedanticness (correcting for GHC < 9.2.2)
-                     , floating-bits
   if flag(live)
     build-depends:     binary
                      , blaze-html

makefile

@@ -61,6 +61,7 @@ ifeq (, $(STACK))
 else
 	STACK=stack
 
+	MACHINE := $(shell uname -m)
 	PLATFORM := $(shell uname -s)
 	ifeq ($(PLATFORM),Darwin)
 		STACK=stack --stack-yaml=stack-macos.yaml
@@ -99,6 +100,15 @@ ifneq (,$(wildcard /usr/local/include/png.h))
 CFLAGS := $(CFLAGS) -I/usr/local/include
 endif
 
+# Apple M1 (Darwin arm64)
+# - Add Homebrew include and library paths.
+ifeq ($(PLATFORM),Darwin)
+ifeq ($(MACHINE),arm64)
+STACK_FLAGS := $(STACK_FLAGS) --extra-include-dirs=/opt/homebrew/include
+STACK_FLAGS := $(STACK_FLAGS) --extra-lib-dirs=/opt/homebrew/lib
+endif
+endif
+
 ifneq (,$(PREFIX))
 STACK_BIN_PATH := --local-bin-path $(PREFIX)
 endif
@@ -108,7 +118,7 @@ ifneq (,$(DEX_CI))
 STACK_FLAGS := $(STACK_FLAGS) --flag dex:debug
 endif
 
-possible-clang-locations := clang++-9 clang++-10 clang++-11 clang++-12 clang++
+possible-clang-locations := clang++-9 clang++-10 clang++-11 clang++-12 clang++-15 clang++
 
 CLANG := clang++
 
@@ -125,7 +135,7 @@ then echo "$$clangversion" ; break ; fi ; done)
 ifeq (,$(CLANG))
 $(error "Please install clang++-12")
 endif
-clang-version-compatible := $(shell $(CLANG) -dumpversion | awk '{ print(gsub(/^((9\.)|(10\.)|(11\.)|(12\.)).*$$/, "")) }')
+clang-version-compatible := $(shell $(CLANG) -dumpversion | awk '{ print(gsub(/^((9\.)|(10\.)|(11\.)|(12\.)|(15\.)).*$$/, "")) }')
 ifneq (1,$(clang-version-compatible))
 $(error "Please install clang++-12")
 endif

src/lib/Algebra.hs

@@ -156,11 +156,11 @@ blockAsPolyRec decls result = case decls of
       _ -> empty
 
     impNameAsPoly :: ImpName i -> BlockTraverserM i o (Polynomial o)
-    impNameAsPoly v = getSubst <&> (!v) >>= \case
+    impNameAsPoly v = getSubst <&> (flip (!) v) >>= \case
       PolyRename v' -> return $ poly [(1, mono [(RightE v', 1)])]
 
     atomNameAsPoly :: AtomName SimpIR i -> BlockTraverserM i o (Polynomial o)
-    atomNameAsPoly v = getSubst <&> (!v) >>= \case
+    atomNameAsPoly v = getSubst <&> (flip (!) v) >>= \case
       PolySubstVal Nothing   -> empty
       PolySubstVal (Just cp) -> return cp
       PolyRename   v'        ->

src/lib/Name.hs

@@ -1323,8 +1323,14 @@ instance (ScopeReader m, ScopeExtender m)
 instance (Monad1 m, ScopeReader m, ScopeExtender m, Fallible1 m)
          => ZipSubstReader (ZipSubstReaderT m) where
 
-  lookupZipSubstFst v = ZipSubstReaderT $ (!v) <$> fst <$> ask
-  lookupZipSubstSnd v = ZipSubstReaderT $ (!v) <$> snd <$> ask
+  lookupZipSubstFst v = ZipSubstReaderT $ (flip (!) v) <$> fst <$> ask
+  lookupZipSubstSnd v = ZipSubstReaderT $ (flip (!) v) <$> snd <$> ask
+  -- lookupZipSubstFst v = ZipSubstReaderT $ do
+  --   (env1, _) <- ask
+  --   return $ (!) env1 v
+  -- lookupZipSubstSnd v = ZipSubstReaderT $ do
+  --   (_, env2) <- ask
+  --   return $ (!) env2 v
 
   extendZipSubstFst frag (ZipSubstReaderT cont) = ZipSubstReaderT $ withReaderT (onFst (<>>frag)) cont
   extendZipSubstSnd frag (ZipSubstReaderT cont) = ZipSubstReaderT $ withReaderT (onSnd (<>>frag)) cont

src/lib/Optimize.hs

@@ -15,7 +15,7 @@ module Optimize
 import Data.Functor
 import Data.Word
 import Data.Bits
-import Data.Bits.Floating
+-- import Data.Bits.Floating
 import Data.List
 import Control.Monad
 import Control.Monad.State.Strict
@@ -144,20 +144,26 @@ foldCast sTy l = case sTy of
     Float64Lit _ -> Nothing
     PtrLit   _ _ -> Nothing
   Float32Type -> case l of
-    Int32Lit  i  -> Just $ Float32Lit $ fixUlp i $ fromIntegral i
-    Int64Lit  i  -> Just $ Float32Lit $ fixUlp i $ fromIntegral i
+    -- Int32Lit  i  -> Just $ Float32Lit $ fixUlp i $ fromIntegral i
+    Int32Lit  i  -> Just $ Float32Lit $ fromIntegral i
+    -- Int64Lit  i  -> Just $ Float32Lit $ fixUlp i $ fromIntegral i
+    Int64Lit  i  -> Just $ Float32Lit $ fromIntegral i
     Word8Lit  i  -> Just $ Float32Lit $ fromIntegral i
-    Word32Lit i  -> Just $ Float32Lit $ fixUlp i $ fromIntegral i
-    Word64Lit i  -> Just $ Float32Lit $ fixUlp i $ fromIntegral i
+    -- Word32Lit i  -> Just $ Float32Lit $ fixUlp i $ fromIntegral i
+    Word32Lit i  -> Just $ Float32Lit $ fromIntegral i
+    -- Word64Lit i  -> Just $ Float32Lit $ fixUlp i $ fromIntegral i
+    Word64Lit i  -> Just $ Float32Lit $ fromIntegral i
     Float32Lit _ -> Just l
     Float64Lit _ -> Nothing
     PtrLit   _ _ -> Nothing
   Float64Type -> case l of
     Int32Lit  i  -> Just $ Float64Lit $ fromIntegral i
-    Int64Lit  i  -> Just $ Float64Lit $ fixUlp i $ fromIntegral i
+    -- Int64Lit  i  -> Just $ Float64Lit $ fixUlp i $ fromIntegral i
+    Int64Lit  i  -> Just $ Float64Lit $ fromIntegral i
     Word8Lit  i  -> Just $ Float64Lit $ fromIntegral i
     Word32Lit i  -> Just $ Float64Lit $ fromIntegral i
-    Word64Lit i  -> Just $ Float64Lit $ fixUlp i $ fromIntegral i
+    -- Word64Lit i  -> Just $ Float64Lit $ fixUlp i $ fromIntegral i
+    Word64Lit i  -> Just $ Float64Lit $ fromIntegral i
     Float32Lit f -> Just $ Float64Lit $ float2Double f
     Float64Lit _ -> Just l
     PtrLit   _ _ -> Nothing
@@ -176,6 +182,8 @@ foldCast sTy l = case sTy of
     -- exhibit when cast back to the original integer type.
     fixUlp :: forall a b w. (Num a, Integral a, FiniteBits a, RealFrac b, FloatingBits b w)
       => a -> b -> b
+    fixUlp orig candidate = candidate
+    {-
     fixUlp orig candidate = res where
       res = closest $ sortBy moreLowBits [candidate, candidatem1, candidatep1]
       candidatem1 = nextDown candidate
@@ -186,6 +194,7 @@ foldCast sTy l = case sTy of
       moreLowBits a b =
         compare (0 - countTrailingZeros (round @b @a a))
                 (0 - countTrailingZeros (round @b @a b))
+    -}
 
 peepholeExpr :: SExpr o -> EnvReaderM o (Either (SAtom o) (SExpr o))
 peepholeExpr expr = case expr of

src/lib/Subst.hs

@@ -30,7 +30,7 @@ class (SinkableV v, Monad2 m) => SubstReader (v::V) (m::MonadKind2) | m -> v whe
    withSubst :: Subst v i' o -> m i' o a -> m i o a
 
 lookupSubstM :: (Color c, SubstReader v m) => Name c i -> m i o (v c o)
-lookupSubstM name = (!name) <$> getSubst
+lookupSubstM name = (flip (!) name) <$> getSubst
 
 dropSubst :: (SubstReader v m, FromName v) => m o o a -> m i o a
 dropSubst cont = withSubst idSubst cont

src/lib/Types/Core.hs

@@ -1710,7 +1710,8 @@ instance (IRRep r, HoistableE ann) => HoistableB (NonDepNest r ann)
 instance (IRRep r, RenameE ann, SinkableE ann) => RenameB (NonDepNest r ann)
 instance (IRRep r, AlphaEqE       ann) => AlphaEqB       (NonDepNest r ann)
 instance (IRRep r, AlphaHashableE ann) => AlphaHashableB (NonDepNest r ann)
-deriving instance (Show (ann n)) => IRRep r => Show (NonDepNest r ann n l)
+-- deriving instance (Show (ann n)) => IRRep r => Show (NonDepNest r ann n l)
+deriving instance (Show (ann n), IRRep r) => Show (NonDepNest r ann n l)
 
 instance GenericB RolePiBinder where
   type RepB RolePiBinder = PairB (LiftB (LiftE ParamRole)) (WithExpl CBinder)

stack-macos.yaml

@@ -4,23 +4,21 @@
 # license that can be found in the LICENSE file or at
 # https://developers.google.com/open-source/licenses/bsd
 
-resolver: lts-18.23
+# Keep in sync with llvm-hs@llvm-15: https://github.com/llvm-hs/llvm-hs/blob/llvm-15/stack.yaml
+resolver: lts-20.16 # GHC 9.2.7
 
 packages:
 - .
 
 extra-deps:
   - github: llvm-hs/llvm-hs
-    commit: 423220bffac4990d019fc088c46c5f25310d5a33
+    commit: 80e0de0f96eb78288c88fda0eaba0f7cf5d38a30 # llvm-15, 2023-04-03
     subdirs:
       - llvm-hs
       - llvm-hs-pure
-  - megaparsec-8.0.0
+  - megaparsec-9.2.2
   - prettyprinter-1.6.2
-  - store-0.7.8@sha256:0b604101fd5053b6d7d56a4ef4c2addf97f4e08fe8cd06b87ef86f958afef3ae,8001
-  - store-core-0.4.4.4@sha256:a19098ca8419ea4f6f387790e942a7a5d0acf62fe1beff7662f098cfb611334c,1430
-  - th-utilities-0.2.4.1@sha256:b37d23c8bdabd678aee5a36dd4373049d4179e9a85f34eb437e9cd3f04f435ca,1869
-  - floating-bits-0.3.0.0@sha256:742bcfcbc21b8daffc995990ee2399ab49550e8f4dd0dff1732d18f57a064c83,2442
+  - bytestring-0.11.4.0
 
 flags:
   llvm-hs: