admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

_testpy: sort by module name

Browse Source
This commit is contained in:
xushiwei
2024-05-13 00:50:58 +08:00
parent a337136389
commit 388b19eed5
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cl/_testpy/callpy/out.ll
View File

@@ -8,10 +8,10 @@ source_filename = "main"
@__llgo_py.os.getcwd = linkonce global ptr null @__llgo_py.os.getcwd = linkonce global ptr null
@0 = private unnamed_addr constant [14 x i8] c"sqrt(2) = %f\0A\00", align 1 @0 = private unnamed_addr constant [14 x i8] c"sqrt(2) = %f\0A\00", align 1
@1 = private unnamed_addr constant [10 x i8] c"cwd = %s\0A\00", align 1 @1 = private unnamed_addr constant [10 x i8] c"cwd = %s\0A\00", align 1
@__llgo_py.os = external global ptr
@2 = private unnamed_addr constant [7 x i8] c"getcwd\00", align 1
@__llgo_py.math = external global ptr @__llgo_py.math = external global ptr
@3 = private unnamed_addr constant [5 x i8] c"sqrt\00", align 1 @2 = private unnamed_addr constant [5 x i8] c"sqrt\00", align 1
@__llgo_py.os = external global ptr
@3 = private unnamed_addr constant [7 x i8] c"getcwd\00", align 1
define void @main.init() { define void @main.init() {
_llgo_0: _llgo_0:
@@ -22,10 +22,10 @@ _llgo_1: ; preds = %_llgo_0
store i1 true, ptr @"main.init$guard", align 1 store i1 true, ptr @"main.init$guard", align 1
call void @"github.com/goplus/llgo/py/math.init"() call void @"github.com/goplus/llgo/py/math.init"()
call void @"github.com/goplus/llgo/py/os.init"() call void @"github.com/goplus/llgo/py/os.init"()
%1 = load ptr, ptr @__llgo_py.os, align 8 %1 = load ptr, ptr @__llgo_py.math, align 8
call void (ptr, ...) @llgoLoadPyModSyms(ptr %1, ptr @2, ptr @__llgo_py.os.getcwd, ptr null) call void (ptr, ...) @llgoLoadPyModSyms(ptr %1, ptr @2, ptr @__llgo_py.math.sqrt, ptr null)
%2 = load ptr, ptr @__llgo_py.math, align 8 %2 = load ptr, ptr @__llgo_py.os, align 8
call void (ptr, ...) @llgoLoadPyModSyms(ptr %2, ptr @3, ptr @__llgo_py.math.sqrt, ptr null) call void (ptr, ...) @llgoLoadPyModSyms(ptr %2, ptr @3, ptr @__llgo_py.os.getcwd, ptr null)
br label %_llgo_2 br label %_llgo_2
_llgo_2: ; preds = %_llgo_1, %_llgo_0 _llgo_2: ; preds = %_llgo_1, %_llgo_0

11
cl/compile.go
View File

@@ -356,8 +356,17 @@ func (p *context) compileBlock(b llssa.Builder, block *ssa.BasicBlock, n int, do
modName := modOf(name) modName := modOf(name)
mods[modName] = append(mods[modName], obj) mods[modName] = append(mods[modName], obj)
} }
// sort by module name
modNames := make([]string, 0, len(mods))
for modName := range mods {
modNames = append(modNames, modName)
}
sort.Strings(modNames)
b.SetBlockEx(ret, llssa.AfterInit) b.SetBlockEx(ret, llssa.AfterInit)
for modName, objs := range mods { for _, modName := range modNames {
objs := mods[modName]
b.LoadPyModSyms(modName, objs...) b.LoadPyModSyms(modName, objs...)
} }
} }