Skip to content

[ESIMD]Fix load_2d inconsistency when reading non native types with VNNI transforms #15584

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 1 commit into from
Oct 2, 2024
Merged

[ESIMD]Fix load_2d inconsistency when reading non native types with VNNI transforms #15584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions sycl/include/sycl/ext/intel/esimd/memory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4070,7 +4070,7 @@ __ESIMD_API simd<T, N> load_2d_impl(const T *Ptr, unsigned SurfaceWidth,
uintptr_t Addr = reinterpret_cast<uintptr_t>(Ptr);
constexpr lsc_data_order Transpose =
Transposed ? lsc_data_order::transpose : lsc_data_order::nontranspose;
simd<RawT, ActualN> Raw =
simd<T, ActualN> Raw =
__esimd_lsc_load2d_stateless<RawT, L1H, L2H, DS, Transpose, NBlocks,
BlockWidth, BlockHeight, Transformed,
ActualN>(Mask.data(), Addr, SurfaceWidth,
Expand All @@ -4096,17 +4096,16 @@ __ESIMD_API simd<T, N> load_2d_impl(const T *Ptr, unsigned SurfaceWidth,
// +----+----+----+----+----+----+-----+-----+
// * signifies the padded element.

simd<RawT, DstElements> Dst;
simd<T, DstElements> Dst;

for (auto i = 0; i < NBlocks; i++) {
auto DstBlock =
Dst.template select<DstBlockElements, 1>(i * DstBlockElements);

auto RawBlock = Raw.template select<GRFBlockSize, 1>(i * GRFBlockPitch);
DstBlock =
RawBlock.template bit_cast_view<RawT, GRFColSize, GRFRowPitch>()
.template select<GRFColSize, 1, GRFRowSize, 1>(0, 0)
.template bit_cast_view<RawT>();
DstBlock = RawBlock.template bit_cast_view<T, GRFColSize, GRFRowPitch>()
.template select<GRFColSize, 1, GRFRowSize, 1>(0, 0)
.template bit_cast_view<T>();
}

return Dst;
Expand Down
3 changes: 3 additions & 0 deletions sycl/test-e2e/ESIMD/lsc/lsc_load_2d_compare.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,15 @@ int main() {
result |= test<uint16_t>();
result |= test<uint8_t>();
result |= test<sycl::half>();
result |= test<bf16>();
Copy link
Contributor

@sarnex sarnex Oct 2, 2024

Choose a reason for hiding this comment

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

do these tests expose the reported issue without the fix?

Copy link
Contributor Author

@fineg74 fineg74 Oct 2, 2024

Choose a reason for hiding this comment

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

This particular one no. The ones below should do

Copy link
Contributor

@sarnex sarnex Oct 2, 2024

Choose a reason for hiding this comment

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

got it, thx


result |= test<float, true>();
result |= test<uint32_t, true>();

result |= test<uint16_t, false, true>();
result |= test<uint8_t, false, true>();
result |= test<sycl::half, false, true>();
result |= test<bf16, false, true>();

std::cout << (result ? "FAILED" : "passed") << std::endl;
return 0;
Expand Down
Loading