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

Merge pull request #1198 from visualfc/pybytes

Browse Source 
ssa: PyVal support py bytes
This commit is contained in:
xushiwei
2025-07-30 15:18:22 +08:00
committed by GitHub
parent d8da4364fd 36fa18b28c
commit 86519b471e
3 changed files with 79 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cl/_testpy/list/in.go
View File

@@ -7,7 +7,8 @@ import (
) )
func main() { func main() {
x := py.List(true, false, 1, float32(2.1), 3.1, uint(4), 1+2i, complex64(3+4i), "hello", []byte("world")) x := py.List(true, false, 1, float32(2.1), 3.1, uint(4), 1+2i, complex64(3+4i),
"hello", []byte("world"), [...]byte{1, 2, 3}, [...]byte{})
y := py.List(std.Abs, std.Print, math.Pi) y := py.List(std.Abs, std.Print, math.Pi)
std.Print(x, y) std.Print(x, y)
} }

90
cl/_testpy/list/out.ll
View File

@@ -35,39 +35,56 @@ _llgo_2: ; preds = %_llgo_1, %_llgo_0
define void @"github.com/goplus/llgo/cl/_testpy/list.main"() { define void @"github.com/goplus/llgo/cl/_testpy/list.main"() {
_llgo_0: _llgo_0:
%0 = call %"github.com/goplus/llgo/runtime/internal/runtime.Slice" @"github.com/goplus/llgo/runtime/internal/runtime.StringToBytes"(%"github.com/goplus/llgo/runtime/internal/runtime.String" { ptr @0, i64 5 }) %0 = call %"github.com/goplus/llgo/runtime/internal/runtime.Slice" @"github.com/goplus/llgo/runtime/internal/runtime.StringToBytes"(%"github.com/goplus/llgo/runtime/internal/runtime.String" { ptr @0, i64 5 })
%1 = call ptr @PyList_New(i64 10) %1 = alloca [3 x i8], align 1
%2 = call ptr @PyBool_FromLong(i32 -1) call void @llvm.memset(ptr %1, i8 0, i64 3, i1 false)
%3 = call i32 @PyList_SetItem(ptr %1, i64 0, ptr %2) %2 = getelementptr inbounds i8, ptr %1, i64 0
%4 = call ptr @PyBool_FromLong(i32 0) %3 = getelementptr inbounds i8, ptr %1, i64 1
%5 = call i32 @PyList_SetItem(ptr %1, i64 1, ptr %4) %4 = getelementptr inbounds i8, ptr %1, i64 2
%6 = call ptr @PyLong_FromLongLong(i64 1) store i8 1, ptr %2, align 1
%7 = call i32 @PyList_SetItem(ptr %1, i64 2, ptr %6) store i8 2, ptr %3, align 1
%8 = call ptr @PyFloat_FromDouble(double 0x4000CCCCC0000000) store i8 3, ptr %4, align 1
%9 = call i32 @PyList_SetItem(ptr %1, i64 3, ptr %8) %5 = load [3 x i8], ptr %1, align 1
%10 = call ptr @PyFloat_FromDouble(double 3.100000e+00) %6 = call ptr @PyList_New(i64 12)
%11 = call i32 @PyList_SetItem(ptr %1, i64 4, ptr %10) %7 = call ptr @PyBool_FromLong(i32 -1)
%12 = call ptr @PyLong_FromUnsignedLongLong(i64 4) %8 = call i32 @PyList_SetItem(ptr %6, i64 0, ptr %7)
%13 = call i32 @PyList_SetItem(ptr %1, i64 5, ptr %12) %9 = call ptr @PyBool_FromLong(i32 0)
%14 = call ptr @PyComplex_FromDoubles(double 1.000000e+00, double 2.000000e+00) %10 = call i32 @PyList_SetItem(ptr %6, i64 1, ptr %9)
%15 = call i32 @PyList_SetItem(ptr %1, i64 6, ptr %14) %11 = call ptr @PyLong_FromLongLong(i64 1)
%16 = call ptr @PyComplex_FromDoubles(double 3.000000e+00, double 4.000000e+00) %12 = call i32 @PyList_SetItem(ptr %6, i64 2, ptr %11)
%17 = call i32 @PyList_SetItem(ptr %1, i64 7, ptr %16) %13 = call ptr @PyFloat_FromDouble(double 0x4000CCCCC0000000)
%18 = call ptr @PyUnicode_FromStringAndSize(ptr @1, i64 5) %14 = call i32 @PyList_SetItem(ptr %6, i64 3, ptr %13)
%19 = call i32 @PyList_SetItem(ptr %1, i64 8, ptr %18) %15 = call ptr @PyFloat_FromDouble(double 3.100000e+00)
%20 = extractvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %0, 0 %16 = call i32 @PyList_SetItem(ptr %6, i64 4, ptr %15)
%21 = extractvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %0, 1 %17 = call ptr @PyLong_FromUnsignedLongLong(i64 4)
%22 = call ptr @PyByteArray_FromStringAndSize(ptr %20, i64 %21) %18 = call i32 @PyList_SetItem(ptr %6, i64 5, ptr %17)
%23 = call i32 @PyList_SetItem(ptr %1, i64 9, ptr %22) %19 = call ptr @PyComplex_FromDoubles(double 1.000000e+00, double 2.000000e+00)
%24 = load ptr, ptr @__llgo_py.math, align 8 %20 = call i32 @PyList_SetItem(ptr %6, i64 6, ptr %19)
%25 = call ptr @PyObject_GetAttrString(ptr %24, ptr @2) %21 = call ptr @PyComplex_FromDoubles(double 3.000000e+00, double 4.000000e+00)
%26 = call ptr @PyList_New(i64 3) %22 = call i32 @PyList_SetItem(ptr %6, i64 7, ptr %21)
%27 = load ptr, ptr @__llgo_py.builtins.abs, align 8 %23 = call ptr @PyUnicode_FromStringAndSize(ptr @1, i64 5)
%28 = call i32 @PyList_SetItem(ptr %26, i64 0, ptr %27) %24 = call i32 @PyList_SetItem(ptr %6, i64 8, ptr %23)
%29 = load ptr, ptr @__llgo_py.builtins.print, align 8 %25 = extractvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %0, 0
%30 = call i32 @PyList_SetItem(ptr %26, i64 1, ptr %29) %26 = extractvalue %"github.com/goplus/llgo/runtime/internal/runtime.Slice" %0, 1
%31 = call i32 @PyList_SetItem(ptr %26, i64 2, ptr %25) %27 = call ptr @PyByteArray_FromStringAndSize(ptr %25, i64 %26)
%32 = load ptr, ptr @__llgo_py.builtins.print, align 8 %28 = call i32 @PyList_SetItem(ptr %6, i64 9, ptr %27)
%33 = call ptr (ptr, ...) @PyObject_CallFunctionObjArgs(ptr %32, ptr %1, ptr %26, ptr null) %29 = alloca [3 x i8], align 1
call void @llvm.memset(ptr %29, i8 0, i64 3, i1 false)
store [3 x i8] %5, ptr %29, align 1
%30 = getelementptr inbounds ptr, ptr %29, i64 0
%31 = call ptr @PyBytes_FromStringAndSize(ptr %30, i64 3)
%32 = call i32 @PyList_SetItem(ptr %6, i64 10, ptr %31)
%33 = call ptr @PyBytes_FromStringAndSize(ptr null, i64 0)
%34 = call i32 @PyList_SetItem(ptr %6, i64 11, ptr %33)
%35 = load ptr, ptr @__llgo_py.math, align 8
%36 = call ptr @PyObject_GetAttrString(ptr %35, ptr @2)
%37 = call ptr @PyList_New(i64 3)
%38 = load ptr, ptr @__llgo_py.builtins.abs, align 8
%39 = call i32 @PyList_SetItem(ptr %37, i64 0, ptr %38)
%40 = load ptr, ptr @__llgo_py.builtins.print, align 8
%41 = call i32 @PyList_SetItem(ptr %37, i64 1, ptr %40)
%42 = call i32 @PyList_SetItem(ptr %37, i64 2, ptr %36)
%43 = load ptr, ptr @__llgo_py.builtins.print, align 8
%44 = call ptr (ptr, ...) @PyObject_CallFunctionObjArgs(ptr %43, ptr %6, ptr %37, ptr null)
ret void ret void
} }
@@ -77,6 +94,9 @@ declare void @"github.com/goplus/lib/py/std.init"()
declare %"github.com/goplus/llgo/runtime/internal/runtime.Slice" @"github.com/goplus/llgo/runtime/internal/runtime.StringToBytes"(%"github.com/goplus/llgo/runtime/internal/runtime.String") declare %"github.com/goplus/llgo/runtime/internal/runtime.Slice" @"github.com/goplus/llgo/runtime/internal/runtime.StringToBytes"(%"github.com/goplus/llgo/runtime/internal/runtime.String")
; Function Attrs: nocallback nofree nounwind willreturn memory(argmem: write)
declare void @llvm.memset(ptr nocapture writeonly, i8, i64, i1 immarg) #0
declare ptr @PyList_New(i64) declare ptr @PyList_New(i64)
declare ptr @PyBool_FromLong(i32) declare ptr @PyBool_FromLong(i32)
@@ -95,8 +115,12 @@ declare ptr @PyUnicode_FromStringAndSize(ptr, i64)
declare ptr @PyByteArray_FromStringAndSize(ptr, i64) declare ptr @PyByteArray_FromStringAndSize(ptr, i64)
declare ptr @PyBytes_FromStringAndSize(ptr, i64)
declare ptr @PyObject_GetAttrString(ptr, ptr) declare ptr @PyObject_GetAttrString(ptr, ptr)
declare ptr @PyObject_CallFunctionObjArgs(ptr, ...) declare ptr @PyObject_CallFunctionObjArgs(ptr, ...)
declare void @llgoLoadPyModSyms(ptr, ...) declare void @llgoLoadPyModSyms(ptr, ...)
attributes #0 = { nocallback nofree nounwind willreturn memory(argmem: write) }

21
ssa/python.go
View File

@@ -17,6 +17,7 @@
package ssa package ssa
import ( import (
"go/constant"
"go/token" "go/token"
"go/types" "go/types"
"sort" "sort"
@@ -456,9 +457,13 @@ func (b Builder) PyVal(v Expr) (ret Expr) {
return b.PyComplex128(v) return b.PyComplex128(v)
} }
case *types.Slice: case *types.Slice:
if elem, ok := t.Elem().(*types.Basic); ok && elem.Kind() == types.Byte { if elem, ok := t.Elem().Underlying().(*types.Basic); ok && elem.Kind() == types.Byte {
return b.PyByteArray(v) return b.PyByteArray(v)
} }
case *types.Array:
if elem, ok := t.Elem().Underlying().(*types.Basic); ok && elem.Kind() == types.Byte {
return b.PyBytes(v)
}
case *types.Pointer: case *types.Pointer:
if v.Type == b.Prog.PyObjectPtr() { if v.Type == b.Prog.PyObjectPtr() {
return v return v
@@ -526,6 +531,20 @@ func (b Builder) PyByteArray(v Expr) Expr {
return b.Call(fn, b.SliceData(v), b.SliceLen(v)) return b.Call(fn, b.SliceData(v), b.SliceLen(v))
} }
// PyBytes(val [...]byte) *Object
func (b Builder) PyBytes(v Expr) Expr {
fn := b.Pkg.pyFunc("PyBytes_FromStringAndSize", b.Prog.tyPyByteArrayFromStringAndSize())
n := v.raw.Type.Underlying().(*types.Array).Len()
typ := b.Prog.Pointer(b.Prog.Byte())
if n == 0 {
return b.Call(fn, Expr{llvm.ConstNull(typ.ll), typ}, b.Prog.Zero(b.Prog.Int()))
}
ptr := b.Alloc(v.Type, false)
b.impl.CreateStore(v.impl, ptr.impl)
p := llvm.CreateInBoundsGEP(b.impl, typ.ll, ptr.impl, []llvm.Value{b.Prog.Zero(b.Prog.Int()).impl})
return b.Call(fn, Expr{p, typ}, b.Const(constant.MakeInt64(n), b.Prog.Int()))
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
type aPyGlobal struct { type aPyGlobal struct {