Skip to content

[SYCL][Matrix] Move joint_matrix's implementation to experimental::ma… #3584

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 4 commits into from
Apr 22, 2021
Merged

[SYCL][Matrix] Move joint_matrix's implementation to experimental::ma… #3584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fd14f72
[SYCL][Matrix] Move joint_matrix's implementation to experimental::ma…
yubingex007-a11y Apr 21, 2021
d32f5da
Address Alexander's comments
yubingex007-a11y Apr 21, 2021
5cc89a4
Just a small bugfix
yubingex007-a11y Apr 21, 2021
5ed8b0c
Address Kevin's comments
yubingex007-a11y Apr 21, 2021
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
2 changes: 1 addition & 1 deletion sycl/include/CL/sycl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <CL/sycl/ONEAPI/filter_selector.hpp>
#include <CL/sycl/ONEAPI/function_pointer.hpp>
#include <CL/sycl/ONEAPI/group_algorithm.hpp>
#include <CL/sycl/ONEAPI/intel_matrix/matrix.hpp>
#include <CL/sycl/ONEAPI/matrix/matrix.hpp>
#include <CL/sycl/ONEAPI/reduction.hpp>
#include <CL/sycl/ONEAPI/sub_group.hpp>
#include <CL/sycl/accessor.hpp>
Expand Down
14 changes: 9 additions & 5 deletions ...L/sycl/ONEAPI/intel_matrix/matrix-amx.hpp → ...lude/CL/sycl/ONEAPI/matrix/matrix-amx.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ template <typename T> class submatrix {
short rows, cols;
};

// TODO: we are adding it this way until sycl::dynamic_extent gets implemented.
constexpr size_t dynamic_extent = std::numeric_limits<size_t>::max();

template <typename T> struct elems_per_dword {
Expand All @@ -62,7 +63,7 @@ ELEMS_PER_DWORD(unsigned short, 2)

} // namespace detail

namespace matrix {
namespace experimental::matrix {
using namespace cl::sycl;
using namespace cl::sycl::ONEAPI;

Expand Down Expand Up @@ -196,10 +197,12 @@ struct joint_matrix<
joint_matrix(Group sg) {}
};

} // namespace matrix
} // namespace experimental::matrix

namespace detail {

using namespace experimental;

template <typename Group, typename T, size_t NumRows, size_t NumCols,
matrix::matrix_layout Layout>
inline __SYCL_ALWAYS_INLINE static
Expand Down Expand Up @@ -231,7 +234,8 @@ inline __SYCL_ALWAYS_INLINE static
uint32_t row, uint32_t col, size_t stride,
matrix::matrix_layout layout, bool shouldreload) {
if (shouldreload) {
// Force sub_m.tile's shape to be matrix::tile_size * matrix::tile_size * 4
// Force sub_m.tile's shape to be matrix::tile_size *
// matrix::tile_size * 4
int8_t NewjmC[matrix::tile_size * matrix::tile_size * 4];
matrix::tilestored64_internal(NumRows, NumCols * sizeof(T),
reinterpret_cast<char *>(NewjmC),
Expand Down Expand Up @@ -309,7 +313,7 @@ inline __SYCL_ALWAYS_INLINE static

} // namespace detail

namespace matrix {
namespace experimental::matrix {

// This handles cases where matrix can't be accommodated by a tile
template <typename Group, typename T, size_t NumRows, size_t NumCols,
Expand Down Expand Up @@ -439,7 +443,7 @@ joint_matrix_mad(Group sg,
return;
}

} // namespace matrix
} // namespace experimental::matrix
} // namespace intel
} // namespace ext
} // namespace sycl
Expand Down
2 changes: 1 addition & 1 deletion ...de/CL/sycl/ONEAPI/intel_matrix/matrix.hpp → .../include/CL/sycl/ONEAPI/matrix/matrix.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@

#if (SYCL_EXT_ONEAPI_MATRIX == 1)
#if defined(__AMXTILE__) && defined(__AMXINT8__) && defined(__AMXBF16__)
#include <CL/sycl/ONEAPI/intel_matrix/matrix-amx.hpp>
#include <CL/sycl/ONEAPI/matrix/matrix-amx.hpp>
#endif
#endif
5 changes: 2 additions & 3 deletions ...evice/extensions/matrix-amx-bf16-test.cpp → sycl/test/matrix/matrix-amx-bf16-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
#if (SYCL_EXT_ONEAPI_MATRIX == 1)
#include <iostream>

using namespace cl::sycl;
using namespace cl::sycl::intel;
using namespace cl::sycl::ext::intel::matrix;
using namespace sycl::intel;
using namespace sycl::ext::intel::experimental::matrix;

#define TILE_SZ 16
#define TM (3 * TILE_SZ-1)
Expand Down
5 changes: 2 additions & 3 deletions ...evice/extensions/matrix-amx-int8-test.cpp → sycl/test/matrix/matrix-amx-int8-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
#if (SYCL_EXT_ONEAPI_MATRIX == 1)
#include <iostream>

using namespace cl::sycl;
using namespace cl::sycl::intel;
using namespace cl::sycl::ext::intel::matrix;
using namespace sycl::intel;
using namespace sycl::ext::intel::experimental::matrix;

#define TILE_SZ 16
#define TM (4 * TILE_SZ-4)
Expand Down