Move AVX2 branch under amd64 build tag

bwesterb · Jul 17, 2024 · 52c3193 · 52c3193
1 parent da1c3f7
commit 52c3193
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 27 deletions.
diff --git a/and_amd64.go b/and_amd64.go
@@ -1,28 +1,37 @@
 package and
 
 func and(dst, a, b []byte) {
-	l := uint64(len(a)) >> 8
-	if l != 0 {
-		andAVX2(&dst[0], &a[0], &b[0], l)
+	l := 0
+	if hasAVX2() {
+		l = uint64(len(a)) >> 8
+		if l != 0 {
+			andAVX2(&dst[0], &a[0], &b[0], l)
+		}
+		l <<= 8
 	}
-	l <<= 8
 	andGeneric(dst[l:], a[l:], b[l:])
 }
 
 func or(dst, a, b []byte) {
-	l := uint64(len(a)) >> 8
-	if l != 0 {
-		orAVX2(&dst[0], &a[0], &b[0], l)
+	l := 0
+	if hasAVX2() {
+		l = uint64(len(a)) >> 8
+		if l != 0 {
+			orAVX2(&dst[0], &a[0], &b[0], l)
+		}
+		l <<= 8
 	}
-	l <<= 8
 	orGeneric(dst[l:], a[l:], b[l:])
 }
 
 func andNot(dst, a, b []byte) {
-	l := uint64(len(a)) >> 8
-	if l != 0 {
-		andNotAVX2(&dst[0], &a[0], &b[0], l)
+	l := 0
+	if hasAVX2() {
+		l = uint64(len(a)) >> 8
+		if l != 0 {
+			andNotAVX2(&dst[0], &a[0], &b[0], l)
+		}
+		l <<= 8
 	}
-	l <<= 8
 	andNotGeneric(dst[l:], a[l:], b[l:])
 }
diff --git a/lib.go b/lib.go
@@ -13,11 +13,7 @@ func And(dst, a, b []byte) {
 		panic("lengths of a, b and dst must be equal")
 	}
 
-	if hasAVX2() {
-		and(dst, a, b)
-		return
-	}
-	andGeneric(dst, a, b)
+	and(dst, a, b)
 }
 
 func andGeneric(dst, a, b []byte) {
@@ -43,11 +39,7 @@ func Or(dst, a, b []byte) {
 		panic("lengths of a, b and dst must be equal")
 	}
 
-	if hasAVX2() {
-		or(dst, a, b)
-		return
-	}
-	orGeneric(dst, a, b)
+	or(dst, a, b)
 }
 
 func orGeneric(dst, a, b []byte) {
@@ -73,11 +65,7 @@ func AndNot(dst, a, b []byte) {
 		panic("lengths of a, b and dst must be equal")
 	}
 
-	if hasAVX2() {
-		andNot(dst, a, b)
-		return
-	}
-	andNotGeneric(dst, a, b)
+	andNot(dst, a, b)
 }
 
 func andNotGeneric(dst, a, b []byte) {