surgical linker for linux64 (#5)

Author: adomurad

.gitignore

@@ -14,6 +14,9 @@ app
 *.obj
 
 host/libhost.h
+platform/dynhost
+platform/linux-x64.rh
+metadata_linux-x64.rm
 
 generated files
 # host/roc

app.roc

@@ -1,5 +1,4 @@
 # app [testCases, config] { r2e: platform "https://github.com/adomurad/r2e-platform/releases/download/0.8.0/o-YITMnvpJZg-zxL2xKiCxBFlJzlEoEwdRY5a39WFZ0.tar.br" }
-# app [main!] { r2e: platform "./platform/main.roc" }
 app [test_cases, config] { r2e: platform "./platform/main.roc" }
 
 import r2e.Test exposing [test]

build.roc

@@ -12,10 +12,13 @@ main! = |_args|
     native = get_native_target!({})?
 
     # build the target
-    build_go_target!({ target: native, host_dir: "host", platform_dir: "platform" })
+    build_for_legacy_linker!({ target: native, host_dir: "host", platform_dir: "platform" })?
 
-build_go_target! : { target : RocTarget, host_dir : Str, platform_dir : Str } => Result {} _
-build_go_target! = |{ target, host_dir, platform_dir }|
+    # surgical is built only for linux 64 for now
+    build_for_surgical_linker!({})
+
+build_for_legacy_linker! : { target : RocTarget, host_dir : Str, platform_dir : Str } => Result {} _
+build_for_legacy_linker! = |{ target, host_dir, platform_dir }|
 
     (goos, goarch, prebuilt_binary) =
         when target is
@@ -29,7 +32,7 @@ build_go_target! = |{ target, host_dir, platform_dir }|
     _ =
         Cmd.new("go")
         |> Cmd.envs([("GOOS", goos), ("GOARCH", goarch), ("CC", "zig cc")])
-        |> Cmd.args(["build", "-C", host_dir, "-buildmode=c-archive", "-o", "libhost.a"])
+        |> Cmd.args(["build", "-C", host_dir, "-buildmode=c-archive", "-o", "libhost.a", "-tags=legacy,netgo"])
         |> Cmd.status!()
         |> Result.map_err(|err| BuildErr(goos, goarch, Inspect.to_str(err)))?
 
@@ -89,3 +92,21 @@ get_native_target! = |_|
         (Linux, Arm64) -> Ok(LinuxArm64)
         (Linux, X64) -> Ok(LinuxX64)
         _ -> Err(UnsupportedNative(os, arch))
+
+build_for_surgical_linker! = |_|
+    build_libapp_so!({})?
+    build_dynhost!({})?
+    preprocess!({})
+
+build_libapp_so! = |_|
+    Cmd.exec!("roc", ("build --lib ./app.roc --output host/libapp.so" |> Str.split_on(" ")))
+
+build_dynhost! = |_|
+    Cmd.new("go")
+    |> Cmd.args(("build -C host -buildmode pie -o ../platform/dynhost" |> Str.split_on(" ")))
+    |> Cmd.envs([("GOOS", "linux"), ("GOARCH", "amd64"), ("CC", "zig cc")])
+    |> Cmd.status!
+    |> Result.map_ok(|_| {})
+
+preprocess! = |_|
+    Cmd.exec!("roc", ("preprocess-host platform/dynhost platform/main.roc host/libapp.so" |> Str.split_on(" ")))

build_ci.roc

@@ -4,15 +4,16 @@ import cli.Cmd
 import cli.Stdout
 
 main! = |_args|
-    build_for_legacy_linker!({})
+    build_for_legacy_linker!({})?
+    build_for_surgical_linker!({})
 
 build_for_legacy_linker! = |{}|
     [MacosArm64, MacosX64, LinuxArm64, LinuxX64, WindowsArm64, WindowsX64]
     |> List.for_each_try!(
         |target|
             build_dot_a!(target) |> Result.map_ok(|_| {}) |> Result.map_err(|_| BuildForLegacyLinker),
     )
-# |> Result.map_err(|_| BuildForLegacyLinker)
+    |> Result.map_err(|_| BuildForLegacyLinker)
 
 build_dot_a! = |target|
     (goos, goarch, zig_target, prebuilt_binary) =
@@ -29,3 +30,21 @@ build_dot_a! = |target|
     |> Cmd.args(("build -C host -buildmode c-archive -o ../platform/${prebuilt_binary} -tags legacy,netgo" |> Str.split_on(" ")))
     |> Cmd.status!()
     |> Result.map_err(|err| BuildErr(target, Inspect.to_str(err)))
+
+build_for_surgical_linker! = |_|
+    build_libapp_so!({})?
+    build_dynhost!({})?
+    preprocess!({})
+
+build_libapp_so! = |_|
+    Cmd.exec!("roc", ("build --lib ./app.roc --output host/libapp.so" |> Str.split_on(" ")))
+
+build_dynhost! = |_|
+    Cmd.new("go")
+    |> Cmd.args(("build -C host -buildmode pie -o ../platform/dynhost" |> Str.split_on(" ")))
+    |> Cmd.envs([("GOOS", "linux"), ("GOARCH", "amd64"), ("CC", "zig cc")])
+    |> Cmd.status!
+    |> Result.map_ok(|_| {})
+
+preprocess! = |_|
+    Cmd.exec!("roc", ("preprocess-host platform/dynhost platform/main.roc host/libapp.so" |> Str.split_on(" ")))

host/main-for-legacy.go

@@ -0,0 +1,11 @@
+//go:build legacy
+
+package main
+
+//#cgo CFLAGS: -Wno-main-return-type
+import "C"
+
+//export main
+func main() {
+	entry()
+}

host/main-for-surgical.go

@@ -0,0 +1,7 @@
+//go:build !legacy
+
+package main
+
+func main() {
+	entry()
+}

host/main.go

@@ -1,8 +1,5 @@
 package main
 
-//#cgo CFLAGS: -Wno-main-return-type
-import "C"
-
 import (
 	"flag"
 	"os"
@@ -11,8 +8,7 @@ import (
 	"host/roc"
 )
 
-//export main
-func main() {
+func entry() {
 	setupOnly := flag.Bool("setup", false, "run only browser and driver setup (useful in CI)")
 	printBrowserVersionOnly := flag.Bool("print-browser-version-only", false, "print the version of used broweser (useful in CI)")
 	verbose := flag.Bool("verbose", false, "run with pauses between actions and visualize actions in browser")

host/roc/app.go

@@ -1,6 +1,9 @@
 package roc
 
-// #include "app.h"
+/*
+#include "app.h"
+#cgo LDFLAGS: -L.. -lapp
+*/
 import "C"
 
 import (

platform/InternalTest.roc

@@ -116,7 +116,7 @@ run_tests! = |test_cases, config|
 
     print_result_summary!(results)?
 
-    any_failures = results |> List.any(|{ result }| result |> Result.is_err)
+    any_failures = results |> List.keep_if(|{ type }| type == FinalResult) |> List.any(|{ result }| result |> Result.is_err)
     if
         any_failures
     then

tests/run-all-tests.sh

@@ -10,10 +10,10 @@ echo "Running roc tests"
 roc test ./platform/main.roc || exit 1;
 
 echo "Running debug-tests.roc"
-roc --linker=legacy $TEST_DIR/debug-tests.roc --debug || exit 1;
+roc $TEST_DIR/debug-tests.roc --debug || exit 1;
 
 echo "Running browser-tests.roc"
-roc --linker=legacy $TEST_DIR/browser-tests.roc --headless || exit 1;
+roc $TEST_DIR/browser-tests.roc --headless || exit 1;
 
 echo "Running element-tests.roc"
 roc --linker=legacy $TEST_DIR/element-tests.roc --headless || exit 1;
@@ -22,7 +22,7 @@ echo "removing the test dir" # should auto remove?
 rm -rf testTestDir78
 
 echo "Running configuration-tests.roc"
-roc --linker=legacy $TEST_DIR/configuration-tests.roc --headless || exit 1;
+roc $TEST_DIR/configuration-tests.roc --headless || exit 1;
 
 if [ -e ./testTestDir78/basicRenamed/index.html ]; then
     echo "reports ok"
@@ -39,8 +39,8 @@ else
 fi
 
 echo "Running element-assertion-tests.roc"
-roc --linker=legacy $TEST_DIR/element-assertion-tests.roc --headless || exit 1;
+roc $TEST_DIR/element-assertion-tests.roc --headless || exit 1;
 
 echo "Running env-tests.roc"
-THIS_ENV_SHOULD_NOT_BE_EMPTY=secret_value roc --linker=legacy $TEST_DIR/env-tests.roc --headless || exit 1;
+THIS_ENV_SHOULD_NOT_BE_EMPTY=secret_value roc $TEST_DIR/env-tests.roc --headless || exit 1;