MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Implement new CPU detection using cpuid, cpuidex plan9 instructions from klauspost/cpuid project, remove C code

Browse Source
This commit is contained in:
Harshavardhana 2015-07-04 14:22:05 -07:00
parent 9977888972
commit aa67a19e99
10 changed files with 44 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/utils/cpu/cpu.go → pkg/cpu/cpu.go
View File

@ -1,5 +1,5 @@
/*
* Minimalist Object Storage, (C) 2014 Minio, Inc.
* Minimalist Object Storage, (C) 2015 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -16,22 +16,24 @@
package cpu
// int has_sse41 (void);
// int has_avx (void);
// int has_avx2 (void);
import "C"
// cpuid, cpuidex
func cpuid(op uint32) (eax, ebx, ecx, edx uint32)
func cpuidex(op, op2 uint32) (eax, ebx, ecx, edx uint32)
// HasSSE41 - CPUID instruction verification wrapper for SSE41 extensions
func HasSSE41() bool {
return int(C.has_sse41()) == 1
_, _, c, _ := cpuid(1)
return ((c & (1 << 19)) != 0)
}
// HasAVX - CPUID instruction verification wrapper for AVX extensions
func HasAVX() bool {
return int(C.has_avx()) == 1
_, _, c, _ := cpuid(1)
return ((c & (1 << 28)) != 0)
}
// HasAVX2 - CPUID instruction verification wrapper for AVX2 extensions
func HasAVX2() bool {
return int(C.has_avx2()) == 1
_, b, _, _ := cpuidex(7, 0)
return ((b & (1 << 5)) != 0)
}

27
pkg/cpu/cpu_amd64.s Normal file
View File

@ -0,0 +1,27 @@
// Copyright (c) 2015 Klaus Post, released under MIT License. See LICENSE file.
//
// See https://github.com/klauspost/cpuid/blob/master/LICENSE
//
// Using this inside Minio with modifications
//
// func cpuid(op uint32) (eax, ebx, ecx, edx uint32)
TEXT ·cpuid(SB),7,$0
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

4
pkg/utils/cpu/cpu_test.go → pkg/cpu/cpu_test.go
View File

@ -1,5 +1,5 @@
/*
* Minimalist Object Storage, (C) 2014 Minio, Inc.
* Minimalist Object Storage, (C) 2015 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -24,7 +24,7 @@ import (
"testing"
. "github.com/minio/check"
"github.com/minio/minio/pkg/utils/cpu"
"github.com/minio/minio/pkg/cpu"
)
func Test(t *testing.T) { TestingT(t) }

0
pkg/utils/cpu/doc.go → pkg/cpu/doc.go
View File

2
pkg/crypto/sha1/sha1_darwin.go
View File

@ -14,7 +14,7 @@ import (
"hash"
"io"
"github.com/minio/minio/pkg/utils/cpu"
"github.com/minio/minio/pkg/cpu"
)
// The size of a SHA1 checksum in bytes.

2
pkg/crypto/sha1/sha1_linux.go
View File

@ -14,7 +14,7 @@ import (
"hash"
"io"
"github.com/minio/minio/pkg/utils/cpu"
"github.com/minio/minio/pkg/cpu"
)
// The size of a SHA1 checksum in bytes.

2
pkg/crypto/sha1/sha1_windows.go
View File

@ -14,7 +14,7 @@ import (
"hash"
"io"
"github.com/minio/minio/pkg/utils/cpu"
"github.com/minio/minio/pkg/cpu"
)
// The size of a SHA1 checksum in bytes.

2
pkg/crypto/sha256/sha256_linux.go
View File

@ -14,7 +14,7 @@ import (
"hash"
"io"
"github.com/minio/minio/pkg/utils/cpu"
"github.com/minio/minio/pkg/cpu"
)
// The size of a SHA256 checksum in bytes.

2
pkg/crypto/sha512/sha512_linux.go
View File

@ -15,7 +15,7 @@ import (
"hash"
"io"
"github.com/minio/minio/pkg/utils/cpu"
"github.com/minio/minio/pkg/cpu"
)
// The size of a SHA512 checksum in bytes.

59
pkg/utils/cpu/cpu.c
View File

@ -1,59 +0,0 @@
/*
* Minimalist Object Storage, (C) 2014 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <stdio.h>
#include <stdlib.h>
static void cpuid(int cpuinfo[4] ,int infotype) {
__asm__ __volatile__ (
"cpuid":
"=a" (cpuinfo[0]),
"=b" (cpuinfo[1]),
"=c" (cpuinfo[2]),
"=d" (cpuinfo[3]) :
"a" (infotype), "c" (0)
);
}
/*
SSE41 : return true
no SSE41 : return false
*/
int has_sse41 (void) {
int info[4];
cpuid(info, 0x00000001);
return ((info[2] & ((int)1 << 19)) != 0);
}
/*
AVX : return true
no AVX : return false
*/
int has_avx (void) {
int info[4];
cpuid(info, 0x00000001);
return ((info[2] & ((int)1 << 28)) != 0);
}
/*
AVX2 : return true
no AVX2 : return false
*/
int has_avx2 (void) {
int info[4];
cpuid(info, 0x00000007);
return ((info[1] & ((int)1 << 5)) != 0);
}