Merge pull request #1032 from cpunion/fix-linking

Remove LLVM runtime depencendy, better c toolchain integration

.github/workflows/doc.yml

@@ -27,7 +27,7 @@ jobs:
         id: lychee
         uses: lycheeverse/lychee-action@v2
         with:
-          args: README.md
+          args: --max-concurrency 3 --retry-wait-time 15 README.md
 
   remote_install:
     strategy:

.github/workflows/llgo.yml

@@ -10,7 +10,23 @@ on:
     branches: [ "**" ]
 
 jobs:
+  download-model:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download model file
+        run: |
+          mkdir -p ./_demo/llama2-c
+          wget -P ./_demo/llama2-c https://huggingface.co/karpathy/tinyllamas/resolve/main/stories15M.bin
+
+      - name: Upload model as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: llama2-model
+          path: ./_demo/llama2-c/stories15M.bin
+          retention-days: 1
+
   llgo:
+    needs: download-model
     continue-on-error: true
     strategy:
       matrix:
@@ -26,9 +42,13 @@ jobs:
         uses: ./.github/actions/setup-deps
         with:
           llvm-version: ${{matrix.llvm}}
+      - name: Download model artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: llama2-model
+          path: ./_demo/llama2-c/
       - name: Install further optional dependencies for demos
         run: |
-          wget -P ./_demo/llama2-c https://huggingface.co/karpathy/tinyllamas/resolve/main/stories15M.bin
           py_deps=(
             numpy # for github.com/goplus/llgo/py/numpy
             torch # for github.com/goplus/llgo/py/torch
@@ -112,7 +132,6 @@ jobs:
           llvm-version: ${{matrix.llvm}}
       - name: Install further optional dependencies for demos
         run: |
-          wget -P ./_demo/llama2-c https://huggingface.co/karpathy/tinyllamas/resolve/main/stories15M.bin
           py_deps=(
             numpy # for github.com/goplus/llgo/py/numpy
             torch # for github.com/goplus/llgo/py/torch
@@ -146,6 +165,7 @@ jobs:
 
       - name: run llgo test
         run: |
+          llgo test ./...
           cd _demo
           llgo test -v ./runtest
 

c/debug/_wrap/debug.c

@@ -1,6 +1,8 @@
 #if defined(__linux__)
 #define UNW_LOCAL_ONLY
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <features.h>
 #endif
 

compiler/chore/llgen/llgen_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 package main
 
 import (

compiler/chore/llpyg/pysig/parse_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 /*
  * Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
  *

compiler/cl/blocks/block_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 /*
  * Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
  *

compiler/cl/builtin_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 /*
  * Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
  *

compiler/cl/compile_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 /*
  * Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
  *

compiler/cmd/llgo/llgo_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 package main
 
 import (

compiler/go.mod

@@ -3,7 +3,7 @@ module github.com/goplus/llgo/compiler
 go 1.22.0
 
 require (
-	github.com/goplus/gogen v1.16.6
+	github.com/goplus/gogen v1.16.8
 	github.com/goplus/llgo v0.9.9
 	github.com/goplus/llgo/runtime v0.0.0-00010101000000-000000000000
 	github.com/goplus/llvm v0.8.1

compiler/go.sum

@@ -1,7 +1,7 @@
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/goplus/gogen v1.16.6 h1:Zwv18HoTbPDk8s2ajxgVeqZE5i4/GMV722KHl6GS8Yk=
+github.com/goplus/gogen v1.16.8 h1:idakC+4OZIAvDSi3wkPGHlhpNEd7xkmvodXDMDvfn4s=
-github.com/goplus/gogen v1.16.6/go.mod h1:6TQYbabXDF9LCdDkOOzHmfg1R4ENfXQ3XpHa9RhTSD8=
+github.com/goplus/gogen v1.16.8/go.mod h1:6TQYbabXDF9LCdDkOOzHmfg1R4ENfXQ3XpHa9RhTSD8=
 github.com/goplus/llvm v0.8.1 h1:Wrc9S8bKDhLjxjPuhnrgDYLRaFfKotOGt3zpId3LBmI=
 github.com/goplus/llvm v0.8.1/go.mod h1:PeVK8GgzxwAYCiMiUAJb5wJR6xbhj989tu9oulKLLT4=
 github.com/goplus/mod v0.13.17 h1:aWp14xosENrh7t0/0qcIejDmQEiTgI3ou2+KoLDlSlE=

compiler/internal/build/build.go

@@ -175,6 +175,14 @@ func Do(args []string, conf *Config) ([]Package, error) {
 			}
 		case ModeRun:
 			return nil, fmt.Errorf("cannot run multiple packages")
+		case ModeTest:
+			newInitial := make([]*packages.Package, 0, len(initial))
+			for _, pkg := range initial {
+				if needLink(pkg, mode) {
+					newInitial = append(newInitial, pkg)
+				}
+			}
+			initial = newInitial
 		}
 	}
 
@@ -480,10 +488,10 @@ func linkMainPkg(ctx *context, pkg *packages.Package, pkgs []*aPackage, linkArgs
 	if verbose {
 		fmt.Fprintln(os.Stderr, "clang", args)
 	}
-	err = ctx.env.Clang().Exec(args...)
+	err = ctx.env.Clang().Link(args...)
 	check(err)
 
-	if runtime.GOOS == "darwin" {
+	if IsRpathChangeEnabled() && runtime.GOOS == "darwin" {
 		dylibDeps := make([]string, 0, len(libs))
 		for _, lib := range libs {
 			dylibDep := findDylibDep(app, lib)
@@ -746,6 +754,7 @@ const llgoDebug = "LLGO_DEBUG"
 const llgoTrace = "LLGO_TRACE"
 const llgoOptimize = "LLGO_OPTIMIZE"
 const llgoCheck = "LLGO_CHECK"
+const llgoRpathChange = "LLGO_RPATH_CHANGE"
 
 func isEnvOn(env string, defVal bool) bool {
 	envVal := strings.ToLower(os.Getenv(env))
@@ -771,6 +780,10 @@ func IsCheckEnable() bool {
 	return isEnvOn(llgoCheck, false)
 }
 
+func IsRpathChangeEnabled() bool {
+	return isEnvOn(llgoRpathChange, false)
+}
+
 func ParseArgs(args []string, swflags map[string]bool) (flags, patterns []string, verbose bool) {
 	n := len(args)
 	for i := 0; i < n; i++ {
@@ -857,7 +870,7 @@ func clFile(ctx *context, args []string, cFile, expFile string, procFile func(li
 	if verbose {
 		fmt.Fprintln(os.Stderr, "clang", args)
 	}
-	err := ctx.env.Clang().Exec(args...)
+	err := ctx.env.Clang().Compile(args...)
 	check(err)
 	procFile(llFile)
 }

compiler/internal/build/build_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 package build
 
 import (

compiler/internal/buildtags/buildtags_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 package buildtags
 
 import (

compiler/internal/env/env_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 package env
 
 import (

compiler/ssa/cl_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 /*
  * Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
  *

compiler/ssa/package.go

@@ -387,14 +387,13 @@ func (p Program) NewPackage(name, pkgPath string) Package {
 	pyobjs := make(map[string]PyObjRef)
 	pymods := make(map[string]Global)
 	strs := make(map[string]llvm.Value)
-	goStrs := make(map[string]llvm.Value)
 	chkabi := make(map[types.Type]bool)
 	glbDbgVars := make(map[Expr]bool)
 	// Don't need reset p.needPyInit here
 	// p.needPyInit = false
 	ret := &aPackage{
 		mod: mod, vars: gbls, fns: fns, stubs: stubs,
-		pyobjs: pyobjs, pymods: pymods, strs: strs, goStrs: goStrs,
+		pyobjs: pyobjs, pymods: pymods, strs: strs,
 		chkabi: chkabi, Prog: p,
 		di: nil, cu: nil, glbDbgVars: glbDbgVars,
 	}

compiler/ssa/ssa_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 /*
  * Copyright (c) 2024 The GoPlus Authors (goplus.org). All rights reserved.
  *

compiler/ssa/ssatest/ssautil_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 package ssatest
 
 import (

runtime/abi/map_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 package abi
 
 import (

runtime/internal/clite/debug/_wrap/debug.c

@@ -1,6 +1,8 @@
 #if defined(__linux__)
 #define UNW_LOCAL_ONLY
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <features.h>
 #endif
 

test/c_test.go

@@ -0,0 +1,21 @@
+//go:build llgo
+// +build llgo
+
+package test
+
+import (
+	"testing"
+
+	"github.com/goplus/llgo/c"
+)
+
+// Can't put it in c/ package because it is marked as 'decl'
+func TestCstr(t *testing.T) {
+	cstr := c.Str("foo")
+	if cstr == nil {
+		t.Fatal("cstr() returned nil")
+	}
+	if c.Strlen(cstr) != 3 {
+		t.Fatal("cstr() returned invalid length")
+	}
+}

xtool/clang/_types/parser/_parser_test.go

@@ -1,3 +1,6 @@
+//go:build !llgo
+// +build !llgo
+
 /*
  * Copyright (c) 2022 The GoPlus Authors (goplus.org). All rights reserved.
  *

xtool/clang/clang.go

@@ -20,6 +20,7 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"strings"
 )
 
 // -----------------------------------------------------------------------------
@@ -40,6 +41,32 @@ func New(app string) *Cmd {
 	return &Cmd{app, os.Stdout, os.Stderr}
 }
 
+func (p *Cmd) Compile(args ...string) error {
+	// Parse CFLAGS environment variable into separate arguments
+	cflags := strings.Fields(os.Getenv("CFLAGS"))
+	if len(cflags) > 0 {
+		// Create a new slice with capacity for all arguments
+		newArgs := make([]string, 0, len(cflags)+len(args))
+		newArgs = append(newArgs, cflags...)
+		newArgs = append(newArgs, args...)
+		args = newArgs
+	}
+	return p.Exec(args...)
+}
+
+func (p *Cmd) Link(args ...string) error {
+	// Parse LDFLAGS environment variable into separate arguments
+	ldflags := strings.Fields(os.Getenv("LDFLAGS"))
+	if len(ldflags) > 0 {
+		// Create a new slice with capacity for all arguments
+		newArgs := make([]string, 0, len(ldflags)+len(args))
+		newArgs = append(newArgs, ldflags...)
+		newArgs = append(newArgs, args...)
+		args = newArgs
+	}
+	return p.Exec(args...)
+}
+
 // Exec executes a clang command.
 func (p *Cmd) Exec(args ...string) error {
 	cmd := exec.Command(p.app, args...)