Merge pull request #1688 from cpunion/exp/plan9asm-llvm-cabi

Remove cabi allowlist with plan9asm-compatible asm lowering

Author: xushiwei

go.mod

@@ -17,7 +17,7 @@ require (
 )
 
 require (
-	github.com/goplus/plan9asm v0.0.0-20260212064924-71ea5584065b
+	github.com/goplus/plan9asm v0.0.0-20260307134905-822503d6bf44
 	github.com/marcinbor85/gohex v0.0.0-20210308104911-55fb1c624d84
 	github.com/mattn/go-tty v0.0.7
 	github.com/sigurn/crc16 v0.0.0-20240131213347-83fcde1e29d1

go.sum

@@ -16,6 +16,12 @@ github.com/goplus/mod v0.19.5 h1:36sbRxKie2Or9aSfWT06X6WV37sBwARXYfKfGfHzEQs=
 github.com/goplus/mod v0.19.5/go.mod h1:T6Ta3xPXx8NQaRb8h632P5iBgIB77zXfh9vLNRFqMqk=
 github.com/goplus/plan9asm v0.0.0-20260212064924-71ea5584065b h1:DFZ0n92lGC3ogziCvtAHK8TKJf7oqiT4U576TIENiyk=
 github.com/goplus/plan9asm v0.0.0-20260212064924-71ea5584065b/go.mod h1:nnr49+IlbnOI5c0yb1fkbilBRcr50RPX0JAreDdYTUI=
+github.com/goplus/plan9asm v0.0.0-20260306151730-9203c54dfd4c h1:1S6F8dDxAnRiZAhqKjzLhAdx71jOaB5YdlHzfwCkdH8=
+github.com/goplus/plan9asm v0.0.0-20260306151730-9203c54dfd4c/go.mod h1:nnr49+IlbnOI5c0yb1fkbilBRcr50RPX0JAreDdYTUI=
+github.com/goplus/plan9asm v0.0.0-20260307044640-a5f1e3b27fc1 h1:hlVAtc3x34x6CQoOPnkOtz9p4juJ+cEZzgDyJpWnit4=
+github.com/goplus/plan9asm v0.0.0-20260307044640-a5f1e3b27fc1/go.mod h1:nnr49+IlbnOI5c0yb1fkbilBRcr50RPX0JAreDdYTUI=
+github.com/goplus/plan9asm v0.0.0-20260307134905-822503d6bf44 h1:zZXTz5CBO1uZIJGZSGWov5gE1CbulJ1QH6ruTMv3UdY=
+github.com/goplus/plan9asm v0.0.0-20260307134905-822503d6bf44/go.mod h1:gpS4VVNoRykYTtc8kPFBowraN5SrBj8lIjW8/lNjaG4=
 github.com/marcinbor85/gohex v0.0.0-20210308104911-55fb1c624d84 h1:hyAgCuG5nqTMDeUD8KZs7HSPs6KprPgPP8QmGV8nyvk=
 github.com/marcinbor85/gohex v0.0.0-20210308104911-55fb1c624d84/go.mod h1:Pb6XcsXyropB9LNHhnqaknG/vEwYztLkQzVCHv8sQ3M=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=

internal/build/build.go

@@ -31,6 +31,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"slices"
+	"sort"
 	"strings"
 	"sync"
 	"sync/atomic"
@@ -247,6 +248,9 @@ func Do(args []string, conf *Config) ([]Package, error) {
 	verbose := conf.Verbose
 	patterns := args
 	tags := "llgo,math_big_pure_go,purego"
+	if conf.AbiMode == cabi.ModeAllFunc {
+		tags += ",llgo_abi_2"
+	}
 	if conf.Tags != "" {
 		tags += "," + conf.Tags
 	}
@@ -547,10 +551,9 @@ type context struct {
 	// go list derived file lists (SFiles, etc.)
 	sfilesCache map[string][]string // pkg.ID -> absolute .s/.S file paths
 
-	// plan9asm package allowlist parsed from env.
+	// plan9asm package policy parsed from env.
 	plan9asmOnce sync.Once
-	plan9asmAll  bool
-	// when plan9asmAll=false: enabled set; when plan9asmAll=true: excluded set.
+	plan9asmMode plan9asmPkgsEnvMode
 	plan9asmPkgs map[string]bool
 }
 
@@ -903,13 +906,24 @@ func linkMainPkg(ctx *context, pkg *packages.Package, pkgs []*aPackage, outputPa
 	for _, v := range pkgs {
 		allPkgs = append(allPkgs, v.Package)
 	}
-	// linkInputs contains .a archives from all packages and .o files from main module
-	var linkInputs []string
+	visitRoots := allPkgs
+	if ctx.mode == ModeTest {
+		visitRoots = []*packages.Package{pkg}
+		for _, p := range allPkgs {
+			if isRuntimePkg(p.PkgPath) {
+				visitRoots = append(visitRoots, p)
+			}
+		}
+	}
+	// archiveInputs contains package .a files. Object files are prepended later so
+	// archive extraction can see their undefined references in a single linker pass.
+	var archiveInputs []string
 	var linkArgs []string
 	var rtLinkInputs []string
 	var rtLinkArgs []string
 	linkedPkgs := make(map[string]bool) // Track linked packages by ID to avoid duplicates
-	packages.Visit(allPkgs, nil, func(p *packages.Package) {
+	var linkedOrder []Package
+	packages.Visit(visitRoots, nil, func(p *packages.Package) {
 		// Skip if already linked this package (by ID)
 		if linkedPkgs[p.ID] {
 			return
@@ -921,53 +935,62 @@ func linkMainPkg(ctx *context, pkg *packages.Package, pkgs []*aPackage, outputPa
 		}
 		if p.ExportFile != "" && aPkg != nil { // skip packages that only contain declarations
 			linkedPkgs[p.ID] = true
+			linkedOrder = append(linkedOrder, aPkg)
+		}
+	})
 
-			// Defer linking runtime packages unless we actually need the runtime.
-			if isRuntimePkg(p.PkgPath) {
-				rtLinkArgs = append(rtLinkArgs, aPkg.LinkArgs...)
-				if aPkg.ArchiveFile != "" {
-					rtLinkInputs = append(rtLinkInputs, aPkg.ArchiveFile)
-				}
-				return
-			} else {
-				// Only let non-runtime packages influence whether runtime is needed.
-				need1, need2 := aPkg.isNeedRuntimeOrPyInit()
-				needRuntime = needRuntime || need1
-				needPyInit = needPyInit || need2
-			}
-			if aPkg.LPkg.NeedAbiInit {
-				needAbiInit = true
-			}
-
-			linkArgs = append(linkArgs, aPkg.LinkArgs...)
+	// packages.Visit with a post callback yields dependencies before importers.
+	// Reverse that order so static archives are linked after the objects that use them.
+	for i := len(linkedOrder) - 1; i >= 0; i-- {
+		aPkg := linkedOrder[i]
+		p := aPkg.Package
+		// Defer linking runtime packages unless we actually need the runtime.
+		if isRuntimePkg(p.PkgPath) {
+			rtLinkArgs = append(rtLinkArgs, aPkg.LinkArgs...)
 			if aPkg.ArchiveFile != "" {
-				linkInputs = append(linkInputs, aPkg.ArchiveFile)
+				rtLinkInputs = append(rtLinkInputs, aPkg.ArchiveFile)
 			}
+			continue
 		}
-	})
+		// Only let non-runtime packages influence whether runtime is needed.
+		need1, need2 := aPkg.isNeedRuntimeOrPyInit()
+		needRuntime = needRuntime || need1
+		needPyInit = needPyInit || need2
+		if aPkg.LPkg.NeedAbiInit {
+			needAbiInit = true
+		}
+
+		linkArgs = append(linkArgs, aPkg.LinkArgs...)
+		if aPkg.ArchiveFile != "" {
+			archiveInputs = append(archiveInputs, aPkg.ArchiveFile)
+		}
+	}
 
 	// Only link runtime objects when needed (or for host builds where runtime is always required).
 	if needRuntime || needPyInit || ctx.buildConf.Target == "" {
 		linkArgs = append(linkArgs, rtLinkArgs...)
-		linkInputs = append(linkInputs, rtLinkInputs...)
+		archiveInputs = append(archiveInputs, rtLinkInputs...)
 	}
 
+	abiSymbols := linkedModuleGlobals(linkedOrder)
+
 	// Generate main module file (needed for global variables even in library modes)
 	// This is compiled directly to .o and added to linkInputs (not cached)
 	// Use a stable synthetic name to avoid confusing it with the real main package in traces/logs.
-	entryPkg := genMainModule(ctx, llssa.PkgRuntime, pkg, needRuntime, needPyInit, needAbiInit)
+	entryPkg := genMainModule(ctx, llssa.PkgRuntime, pkg, needRuntime, needPyInit, needAbiInit, abiSymbols)
 	entryObjFile, err := exportObject(ctx, "entry_main", entryPkg.ExportFile, []byte(entryPkg.LPkg.String()))
 	if err != nil {
 		return err
 	}
-	linkInputs = append(linkInputs, entryObjFile)
+	linkInputs := []string{entryObjFile}
 
 	// Compile extra files from target configuration
 	extraObjFiles, err := compileExtraFiles(ctx, verbose)
 	if err != nil {
 		return err
 	}
 	linkInputs = append(linkInputs, extraObjFiles...)
+	linkInputs = append(linkInputs, archiveInputs...)
 
 	if IsFullRpathEnabled() {
 		// Treat every link-time library search path, specified by the -L parameter, as a runtime search path as well.
@@ -994,6 +1017,27 @@ func linkMainPkg(ctx *context, pkg *packages.Package, pkgs []*aPackage, outputPa
 	return nil
 }
 
+func linkedModuleGlobals(pkgs []Package) []string {
+	if len(pkgs) == 0 {
+		return nil
+	}
+	seen := make(map[string]struct{})
+	for _, pkg := range pkgs {
+		if pkg == nil || pkg.LPkg == nil {
+			continue
+		}
+		for g := pkg.LPkg.Module().FirstGlobal(); !g.IsNil(); g = gllvm.NextGlobal(g) {
+			seen[g.Name()] = struct{}{}
+		}
+	}
+	names := make([]string, 0, len(seen))
+	for name := range seen {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	return names
+}
+
 // isRuntimePkg reports whether the package path belongs to the llgo runtime tree.
 func isRuntimePkg(pkgPath string) bool {
 	rtRoot := env.LLGoRuntimePkg

internal/build/main_module.go

@@ -41,7 +41,7 @@ import (
 // The module contains argc/argv globals and, for executable build modes,
 // the entry function that wires initialization and main. For C archive or
 // shared library modes, only the globals are emitted.
-func genMainModule(ctx *context, rtPkgPath string, pkg *packages.Package, needRuntime, needPyInit, needAbiInit bool) Package {
+func genMainModule(ctx *context, rtPkgPath string, pkg *packages.Package, needRuntime, needPyInit, needAbiInit bool, abiSymbols []string) Package {
 	prog := ctx.prog
 	mainPkg := prog.NewPackage("", pkg.ID+".main")
 
@@ -84,7 +84,7 @@ func genMainModule(ctx *context, rtPkgPath string, pkg *packages.Package, needRu
 
 	var abiInit llssa.Function
 	if needAbiInit {
-		abiInit = mainPkg.InitAbiTypes("init$abitypes")
+		abiInit = mainPkg.InitAbiTypesFor("init$abitypes", abiSymbols)
 	}
 
 	mainInit := declareNoArgFunc(mainPkg, pkg.PkgPath+".init")

internal/build/main_module_test.go

@@ -29,7 +29,7 @@ func TestGenMainModuleExecutable(t *testing.T) {
 		},
 	}
 	pkg := &packages.Package{PkgPath: "example.com/foo", ExportFile: "foo.a"}
-	mod := genMainModule(ctx, llssa.PkgRuntime, pkg, true, true, true)
+	mod := genMainModule(ctx, llssa.PkgRuntime, pkg, true, true, true, nil)
 	if mod.ExportFile != "foo.a-main" {
 		t.Fatalf("unexpected export file: %s", mod.ExportFile)
 	}
@@ -59,7 +59,7 @@ func TestGenMainModuleLibrary(t *testing.T) {
 		},
 	}
 	pkg := &packages.Package{PkgPath: "example.com/foo", ExportFile: "foo.a"}
-	mod := genMainModule(ctx, llssa.PkgRuntime, pkg, false, false, false)
+	mod := genMainModule(ctx, llssa.PkgRuntime, pkg, false, false, false, nil)
 	ir := mod.LPkg.String()
 	if strings.Contains(ir, "define i32 @main") {
 		t.Fatalf("library mode should not emit main function:\n%s", ir)