timshen updated this revision to Diff 139045.
timshen added a comment.
Herald added a subscriber: christof.
Rebase.
https://reviews.llvm.org/D41845
Files:
libcxx/include/experimental/simd
libcxx/test/std/experimental/simd/simd.cons/load.pass.cpp
libcxx/test/std/experimental/simd/simd.mask.cons/load.pass.cpp
libcxx/test/std/experimental/simd/simd.mask.mem/load.pass.cpp
libcxx/test/std/experimental/simd/simd.mask.mem/store.pass.cpp
libcxx/test/std/experimental/simd/simd.mem/load.pass.cpp
libcxx/test/std/experimental/simd/simd.mem/store.pass.cpp
libcxx/test/std/experimental/simd/simd.traits/is_abi_tag.pass.cpp
libcxx/test/std/experimental/simd/simd.traits/is_simd.pass.cpp
libcxx/test/std/experimental/simd/simd.traits/is_simd_flag_type.pass.cpp
libcxx/test/std/experimental/simd/simd.traits/is_simd_mask.pass.cpp
libcxx/test/std/experimental/simd/simd.traits/memory_alignment.pass.cpp
Index: libcxx/test/std/experimental/simd/simd.traits/memory_alignment.pass.cpp
===================================================================
--- /dev/null
+++ libcxx/test/std/experimental/simd/simd.traits/memory_alignment.pass.cpp
@@ -0,0 +1,67 @@
+//===----------------------------------------------------------------------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// UNSUPPORTED: c++98, c++03
+
+// <experimental/simd>
+//
+// [simd.traits]
+// template <class T, class U = typename T::value_type> struct memory_alignment;
+// template <class T, class U = typename T::value_type>
+// inline constexpr size_t memory_alignment_v = memory_alignment<T, U>::value;
+
+#include <experimental/simd>
+#include "test_macros.h"
+
+using namespace std::experimental::parallelism_v2;
+
+static_assert(std::is_same<const size_t,
+ decltype(memory_alignment<simd<int>>::value)>::value,
+ "");
+static_assert(
+ std::is_same<const size_t,
+ decltype(memory_alignment<simd<int>, int>::value)>::value,
+ "");
+static_assert(
+ std::is_same<
+ const size_t,
+ decltype(memory_alignment<simd<int>, unsigned int>::value)>::value,
+ "");
+static_assert(
+ std::is_same<const size_t,
+ decltype(memory_alignment<simd_mask<int>>::value)>::value,
+ "");
+static_assert(
+ std::is_same<const size_t, decltype(memory_alignment<simd_mask<int>,
+ bool>::value)>::value,
+ "");
+
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
+
+static_assert(
+ std::is_same<const size_t, decltype(memory_alignment_v<simd<int>>)>::value,
+ "");
+static_assert(std::is_same<const size_t,
+ decltype(memory_alignment_v<simd<int>, int>)>::value,
+ "");
+static_assert(
+ std::is_same<const size_t,
+ decltype(memory_alignment_v<simd<int>, unsigned int>)>::value,
+ "");
+static_assert(std::is_same<const size_t,
+ decltype(memory_alignment_v<simd_mask<int>>)>::value,
+ "");
+static_assert(
+ std::is_same<const size_t,
+ decltype(memory_alignment_v<simd_mask<int>, bool>)>::value,
+ "");
+
+#endif
+
+int main() {}
Index: libcxx/test/std/experimental/simd/simd.traits/is_simd_mask.pass.cpp
===================================================================
--- libcxx/test/std/experimental/simd/simd.traits/is_simd_mask.pass.cpp
+++ libcxx/test/std/experimental/simd/simd.traits/is_simd_mask.pass.cpp
@@ -67,8 +67,7 @@
static_assert(!is_simd_mask<int>::value, "");
-#if TEST_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES) && \
- !defined(_LIBCPP_HAS_NO_INLINE_VARIABLES)
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
static_assert(is_simd_mask_v<native_simd_mask<int8_t>>, "");
static_assert(is_simd_mask_v<native_simd_mask<int16_t>>, "");
Index: libcxx/test/std/experimental/simd/simd.traits/is_simd_flag_type.pass.cpp
===================================================================
--- libcxx/test/std/experimental/simd/simd.traits/is_simd_flag_type.pass.cpp
+++ libcxx/test/std/experimental/simd/simd.traits/is_simd_flag_type.pass.cpp
@@ -26,8 +26,7 @@
static_assert(is_simd_flag_type<overaligned_tag<16>>::value, "");
static_assert(is_simd_flag_type<overaligned_tag<32>>::value, "");
-#if TEST_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES) && \
- !defined(_LIBCPP_HAS_NO_INLINE_VARIABLES)
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
static_assert(is_simd_flag_type_v<element_aligned_tag>, "");
static_assert(is_simd_flag_type_v<vector_aligned_tag>, "");
Index: libcxx/test/std/experimental/simd/simd.traits/is_simd.pass.cpp
===================================================================
--- libcxx/test/std/experimental/simd/simd.traits/is_simd.pass.cpp
+++ libcxx/test/std/experimental/simd/simd.traits/is_simd.pass.cpp
@@ -67,8 +67,7 @@
static_assert(!is_simd<int>::value, "");
-#if TEST_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES) && \
- !defined(_LIBCPP_HAS_NO_INLINE_VARIABLES)
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
static_assert(is_simd_v<native_simd<int8_t>>, "");
static_assert(is_simd_v<native_simd<int16_t>>, "");
Index: libcxx/test/std/experimental/simd/simd.traits/is_abi_tag.pass.cpp
===================================================================
--- libcxx/test/std/experimental/simd/simd.traits/is_abi_tag.pass.cpp
+++ libcxx/test/std/experimental/simd/simd.traits/is_abi_tag.pass.cpp
@@ -54,8 +54,7 @@
static_assert(is_abi_tag<simd_abi::fixed_size<5>>::value, "");
static_assert(is_abi_tag<simd_abi::fixed_size<32>>::value, "");
-#if TEST_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES) && \
- !defined(_LIBCPP_HAS_NO_INLINE_VARIABLES)
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
static_assert(is_abi_tag_v<simd_abi::native<int8_t>>, "");
static_assert(is_abi_tag_v<simd_abi::native<int16_t>>, "");
Index: libcxx/test/std/experimental/simd/simd.mem/store.pass.cpp
===================================================================
--- libcxx/test/std/experimental/simd/simd.mem/store.pass.cpp
+++ libcxx/test/std/experimental/simd/simd.mem/store.pass.cpp
@@ -48,7 +48,7 @@
assert(buffer[3] == 1);
}
-#if TEST_STD_VER > 14
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
{
alignas(32) int32_t buffer[4] = {0};
a.copy_to(buffer, element_aligned);
Index: libcxx/test/std/experimental/simd/simd.mem/load.pass.cpp
===================================================================
--- libcxx/test/std/experimental/simd/simd.mem/load.pass.cpp
+++ libcxx/test/std/experimental/simd/simd.mem/load.pass.cpp
@@ -74,7 +74,7 @@
assert(a[3] == 1);
}
-#if TEST_STD_VER > 14
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
{
fixed_size_simd<int32_t, 4> a;
a.copy_from(buffer, element_aligned);
Index: libcxx/test/std/experimental/simd/simd.mask.mem/store.pass.cpp
===================================================================
--- libcxx/test/std/experimental/simd/simd.mask.mem/store.pass.cpp
+++ libcxx/test/std/experimental/simd/simd.mask.mem/store.pass.cpp
@@ -51,7 +51,7 @@
assert(!buffer[3]);
}
-#if TEST_STD_VER > 14
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
{
alignas(32) bool buffer[4] = {0};
a.copy_to(buffer, element_aligned);
Index: libcxx/test/std/experimental/simd/simd.mask.mem/load.pass.cpp
===================================================================
--- libcxx/test/std/experimental/simd/simd.mask.mem/load.pass.cpp
+++ libcxx/test/std/experimental/simd/simd.mask.mem/load.pass.cpp
@@ -74,7 +74,7 @@
assert(!a[3]);
}
-#if TEST_STD_VER > 14
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
{
fixed_size_simd_mask<int32_t, 4> a;
a.copy_from(buffer, element_aligned);
Index: libcxx/test/std/experimental/simd/simd.mask.cons/load.pass.cpp
===================================================================
--- libcxx/test/std/experimental/simd/simd.mask.cons/load.pass.cpp
+++ libcxx/test/std/experimental/simd/simd.mask.cons/load.pass.cpp
@@ -46,7 +46,7 @@
assert(buf[2] == m[2]);
assert(buf[3] == m[3]);
}
-#if TEST_STD_VER > 14
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
{
bool buf[] = {false, true, true, false};
fixed_size_simd_mask<int, 4> m(buf, element_aligned);
Index: libcxx/test/std/experimental/simd/simd.cons/load.pass.cpp
===================================================================
--- libcxx/test/std/experimental/simd/simd.cons/load.pass.cpp
+++ libcxx/test/std/experimental/simd/simd.cons/load.pass.cpp
@@ -70,7 +70,7 @@
assert(a[3] == 1);
}
-#if TEST_STD_VER > 14
+#if TEST_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
{
fixed_size_simd<int32_t, 4> a(buffer, element_aligned);
assert(a[0] == 4);
Index: libcxx/include/experimental/simd
===================================================================
--- libcxx/include/experimental/simd
+++ libcxx/include/experimental/simd
@@ -962,7 +962,7 @@
template <int _Np>
using fixed_size = __simd_abi<_StorageKind::_Array, _Np>;
-#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
+#if _LIBCPP_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
template <class _Tp>
_LIBCPP_INLINE_VAR constexpr size_t max_fixed_size = 32;
#endif
@@ -996,14 +996,12 @@
struct vector_aligned_tag {};
template <size_t>
struct overaligned_tag {};
-#if _LIBCPP_STD_VER > 14
_LIBCPP_INLINE_VAR constexpr element_aligned_tag element_aligned{};
_LIBCPP_INLINE_VAR constexpr vector_aligned_tag vector_aligned{};
#if !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
template <size_t _Np>
_LIBCPP_INLINE_VAR constexpr overaligned_tag<_Np> overaligned{};
#endif
-#endif
// traits [simd.traits]
template <class _Tp>
@@ -1041,7 +1039,7 @@
struct is_simd_flag_type<overaligned_tag<_Align>>
: std::integral_constant<bool, true> {};
-#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
+#if _LIBCPP_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
template <class _Tp>
_LIBCPP_INLINE_VAR constexpr bool is_abi_tag_v = is_abi_tag<_Tp>::value;
template <class _Tp>
@@ -1083,11 +1081,19 @@
"Element type should be vectorizable");
};
-// TODO: implement it.
-template <class _Tp, class _Up = typename _Tp::value_type>
+template <class _SimdType, class _ValueType = typename _SimdType::value_type>
struct memory_alignment;
-#if _LIBCPP_STD_VER > 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
+// TODO: May extend this after implementing vector_aligned.
+template <class _Tp, class _Abi, class _Up>
+struct memory_alignment<simd<_Tp, _Abi>, _Up>
+ : std::integral_constant<size_t, alignof(simd<_Tp, _Abi>)> {};
+
+template <class _Tp, class _Abi>
+struct memory_alignment<simd_mask<_Tp, _Abi>, bool>
+ : std::integral_constant<size_t, alignof(simd_mask<_Tp, _Abi>)> {};
+
+#if _LIBCPP_STD_VER >= 14 && !defined(_LIBCPP_HAS_NO_VARIABLE_TEMPLATES)
template <class _Tp, class _Abi = simd_abi::compatible<_Tp>>
_LIBCPP_INLINE_VAR constexpr size_t simd_size_v = simd_size<_Tp, _Abi>::value;
@@ -1785,9 +1791,9 @@
template <class _Up,
class = typename std::enable_if<__can_broadcast<_Up>()>::type>
simd(_Up&& __rv) {
- auto __v = static_cast<_Tp>(__rv);
+ auto __val = static_cast<_Tp>(__rv);
for (size_t __i = 0; __i < size(); __i++) {
- (*this)[__i] = __v;
+ (*this)[__i] = __val;
}
}
@@ -2096,9 +2102,9 @@
simd_mask() = default;
// broadcast constructor
- explicit simd_mask(value_type __value) noexcept {
+ explicit simd_mask(value_type __val) noexcept {
for (size_t __i = 0; __i < size(); __i++) {
- (*this)[__i] = __value;
+ (*this)[__i] = __val;
}
}
@@ -2118,6 +2124,7 @@
template <class _Flags, class = typename std::enable_if<
is_simd_flag_type<_Flags>::value>::type>
simd_mask(const value_type* __buffer, _Flags) {
+ // TODO: optimize for overaligned flags
for (size_t __i = 0; __i < size(); __i++) {
(*this)[__i] = __buffer[__i];
}
@@ -2133,6 +2140,7 @@
template <class _Flags>
typename std::enable_if<is_simd_flag_type<_Flags>::value>::type
copy_to(value_type* __buffer, _Flags) const {
+ // TODO: optimize for overaligned flags
for (size_t __i = 0; __i < size(); __i++) {
__buffer[__i] = (*this)[__i];
}
@@ -2200,6 +2208,7 @@
template <class _Tp, class _Abi, class _Up, class _Flags>
void __mask_copy_to(const simd<_Tp, _Abi>& __v, const simd_mask<_Tp, _Abi>& __m,
_Up* __buffer, _Flags) {
+ // TODO: optimize for overaligned flags
for (size_t __i = 0; __i < __v.size(); __i++) {
if (__m[__i]) {
__buffer[__i] = static_cast<_Up>(__v[__i]);
@@ -2210,17 +2219,18 @@
template <class _Tp, class _Abi, class _Up, class _Flags>
void __mask_copy_to(const simd_mask<_Tp, _Abi>& __v,
const simd_mask<_Tp, _Abi>& __m, _Up* __buffer, _Flags) {
+ // TODO: optimize based on bool's bit pattern.
for (size_t __i = 0; __i < __v.size(); __i++) {
if (__m[__i]) {
__buffer[__i] = static_cast<_Up>(__v[__i]);
}
}
}
template <class _Tp, class _Up, class _Flags>
-void __mask_copy_to(_Tp __v, bool __m, _Up* __buffer, _Flags) {
+void __mask_copy_to(_Tp __val, bool __m, _Up* __buffer, _Flags) {
if (__m) {
- *__buffer = static_cast<_Up>(__v);
+ *__buffer = static_cast<_Up>(__val);
}
}
@@ -2248,9 +2258,9 @@
}
template <class _Tp, class _Up, class _Flags>
-void __mask_copy_from(_Tp& __v, bool __m, const _Up* __buffer, _Flags) {
+void __mask_copy_from(_Tp& __val, bool __m, const _Up* __buffer, _Flags) {
if (__m) {
- __v = static_cast<_Tp>(*__buffer);
+ __val = static_cast<_Tp>(*__buffer);
}
}
@@ -2566,6 +2576,8 @@
__w.__v_, __w.__m_));
}
+// TODO: Implement <cmath> functions for simd.
+
_LIBCPP_END_NAMESPACE_EXPERIMENTAL_SIMD
#endif /* _LIBCPP_EXPERIMENTAL_SIMD */
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
