Improve benchmarks and fix bitvector iterator

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>

lib/rlepluslazy/internal/bitvector.go

@@ -173,7 +173,6 @@ func (v *BitVector) Iterator(order BitNumbering) func(uint) byte {
 		// Here be dragons
 		// This is about 10x faster
 		index := int(0)
-		bitIdx := uint(0)
 
 		var rest uint64
 		for n := 7; n >= 0; n-- {
@@ -186,16 +185,17 @@ func (v *BitVector) Iterator(order BitNumbering) func(uint) byte {
 			index++
 		}
 
+		bitCap := uint(64)
+
 		return func(bits uint) (out byte) {
 			if bits > 8 {
 				log.Panicf("invalid count")
 			}
 			res := byte(rest) & masks[bits]
 			rest = rest >> bits
-			bitIdx = bitIdx + bits
+			bitCap = bitCap - bits
 
-			if bitIdx > (64 - 8) {
+			if bitCap < 8 {
-				bitIdx = bitIdx & 7
 				var add uint64
 
 				for n := 6; n >= 0; n-- {
@@ -207,7 +207,8 @@ func (v *BitVector) Iterator(order BitNumbering) func(uint) byte {
 					add = add<<8 | o
 				}
 				index = index + 7
-				rest = rest | add<<(8-bitIdx)
+				rest = rest | add<<(bitCap)
+				bitCap = bitCap + 7*8
 			}
 
 			return res

lib/rlepluslazy/internal/bitvector_test.go

@@ -100,8 +100,8 @@ func TestBitVector(t *testing.T) {
 		var buf []byte
 
 		// make a bitvector of 256 sample bits
-		for i := 0; i < 32; i++ {
+		for i := 0; i < 1000; i++ {
-			buf = append(buf, byte(128+i))
+			buf = append(buf, byte(i))
 		}
 
 		v := bitvector.NewBitVector(buf, bitvector.LSB0)

lib/rlepluslazy/rleplus_test.go

@@ -2,7 +2,6 @@ package rlepluslazy
 
 import (
 	"math/rand"
-	"runtime"
 	"testing"
 
 	"github.com/filecoin-project/go-lotus/extern/rleplus"
@@ -47,11 +46,11 @@ func TestDecode(t *testing.T) {
 	assert.Equal(t, expectedNumbers, decoded)
 }
 
-func TestGolden(t *testing.T) {
+func TestGoldenGen(t *testing.T) {
 	t.SkipNow()
-	N := 1000
+	N := 10000
-	mod := uint32(1) << 16
+	mod := uint32(1) << 20
-	runExProp := float32(0.9)
+	runExProp := float32(0.93)
 
 	bits := make([]uint64, N)
 
@@ -70,39 +69,85 @@ func TestGolden(t *testing.T) {
 	t.Logf("%#v", out)
 	_, runs := rleplus.RunLengths(bits)
 	t.Logf("runs: %v", runs)
+	t.Logf("len: %d", len(out))
 }
 
+func TestGolden(t *testing.T) {
+	expected, _ := rleplus.Decode(goldenRLE)
+	res := make([]uint64, 0, len(expected))
+
+	rle, err := FromBuf(goldenRLE)
+	assert.NoError(t, err)
+	rit, err := rle.RunIterator()
+	assert.NoError(t, err)
+	it, err := BitsFromRuns(rit)
+	assert.NoError(t, err)
+	for it.HasNext() {
+		bit, err := it.Next()
+		assert.NoError(t, err)
+		res = append(res, bit)
+	}
+	assert.Equal(t, expected, res)
+
+}
+
+var Res uint64 = 0
+
 func BenchmarkIterator(b *testing.B) {
+	b.ReportAllocs()
+	var r uint64
 	for i := 0; i < b.N; i++ {
 		rle, _ := FromBuf(goldenRLE)
 		it, _ := rle.Iterator()
 		for it.HasNext() {
 			bit, _ := it.Next()
-			runtime.KeepAlive(bit)
+			if bit < 1<<63 {
+				r++
 			}
 		}
+	}
+	Res = Res + r
 }
 
 func BenchmarkRunIterator(b *testing.B) {
+	b.ReportAllocs()
+	var r uint64
 	for i := 0; i < b.N; i++ {
 		rle, _ := FromBuf(goldenRLE)
 		rit, _ := rle.RunIterator()
 		for rit.HasNext() {
 			run, _ := rit.NextRun()
-			runtime.KeepAlive(run)
+			if run.Val {
+				r = r + run.Len
 			}
 		}
+	}
+	Res = Res + r
 }
 
 func BenchmarkRunsToBits(b *testing.B) {
-
+	b.ReportAllocs()
+	var r uint64
 	for i := 0; i < b.N; i++ {
 		rle, _ := FromBuf(goldenRLE)
 		rit, _ := rle.RunIterator()
 		it, _ := BitsFromRuns(rit)
 		for it.HasNext() {
 			bit, _ := it.Next()
-			runtime.KeepAlive(bit)
+			if bit < 1<<63 {
+				r++
 			}
 		}
+	}
+	Res = Res + r
+}
+
+func BenchmarkOldRLE(b *testing.B) {
+	b.ReportAllocs()
+	var r uint64
+	for i := 0; i < b.N; i++ {
+		rle, _ := rleplus.Decode(goldenRLE)
+		r = r + uint64(len(rle))
+	}
+	Res = Res + r
 }