Skip to content

[SYCL][Joint Matrix] Add more cases in common JM tests functions #15712

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
Nov 5, 2024
Merged

[SYCL][Joint Matrix] Add more cases in common JM tests functions #15712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c15e2e
[SYCL][Joint Matrix] Add more cases in common JM tests functions
dkhaldi Oct 15, 2024
45e7ba6
restructure combinations so it can be reused and augmented by similar…
dkhaldi Nov 5, 2024
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
13 changes: 7 additions & 6 deletions sycl/source/detail/device_info.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,8 +838,8 @@ struct get_device_info_impl<
};
else if ((architecture::intel_gpu_pvc == DeviceArch) ||
(architecture::intel_gpu_bmg_g21 == DeviceArch) ||
(architecture::intel_gpu_lnl_m == DeviceArch))
return {
(architecture::intel_gpu_lnl_m == DeviceArch)) {
std::vector<ext::oneapi::experimental::matrix::combination> pvc_combs = {
{8, 0, 0, 0, 16, 32, matrix_type::uint8, matrix_type::uint8,
matrix_type::sint32, matrix_type::sint32},
{8, 0, 0, 0, 16, 32, matrix_type::uint8, matrix_type::sint8,
Expand Down Expand Up @@ -943,10 +943,11 @@ struct get_device_info_impl<
{8, 0, 0, 0, 16, 8, matrix_type::tf32, matrix_type::tf32,
matrix_type::fp32, matrix_type::fp32},
};
else if ((architecture::intel_gpu_dg2_g10 == DeviceArch) ||
(architecture::intel_gpu_dg2_g11 == DeviceArch) ||
(architecture::intel_gpu_dg2_g12 == DeviceArch) ||
(architecture::intel_gpu_arl_h == DeviceArch))
return pvc_combs;
} else if ((architecture::intel_gpu_dg2_g10 == DeviceArch) ||
(architecture::intel_gpu_dg2_g11 == DeviceArch) ||
(architecture::intel_gpu_dg2_g12 == DeviceArch) ||
(architecture::intel_gpu_arl_h == DeviceArch))
return {
{8, 0, 0, 0, 8, 32, matrix_type::uint8, matrix_type::uint8,
matrix_type::sint32, matrix_type::sint32},
Expand Down
6 changes: 3 additions & 3 deletions sycl/test-e2e/Matrix/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ void matrix_multiply_ref(Ta *A, Tb *B, Tc *C, int M, int N, int K,
if constexpr (std::is_same_v<Ta, bfloat16> &&
std::is_same_v<Tc, float>)
acc += make_fp32(va[i]) * make_fp32(vb[i]);
else if constexpr (std::is_same_v<Ta, sycl::half> &&
std::is_same_v<Tc, float>)
else if constexpr (std::is_same_v<Ta, sycl::half>)
acc += (float)va[i] * (float)vb[i];
else if constexpr (std::is_same_v<Ta, float> &&
std::is_same_v<Tc, float> ||
Expand Down Expand Up @@ -135,7 +134,8 @@ void matrix_rand(unsigned int rows, unsigned int cols, T *src, T val) {

for (unsigned int i = 0; i < rows; i++) {
for (unsigned int j = 0; j < cols; j++) {
if constexpr (std::is_same_v<T, bfloat16> || std::is_same_v<T, float> ||
if constexpr (std::is_same_v<T, sycl::half> ||
std::is_same_v<T, bfloat16> || std::is_same_v<T, float> ||
std::is_same_v<T, double>) {
src[i * cols + j] = T(fdistr(dev));
} else if constexpr (std::is_integral_v<T>) {
Expand Down
Loading