mask_asm.go: Disable AVX2

nhooyr · nhooyr · commit f5397ae3d1bf · 2023-10-25T17:41:31.000-07:00
Slower for some reason than just SIMD.

Also no dependency on cpu package is nice.
diff --git a/go.mod b/go.mod
@@ -1,5 +1,3 @@
 module nhooyr.io/websocket
 
 go 1.19
-
-require golang.org/x/sys v0.13.0
diff --git a/go.sum b/go.sum
@@ -1,2 +0,0 @@
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
diff --git a/internal/examples/go.mod b/internal/examples/go.mod
@@ -8,5 +8,3 @@ require (
 	golang.org/x/time v0.3.0
 	nhooyr.io/websocket v0.0.0-00010101000000-000000000000
 )
-
-require golang.org/x/sys v0.13.0 // indirect
diff --git a/internal/examples/go.sum b/internal/examples/go.sum
@@ -1,4 +1,2 @@
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
diff --git a/mask_asm.go b/mask_asm.go
@@ -2,16 +2,14 @@
 
 package websocket
 
-import "golang.org/x/sys/cpu"
-
 func mask(key uint32, b []byte) uint32 {
 	if len(b) > 0 {
 		return maskAsm(&b[0], len(b), key)
 	}
 	return key
 }
 
-var useAVX2 = cpu.X86.HasAVX2 //lint:ignore U1000 mask_amd64.s
+var useAVX2 = false
 
 //go:noescape
 func maskAsm(b *byte, len int, key uint32) uint32

-Original file line number
+Diff line change
@@ @@ -1,5 +1,3 @@ @@
 module nhooyr.io/websocket
 go 1.19
+-
 -require golang.org/x/sys v0.13.0
Original file line number	Diff line number	Diff line change
`@@ -1,2 +0,0 @@`
`1`		`-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=`
`2`		`-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,3 @@ require (`
`8`	`8`	`golang.org/x/time v0.3.0`
`9`	`9`	`nhooyr.io/websocket v0.0.0-00010101000000-000000000000`
`10`	`10`	`)`
`11`		`-`
`12`		`-require golang.org/x/sys v0.13.0 // indirect`
Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,14 @@`
`2`	`2`
`3`	`3`	`package websocket`
`4`	`4`
`5`		`-import "golang.org/x/sys/cpu"`
`6`		`-`
`7`	`5`	`func mask(key uint32, b []byte) uint32 {`
`8`	`6`	`if len(b) > 0 {`
`9`	`7`	`return maskAsm(&b[0], len(b), key)`
`10`	`8`	`}`
`11`	`9`	`return key`
`12`	`10`	`}`
`13`	`11`
`14`		`-var useAVX2 = cpu.X86.HasAVX2 //lint:ignore U1000 mask_amd64.s`
	`12`	`+var useAVX2 = false`
`15`	`13`
`16`	`14`	`//go:noescape`
`17`	`15`	`func maskAsm(b *byte, len int, key uint32) uint32`