XeLabs/sonic
2
0
Fork 0
mirror of https://github.com/ii64/sonic.git synced 2026-06-20 16:45:22 +08:00
Code Issues Projects Releases Wiki Activity

fix: issux213 (#215)

Browse source 
* fix (decoder): use AVX mode only on base64x
This commit is contained in:
Yi Duan 2022-04-21 15:29:52 +08:00 committed by GitHub
parent 2c8299dd44
commit 9aab4704ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
decoder/assembler_amd64_go116.go
View file

@ -27,7 +27,6 @@ import (
`unsafe`
`github.com/bytedance/sonic/internal/caching`
`github.com/bytedance/sonic/internal/cpu`
`github.com/bytedance/sonic/internal/jit`
`github.com/bytedance/sonic/internal/native`
`github.com/bytedance/sonic/internal/native/types`
@ -1117,12 +1116,8 @@ func (self *_Assembler) _asm_OP_bin(_ *_Instr) {
self.Emit("MOVQ" , _SI, jit.Ptr(_VP, 16)) // MOVQ SI, 16(VP)
self.malloc(_SI, _SI) // MALLOC SI, SI
/* check for AVX2 support */
if !cpu.HasAVX2 {
self.Emit("XORL", _CX, _CX) // XORL CX, CX
} else {
self.Emit("MOVL", jit.Imm(_MODE_AVX2), _CX) // MOVL $_MODE_AVX2, CX
}
// TODO: due to base64x's bug, only use AVX mode now
self.Emit("XORL", _CX, _CX) // XORL CX, CX
/* call the decoder */
self.Emit("XORL" , _DX, _DX) // XORL DX, DX

9
decoder/assembler_amd64_go117.go
View file

@ -27,7 +27,6 @@ import (
`unsafe`
`github.com/bytedance/sonic/internal/caching`
`github.com/bytedance/sonic/internal/cpu`
`github.com/bytedance/sonic/internal/jit`
`github.com/bytedance/sonic/internal/native`
`github.com/bytedance/sonic/internal/native/types`
@ -1114,12 +1113,8 @@ func (self *_Assembler) _asm_OP_bin(_ *_Instr) {
self.Emit("MOVQ" , _SI, jit.Ptr(_VP, 16)) // MOVQ SI, 16(VP)
self.malloc_AX(_SI, _SI) // MALLOC SI, SI
/* check for AVX2 support */
if !cpu.HasAVX2 {
self.Emit("XORL", _CX, _CX) // XORL CX, CX
} else {
self.Emit("MOVL", jit.Imm(_MODE_AVX2), _CX) // MOVL $_MODE_AVX2, CX
}
// TODO: due to base64x's bug, only use AVX mode now
self.Emit("XORL", _CX, _CX) // XORL CX, CX
/* call the decoder */
self.Emit("XORL" , _DX, _DX) // XORL DX, DX

59
issue_test/issue213_test.go Normal file
View file

@ -0,0 +1,59 @@
/*
* Copyright 2021 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
*
* http://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 issue_test
import (
`sync`
`testing`
`github.com/bytedance/sonic`
)
type ByteStruct struct {
Bytes []byte
}
type ObjStruct struct {
Obj ByteStruct
}
func TestIssue213(t *testing.T) {
// bytes := []byte("{\"Obj\":{\"Bytes\":\"eyJUZXN0Q29kZSI6MjIyMiwiVGVzdFN0cmluZyI6InRlc3Rfc3RyaW5n\"}}") // this is OK
bytes := []byte("{\"Obj\":{\"Bytes\":\"eyJUZXN0Q29kZSI6MjIyMiwiVGVzdFN0cmluZyI6InRlc3Rfc3RyaW5n\", \"x\":0}}")
wg := sync.WaitGroup{}
for i:=0;i<1000;i++{
wg.Add(1)
go func(){
defer wg.Done()
var o *ObjStruct
if err := sonic.Unmarshal(bytes, &o); err != nil {
t.Fatal(err)
}
}()
}
wg.Wait()
}
func BenchmarkIssue213(b *testing.B) {
// bytes := []byte("{\"Obj\":{\"Bytes\":\"eyJUZXN0Q29kZSI6MjIyMiwiVGVzdFN0cmluZyI6InRlc3Rfc3RyaW5n\"}}") // this is OK
js := "{\"Obj\":{\"Bytes\":\"eyJUZXN0Q29kZSI6MjIyMiwiVGVzdFN0cmluZyI6InRlc3Rfc3RyaW5n\", \"x\":0}}"
b.ResetTimer()
for i:=0; i<b.N; i++ {
var o *ObjStruct
_ = sonic.UnmarshalString(js, &o)
}
}