From bf0148e047e576ce746b0bcefdb3ed1f8402930c Mon Sep 17 00:00:00 2001 From: xushiwei Date: Mon, 17 Jun 2024 05:33:07 +0800 Subject: [PATCH 1/3] canSkipToBuild --- cl/compile.go | 15 ----------- cl/import.go | 14 +++++++++++ cmd/internal/base/base.go | 2 +- internal/build/build.go | 52 ++++++++++++++++++++------------------- 4 files changed, 42 insertions(+), 41 deletions(-) diff --git a/cl/compile.go b/cl/compile.go index d3977318..ec18c06f 100644 --- a/cl/compile.go +++ b/cl/compile.go @@ -25,7 +25,6 @@ import ( "log" "os" "sort" - "strings" "github.com/goplus/llgo/cl/blocks" "github.com/goplus/llgo/internal/typepatch" @@ -91,20 +90,6 @@ func (p *context) pkgNoInit(pkg *types.Package) bool { return false } -func ignoreName(name string) bool { - /* TODO(xsw): confirm this is not needed more - if name == "unsafe.init" { - return true - } - */ - return strings.HasPrefix(name, "internal/") || strings.HasPrefix(name, "crypto/") || - strings.HasPrefix(name, "arena.") || strings.HasPrefix(name, "maps.") || - strings.HasPrefix(name, "time.") || strings.HasPrefix(name, "syscall.") || - strings.HasPrefix(name, "os.") || strings.HasPrefix(name, "plugin.") || - strings.HasPrefix(name, "reflect.") || strings.HasPrefix(name, "errors.") || - strings.HasPrefix(name, "runtime/") -} - // ----------------------------------------------------------------------------- type instrOrValue interface { diff --git a/cl/import.go b/cl/import.go index 21979310..fbbf4408 100644 --- a/cl/import.go +++ b/cl/import.go @@ -490,6 +490,20 @@ func replaceGoName(v string, pos int) string { return v } +func ignoreName(name string) bool { + /* TODO(xsw): confirm this is not needed more + if name == "unsafe.init" { + return true + } + */ + return strings.HasPrefix(name, "internal/") || strings.HasPrefix(name, "crypto/") || + strings.HasPrefix(name, "arena.") || strings.HasPrefix(name, "maps.") || + strings.HasPrefix(name, "time.") || strings.HasPrefix(name, "syscall.") || + strings.HasPrefix(name, "os.") || strings.HasPrefix(name, "plugin.") || + strings.HasPrefix(name, "reflect.") || strings.HasPrefix(name, "errors.") || + strings.HasPrefix(name, "runtime/") +} + // ----------------------------------------------------------------------------- const ( diff --git a/cmd/internal/base/base.go b/cmd/internal/base/base.go index 440cdf4a..e23061cf 100644 --- a/cmd/internal/base/base.go +++ b/cmd/internal/base/base.go @@ -52,7 +52,7 @@ type Command struct { // Llgo command var Llgo = &Command{ UsageLine: "llgo", - Short: `llgo is a Go compiler based on LLVM in order to better integrate Go with the C ecosystem.`, + Short: `llgo is a Go compiler based on LLVM in order to better integrate Go with the C ecosystem including Python.`, // Commands initialized in package main } diff --git a/internal/build/build.go b/internal/build/build.go index 247546c1..d1a522fb 100644 --- a/internal/build/build.go +++ b/internal/build/build.go @@ -292,18 +292,18 @@ func linkMainPkg(pkg *packages.Package, pkgs []*aPackage, runtimeFiles []string, if app == "" { app = filepath.Join(conf.BinPath, name+conf.AppExt) } - const N = 6 + const N = 5 args := make([]string, N, len(pkg.Imports)+len(runtimeFiles)+(N+1)) args[0] = "-o" args[1] = app args[2] = "-Wno-override-module" - args[3] = "-fuse-ld=lld" - args[4] = "-Xlinker" + args[3] = "-Xlinker" if runtime.GOOS == "darwin" { // ld64.lld (macOS) - args[5] = "-dead_strip" + args[4] = "-dead_strip" } else { // ld.lld (Unix), lld-link (Windows), wasm-ld (WebAssembly) - args[5] = "--gc-sections" + args[4] = "--gc-sections" } + //args[5] = "-fuse-ld=lld" // TODO(xsw): to check lld exists or not //args[6] = "-O2" needRuntime := false needPyInit := false @@ -399,25 +399,6 @@ func buildPkg(ctx *context, aPkg *aPackage) { aPkg.LPkg = ret } -func canSkipToBuild(pkgPath string) bool { - switch pkgPath { - case "unsafe", "errors", "runtime", "sync": // TODO(xsw): remove it - return true - default: - return strings.HasPrefix(pkgPath, "internal/") || - strings.HasPrefix(pkgPath, "runtime/internal/") - } -} - -type none struct{} - -var hasAltPkg = map[string]none{ - "math": {}, - "sync": {}, - "sync/atomic": {}, - "runtime": {}, -} - const ( altPkgPathPrefix = "github.com/goplus/llgo/internal/lib/" ) @@ -468,7 +449,9 @@ func allPkgs(ctx *context, initial []*packages.Package) (all []*aPackage, errs [ var altPkg *packages.Cached var ssaPkg = createSSAPkg(prog, p, verbose) if _, ok := hasAltPkg[p.PkgPath]; ok { - altPkg = ctx.dedup.Check(altPkgPathPrefix + p.PkgPath) + if altPkg = ctx.dedup.Check(altPkgPathPrefix + p.PkgPath); altPkg == nil { + return + } } all = append(all, &aPackage{p, ssaPkg, altPkg, nil}) } else { @@ -685,6 +668,25 @@ func decodeFile(outFile string, zipf *zip.File) (err error) { return } +func canSkipToBuild(pkgPath string) bool { + switch pkgPath { + case "unsafe", "errors": // TODO(xsw): remove it + return true + default: + return strings.HasPrefix(pkgPath, "internal/") || + strings.HasPrefix(pkgPath, "runtime/internal/") + } +} + +type none struct{} + +var hasAltPkg = map[string]none{ + "math": {}, + "sync": {}, + "sync/atomic": {}, + "runtime": {}, +} + func check(err error) { if err != nil { panic(err) From 8c6cdcc97e0cd7a689e934d3c7afd12ae9777293 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Mon, 17 Jun 2024 05:34:52 +0800 Subject: [PATCH 2/3] pkgPath --- internal/build/build.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/build/build.go b/internal/build/build.go index d1a522fb..d3f16c6f 100644 --- a/internal/build/build.go +++ b/internal/build/build.go @@ -443,13 +443,14 @@ func allPkgs(ctx *context, initial []*packages.Package) (all []*aPackage, errs [ built := ctx.built packages.Visit(initial, nil, func(p *packages.Package) { if p.Types != nil && !p.IllTyped { - if _, ok := built[p.PkgPath]; ok { + pkgPath := p.PkgPath + if _, ok := built[pkgPath]; ok { return } var altPkg *packages.Cached var ssaPkg = createSSAPkg(prog, p, verbose) - if _, ok := hasAltPkg[p.PkgPath]; ok { - if altPkg = ctx.dedup.Check(altPkgPathPrefix + p.PkgPath); altPkg == nil { + if _, ok := hasAltPkg[pkgPath]; ok { + if altPkg = ctx.dedup.Check(altPkgPathPrefix + pkgPath); altPkg == nil { return } } From a819796ce20d4a1ef6c46fb6884a29362fe950a0 Mon Sep 17 00:00:00 2001 From: xushiwei Date: Mon, 17 Jun 2024 11:02:52 +0800 Subject: [PATCH 3/3] build: LLGoFiles (support to compile c files) --- internal/build/build.go | 52 ++++++++++++++++++++----- py/llgo.cfg | 7 ---- py/llgo_autogen.lla | Bin 1639 -> 400 bytes py/module.ll | 82 ---------------------------------------- py/python.go | 1 + 5 files changed, 43 insertions(+), 99 deletions(-) delete mode 100644 py/llgo.cfg delete mode 100644 py/module.ll diff --git a/internal/build/build.go b/internal/build/build.go index d3f16c6f..d115f7c6 100644 --- a/internal/build/build.go +++ b/internal/build/build.go @@ -19,6 +19,7 @@ package build import ( "archive/zip" "fmt" + "go/constant" "go/token" "go/types" "io" @@ -147,7 +148,7 @@ func Do(args []string, conf *Config) { progSSA := ssa.NewProgram(initial[0].Fset, ssaBuildMode) patches := make(cl.Patches, len(altPkgPaths)) - altSSAPkgs(progSSA, patches, altPkgs[1:]) + altSSAPkgs(progSSA, patches, altPkgs[1:], verbose) ctx := &context{progSSA, prog, dedup, patches, make(map[string]none), mode, verbose} pkgs := buildAllPkgs(ctx, initial) @@ -234,9 +235,8 @@ func buildAllPkgs(ctx *context, initial []*packages.Package) (pkgs []*aPackage) // and set no export file pkg.ExportFile = "" case cl.PkgLinkIR, cl.PkgLinkExtern, cl.PkgPyModule: - pkgPath := pkg.PkgPath - if isPkgInLLGo(pkgPath) { - pkg.ExportFile = concatPkgLinkFiles(pkgPath) + if isPkgInLLGo(pkg.PkgPath) { + pkg.ExportFile = concatPkgLinkFiles(pkg, ctx.verbose) } else { // panic("todo") // TODO(xsw): support packages out of llgo @@ -414,14 +414,14 @@ func altPkgs(initial []*packages.Package, alts ...string) []string { return alts } -func altSSAPkgs(prog *ssa.Program, patches cl.Patches, alts []*packages.Package) { +func altSSAPkgs(prog *ssa.Program, patches cl.Patches, alts []*packages.Package, verbose bool) { packages.Visit(alts, nil, func(p *packages.Package) { if p.Types != nil && !p.IllTyped { pkgSSA := prog.CreatePackage(p.Types, p.Syntax, p.TypesInfo, true) if strings.HasPrefix(p.PkgPath, altPkgPathPrefix) { path := p.PkgPath[len(altPkgPathPrefix):] patches[path] = pkgSSA - if debugBuild { + if debugBuild || verbose { log.Println("==> Patching", path) } } @@ -563,11 +563,11 @@ func isSingleLinkFile(ret string) bool { return len(ret) > 0 && ret[0] != ' ' } -func concatPkgLinkFiles(pkgPath string) string { +func concatPkgLinkFiles(pkg *packages.Package, verbose bool) string { var b strings.Builder var ret string var n int - llgoPkgLinkFiles(pkgPath, "", func(linkFile string) { + llgoPkgLinkFiles(pkg, "", func(linkFile string) { if n == 0 { ret = linkFile } else { @@ -575,7 +575,7 @@ func concatPkgLinkFiles(pkgPath string) string { b.WriteString(linkFile) } n++ - }) + }, verbose) if n > 1 { b.WriteByte(' ') b.WriteString(ret) @@ -584,7 +584,39 @@ func concatPkgLinkFiles(pkgPath string) string { return ret } -func llgoPkgLinkFiles(pkgPath string, llFile string, procFile func(linkFile string)) { +// const LLGoFiles = "file1; file2; ..." +func llgoPkgLinkFiles(pkg *packages.Package, llFile string, procFile func(linkFile string), verbose bool) { + if o := pkg.Types.Scope().Lookup("LLGoFiles"); o != nil { + val := o.(*types.Const).Val() + if val.Kind() == constant.String { + clFiles(constant.StringVal(val), pkg, procFile, verbose) + } + } + unzipPkgLinkFiles(pkg.PkgPath, llFile, procFile) +} + +// files = "file1; file2; ..." +func clFiles(files string, pkg *packages.Package, procFile func(linkFile string), verbose bool) { + dir := filepath.Dir(pkg.CompiledGoFiles[0]) + expFile := pkg.ExportFile + for _, file := range strings.Split(files, ";") { + cFile := filepath.Join(dir, strings.TrimSpace(file)) + clFile(cFile, expFile, procFile, verbose) + } +} + +func clFile(cFile, expFile string, procFile func(linkFile string), verbose bool) { + llFile := expFile + filepath.Base(cFile) + ".ll" + args := []string{"-emit-llvm", "-S", "-o", llFile, "-c", cFile} + if verbose { + fmt.Fprintln(os.Stderr, "clang", args) + } + err := clang.New("").Exec(args...) + check(err) + procFile(llFile) +} + +func unzipPkgLinkFiles(pkgPath string, llFile string, procFile func(linkFile string)) { dir := llgoRoot() + pkgPath[len(llgoModPath):] + "/" if llFile == "" { llFile = "llgo_autogen.ll" diff --git a/py/llgo.cfg b/py/llgo.cfg deleted file mode 100644 index dcc7c16d..00000000 --- a/py/llgo.cfg +++ /dev/null @@ -1,7 +0,0 @@ -{ - "cl": [ - "clang -emit-llvm -S -o module.ll -c _pyg/module.c", - "llgen .", - "rm llgo_autogen.lla; zip llgo_autogen.lla llgo_autogen.ll module.ll", - ] -} diff --git a/py/llgo_autogen.lla b/py/llgo_autogen.lla index 36aace8390331918fee0d29f636308f0e8a26475..0bbf8a002158164eb4a3ede78fd4a7526b3e6c22 100644 GIT binary patch delta 73 zcmaFPGl7{mz?+#xgn@y9gQ3>%;zV9m_Px{c(+*6_pJ@4xmyt=187?<@534aVP;#;( Tn*<*t10zEyP?strkYE4+&D{|X delta 1340 zcmbQh{G5k3z?+#xgn@y9gW-F?xrw~0>>rnAr+r?UJ<;-AJxoT*`&&=5`r<|nhW)1CrxX$3a}BgDdyB_bD zX&`ldlKQ1hy5<}gl3d%9WW^K?#C087pmFM&Q=pdX&Elp%@2$N)@vD{vDc`>QX+glA z_w{yi`>o}kdVi^w3va6b*Rk%x?8=Rif96~jcK&uu>$8`koqy0l)w31~bNCKzTobo4 z^yrrlRiE9zh^I>#R0S7I5&u$sRQI(|?JAYanR*x5*M|P&J83gjX{rp{)R^T)Y-^@j z`b&*o|omJD;m(%~Z?HP;umCvyz zGJL;ZsLS7t=J?9N;?{aX($#-Y%!Vc0oleX$ZyPgjn6fVSeSCS@Nn`EuiI?SFr&)#n z(Oh=#Yq0-~n)I0h(>jCBW~}txkbibwXKJ3{NV{`oi=gR4pGbFygPCd5X`_0KXuO?xq5~wlzPh15TV=Tk@9@rere59c6eYU`{b$e6nvs2N_H^wm?V_$s6c5Oyr zeS<=r+w07L*5;)Fl}Bs?X5KyYq~_eT?MwH~Js#qyldxV_Zb8XmsZh^DQ^S{)%Y0B& zP;lg4XB!q`z?jYPF15mbegW5`4?;c6r@YG#h#2?#E-Wq=crLXgxqO0%Th;$9{{%c(VrP^k-@jdue)GcdoEO*3YJ6{8aLLV> zVfH0PIxow*CL{Lp4DY)?&hX5S@4qbQcZ0y_nH|1md2Zg%e|^?}!5#lm*O>9d z7VgYwZ|(yO9J?FxI^QR5Rx>}x9$d!}H7{mC=wyMG=7sh$3%jf2t{rZ)Zz^|cGwA<) zuK6o}fHxzP95cMInry;oTmdSr&