cpu: Remove pkg/cpu in favor of better klauspost/cpuid.

Fixes minio#1128
neogenix · Feb 15, 2016 · 9e10ee7 · 9e10ee7
1 parent a173313
commit 9e10ee7
Show file tree

Hide file tree

Showing 24 changed files with 2,750 additions and 200 deletions.
diff --git a/Makefile b/Makefile
@@ -107,7 +107,7 @@ cyclo:
 	@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/gocyclo -over 65 pkg
 
 build: getdeps verifiers $(UI_ASSETS) isa-l
-	@GO15VENDOREXPERIMENT=1 go generate ./...
+	@GO15VENDOREXPERIMENT=1 go generate github.com/minio/minio/pkg/crypto/sha1
 
 deadcode:
 	@GO15VENDOREXPERIMENT=1 ${GOPATH}/bin/deadcode

diff --git a/README.md b/README.md
@@ -2,10 +2,16 @@
 
 Minio is a distributed object storage server written in Golang. Source is available under free software / open source [Apache license 2.0](./LICENSE). API compatible with Amazon S3 cloud storage service.
 
+
 ## Description
 
 Micro services environment provisions one Minio server per application instance. Scalability is achieved through large number of smaller personalized instances. This version of the Minio binary is built using Filesystem storage backend for magnetic and solid state disks.
 
+Minio currently implements two backends
+
+  - Filesystem (FS) - is available and ready for general purpose use.
+  - ErasureCoded (XL) - is work in progress and not ready for general purpose use.
+
 ## Minio Client
 
 [Minio Client (mc)](https://github.com/minio/mc#minio-client-mc-) provides a modern alternative to Unix commands like ``ls``, ``cat``, ``cp``, ``sync``, and ``diff``. It supports POSIX compatible filesystems and Amazon S3 compatible cloud storage systems. It is entirely written in Golang.

diff --git a/appveyor.yml b/appveyor.yml
@@ -40,7 +40,7 @@ build_script:
   - curl -fsSL -o ui-assets.asc  https://dl.minio.io/assets/server/ui/%UI_ASSETS_ARMOR%
   - gpg --batch --no-tty --yes --keyserver pgp.mit.edu --recv-keys F9AAC728
   - gpg --batch --no-tty --verify %UI_ASSETS_ARMOR% %UI_ASSETS%
-  - go generate ./...
+  - go generate github.com/minio/minio/pkg/crypto/sha1
   - go test .
   - go test -race .
   - go test github.com/minio/minio/pkg...

diff --git a/pkg/cpu/cpu_amd64.go b/pkg/cpu/cpu_amd64.go
diff --git a/pkg/cpu/cpu_amd64.s b/pkg/cpu/cpu_amd64.s
diff --git a/pkg/cpu/cpu_arm.go b/pkg/cpu/cpu_arm.go
diff --git a/pkg/cpu/cpu_test.go b/pkg/cpu/cpu_test.go
diff --git a/pkg/cpu/doc.go b/pkg/cpu/doc.go
diff --git a/pkg/crypto/sha1/sha1block.go b/pkg/crypto/sha1/sha1block.go
@@ -26,12 +26,12 @@ import "C"
 import (
 	"unsafe"
 
-	"github.com/minio/minio/pkg/cpu"
+	"github.com/klauspost/cpuid"
 )
 
 func block(dig *digest, p []byte) {
 	switch true {
-	case cpu.HasSSE41() == true:
+	case cpuid.CPU.SSE3():
 		blockSSE3(dig, p)
 	default:
 		blockGeneric(dig, p)

diff --git a/pkg/crypto/sha1/sha1block_linux.go b/pkg/crypto/sha1/sha1block_linux.go
@@ -27,14 +27,14 @@ import "C"
 import (
 	"unsafe"
 
-	"github.com/minio/minio/pkg/cpu"
+	"github.com/klauspost/cpuid"
 )
 
 func block(dig *digest, p []byte) {
 	switch true {
-	case cpu.HasAVX2():
+	case cpuid.CPU.AVX2():
 		blockAVX2(dig, p)
-	case cpu.HasSSE41():
+	case cpuid.CPU.SSE3():
 		blockSSE3(dig, p)
 	default:
 		blockGeneric(dig, p)

diff --git a/pkg/crypto/sha256/sha256_linux.go b/pkg/crypto/sha256/sha256_linux.go
@@ -31,7 +31,7 @@ package sha256
 import (
 	"hash"
 
-	"github.com/minio/minio/pkg/cpu"
+	"github.com/klauspost/cpuid"
 )
 
 // Size - The size of a SHA256 checksum in bytes.
@@ -76,11 +76,11 @@ func (d *digest) Reset() {
 
 func block(dig *digest, p []byte) {
 	switch true {
-	case cpu.HasAVX2() == true:
+	case cpuid.CPU.AVX2():
 		blockAVX2(dig, p)
-	case cpu.HasAVX() == true:
+	case cpuid.CPU.AVX():
 		blockAVX(dig, p)
-	case cpu.HasSSE41() == true:
+	case cpuid.CPU.SSSE3():
 		blockSSE(dig, p)
 	default:
 		blockGeneric(dig, p)

diff --git a/pkg/crypto/sha512/sha512_linux.go b/pkg/crypto/sha512/sha512_linux.go
@@ -16,7 +16,7 @@ package sha512
 import (
 	"hash"
 
-	"github.com/minio/minio/pkg/cpu"
+	"github.com/klauspost/cpuid"
 )
 
 // Size - The size of a SHA512 checksum in bytes.
@@ -47,11 +47,11 @@ type digest struct {
 
 func block(dig *digest, p []byte) {
 	switch true {
-	case cpu.HasAVX2() == true:
+	case cpuid.CPU.AVX2():
 		blockAVX2(dig, p)
-	case cpu.HasAVX() == true:
+	case cpuid.CPU.AVX():
 		blockAVX(dig, p)
-	case cpu.HasSSE41() == true:
+	case cpuid.CPU.SSSE3():
 		blockSSE(dig, p)
 	default:
 		blockGeneric(dig, p)

diff --git a/vendor/github.com/klauspost/cpuid/LICENSE b/vendor/github.com/klauspost/cpuid/LICENSE