Skip to content

[SYCL][Joint Matrix] Add support for Offset joint_matrix_load and joi #15526

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

Draft
wants to merge 3 commits into
base: sycl
Choose a base branch
from
Draft
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
21 changes: 21 additions & 0 deletions sycl/include/CL/__spirv/spirv_ops.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,27 @@ extern __DPCPP_SYCL_EXTERNAL void __spirv_CooperativeMatrixPrefetchINTEL(
T *Ptr, uint32_t NumRows, uint32_t NumCols, unsigned int CacheLevel,
__spv::MatrixLayout Layout, size_t Stride);

template <typename T, typename Tp, std::size_t R, std::size_t C,
__spv::MatrixUse U,
__spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
__spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
extern __DPCPP_SYCL_EXTERNAL
__spv::__spirv_JointMatrixINTEL<Tp, R, C, L, S, U> *
Copy link
Contributor

@YixingZhang007 YixingZhang007 Dec 9, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello Dounia! I found this line needs to be updated to __spv::__spirv_CooperativeMatrixKHR<Tp, S, R, C, U> * because a commit merged two weeks ago switched operations to use SPV_KHR_cooperative_matrix (#16045)

__spirv_CooperativeMatrixLoadOffsetINTEL(T *Ptr, int32_t RowIndex,
int32_t ColIndex,
__spv::MatrixLayout Layout = L,
std::size_t Stride = 0,
int MemOperand = 0);

template <typename T, typename Tp, std::size_t R, std::size_t C,
__spv::MatrixUse U,
__spv::MatrixLayout L = __spv::MatrixLayout::RowMajor,
__spv::Scope::Flag S = __spv::Scope::Flag::Subgroup>
extern __DPCPP_SYCL_EXTERNAL void __spirv_CooperativeMatrixStoreOffsetINTEL(
T *Ptr, int32_t RowIndex, int32_t ColIndex,
__spv::__spirv_JointMatrixINTEL<Tp, R, C, L, S, U> *Object,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line would also need to be updated to __spv::__spirv_CooperativeMatrixKHR<Tp, S, R, C, U> *Object for the same reason above.

__spv::MatrixLayout Layout = L, std::size_t Stride = 0, int MemOperand = 0);

#ifndef __SPIRV_BUILTIN_DECLARATIONS__
#error \
"SPIR-V built-ins are not available. Please set -fdeclare-spirv-builtins flag."
Expand Down
95 changes: 95 additions & 0 deletions sycl/include/sycl/ext/oneapi/matrix/matrix-intel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,101 @@ inline __SYCL_ALWAYS_INLINE void joint_matrix_store_checked(
}
// End out-of-bounds API

template <
typename Group, typename T, typename Tp,
sycl::ext::oneapi::experimental::matrix::use Use, size_t NumRows,
size_t NumCols, sycl::ext::oneapi::experimental::matrix::layout Layout,
access::address_space Space, access::decorated IsDecorated,
std::enable_if_t<Use == sycl::ext::oneapi::experimental::matrix::use::a ||
Use == sycl::ext::oneapi::experimental::matrix::use::b,
bool> = true>
inline __SYCL_ALWAYS_INLINE void
joint_matrix_store(Group,
const sycl::ext::oneapi::experimental::matrix::joint_matrix<
Group, Tp, Use, NumRows, NumCols, Layout> &Src,
size_t RowIndex, size_t ColIndex,
multi_ptr<T, Space, IsDecorated> BaseDst, size_t Stride) {
#if defined(__SYCL_DEVICE_ONLY__)
static_assert(Space != access::address_space::private_space,
"Joint Matrix doesn't support store to private memory!");
#if defined(__NVPTX__)
std::ignore = Src;
std::ignore = BaseDst;
std::ignore = Stride;
throw exception(
make_error_code(errc::runtime),
"This version of the matrix extension is only currently supported on "
"intel devices");
#else
// intel's impl
using DecorT = typename sycl::detail::DecoratedType<T, Space>::type;
DecorT *Ptr = sycl::detail::getDecorated<DecorT>(BaseDst);
__spirv_CooperativeMatrixStoreOffsetINTEL<
DecorT, Tp, NumRows, NumCols,
sycl::ext::oneapi::experimental::matrix::spv_matrix_use_traits<
Use>::value,
sycl::ext::oneapi::experimental::matrix::spv_matrix_layout_traits<
Layout>::value>(
Ptr, RowIndex, ColIndex, Src.spvm,
sycl::ext::oneapi::experimental::matrix::spv_matrix_layout_traits<
Layout>::value,
Stride);
#endif // defined(__NVPTX__)
#else
std::ignore = Src;
std::ignore = BaseDst;
std::ignore = Stride;
throw exception(make_error_code(errc::runtime),
"joint matrix is not supported on host.");
#endif // defined(__SYCL_DEVICE_ONLY__)
}
template <
typename Group, typename T, typename Tp,
sycl::ext::oneapi::experimental::matrix::use Use, size_t NumRows,
size_t NumCols, sycl::ext::oneapi::experimental::matrix::layout Layout,
typename PropertyListT,
std::enable_if_t<Use == sycl::ext::oneapi::experimental::matrix::use::a ||
Use == sycl::ext::oneapi::experimental::matrix::use::b,
bool> = true>
inline __SYCL_ALWAYS_INLINE void joint_matrix_store(
Group,
const sycl::ext::oneapi::experimental::matrix::joint_matrix<
Group, Tp, Use, NumRows, NumCols, Layout>
Src,
ext::oneapi::experimental::annotated_ptr<T, PropertyListT> BaseDst,
size_t RowIndex, size_t ColIndex, size_t Stride) {
#if defined(__SYCL_DEVICE_ONLY__)
#if defined(__NVPTX__)
std::ignore = Src;
std::ignore = BaseDst;
std::ignore = Stride;
throw exception(
make_error_code(errc::runtime),
"This version of the matrix extension is only currently supported on "
"intel devices");
#else
// intel's impl
T *Ptr = BaseDst.get();
__spirv_CooperativeMatrixStoreOffsetINTEL<
T, Tp, NumRows, NumCols,
sycl::ext::oneapi::experimental::matrix::spv_matrix_use_traits<
Use>::value,
sycl::ext::oneapi::experimental::matrix::spv_matrix_layout_traits<
Layout>::value>(
Ptr, Src.spvm,
sycl::ext::oneapi::experimental::matrix::spv_matrix_layout_traits<
Layout>::value,
RowIndex, ColIndex, Stride);
#endif // defined(__NVPTX__)
#else
std::ignore = Src;
std::ignore = BaseDst;
std::ignore = Stride;
throw exception(make_error_code(errc::runtime),
"joint matrix is not supported on host.");
#endif // defined(__SYCL_DEVICE_ONLY__)
}

} // namespace intel::experimental::matrix

} // namespace ext
Expand Down
Loading
Loading