Skip to content

[NFC][ESIMD] Simplify simd_view template specialization for len=1 #4334

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

Merged
merged 3 commits into from
Aug 16, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ template <typename T, int SizeY, int StrideY, int SizeX, int StrideX>
using region2d_t = region_base<true, T, SizeY, StrideY, SizeX, StrideX>;

// A region with a single element.
template <bool Is2D, typename T, int StrideY, int StrideX>
using region_base_1 = region_base<Is2D, T, 1, StrideY, 1, StrideX>;
template <typename T> using region_base_1 = region_base<false, T, 1, 0, 1, 0>;

// simd_view forward declaration.
template <typename BaseTy, typename RegionTy> class simd_view;
Expand Down
10 changes: 5 additions & 5 deletions sycl/include/sycl/ext/intel/experimental/esimd/simd_view.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ class simd_view : public detail::simd_view_impl<BaseTy, RegionTy> {
/// bool b = v[0] > v[1] && v[2] < 42;
///
/// \ingroup sycl_esimd
template <typename BaseTy, bool Is2D, typename T, int StrideY, int StrideX>
class simd_view<BaseTy, region_base_1<Is2D, T, StrideY, StrideX>>
: public detail::simd_view_impl<BaseTy,
region_base_1<Is2D, T, StrideY, StrideX>> {
template <typename BaseTy>
class simd_view<BaseTy, region_base_1<typename BaseTy::element_type>>
: public detail::simd_view_impl<
BaseTy, region_base_1<typename BaseTy::element_type>> {
template <typename, int> friend class simd;

public:
using RegionTy = region_base_1<Is2D, T, StrideY, StrideX>;
using RegionTy = region_base_1<typename BaseTy::element_type>;
using BaseClass = detail::simd_view_impl<BaseTy, RegionTy>;
using ShapeTy = typename shape_type<RegionTy>::type;
static constexpr int length = ShapeTy::Size_x * ShapeTy::Size_y;
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/esimd/esimd-util-compiler-eval.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ static_assert(log2<1024 * 1024>() == 20, "");

using BaseTy = simd<float, 4>;
using RegionTy = region1d_t<float, 2, 1>;
using RegionTy1 = region_base_1<false, float, 1, 1>;
using RegionTy1 = region_base_1<float>;
static_assert(is_simd_view_v<simd_view_impl<BaseTy, RegionTy>>::value, "");
static_assert(is_simd_view_v<simd_view<BaseTy, RegionTy>>::value, "");
static_assert(is_simd_view_v<simd_view<BaseTy, RegionTy1>>::value, "");
Expand Down