Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a native compile target for demos #1457

Merged
merged 1 commit into from
Aug 19, 2022
Merged

Add a native compile target for demos #1457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions app/Commands/Compile.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import System.Process qualified as P
juvixBuildDir :: FilePath
juvixBuildDir = ".juvix-build"

data CompileTarget = TargetC | TargetWasm
data CompileTarget = TargetC | TargetWasm | TargetNative
deriving stock (Show)

data CompileRuntime
Expand All @@ -38,7 +38,7 @@ parseCompile = do
<> metavar "TARGET"
<> value TargetWasm
<> showDefaultWith targetShow
<> help "select a target: wasm, c"
<> help "select a target: wasm, c, native"
)

_compileRuntime <-
Expand Down Expand Up @@ -68,12 +68,14 @@ parseCompile = do
parseTarget = \case
"wasm" -> Right TargetWasm
"c" -> Right TargetC
"native" -> Right TargetNative
s -> Left $ "unrecognised target: " <> s

targetShow :: CompileTarget -> String
targetShow = \case
TargetC -> "c"
TargetWasm -> "wasm"
TargetNative -> "native"

parseRuntime :: String -> Either String CompileRuntime
parseRuntime = \case
Expand Down Expand Up @@ -103,6 +105,7 @@ runCompile projRoot compileInputFile o minic = do
case o ^. compileTarget of
TargetWasm -> runM (runError (clangCompile projRoot compileInputFile o))
TargetC -> return (Right ())
TargetNative -> runM (runError (clangNativeCompile projRoot compileInputFile o))

prepareRuntime :: FilePath -> CompileOptions -> IO ()
prepareRuntime projRoot o = do
Expand All @@ -123,16 +126,36 @@ prepareRuntime projRoot o = do
wallocDir :: [(FilePath, BS.ByteString)]
wallocDir = $(FE.makeRelativeToProject "c-runtime/walloc" >>= FE.embedDir)

libcRuntime :: [(FilePath, BS.ByteString)]
libcRuntime = wasiLibCRuntimeDir <> builtinCRuntimeDir

runtimeProjectDir :: [(FilePath, BS.ByteString)]
runtimeProjectDir = case o ^. compileRuntime of
RuntimeWasiStandalone -> wasiStandaloneRuntimeDir <> builtinCRuntimeDir <> wallocDir
RuntimeWasiLibC -> wasiLibCRuntimeDir <> builtinCRuntimeDir
RuntimeStandalone -> standaloneRuntimeDir <> builtinCRuntimeDir <> wallocDir
runtimeProjectDir = case o ^. compileTarget of
TargetNative -> libcRuntime
_ -> case o ^. compileRuntime of
RuntimeWasiStandalone -> wasiStandaloneRuntimeDir <> builtinCRuntimeDir <> wallocDir
RuntimeWasiLibC -> libcRuntime
RuntimeStandalone -> standaloneRuntimeDir <> builtinCRuntimeDir <> wallocDir

writeRuntime :: (FilePath, BS.ByteString) -> IO ()
writeRuntime (filePath, contents) =
BS.writeFile (projRoot </> juvixBuildDir </> takeFileName filePath) contents

clangNativeCompile ::
forall r.
Members '[Embed IO, Error Text] r =>
FilePath ->
FilePath ->
CompileOptions ->
Sem r ()
clangNativeCompile projRoot compileInputFile o = runClang (nativeArgs outputFile inputFile)
where
outputFile :: FilePath
outputFile = fromMaybe (takeBaseName compileInputFile) (o ^. compileOutputFile)

inputFile :: FilePath
inputFile = inputCFile projRoot compileInputFile

clangCompile ::
forall r.
Members '[Embed IO, Error Text] r =>
Expand Down Expand Up @@ -164,8 +187,7 @@ clangCompile projRoot compileInputFile o = clangArgs >>= runClang

commonArgs :: FilePath -> [String]
commonArgs wasmOutputFile =
[ "-nodefaultlibs",
"-std=c99",
[ "-std=c99",
"-Oz",
"-I",
juvixBuildDir,
Expand Down Expand Up @@ -195,10 +217,15 @@ wasiLibcArgs wasmOutputFile inputFile sysrootPath =
wasiCommonArgs sysrootPath wasmOutputFile
<> ["-lc", inputFile]

nativeArgs :: FilePath -> FilePath -> [String]
nativeArgs outputFile inputFile =
commonArgs outputFile <> [inputFile]

wasiCommonArgs :: FilePath -> FilePath -> [String]
wasiCommonArgs sysrootPath wasmOutputFile =
commonArgs wasmOutputFile
<> [ "--target=wasm32-wasi",
<> [ "-nodefaultlibs",
"--target=wasm32-wasi",
"--sysroot",
sysrootPath
]
Expand Down
4 changes: 4 additions & 0 deletions tests/CLI/Commands/compile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ $ juvix compile --help
$ cd tests/positive/MiniC/HelloWorld && juvix compile Input.juvix -o hello.wasm
>
>= 0

$ cd examples/milestone/HelloWorld && juvix compile -t native HelloWorld.juvix && ./HelloWorld
hello world!
>= 0