Move alloc tests.

compressible_test.go

@@ -3,13 +3,7 @@ package compress
 import (
 	"crypto/rand"
 	"encoding/base32"
-	"io/ioutil"
-	"strconv"
-	"strings"
 	"testing"
-
-	"github.com/klauspost/compress/flate"
-	"github.com/klauspost/compress/gzip"
 )
 
 func BenchmarkEstimate(b *testing.B) {
@@ -239,64 +233,3 @@ Thoughts?`)
 		b.Log(ShannonEntropyBits(testData))
 	})
 }
-
-func BenchmarkCompressAllocations(b *testing.B) {
-	payload := []byte(strings.Repeat("Tiny payload", 20))
-	for j := -2; j <= 9; j++ {
-		b.Run("level("+strconv.Itoa(j)+")", func(b *testing.B) {
-			b.Run("flate", func(b *testing.B) {
-				b.ReportAllocs()
-
-				for i := 0; i < b.N; i++ {
-					w, err := flate.NewWriter(ioutil.Discard, j)
-					if err != nil {
-						b.Fatal(err)
-					}
-					w.Write(payload)
-					w.Close()
-				}
-			})
-			b.Run("gzip", func(b *testing.B) {
-				b.ReportAllocs()
-
-				for i := 0; i < b.N; i++ {
-					w, err := gzip.NewWriterLevel(ioutil.Discard, j)
-					if err != nil {
-						b.Fatal(err)
-					}
-					w.Write(payload)
-					w.Close()
-				}
-			})
-		})
-	}
-}
-
-func BenchmarkCompressAllocationsSingle(b *testing.B) {
-	payload := []byte(strings.Repeat("Tiny payload", 20))
-	const level = 2
-	b.Run("flate", func(b *testing.B) {
-		b.ReportAllocs()
-
-		for i := 0; i < b.N; i++ {
-			w, err := flate.NewWriter(ioutil.Discard, level)
-			if err != nil {
-				b.Fatal(err)
-			}
-			w.Write(payload)
-			w.Close()
-		}
-	})
-	b.Run("gzip", func(b *testing.B) {
-		b.ReportAllocs()
-
-		for i := 0; i < b.N; i++ {
-			w, err := gzip.NewWriterLevel(ioutil.Discard, level)
-			if err != nil {
-				b.Fatal(err)
-			}
-			w.Write(payload)
-			w.Close()
-		}
-	})
-}

flate/writer_test.go

@@ -502,3 +502,40 @@ func copyBuffer(dst io.Writer, src io.Reader, buf []byte) (written int64, err er
 	}
 	return written, err
 }
+
+func BenchmarkCompressAllocations(b *testing.B) {
+	payload := []byte(strings.Repeat("Tiny payload", 20))
+	for j := -2; j <= 9; j++ {
+		b.Run("level("+strconv.Itoa(j)+")", func(b *testing.B) {
+			b.Run("flate", func(b *testing.B) {
+				b.ReportAllocs()
+
+				for i := 0; i < b.N; i++ {
+					w, err := NewWriter(ioutil.Discard, j)
+					if err != nil {
+						b.Fatal(err)
+					}
+					w.Write(payload)
+					w.Close()
+				}
+			})
+		})
+	}
+}
+
+func BenchmarkCompressAllocationsSingle(b *testing.B) {
+	payload := []byte(strings.Repeat("Tiny payload", 20))
+	const level = 2
+	b.Run("flate", func(b *testing.B) {
+		b.ReportAllocs()
+
+		for i := 0; i < b.N; i++ {
+			w, err := NewWriter(ioutil.Discard, level)
+			if err != nil {
+				b.Fatal(err)
+			}
+			w.Write(payload)
+			w.Close()
+		}
+	})
+}

gzip/gzip_test.go

@@ -10,6 +10,8 @@ import (
 	"io"
 	"io/ioutil"
 	"math/rand"
+	"strconv"
+	"strings"
 	"testing"
 	"time"
 )
@@ -524,3 +526,41 @@ func benchmarkOldGzipN(b *testing.B, level int) {
 }
 
 */
+
+func BenchmarkCompressAllocations(b *testing.B) {
+	payload := []byte(strings.Repeat("Tiny payload", 20))
+	for j := -2; j <= 9; j++ {
+		b.Run("level("+strconv.Itoa(j)+")", func(b *testing.B) {
+			b.Run("gzip", func(b *testing.B) {
+				b.ReportAllocs()
+
+				for i := 0; i < b.N; i++ {
+					w, err := NewWriterLevel(ioutil.Discard, j)
+					if err != nil {
+						b.Fatal(err)
+					}
+					w.Write(payload)
+					w.Close()
+				}
+			})
+		})
+	}
+}
+
+func BenchmarkCompressAllocationsSingle(b *testing.B) {
+	payload := []byte(strings.Repeat("Tiny payload", 20))
+	const level = 2
+
+	b.Run("gzip", func(b *testing.B) {
+		b.ReportAllocs()
+
+		for i := 0; i < b.N; i++ {
+			w, err := NewWriterLevel(ioutil.Discard, level)
+			if err != nil {
+				b.Fatal(err)
+			}
+			w.Write(payload)
+			w.Close()
+		}
+	})
+}