Fixup Brotli compression tests (#2567)

* Fixup Brotli compression tests

As seen here, dotnet/runtime#73391 (comment), this test had a bug where in
the work that was being done by the underlying test was not being correctly measured. This fix resolves that.

* Address pr feedback

* code review feedback

---------

Co-authored-by: Radek Zikmund <[email protected]>

Author: DrewScoggins

src/benchmarks/micro/libraries/System.IO.Compression/Brotli.cs

@@ -12,8 +12,8 @@ public class Brotli : CompressionStreamPerfTestBase
     {
         private const int Window = 22;
 
-        public override Stream CreateStream(Stream stream, CompressionMode mode) => new BrotliStream(stream, mode);
-        public override Stream CreateStream(Stream stream, CompressionLevel level) => new BrotliStream(stream, level);
+        public override Stream CreateStream(Stream stream, CompressionMode mode, bool leaveOpen) => new BrotliStream(stream, mode, leaveOpen);
+        public override Stream CreateStream(Stream stream, CompressionLevel level, bool leaveOpen) => new BrotliStream(stream, level, leaveOpen);
 
         [Benchmark]
         public Span<byte> Compress_WithState()
@@ -24,7 +24,7 @@ public Span<byte> Compress_WithState()
                 ReadOnlySpan<byte> input = CompressedFile.UncompressedData;
                 while (!input.IsEmpty && !output.IsEmpty)
                 {
-                    encoder.Compress(input, output, out int bytesConsumed, out int written, isFinalBlock:false);
+                    encoder.Compress(input, output, out int bytesConsumed, out int written, isFinalBlock: false);
                     input = input.Slice(bytesConsumed);
                     output = output.Slice(written);
                 }
@@ -64,7 +64,7 @@ public bool Compress_WithoutState()
         [Benchmark]
         public bool Decompress_WithoutState() // the level argument is not used here, but it describes how the data was compressed (in the benchmark id)
             => BrotliDecoder.TryDecompress(CompressedFile.CompressedData, CompressedFile.UncompressedData, out int bytesWritten);
-        
+
         private static int GetQuality(CompressionLevel compressLevel)
             => compressLevel == CompressionLevel.Optimal ? 11 : compressLevel == CompressionLevel.Fastest ? 1 : 0;
     }

src/benchmarks/micro/libraries/System.IO.Compression/CompressedFile.cs

@@ -12,8 +12,8 @@ public class CompressedFile
         public byte[] UncompressedData { get; }
         public byte[] CompressedData { get; }
         public MemoryStream CompressedDataStream { get; }
-            
-        public CompressedFile(string fileName, CompressionLevel compressionLevel, Func<Stream, CompressionLevel, Stream> factory)
+
+        public CompressedFile(string fileName, CompressionLevel compressionLevel, Func<Stream, CompressionLevel, bool, Stream> factory)
         {
             Name = fileName;
             CompressionLevel = compressionLevel;
@@ -22,17 +22,18 @@ public CompressedFile(string fileName, CompressionLevel compressionLevel, Func<S
             UncompressedData = File.ReadAllBytes(filePath);
             CompressedDataStream = new MemoryStream(capacity: UncompressedData.Length);
 
-            var compressionStream = factory(CompressedDataStream, compressionLevel);
-            compressionStream.Write(UncompressedData, 0, UncompressedData.Length);
-            compressionStream.Flush();
-            
+            using (var compressionStream = factory(CompressedDataStream, compressionLevel, true))
+            {
+                compressionStream.Write(UncompressedData, 0, UncompressedData.Length);
+            }
+
             CompressedDataStream.Position = 0;
             CompressedData = CompressedDataStream.ToArray();
         }
 
         public override string ToString() => Name;
 
-        internal static string GetFilePath(string fileName) 
+        internal static string GetFilePath(string fileName)
             => Path.Combine(
                 AppContext.BaseDirectory,
                 "libraries", "System.IO.Compression", "TestData",

src/benchmarks/micro/libraries/System.IO.Compression/CompressionStreamPerfTestBase.cs

@@ -10,21 +10,21 @@ namespace System.IO.Compression
 {
     public class Gzip : CompressionStreamPerfTestBase
     {
-        public override Stream CreateStream(Stream stream, CompressionMode mode) => new GZipStream(stream, mode);
-        public override Stream CreateStream(Stream stream, CompressionLevel level) => new GZipStream(stream, level);
+        public override Stream CreateStream(Stream stream, CompressionMode mode, bool leaveOpen) => new GZipStream(stream, mode, leaveOpen);
+        public override Stream CreateStream(Stream stream, CompressionLevel level, bool leaveOpen) => new GZipStream(stream, level, leaveOpen);
     }
 
     public class Deflate : CompressionStreamPerfTestBase
     {
-        public override Stream CreateStream(Stream stream, CompressionMode mode) => new DeflateStream(stream, mode);
-        public override Stream CreateStream(Stream stream, CompressionLevel level) => new DeflateStream(stream, level);
+        public override Stream CreateStream(Stream stream, CompressionMode mode, bool leaveOpen) => new DeflateStream(stream, mode, leaveOpen);
+        public override Stream CreateStream(Stream stream, CompressionLevel level, bool leaveOpen) => new DeflateStream(stream, level, leaveOpen);
     }
 
 #if NET6_0_OR_GREATER // API introduced in .NET 6
     public class ZLib : CompressionStreamPerfTestBase
     {
-        public override Stream CreateStream(Stream stream, CompressionMode mode) => new ZLibStream(stream, mode);
-        public override Stream CreateStream(Stream stream, CompressionLevel level) => new ZLibStream(stream, level);
+        public override Stream CreateStream(Stream stream, CompressionMode mode, bool leaveOpen) => new ZLibStream(stream, mode, leaveOpen);
+        public override Stream CreateStream(Stream stream, CompressionLevel level, bool leaveOpen) => new ZLibStream(stream, level, leaveOpen);
     }
 #endif
 
@@ -33,8 +33,8 @@ public class ZLib : CompressionStreamPerfTestBase
     [BenchmarkCategory(Categories.Libraries, Categories.NoWASM)]
     public abstract class CompressionStreamPerfTestBase
     {
-        public abstract Stream CreateStream(Stream stream, CompressionMode mode);
-        public abstract Stream CreateStream(Stream stream, CompressionLevel level);
+        public abstract Stream CreateStream(Stream stream, CompressionMode mode, bool leaveOpen = true);
+        public abstract Stream CreateStream(Stream stream, CompressionLevel level, bool leaveOpen = true);
 
         [ParamsSource(nameof(UncompressedTestFileNames))]
         public string file { get; set; }
@@ -59,7 +59,7 @@ public void Compress()
         {
             CompressedFile.CompressedDataStream.Position = 0; // all benchmarks invocation reuse the same stream, we set Postion to 0 to start at the beginning
 
-            var compressor = CreateStream(CompressedFile.CompressedDataStream, level);
+            using var compressor = CreateStream(CompressedFile.CompressedDataStream, level);
             compressor.Write(CompressedFile.UncompressedData, 0, CompressedFile.UncompressedData.Length);
         }
 
@@ -68,7 +68,7 @@ public int Decompress()
         {
             CompressedFile.CompressedDataStream.Position = 0;
 
-            var compressor = CreateStream(CompressedFile.CompressedDataStream, CompressionMode.Decompress);
+            using var compressor = CreateStream(CompressedFile.CompressedDataStream, CompressionMode.Decompress);
 
             byte[] buffer = CompressedFile.UncompressedData;