update bitlen to use __clzdi2 when using gccgo

zentures · Nov 18, 2013 · 2b5f82a · aktau · Jun 22, 2014 · zhenjl
1 parent 7695c37
commit 2b5f82a
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 13 deletions.
diff --git a/benchmark/benchmark.go b/benchmark/benchmark.go
@@ -221,6 +221,8 @@ func testCodecs(codecs map[string]encoding.Integer, data [][]int32, output bool)
 					return fmt.Errorf("benchmark/testCodecs: Problem recovering. index = %d, in = %d, recovered = %d, original length = %d, recovered length = %d\n", i, in[i], out2[i], k, len(out2))
 				}
 			}
+
+			runtime.GC()
 		}
 	}
 

diff --git a/bitlen.go b/bitlen.go
@@ -1,12 +1,12 @@
-// +build gccgo !amd64,!386,!arm
+// +build !gccgo,!amd64,!386,!arm
 
 // (gccgo) OR ((NOT amd64) AND (NOT 386) AND (NOT ARM))
 package encoding
 
 import (
-    "math/big"
+	"math/big"
 )
 
 func bitlen(x big.Word) (n int) {
-    return 32 - int(nlz1a(uint32(x)))
+	return 32 - int(nlz1a(uint32(x)))
 }
diff --git a/bitlen_decl.go b/bitlen_decl.go
@@ -0,0 +1,11 @@
+// +build !gccgo
+// +build amd64 386 arm
+
+package encoding
+
+import (
+	"math/big"
+)
+
+// This is defined in util_{amd64,386}.s, copied from pkg/math/big/arith_{amd64/386}.s
+func bitlen(x big.Word) (n int)
diff --git a/bitlen_gccgo.go b/bitlen_gccgo.go
@@ -0,0 +1,14 @@
+// +build gccgo
+
+package encoding
+
+import (
+    "math/big"
+)
+
+func clz(uint64) uint64 __asm__("__clzdi2")
+
+func bitlen(x big.Word) (n int) {
+    if x == 0 { return 0 }
+    return 64-int(clz(uint64(x)))
+}
diff --git a/delta/fastpfor/fastpfor.go b/delta/fastpfor/fastpfor.go
@@ -8,9 +8,9 @@ package fastpfor
 
 import (
 	"errors"
+	"github.com/reducedb/bytebuffer"
 	"github.com/reducedb/encoding"
 	"github.com/reducedb/encoding/bitpacking"
-	"github.com/reducedb/bytebuffer"
 	"github.com/reducedb/encoding/cursor"
 	"math"
 )

diff --git a/delta/variablebyte/variablebyte.go b/delta/variablebyte/variablebyte.go
@@ -8,8 +8,8 @@ package variablebyte
 
 import (
 	"errors"
-	"github.com/reducedb/encoding"
 	"github.com/reducedb/bytebuffer"
+	"github.com/reducedb/encoding"
 	"github.com/reducedb/encoding/cursor"
 )
 

diff --git a/fastpfor/fastpfor.go b/fastpfor/fastpfor.go
@@ -8,9 +8,9 @@ package fastpfor
 
 import (
 	"errors"
+	"github.com/reducedb/bytebuffer"
 	"github.com/reducedb/encoding"
 	"github.com/reducedb/encoding/bitpacking"
-	"github.com/reducedb/bytebuffer"
 	"github.com/reducedb/encoding/cursor"
 	"math"
 )

diff --git a/util.go b/util.go
@@ -8,7 +8,7 @@ package encoding
 
 import (
 	"fmt"
-    "math/big"
+	"math/big"
 )
 
 func FloorBy(value, factor int) int {
@@ -21,7 +21,7 @@ func CeilBy(value, factor int) int {
 
 func LeadingBitPosition(x uint32) int32 {
 	//return 32 - int32(nlz1a(x))
-    return int32(bitlen(big.Word(x)))
+	return int32(bitlen(big.Word(x)))
 }
 
 func DeltaMaxBits(initoffset int32, buf []int32) int32 {
@@ -541,6 +541,3 @@ func UnrolledLeadingBitFrequency128(in, freqs []int32) {
 	freqs[LeadingBitPosition(uint32(in[126]))]++
 	freqs[LeadingBitPosition(uint32(in[127]))]++
 }
-
-// This is defined in util_{amd64,386}.s, copied from pkg/math/big/arith_{amd64/386}.s
-func bitlen(x big.Word) (n int)
diff --git a/variablebyte/variablebyte.go b/variablebyte/variablebyte.go
@@ -8,8 +8,8 @@ package variablebyte
 
 import (
 	"errors"
-	"github.com/reducedb/encoding"
 	"github.com/reducedb/bytebuffer"
+	"github.com/reducedb/encoding"
 	"github.com/reducedb/encoding/cursor"
 )
 

diff --git a/zigzag/fastpfor/fastpfor.go b/zigzag/fastpfor/fastpfor.go
@@ -8,9 +8,9 @@ package fastpfor
 
 import (
 	"errors"
+	"github.com/reducedb/bytebuffer"
 	"github.com/reducedb/encoding"
 	"github.com/reducedb/encoding/bitpacking"
-	"github.com/reducedb/bytebuffer"
 	"github.com/reducedb/encoding/cursor"
 	"math"
 )
-Original file line number
+Diff line change
@@ Expand Up @@
     					return fmt.Errorf("benchmark/testCodecs: Problem recovering. index = %d, in = %d, recovered = %d, original length = %d, recovered length = %d\n", i, in[i], out2[i], k, len(out2))
     				}
     			}
+    			runtime.GC()
     		}
     	}
@@ Expand Down @@