Add cabal.project file

- Adds cabal projects to cabal.project
- Disables cabal building C++ by default in cabal.project
- Updates some of the wpc-plugin and external-stg-compiler code

Author: dmjio

cabal.project

@@ -0,0 +1,23 @@
+packages:
+  external-stg/
+  external-stg-syntax/
+  external-stg-interpreter/
+  external-stg-compiler/
+  wpc-plugin/
+  lambda/
+
+package external-stg-interpreter
+  flags: +external-ext-stg-gc
+
+package external-stg-compiler
+  flags: +external-ext-stg-liveness
+
+source-repository-package
+  type: git
+  location: https://github.com/david-christiansen/final-pretty-printer
+  tag: 048e8fa2d8b2b7a6f9e4e209db4f67361321eec8
+
+source-repository-package
+  type: git
+  location: https://github.com/luc-tielen/souffle-haskell
+  tag: 268a11283ca9293b5eacabf7a0b79d9368232478

external-stg-compiler/.ghci

@@ -0,0 +1 @@
+:set -ilib

external-stg-compiler/external-stg-compiler.cabal

@@ -12,6 +12,15 @@ copyright:           2020 Csaba Hruska
 category:            Compiler
 build-type:          Simple
 
+flag external-ext-stg-liveness
+  manual:
+    True
+  default:
+    False
+  description:
+    If enabled, the ext-stg-liveness binary is provided externally and available in $PATH
+    Disbled by default.
+
 library
   hs-source-dirs:      lib
   exposed-modules:
@@ -43,13 +52,14 @@ library
   default-language:     Haskell2010
   cpp-options:          -DEXTERNAL_STG_COMPILER_PACKAGE
 
-  include-dirs:         cbits
+  if !flag(external-ext-stg-liveness)
+    include-dirs:         cbits
 
-  extra-libraries:      gomp
+    extra-libraries:      gomp
 
-  cxx-sources:          cbits/ext-stg-liveness.cpp
-  cxx-options:          -D__EMBEDDED_SOUFFLE__ -D_OPENMP -std=c++17
-  ld-options:           "-Wl,--undefined=__factory_Sf_ext_stg_liveness_instance"
+    cxx-sources:          cbits/ext-stg-liveness.cpp
+    cxx-options:          -D__EMBEDDED_SOUFFLE__ -D_OPENMP -std=c++17
+    ld-options:           "-Wl,--undefined=__factory_Sf_ext_stg_liveness_instance"
 
 executable gen-exe
   hs-source-dirs:      app

external-stg-compiler/lib/Stg/GHC/Backend.hs

@@ -1,7 +1,7 @@
 module Stg.GHC.Backend where
 
 -- Compiler
-import GHC
+import GHC hiding (Backend)
 import GHC.Paths ( libdir )
 import GHC.Platform ( platformOS, osSubsectionsViaSymbols )
 import GHC.Driver.CodeOutput
@@ -10,11 +10,12 @@ import GHC.Driver.Main
 import GHC.Driver.Phases
 import GHC.Driver.Pipeline
 import GHC.Driver.Session
---import GHC.Driver.Types
 import GHC.Utils.Error
 import GHC.Utils.Outputable
 import GHC.Builtin.Names (rOOT_MAIN)
 import GHC.Unit.State
+import GHC.Types.Basic
+import GHC.Types.HpcInfo
 
 -- Stg Types
 import GHC.Data.FastString
@@ -33,7 +34,7 @@ import GHC.Cmm
 import GHC.Cmm.Info (cmmToRawCmm )
 import GHC.StgToCmm (codeGen)
 import GHC.Types.Unique.Supply ( mkSplitUniqSupply, initUs_ )
-import GHC.StgToCmm.Types (CgInfos (..))
+import GHC.StgToCmm.Types
 
 import Control.Monad.Trans
 import Control.Monad
@@ -61,11 +62,11 @@ modl = rOOT_MAIN
 data Backend = NCG | LLVM
 
 
-compileToObject :: Backend -> Unit -> ModuleName -> ForeignStubs -> [TyCon] -> [StgTopBinding] -> FilePath -> IO ()
+compileToObject :: Backend -> Unit -> ModuleName -> C.ForeignStubs -> [TyCon] -> [StgTopBinding] -> FilePath -> IO ()
 compileToObject backend unitId modName stubs tyCons topBinds_simple outputName = do
   runGhc (Just libdir) $ compileToObjectM backend unitId modName stubs tyCons topBinds_simple outputName
 
-compileToObjectM :: Backend -> Unit -> ModuleName -> ForeignStubs -> [TyCon] -> [StgTopBinding] -> FilePath -> Ghc ()
+compileToObjectM :: Backend -> Unit -> ModuleName -> C.ForeignStubs -> [TyCon] -> [StgTopBinding] -> FilePath -> Ghc ()
 compileToObjectM backend unitId modName stubs tyCons topBinds_simple outputName = do
   dflags <- getSessionDynFlags
 
@@ -103,7 +104,7 @@ compileToObjectM backend unitId modName stubs tyCons topBinds_simple outputName
   -- Compile
   dflags <- getSessionDynFlags
   pkgs <- setSessionDynFlags $
-    dflags { hscTarget = target, ghcLink = NoLink }
+    dflags { targetPlatform = target, ghcLink = NoLink }
     `gopt_set`  Opt_KeepSFiles
     `gopt_set`  Opt_KeepLlvmFiles
 --    `dopt_set`  Opt_D_dump_cmm
@@ -125,7 +126,7 @@ compileToObjectM backend unitId modName stubs tyCons topBinds_simple outputName
   pure ()
 
 
-compileProgram :: Backend -> Bool -> [String] -> [String] -> [String] -> [String] -> ForeignStubs -> [TyCon] -> [StgTopBinding] -> IO ()
+compileProgram :: Backend -> Bool -> [String] -> [String] -> [String] -> [String] -> C.ForeignStubs -> [TyCon] -> [StgTopBinding] -> IO ()
 compileProgram backend noHsMain incPaths libPaths ldOpts clikeFiles stubs tyCons topBinds_simple = runGhc (Just libdir) $ do
   dflags <- getSessionDynFlags
 
@@ -176,7 +177,7 @@ type CollectedCCs
   setSessionDynFlags $
     (if noHsMain then flip gopt_set Opt_NoHsMain else id) $
     dflags
-      { hscTarget     = target
+      { targetPlatform = target
       , ghcLink       = LinkBinary
       , libraryPaths  = libraryPaths dflags ++ libPaths
       , ldInputs      = ldInputs dflags ++ map Option ldOpts
@@ -220,12 +221,12 @@ newGen :: DynFlags
        -> HscEnv
        -> FilePath
        -> Module
-       -> ForeignStubs
+       -> C.ForeignStubs
        -> [TyCon]
        -> CollectedCCs
        -> [StgTopBinding]
        -> HpcInfo
-       -> IO (FilePath, Maybe FilePath, [(ForeignSrcLang, FilePath)], CgInfos)
+       -> IO (FilePath, Maybe FilePath, [(ForeignSrcLang, FilePath)], CmmCgInfos)
 newGen dflags hsc_env output_filename this_mod foreign_stubs data_tycons cost_centre_info stg_binds hpc_info = do
   -- TODO: add these to parameters
   let location = ModLocation

wpc-plugin/src/WPC/StgToExtStg.hs

@@ -8,13 +8,15 @@ import GHC.Prelude
 import qualified Data.ByteString.Char8 as BS8
 
 import qualified GHC
+import qualified GHC.Tc.Types.Origin    as GHC
 import qualified GHC.Hs.Extension       as GHC
 import qualified GHC.Hs.Decls           as GHC
 import qualified GHC.Builtin.PrimOps    as GHC
 import qualified GHC.Core               as GHC
 import qualified GHC.Core.DataCon       as GHC
 import qualified GHC.Core.TyCon         as GHC
 import qualified GHC.Core.TyCo.Ppr      as GHC
+import qualified GHC.Core.TyCon         as GHC
 import qualified GHC.Core.TyCo.Rep      as GHC
 import qualified GHC.Core.Type          as GHC
 import qualified GHC.Data.FastString    as GHC