- Notifications
You must be signed in to change notification settings - Fork329
use simd masking for amd64&arm64#326
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
+621 −152
Merged
Changes from1 commit
Commits
Show all changes
26 commits Select commitHold shift + click to select a range
5df0303 mask.go: Use SIMD masking for amd64 and arm64
wdvxdr1123cda2170 Refactor and compile masking code again
nhooyrf5397ae mask_asm.go: Disable AVX2
nhooyr14172e5 Benchmark pure go masking algorithm separately from assembly
nhooyr685a56e Update README.md to indicate assembly websocket masking
nhooyrcb7509a mask_amd64.s: Remove AVX2 fully
nhooyr3f8c9e0 mask_amd64.s: Minor improvements
nhooyr367743d mask_amd64.sh: Cleanup
nhooyr27f80cb mask.go: Cleanup assembly and add nbio benchmark
nhooyr369d641 mask_arm64.s: Cleanup
nhooyrfb13df2 ci/bench.sh: Benchmark masking on arm64 with QEMU
nhooyrecf7dec ci/bench.sh: Install QEMU on CI
nhooyrd34e5d4 wsjson: Add json.Encoder vs json.Marshal benchmark
nhooyre25d968 ci/bench.sh: Don't profile by default
nhooyr640e3c2 ci/bench.sh: Try function instead of alias
nhooyr0596e7a wsjson: Extend benchmark with multiple sizes
nhooyr30447a3 ci/bench.sh: Just symlink the expected qemu-aarch64 binary name
nhooyrf4e61e5 ci/fmt.sh: Error if changes on CI
nhooyrf533f43 mask.go: Reorganize
nhooyra1bb441 ci: Fix dev coverage output
nhooyrfee3739 mask_asm: Note implementation may not be perfect
nhooyr68fc887 mask.go: Revert my changes
nhooyrf62cef3 test.sh: Test assembly masking on arm64
nhooyr92acb74 internal/xcpu: Vendor golang.org/x/sys/cpu
nhooyr17e1b86 mask_asm: Disable AVX2
nhooyr2cd18b3 README.md: Link to assembly benchmark results
nhooyrFile filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
mask.go: Reorganize
- Loading branch information
Uh oh!
There was an error while loading.Please reload this page.
commitf533f430c7d63e9e0bceb2dcbbd5d75602803b82
There are no files selected for viewing
125 changes: 0 additions & 125 deletionsframe.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
131 changes: 127 additions & 4 deletionsmask.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,130 @@ | ||
| package websocket | ||
| import ( | ||
| "encoding/binary" | ||
| "math/bits" | ||
| ) | ||
| // maskGo applies the WebSocket masking algorithm to p | ||
| // with the given key. | ||
| // See https://tools.ietf.org/html/rfc6455#section-5.3 | ||
| // | ||
| // The returned value is the correctly rotated key to | ||
| // to continue to mask/unmask the message. | ||
| // | ||
| // It is optimized for LittleEndian and expects the key | ||
| // to be in little endian. | ||
| // | ||
| // See https://github.com/golang/go/issues/31586 | ||
| // | ||
| //lint:ignore U1000 mask.go | ||
| func maskGo(b []byte, key uint32) uint32 { | ||
| if len(b) >= 8 { | ||
| key64 := uint64(key)<<32 | uint64(key) | ||
| // At some point in the future we can clean these unrolled loops up. | ||
| // See https://github.com/golang/go/issues/31586#issuecomment-487436401 | ||
| // Then we xor until b is less than 128 bytes. | ||
| for len(b) >= 128 { | ||
| v := binary.LittleEndian.Uint64(b) | ||
| binary.LittleEndian.PutUint64(b, v^key64) | ||
| v = binary.LittleEndian.Uint64(b[8:16]) | ||
| binary.LittleEndian.PutUint64(b[8:16], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[16:24]) | ||
| binary.LittleEndian.PutUint64(b[16:24], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[24:32]) | ||
| binary.LittleEndian.PutUint64(b[24:32], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[32:40]) | ||
| binary.LittleEndian.PutUint64(b[32:40], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[40:48]) | ||
| binary.LittleEndian.PutUint64(b[40:48], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[48:56]) | ||
| binary.LittleEndian.PutUint64(b[48:56], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[56:64]) | ||
| binary.LittleEndian.PutUint64(b[56:64], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[64:72]) | ||
| binary.LittleEndian.PutUint64(b[64:72], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[72:80]) | ||
| binary.LittleEndian.PutUint64(b[72:80], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[80:88]) | ||
| binary.LittleEndian.PutUint64(b[80:88], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[88:96]) | ||
| binary.LittleEndian.PutUint64(b[88:96], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[96:104]) | ||
| binary.LittleEndian.PutUint64(b[96:104], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[104:112]) | ||
| binary.LittleEndian.PutUint64(b[104:112], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[112:120]) | ||
| binary.LittleEndian.PutUint64(b[112:120], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[120:128]) | ||
| binary.LittleEndian.PutUint64(b[120:128], v^key64) | ||
| b = b[128:] | ||
| } | ||
| // Then we xor until b is less than 64 bytes. | ||
| for len(b) >= 64 { | ||
| v := binary.LittleEndian.Uint64(b) | ||
| binary.LittleEndian.PutUint64(b, v^key64) | ||
| v = binary.LittleEndian.Uint64(b[8:16]) | ||
| binary.LittleEndian.PutUint64(b[8:16], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[16:24]) | ||
| binary.LittleEndian.PutUint64(b[16:24], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[24:32]) | ||
| binary.LittleEndian.PutUint64(b[24:32], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[32:40]) | ||
| binary.LittleEndian.PutUint64(b[32:40], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[40:48]) | ||
| binary.LittleEndian.PutUint64(b[40:48], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[48:56]) | ||
| binary.LittleEndian.PutUint64(b[48:56], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[56:64]) | ||
| binary.LittleEndian.PutUint64(b[56:64], v^key64) | ||
| b = b[64:] | ||
| } | ||
| // Then we xor until b is less than 32 bytes. | ||
| for len(b) >= 32 { | ||
| v := binary.LittleEndian.Uint64(b) | ||
| binary.LittleEndian.PutUint64(b, v^key64) | ||
| v = binary.LittleEndian.Uint64(b[8:16]) | ||
| binary.LittleEndian.PutUint64(b[8:16], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[16:24]) | ||
| binary.LittleEndian.PutUint64(b[16:24], v^key64) | ||
| v = binary.LittleEndian.Uint64(b[24:32]) | ||
| binary.LittleEndian.PutUint64(b[24:32], v^key64) | ||
| b = b[32:] | ||
| } | ||
| // Then we xor until b is less than 16 bytes. | ||
| for len(b) >= 16 { | ||
| v := binary.LittleEndian.Uint64(b) | ||
| binary.LittleEndian.PutUint64(b, v^key64) | ||
| v = binary.LittleEndian.Uint64(b[8:16]) | ||
| binary.LittleEndian.PutUint64(b[8:16], v^key64) | ||
| b = b[16:] | ||
| } | ||
| // Then we xor until b is less than 8 bytes. | ||
| for len(b) >= 8 { | ||
| v := binary.LittleEndian.Uint64(b) | ||
| binary.LittleEndian.PutUint64(b, v^key64) | ||
| b = b[8:] | ||
| } | ||
| } | ||
| // Then we xor until b is less than 4 bytes. | ||
| for len(b) >= 4 { | ||
| v := binary.LittleEndian.Uint32(b) | ||
| binary.LittleEndian.PutUint32(b, v^key) | ||
| b = b[4:] | ||
| } | ||
| // xor remaining bytes. | ||
| for i := range b { | ||
| b[i] ^= byte(key) | ||
| key = bits.RotateLeft32(key, -8) | ||
| } | ||
| return key | ||
| } |
36 changes: 30 additions & 6 deletionsmask_amd64.s
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletionsmask_asm.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletionsmask_go.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| //go:build !amd64 && !arm64 && !js | ||
| package websocket | ||
| func mask(b []byte, key uint32) uint32 { | ||
| return maskGo(b, key) | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.