-
Notifications
You must be signed in to change notification settings - Fork 22
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
chore: get rid of the golang.org/x/sys/cpu #75
base: query-simd
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package simd | ||
|
||
// cpuid is implemented in cpu_amd64.s | ||
func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32) | ||
|
||
// xgetbv with ecx = 0 is implemented in cpu_amd64.s | ||
func xgetbv() (eax, edx uint32) | ||
|
||
// useSIMD reports the availability of FMA and AVX2 cpu features | ||
func useSIMD() bool { | ||
var ( | ||
hasAVX2 bool | ||
hasFMA bool | ||
|
||
isSet = func(bitpos uint, value uint32) bool { | ||
return value&(1<<bitpos) != 0 | ||
} | ||
) | ||
|
||
if maxID, _, _, _ := cpuid(0, 0); maxID < 7 { | ||
return false | ||
} | ||
_, _, ecx1, _ := cpuid(1, 0) | ||
|
||
hasFMA = isSet(12, ecx1) | ||
|
||
if hasOSXSAVE := isSet(27, ecx1); hasOSXSAVE { | ||
eax, _ := xgetbv() // For XGETBV, OSXSAVE bit is required and sufficient. | ||
_, ebx7, _, _ := cpuid(7, 0) | ||
hasAVX2 = isSet(1, eax) && isSet(2, eax) && isSet(5, ebx7) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
} | ||
|
||
return hasAVX2 && hasFMA | ||
} |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,55 @@ | ||||||
/* This file is a copy of https://cs.opensource.google/go/x/sys/+/master:cpu/cpu_x86.s. | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In case their file changes in the future, it might be better to reference a specific version of it
Suggested change
|
||||||
Here is its license, which only applies to the copied parts and not to the rest of chromem-go, | ||||||
which is licensed under the GNU Affero General Public License. | ||||||
|
||||||
BSD 3-clause license | ||||||
|
||||||
Copyright (c) 2009 The Go Authors. All rights reserved. | ||||||
|
||||||
Redistribution and use in source and binary forms, with or without | ||||||
modification, are permitted provided that the following conditions are | ||||||
met: | ||||||
|
||||||
* Redistributions of source code must retain the above copyright | ||||||
notice, this list of conditions and the following disclaimer. | ||||||
* Redistributions in binary form must reproduce the above | ||||||
copyright notice, this list of conditions and the following disclaimer | ||||||
in the documentation and/or other materials provided with the | ||||||
distribution. | ||||||
* Neither the name of Google Inc. nor the names of its | ||||||
contributors may be used to endorse or promote products derived from | ||||||
this software without specific prior written permission. | ||||||
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||||||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||||||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||||||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||||||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||||||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||||||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||||||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||||
*/ | ||||||
|
||||||
#include "textflag.h" | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do you know if this could lead to any constraints on users' side? Does it work when using TinyGo as compiler? (Haven't tried with current There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
not really, as long as we take care of proper build tags, nothing should break or cause additional constraints (we have default fallback)
iirc,
If we want to attempt to build TinyGo "normal" binaries we can manage the builds with the However I don't think tinygo works right now (unrelated to the changes being worked on here). Tried quickly to build the minimal example with TinyGo and it panics checkId: 22 should be 23
panic: bootstrap type wrong id: mapType mapType not <nil> There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It would be |
||||||
|
||||||
// func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32) | ||||||
TEXT ·cpuid(SB), NOSPLIT, $0-24 | ||||||
MOVL eaxArg+0(FP), AX | ||||||
MOVL ecxArg+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() (eax, edx uint32) | ||||||
TEXT ·xgetbv(SB),NOSPLIT,$0-8 | ||||||
MOVL $0, CX | ||||||
XGETBV | ||||||
MOVL AX, eax+0(FP) | ||||||
MOVL DX, edx+4(FP) | ||||||
RET |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
//go:build !amd64 | ||
|
||
package simd | ||
|
||
func useSIMD() bool { | ||
return false | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this the required subset of the
x/sys/cpu
'scpu.X86.HasAVX2
andcpu.X86.HasFMA
checks? (Sorry currently don't have much time to confirm myself)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, https://cs.opensource.google/go/x/sys/+/refs/tags/v0.20.0:cpu/cpu_x86.go is used as reference
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah thanks! Checked it and commented a question below