-
Notifications
You must be signed in to change notification settings - Fork 9.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
lstm: Move class SIMDDetect to new source file and improve code
Modify also the code to use a singleton. This simplifies the code as no locking is needed. It also slightly improves the performance because no check whether the architecture was tested is needed. Signed-off-by: Stefan Weil <[email protected]>
- Loading branch information
Showing
5 changed files
with
123 additions
and
83 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /////////////////////////////////////////////////////////////////////// | ||
| // File: simddetect.h | ||
| // Description: Architecture detector. | ||
| // Author: Stefan Weil (based on code from Ray Smith) | ||
| // | ||
| // (C) Copyright 2014, Google 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 "simddetect.h" | ||
| #include "tprintf.h" | ||
|
|
||
| #undef X86_BUILD | ||
| #if defined(__x86_64__) || defined(__i386__) || defined(_WIN32) | ||
| # if !defined(ANDROID_BUILD) | ||
| # define X86_BUILD 1 | ||
| # endif // !ANDROID_BUILD | ||
| #endif // x86 target | ||
|
|
||
| #if defined(X86_BUILD) | ||
| # if defined(__linux__) || defined(__MINGW32__) | ||
| # include <cpuid.h> | ||
| # elif defined(_WIN32) | ||
| # include <intrin.h> | ||
| # endif | ||
| #endif | ||
|
|
||
| SIMDDetect SIMDDetect::detector; | ||
|
|
||
| // If true, then AVX has been detected. | ||
| bool SIMDDetect::avx_available_; | ||
| // If true, then SSe4.1 has been detected. | ||
| bool SIMDDetect::sse_available_; | ||
|
|
||
| // Constructor. | ||
| // Tests the architecture in a system-dependent way to detect AVX, SSE and | ||
| // any other available SIMD equipment. | ||
| SIMDDetect::SIMDDetect() { | ||
| #if defined(X86_BUILD) | ||
| # if defined(__linux__) || defined(__MINGW32__) | ||
| unsigned int eax, ebx, ecx, edx; | ||
| if (__get_cpuid(1, &eax, &ebx, &ecx, &edx) != 0) { | ||
| sse_available_ = (ecx & 0x00080000) != 0; | ||
| avx_available_ = (ecx & 0x10000000) != 0; | ||
| } | ||
| # elif defined(_WIN32) | ||
| int cpuInfo[4]; | ||
| __cpuid(cpuInfo, 0); | ||
| if (cpuInfo[0] >= 1) { | ||
| __cpuid(cpuInfo, 1); | ||
| sse_available_ = (cpuInfo[2] & 0x00080000) != 0; | ||
| avx_available_ = (cpuInfo[2] & 0x10000000) != 0; | ||
| } | ||
| # endif | ||
| if (avx_available_) tprintf("Found AVX\n"); | ||
| if (sse_available_) tprintf("Found SSE\n"); | ||
| #endif // X86_BUILD | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /////////////////////////////////////////////////////////////////////// | ||
| // File: simddetect.h | ||
| // Description: Architecture detector. | ||
| // Author: Stefan Weil (based on code from Ray Smith) | ||
| // | ||
| // (C) Copyright 2014, Google 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. | ||
| /////////////////////////////////////////////////////////////////////// | ||
|
|
||
| // Architecture detector. Add code here to detect any other architectures for | ||
| // SIMD-based faster dot product functions. Intended to be a single static | ||
| // object, but it does no real harm to have more than one. | ||
| class SIMDDetect { | ||
| public: | ||
| // Returns true if AVX is available on this system. | ||
| static inline bool IsAVXAvailable() { | ||
| return detector.avx_available_; | ||
| } | ||
| // Returns true if SSE4.1 is available on this system. | ||
| static inline bool IsSSEAvailable() { | ||
| return detector.sse_available_; | ||
| } | ||
|
|
||
| private: | ||
| // Constructor, must set all static member variables. | ||
| SIMDDetect(); | ||
|
|
||
| private: | ||
| // Singleton. | ||
| static SIMDDetect detector; | ||
| // If true, then AVX has been detected. | ||
| static bool avx_available_; | ||
| // If true, then SSe4.1 has been detected. | ||
| static bool sse_available_; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters