Skip to content
Merged
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
18 changes: 15 additions & 3 deletions include/xvec/detail/core.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,22 @@ struct mask_traits
static constexpr int internalNp = std::bit_ceil(std::max<unsigned>(8, _Np));

#if defined (__llvm__)
#if (__INTEL_LLVM_COMPILER > 20220000)
using compact_builtin_type = unsigned _BitInt(internalNp);

// Two different names for ExtInt/BitInt - choose one explicitly to avoid warnings about deprecations.
#if defined(__INTEL_LLVM_COMPILER)
#if __INTEL_LLVM_COMPILER > 20220000
using compact_builtin_type = unsigned _BitInt(internalNp);
#else
using compact_builtin_type = unsigned _ExtInt(internalNp);
#endif
#elif defined(__clang_major__)
#if __clang_major__ >= 14
using compact_builtin_type = unsigned _BitInt(internalNp);
#else
using compact_builtin_type = unsigned _ExtInt(internalNp);
#endif
#else
using compact_builtin_type = unsigned _ExtInt(internalNp);
#error "Unknown LLVM-based compiler: choose a bit-precise integer type"
#endif

static constexpr auto all_bits_set = (_Np == internalNp) ? ~compact_builtin_type() : ((compact_builtin_type(1) << _Np) - 1);
Expand Down
1 change: 0 additions & 1 deletion include/xvec/x86/x86_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,6 @@ mask_to_bitset(x86_avx512_tag, const _Mp& mask) noexcept

// Build the bitset up 64-bits at a time. Each 64-bit group is extracted from the extended int and
// then inserted into the bitset.
#pragma unroll
for (simd_size_type i = 0; i<((_Np + 63) / 64); ++i)
{
const auto b = std::bitset<_Np>(std::uint64_t(mask.to_builtin() >> (64 * i)));
Expand Down
17 changes: 1 addition & 16 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,7 @@ target_compile_options(
INTERFACE
-Wall
-Wextra
-Wno-tautological-constant-compare
-Wno-deprecated-declarations
-Werror
-Wno-psabi
-Wno-sign-compare
"${XVEC_TEST_OLEVEL}"
Expand All @@ -246,25 +245,11 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "^(IntelLLVM|Clang)$")
target_compile_options(
xvec_test_common
INTERFACE
-Wno-unknown-warning-option
-Wno-deprecated-copy
-Wno-deprecated-builtins
-Wno-unused-command-line-argument
)

if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
target_compile_options(
xvec_test_common
INTERFACE
-Wno-deprecated-type
)
endif()
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(
xvec_test_common
INTERFACE
-Wno-unknown-warning
-Wno-maybe-uninitialized
-Wno-unknown-pragmas
-flax-vector-conversions
)
Expand Down
Loading