Cleanup code to be idiomatic Go

minio · Jan 4, 2019 · 771b9fb · 771b9fb
1 parent b001441
commit 771b9fb
Show file tree

Hide file tree

Showing 16 changed files with 2,525 additions and 2,381 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.test
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,7 @@ os:
 
 go:
 - tip
-- 1.11
-- 1.10
+- 1.11.x
 
 env:
 - ARCH=x86_64

diff --git a/cpuid.go b/cpuid.go
@@ -17,65 +17,65 @@ package sha256
 
 // True when SIMD instructions are available.
 var avx512 bool
-var avx2   bool
-var avx    bool
-var sse    bool
-var sse2   bool
-var sse3   bool
-var ssse3  bool
-var sse41  bool
-var sse42  bool
+var avx2 bool
+var avx bool
+var sse bool
+var sse2 bool
+var sse3 bool
+var ssse3 bool
+var sse41 bool
+var sse42 bool
 var popcnt bool
-var sha    bool
-var armSha bool = haveArmSha()
+var sha bool
+var armSha = haveArmSha()
 
 func init() {
-	var _xsave           bool
-	var _osxsave         bool
-	var _avx             bool
-	var _avx2            bool
-	var _avx512f         bool
-	var _avx512dq        bool
-//	var _avx512pf        bool
-//	var _avx512er        bool
-//	var _avx512cd        bool
-	var _avx512bw        bool
-	var _avx512vl        bool
-	var _sse_state       bool
-	var _avx_state       bool
-	var _opmask_state    bool
-	var _zmm_hi256_state bool
-	var _hi16_zmm_state  bool
+	var _xsave bool
+	var _osxsave bool
+	var _avx bool
+	var _avx2 bool
+	var _avx512f bool
+	var _avx512dq bool
+	//	var _avx512pf        bool
+	//	var _avx512er        bool
+	//	var _avx512cd        bool
+	var _avx512bw bool
+	var _avx512vl bool
+	var _sseState bool
+	var _avxState bool
+	var _opmaskState bool
+	var _zmmHI256State bool
+	var _hi16ZmmState bool
 
 	mfi, _, _, _ := cpuid(0)
 
 	if mfi >= 1 {
 		_, _, c, d := cpuid(1)
 
-		sse      = (d & (1 << 25)) != 0
-		sse2     = (d & (1 << 26)) != 0
-		sse3     = (c & (1 <<  0)) != 0
-		ssse3    = (c & (1 <<  9)) != 0
-		sse41    = (c & (1 << 19)) != 0
-		sse42    = (c & (1 << 20)) != 0
-		popcnt   = (c & (1 << 23)) != 0
-		_xsave   = (c & (1 << 26)) != 0
+		sse = (d & (1 << 25)) != 0
+		sse2 = (d & (1 << 26)) != 0
+		sse3 = (c & (1 << 0)) != 0
+		ssse3 = (c & (1 << 9)) != 0
+		sse41 = (c & (1 << 19)) != 0
+		sse42 = (c & (1 << 20)) != 0
+		popcnt = (c & (1 << 23)) != 0
+		_xsave = (c & (1 << 26)) != 0
 		_osxsave = (c & (1 << 27)) != 0
-		_avx	 = (c & (1 << 28)) != 0
+		_avx = (c & (1 << 28)) != 0
 	}
 
 	if mfi >= 7 {
 		_, b, _, _ := cpuid(7)
 
-		_avx2     = (b & (1 <<  5)) != 0
-		_avx512f  = (b & (1 << 16)) != 0
+		_avx2 = (b & (1 << 5)) != 0
+		_avx512f = (b & (1 << 16)) != 0
 		_avx512dq = (b & (1 << 17)) != 0
-//		_avx512pf = (b & (1 << 26)) != 0
-//		_avx512er = (b & (1 << 27)) != 0
-//		_avx512cd = (b & (1 << 28)) != 0
+		//		_avx512pf = (b & (1 << 26)) != 0
+		//		_avx512er = (b & (1 << 27)) != 0
+		//		_avx512cd = (b & (1 << 28)) != 0
 		_avx512bw = (b & (1 << 30)) != 0
 		_avx512vl = (b & (1 << 31)) != 0
-		sha       = (b & (1 << 29)) != 0
+		sha = (b & (1 << 29)) != 0
 	}
 
 	// Stop here if XSAVE unsupported or not enabled
@@ -86,34 +86,34 @@ func init() {
 	if _xsave && _osxsave {
 		a, _ := xgetbv(0)
 
-		_sse_state       = (a & (1 << 1)) != 0
-		_avx_state       = (a & (1 << 2)) != 0
-		_opmask_state    = (a & (1 << 5)) != 0
-		_zmm_hi256_state = (a & (1 << 6)) != 0
-		_hi16_zmm_state  = (a & (1 << 7)) != 0
+		_sseState = (a & (1 << 1)) != 0
+		_avxState = (a & (1 << 2)) != 0
+		_opmaskState = (a & (1 << 5)) != 0
+		_zmmHI256State = (a & (1 << 6)) != 0
+		_hi16ZmmState = (a & (1 << 7)) != 0
 	} else {
-		_sse_state       = true
+		_sseState = true
 	}
 
 	// Very unlikely that OS would enable XSAVE and then disable SSE
-	if !_sse_state {
-		sse      = false
-		sse2     = false
-		sse3     = false
-		ssse3    = false
-		sse41    = false
-		sse42    = false
+	if !_sseState {
+		sse = false
+		sse2 = false
+		sse3 = false
+		ssse3 = false
+		sse41 = false
+		sse42 = false
 	}
 
-	if _avx_state {
-		avx      = _avx
-		avx2     = _avx2
+	if _avxState {
+		avx = _avx
+		avx2 = _avx2
 	}
 
-	if _opmask_state && _zmm_hi256_state && _hi16_zmm_state {
-		avx512   = (_avx512f  &&
-					_avx512dq &&
-					_avx512bw &&
-					_avx512vl)
+	if _opmaskState && _zmmHI256State && _hi16ZmmState {
+		avx512 = (_avx512f &&
+			_avx512dq &&
+			_avx512bw &&
+			_avx512vl)
 	}
 }
diff --git a/cpuid_386.s b/cpuid_386.s
@@ -24,30 +24,30 @@
 
 // func cpuid(op uint32) (eax, ebx, ecx, edx uint32)
 TEXT ·cpuid(SB), 7, $0
-        XORL CX, CX
-        MOVL op+0(FP), AX
-        CPUID
-        MOVL AX, eax+4(FP)
-        MOVL BX, ebx+8(FP)
-        MOVL CX, ecx+12(FP)
-        MOVL DX, edx+16(FP)
-        RET
+	XORL CX, CX
+	MOVL op+0(FP), AX
+	CPUID
+	MOVL AX, eax+4(FP)
+	MOVL BX, ebx+8(FP)
+	MOVL CX, ecx+12(FP)
+	MOVL DX, edx+16(FP)
+	RET
 
 // func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
 TEXT ·cpuidex(SB), 7, $0
-        MOVL op+0(FP), AX
-        MOVL op2+4(FP), CX
-        CPUID
-        MOVL AX, eax+8(FP)
-        MOVL BX, ebx+12(FP)
-        MOVL CX, ecx+16(FP)
-        MOVL DX, edx+20(FP)
-        RET
+	MOVL op+0(FP), AX
+	MOVL op2+4(FP), CX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
 
 // func xgetbv(index uint32) (eax, edx uint32)
 TEXT ·xgetbv(SB), 7, $0
-        MOVL index+0(FP), CX
-        BYTE $0x0f; BYTE $0x01; BYTE $0xd0 // XGETBV
-        MOVL AX, eax+4(FP)
-        MOVL DX, edx+8(FP)
-        RET
+	MOVL index+0(FP), CX
+	BYTE $0x0f; BYTE $0x01; BYTE $0xd0 // XGETBV
+	MOVL AX, eax+4(FP)
+	MOVL DX, edx+8(FP)
+	RET
diff --git a/cpuid_amd64.s b/cpuid_amd64.s
@@ -24,31 +24,30 @@
 
 // func cpuid(op uint32) (eax, ebx, ecx, edx uint32)
 TEXT ·cpuid(SB), 7, $0
-        XORQ CX, CX
-        MOVL op+0(FP), AX
-        CPUID
-        MOVL AX, eax+8(FP)
-        MOVL BX, ebx+12(FP)
-        MOVL CX, ecx+16(FP)
-        MOVL DX, edx+20(FP)
-        RET
-
+	XORQ CX, CX
+	MOVL op+0(FP), AX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
 
 // func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
 TEXT ·cpuidex(SB), 7, $0
-        MOVL op+0(FP), AX
-        MOVL op2+4(FP), CX
-        CPUID
-        MOVL AX, eax+8(FP)
-        MOVL BX, ebx+12(FP)
-        MOVL CX, ecx+16(FP)
-        MOVL DX, edx+20(FP)
-        RET
+	MOVL op+0(FP), AX
+	MOVL op2+4(FP), CX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
 
 // func xgetbv(index uint32) (eax, edx uint32)
 TEXT ·xgetbv(SB), 7, $0
-        MOVL index+0(FP), CX
-        BYTE $0x0f; BYTE $0x01; BYTE $0xd0 // XGETBV
-        MOVL AX, eax+8(FP)
-        MOVL DX, edx+12(FP)
-        RET
+	MOVL index+0(FP), CX
+	BYTE $0x0f; BYTE $0x01; BYTE $0xd0 // XGETBV
+	MOVL AX, eax+8(FP)
+	MOVL DX, edx+12(FP)
+	RET