Skip to content
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

ARROW-3844: [C++] Remove ARROW_USE_SSE and ARROW_SSE3 #3037

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,9 @@ Pass multiple labels by dividing with semicolons")
"Build Arrow Fuzzing executables"
OFF)

option(ARROW_SSE3
"Build Arrow with SSE3"
# Disable this option to exercise non-SIMD fallbacks
option(ARROW_USE_SIMD
"Build with SIMD optimizations"
ON)

option(ARROW_ALTIVEC
Expand Down Expand Up @@ -222,10 +223,6 @@ Pass multiple labels by dividing with semicolons")
"Build the plasma object store java client"
OFF)

option(ARROW_USE_SSE
"Build with SSE4 optimizations"
OFF)

option(ARROW_WITH_BROTLI
"Build with Brotli compression"
ON)
Expand Down
4 changes: 2 additions & 2 deletions cpp/cmake_modules/SetupCxxFlags.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ if (CXX_SUPPORTS_ALTIVEC AND ARROW_ALTIVEC)
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -maltivec")
endif()

if (ARROW_USE_SSE)
add_definitions(-DARROW_USE_SSE)
if (ARROW_USE_SIMD)
add_definitions(-DARROW_USE_SIMD)
endif()

if (APPLE)
Expand Down
5 changes: 0 additions & 5 deletions cpp/src/arrow/util/bit-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@
#include "arrow/util/type_traits.h"
#include "arrow/util/visibility.h"

#ifdef ARROW_USE_SSE
#include "arrow/util/cpu-info.h"
#include "arrow/util/sse-util.h"
#endif

namespace arrow {

class Buffer;
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/arrow/util/cpu-info.cc
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ void CpuInfo::VerifyCpuRequirements() {
}

bool CpuInfo::CanUseSSE4_2() const {
#ifdef ARROW_USE_SSE
#ifdef ARROW_USE_SIMD
return IsSupported(CpuInfo::SSE4_2);
#else
return false;
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/util/sse-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
#undef ARROW_HAVE_SSE2
#undef ARROW_HAVE_SSE4_2

#ifdef ARROW_USE_SIMD

// MSVC x86-64

#if (defined(_M_AMD64) || defined(_M_X64))
Expand All @@ -44,8 +46,6 @@
#include <nmmintrin.h>
#endif

#if defined(ARROW_USE_SSE) && !defined(ARROW_HAVE_SSE2)
#error "ARROW_USE_SSE enabled but no intrinsics available"
#endif

namespace arrow {
Expand Down