Skip to content

[SYCL] More adjustments for SYCL 2020 vec aliases #7896

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jan 3, 2023
Merged

[SYCL] More adjustments for SYCL 2020 vec aliases #7896

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c6eaf0
[SYCL] Fix LIT tests on Windows
AlexeySachkov Jan 2, 2023
441a874
Remove dead code
AlexeySachkov Jan 2, 2023
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
47 changes: 27 additions & 20 deletions sycl/test/basic_tests/generic_type_traits.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,41 +99,48 @@ int main() {
is_genint
*/

// According to SYCL 2020 specification, revision 6 section 4.14.2.2. Aliases:
// long{n} alias corresponds to vec<int64_t, n>
//
// Therefore, generic "type" longn/ulongn may not be the same as long{n},
// because 'long' is only guaranteed to be 32 bits long by C++ spec.

// is_ulongn
constexpr bool long_is_64_bits = sizeof(long) == 8;
static_assert(d::is_ulongn<s::uchar>::value == false, "");
static_assert(d::is_ulongn<s::ulong>::value == false, "");
static_assert(d::is_ulongn<s::ulong2>::value == true, "");
static_assert(d::is_ulongn<s::ulong3>::value == true, "");
static_assert(d::is_ulongn<s::ulong4>::value == true, "");
static_assert(d::is_ulongn<s::ulong8>::value == true, "");
static_assert(d::is_ulongn<s::ulong16>::value == true, "");
static_assert(d::is_ulongn<s::ulong2>::value == long_is_64_bits, "");
static_assert(d::is_ulongn<s::ulong3>::value == long_is_64_bits, "");
static_assert(d::is_ulongn<s::ulong4>::value == long_is_64_bits, "");
static_assert(d::is_ulongn<s::ulong8>::value == long_is_64_bits, "");
static_assert(d::is_ulongn<s::ulong16>::value == long_is_64_bits, "");

// is_ugenlong
static_assert(d::is_ugenlong<s::uchar>::value == false, "");
static_assert(d::is_ugenlong<s::ulong>::value == true, "");
static_assert(d::is_ugenlong<s::ulong2>::value == true, "");
static_assert(d::is_ugenlong<s::ulong3>::value == true, "");
static_assert(d::is_ugenlong<s::ulong4>::value == true, "");
static_assert(d::is_ugenlong<s::ulong8>::value == true, "");
static_assert(d::is_ugenlong<s::ulong16>::value == true, "");
static_assert(d::is_ugenlong<s::ulong2>::value == long_is_64_bits, "");
static_assert(d::is_ugenlong<s::ulong3>::value == long_is_64_bits, "");
static_assert(d::is_ugenlong<s::ulong4>::value == long_is_64_bits, "");
static_assert(d::is_ugenlong<s::ulong8>::value == long_is_64_bits, "");
static_assert(d::is_ugenlong<s::ulong16>::value == long_is_64_bits, "");

// is_longn
static_assert(d::is_longn<char>::value == false, "");
static_assert(d::is_longn<long>::value == false, "");
static_assert(d::is_longn<s::long2>::value == true, "");
static_assert(d::is_longn<s::long3>::value == true, "");
static_assert(d::is_longn<s::long4>::value == true, "");
static_assert(d::is_longn<s::long8>::value == true, "");
static_assert(d::is_longn<s::long16>::value == true, "");
static_assert(d::is_longn<s::long2>::value == long_is_64_bits, "");
static_assert(d::is_longn<s::long3>::value == long_is_64_bits, "");
static_assert(d::is_longn<s::long4>::value == long_is_64_bits, "");
static_assert(d::is_longn<s::long8>::value == long_is_64_bits, "");
static_assert(d::is_longn<s::long16>::value == long_is_64_bits, "");

// is_genlong
static_assert(d::is_genlong<char>::value == false, "");
static_assert(d::is_genlong<long>::value == true, "");
static_assert(d::is_genlong<s::long2>::value == true, "");
static_assert(d::is_genlong<s::long3>::value == true, "");
static_assert(d::is_genlong<s::long4>::value == true, "");
static_assert(d::is_genlong<s::long8>::value == true, "");
static_assert(d::is_genlong<s::long16>::value == true, "");
static_assert(d::is_genlong<s::long2>::value == long_is_64_bits, "");
static_assert(d::is_genlong<s::long3>::value == long_is_64_bits, "");
static_assert(d::is_genlong<s::long4>::value == long_is_64_bits, "");
static_assert(d::is_genlong<s::long8>::value == long_is_64_bits, "");
static_assert(d::is_genlong<s::long16>::value == long_is_64_bits, "");

/*
is_ulonglongn
Expand Down
24 changes: 13 additions & 11 deletions sycl/test/basic_tests/vectors/vectors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#define SYCL_SIMPLE_SWIZZLES
#include <sycl/sycl.hpp>

#include <cstddef>

void check_vectors(sycl::int4 a, sycl::int4 b, sycl::int4 c, sycl::int4 gold) {
sycl::int4 result = a * (sycl::int4)b.y() + c;
assert((int)result.x() == (int)gold.x());
Expand Down Expand Up @@ -100,17 +102,17 @@ int main() {
auto asVec = inputVec.template swizzle<sycl::elem::s0, sycl::elem::s1>()
.template as<sycl::vec<int16_t, 1>>();

// Check that [u]long[n] type aliases match vec<[unsigned] long, n> types.
assert((std::is_same<sycl::vec<long, 2>, sycl::long2>::value));
assert((std::is_same<sycl::vec<long, 3>, sycl::long3>::value));
assert((std::is_same<sycl::vec<long, 4>, sycl::long4>::value));
assert((std::is_same<sycl::vec<long, 8>, sycl::long8>::value));
assert((std::is_same<sycl::vec<long, 16>, sycl::long16>::value));
assert((std::is_same<sycl::vec<unsigned long, 2>, sycl::ulong2>::value));
assert((std::is_same<sycl::vec<unsigned long, 3>, sycl::ulong3>::value));
assert((std::is_same<sycl::vec<unsigned long, 4>, sycl::ulong4>::value));
assert((std::is_same<sycl::vec<unsigned long, 8>, sycl::ulong8>::value));
assert((std::is_same<sycl::vec<unsigned long, 16>, sycl::ulong16>::value));
// Check that [u]long[n] type aliases match vec<[u]int64_t, n> types.
assert((std::is_same<sycl::vec<std::int64_t, 2>, sycl::long2>::value));
assert((std::is_same<sycl::vec<std::int64_t, 3>, sycl::long3>::value));
assert((std::is_same<sycl::vec<std::int64_t, 4>, sycl::long4>::value));
assert((std::is_same<sycl::vec<std::int64_t, 8>, sycl::long8>::value));
assert((std::is_same<sycl::vec<std::int64_t, 16>, sycl::long16>::value));
assert((std::is_same<sycl::vec<std::uint64_t, 2>, sycl::ulong2>::value));
assert((std::is_same<sycl::vec<std::uint64_t, 3>, sycl::ulong3>::value));
assert((std::is_same<sycl::vec<std::uint64_t, 4>, sycl::ulong4>::value));
assert((std::is_same<sycl::vec<std::uint64_t, 8>, sycl::ulong8>::value));
assert((std::is_same<sycl::vec<std::uint64_t, 16>, sycl::ulong16>::value));

// Check convert() from and to various types.
check_convert_from<int8_t>();
Expand Down