diff options
Diffstat (limited to 'vendor/github.com/bytedance/sonic/loader')
7 files changed, 162 insertions, 58 deletions
diff --git a/vendor/github.com/bytedance/sonic/loader/funcdata_compat.go b/vendor/github.com/bytedance/sonic/loader/funcdata_compat.go index b4a24bcd6..68bea25d0 100644 --- a/vendor/github.com/bytedance/sonic/loader/funcdata_compat.go +++ b/vendor/github.com/bytedance/sonic/loader/funcdata_compat.go @@ -1,5 +1,5 @@ -//go:build !go1.17 || go1.24 -// +build !go1.17 go1.24 +//go:build !go1.17 || go1.25 +// +build !go1.17 go1.25 /* * Copyright 2021 ByteDance Inc. diff --git a/vendor/github.com/bytedance/sonic/loader/funcdata_go123.go b/vendor/github.com/bytedance/sonic/loader/funcdata_go123.go index a50cd364f..e1fa473a3 100644 --- a/vendor/github.com/bytedance/sonic/loader/funcdata_go123.go +++ b/vendor/github.com/bytedance/sonic/loader/funcdata_go123.go @@ -1,5 +1,5 @@ -//go:build go1.23 && !go1.24 -// +build go1.23,!go1.24 +//go:build go1.23 && !go1.25 +// +build go1.23,!go1.25 /* * Copyright 2021 ByteDance Inc. diff --git a/vendor/github.com/bytedance/sonic/loader/funcdata_latest.go b/vendor/github.com/bytedance/sonic/loader/funcdata_latest.go index 8b6018bdc..eb64ffa6d 100644 --- a/vendor/github.com/bytedance/sonic/loader/funcdata_latest.go +++ b/vendor/github.com/bytedance/sonic/loader/funcdata_latest.go @@ -1,5 +1,5 @@ -// go:build go1.18 && !go1.24 -// +build go1.18,!go1.24 +// go:build go1.18 && !go1.25 +// +build go1.18,!go1.25 /* * Copyright 2021 ByteDance Inc. diff --git a/vendor/github.com/bytedance/sonic/loader/internal/rt/stackmap.go b/vendor/github.com/bytedance/sonic/loader/internal/rt/stackmap.go index 84ed9a95f..c4394742b 100644 --- a/vendor/github.com/bytedance/sonic/loader/internal/rt/stackmap.go +++ b/vendor/github.com/bytedance/sonic/loader/internal/rt/stackmap.go @@ -62,10 +62,13 @@ func (self *Bitmap) AppendMany(n int, bv int) { } } -// var ( -// _stackMapLock = sync.Mutex{} -// _stackMapCache = make(map[*StackMap]struct{}) -// ) +func (b *Bitmap) String() string { + var buf strings.Builder + for _, byteVal := range b.B { + fmt.Fprintf(&buf, "%08b ", byteVal) + } + return fmt.Sprintf("Bits: %s(total %d bits, %d bytes)", buf.String(), b.N, len(b.B)) +} type BitVec struct { N uintptr @@ -92,27 +95,44 @@ func (self BitVec) String() string { ) } +/* +reference Golang 1.22.0 code: + +``` +args := bitvec.New(int32(maxArgs / int64(types.PtrSize))) +aoff := objw.Uint32(&argsSymTmp, 0, uint32(len(lv.stackMaps))) // number of bitmaps +aoff = objw.Uint32(&argsSymTmp, aoff, uint32(args.N)) // number of bits in each bitmap + +locals := bitvec.New(int32(maxLocals / int64(types.PtrSize))) +loff := objw.Uint32(&liveSymTmp, 0, uint32(len(lv.stackMaps))) // number of bitmaps +loff = objw.Uint32(&liveSymTmp, loff, uint32(locals.N)) // number of bits in each bitmap + +for _, live := range lv.stackMaps { + args.Clear() + locals.Clear() + + lv.pointerMap(live, lv.vars, args, locals) + + aoff = objw.BitVec(&argsSymTmp, aoff, args) + loff = objw.BitVec(&liveSymTmp, loff, locals) +} +``` + +*/ + type StackMap struct { + // number of bitmaps N int32 + // number of bits of each bitmap L int32 + // bitmap1, bitmap2, ... bitmapN B [1]byte } -// func (self *StackMap) add() { -// _stackMapLock.Lock() -// _stackMapCache[self] = struct{}{} -// _stackMapLock.Unlock() -// } - -func (self *StackMap) Pin() uintptr { - // self.add() - return uintptr(unsafe.Pointer(self)) -} - -func (self *StackMap) Get(i int32) BitVec { +func (self *StackMap) Get(i int) BitVec { return BitVec { N: uintptr(self.L), - B: unsafe.Pointer(uintptr(unsafe.Pointer(&self.B)) + uintptr(i * ((self.L + 7) >> 3))), + B: unsafe.Pointer(uintptr(unsafe.Pointer(&self.B)) + uintptr(i * self.BitmapBytes())), } } @@ -121,7 +141,7 @@ func (self *StackMap) String() string { sb.WriteString("StackMap {") /* dump every stack map */ - for i := int32(0); i < self.N; i++ { + for i := 0; i < int(self.N); i++ { sb.WriteRune('\n') sb.WriteString(" " + self.Get(i).String()) } @@ -131,11 +151,31 @@ func (self *StackMap) String() string { return sb.String() } +func (self *StackMap) BitmapLen() int { + return int(self.L) +} + +func (self *StackMap) BitmapBytes() int { + return int(self.L + 7) >> 3 +} + +func (self *StackMap) BitmapNums() int { + return int(self.N) +} + +func (self *StackMap) StackMapHeaderSize() int { + return int(unsafe.Sizeof(self.L)) + int(unsafe.Sizeof(self.N)) +} + func (self *StackMap) MarshalBinary() ([]byte, error) { - size := int(self.N) * int(self.L) + int(unsafe.Sizeof(self.L)) + int(unsafe.Sizeof(self.N)) + size := self.BinaryLen() return BytesFrom(unsafe.Pointer(self), size, size), nil } +func (self *StackMap) BinaryLen() int { + return self.StackMapHeaderSize() + self.BitmapBytes() * self.BitmapNums() +} + var ( byteType = UnpackEface(byte(0)).Type ) @@ -152,15 +192,22 @@ type StackMapBuilder struct { b Bitmap } + //go:nocheckptr func (self *StackMapBuilder) Build() (p *StackMap) { nb := len(self.b.B) - bm := mallocgc(_StackMapSize + uintptr(nb) - 1, byteType, false) + allocatedSize := _StackMapSize + uintptr(nb) - 1 + bm := mallocgc(allocatedSize, byteType, false) /* initialize as 1 bitmap of N bits */ p = (*StackMap)(bm) p.N, p.L = 1, int32(self.b.N) copy(BytesFrom(unsafe.Pointer(&p.B), nb, nb), self.b.B) + + /* assert length */ + if allocatedSize < uintptr(p.BinaryLen()) { + panic(fmt.Sprintf("stackmap allocation too small: allocated %d, required %d", allocatedSize, p.BinaryLen())) + } return } diff --git a/vendor/github.com/bytedance/sonic/loader/register.go b/vendor/github.com/bytedance/sonic/loader/register.go new file mode 100644 index 000000000..d32f9fa50 --- /dev/null +++ b/vendor/github.com/bytedance/sonic/loader/register.go @@ -0,0 +1,55 @@ +// +build !bytedance_tango + +/** + * Copyright 2024 ByteDance Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package loader + +import ( + "sync/atomic" + "unsafe" +) + +func registerModule(mod *moduledata) { + registerModuleLockFree(&lastmoduledatap, mod) +} + +func registerModuleLockFree(tail **moduledata, mod *moduledata) { + for { + oldTail := loadModule(tail) + if casModule(tail, oldTail, mod) { + storeModule(&oldTail.next, mod) + break + } + } +} + +func loadModule(p **moduledata) *moduledata { + return (*moduledata)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p)))) +} + +func storeModule(p **moduledata, value *moduledata) { + atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(value)) +} + +func casModule(p **moduledata, oldValue *moduledata, newValue *moduledata) bool { + return atomic.CompareAndSwapPointer( + (*unsafe.Pointer)(unsafe.Pointer(p)), + unsafe.Pointer(oldValue), + unsafe.Pointer(newValue), + ) +} + diff --git a/vendor/github.com/bytedance/sonic/loader/register_tango.go b/vendor/github.com/bytedance/sonic/loader/register_tango.go new file mode 100644 index 000000000..08abfb5a8 --- /dev/null +++ b/vendor/github.com/bytedance/sonic/loader/register_tango.go @@ -0,0 +1,34 @@ +// +build bytedance_tango + +/** + * Copyright 2024 ByteDance Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package loader + +import ( + "sync" + _ "unsafe" +) + +//go:linkname pluginsMu plugin.pluginsMu +var pluginsMu sync.Mutex + +func registerModule(mod *moduledata) { + pluginsMu.Lock() + defer pluginsMu.Unlock() + lastmoduledatap.next = mod + lastmoduledatap = mod +} diff --git a/vendor/github.com/bytedance/sonic/loader/stubs.go b/vendor/github.com/bytedance/sonic/loader/stubs.go index 80f8de836..28aebd60b 100644 --- a/vendor/github.com/bytedance/sonic/loader/stubs.go +++ b/vendor/github.com/bytedance/sonic/loader/stubs.go @@ -17,8 +17,6 @@ package loader import ( - "sync/atomic" - "unsafe" _ `unsafe` ) @@ -26,35 +24,5 @@ import ( //goland:noinspection GoUnusedGlobalVariable var lastmoduledatap *moduledata -func registerModule(mod *moduledata) { - registerModuleLockFree(&lastmoduledatap, mod) -} - //go:linkname moduledataverify1 runtime.moduledataverify1 func moduledataverify1(_ *moduledata) - -func registerModuleLockFree(tail **moduledata, mod *moduledata) { - for { - oldTail := loadModule(tail) - if casModule(tail, oldTail, mod) { - storeModule(&oldTail.next, mod) - break - } - } -} - -func loadModule(p **moduledata) *moduledata { - return (*moduledata)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p)))) -} - -func storeModule(p **moduledata, value *moduledata) { - atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(value)) -} - -func casModule(p **moduledata, oldValue *moduledata, newValue *moduledata) bool { - return atomic.CompareAndSwapPointer( - (*unsafe.Pointer)(unsafe.Pointer(p)), - unsafe.Pointer(oldValue), - unsafe.Pointer(newValue), - ) -} |