cmake: misc fixes for build on i386 #15516
Merged
Conversation
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
tchaikov
requested changes
Jun 6, 2017
cmake/modules/SIMDExt.cmake
Outdated
| @@ -91,6 +91,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64") | |||
| if(HAVE_INTEL_SSSE3) | |||
| set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3") | |||
| endif() | |||
| elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64") | |||
There was a problem hiding this comment.
i don't think this would work. as if the branches above are not mutual exclusive.
instead, probably we should just drop the i386 at line 76. because it apparently does not feature any of the SSE* instruction set. but we can have a dedicated branch for i686, as it supports SSE. see https://en.wikipedia.org/wiki/P6_(microarchitecture) and https://gcc.gnu.org/onlinedocs/gcc-4.5.3/gcc/i386-and-x86_002d64-Options.html.
and move SSE2 and above into the branch of amd64 x86_64 AMD64.
in otherwords:
if(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
set(HAVE_INTEL 1)
if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64")
CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE)
if(HAVE_INTEL_SSE)
set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse")
endif()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
if(HAVE_INTEL_SSE2)
set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse2")
endif()
CHECK_C_COMPILER_FLAG(-msse3 HAVE_INTEL_SSE3)
if(HAVE_INTEL_SSE3)
set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3")
endif()
CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3)
if(HAVE_INTEL_SSSE3)
set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3")
endif()
# ...
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64")
endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")There was a problem hiding this comment.
You're quite correct - I'll rework
javacruft
force-pushed
the
i386-cmake-fixes
branch
from
02728d5
to
31572c9
Compare
Scope SIMD CPU flag detection base on target architecture, resolving build failures in gf-complete on i386; this is inline with the previous autotools based feature detection. Only compile crypto/isa-l if yasm 64 bit complier is found, effectively limiting scope to x86_64. Signed-off-by: James Page <james.page@ubuntu.com>
javacruft
force-pushed
the
i386-cmake-fixes
branch
from
31572c9
to
5d92c79
Compare
tchaikov
approved these changes
Jun 6, 2017
tchaikov
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Limit scope of SIMD detection to 64 bit x86 for:
resolving build failures in gf-complete on i386; this is
inline with the previous autotools based feature detection.
Only compile crypto/isa-l if yasm 64 bit complier is found,
effectively limiting scope to x86_64.