Skip to content

[SYCL][ESIMD] Reenable local_accessor atomic_update() tests on DG2 #12932

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 9 commits into from
Mar 26, 2024
Merged

[SYCL][ESIMD] Reenable local_accessor atomic_update() tests on DG2 #12932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
47cba95
Reenable tests on DG2
fineg74 Mar 6, 2024
36d81ad
Merge remote-tracking branch 'origin/sycl' into enableTests
fineg74 Mar 18, 2024
bd8197e
Merge remote-tracking branch 'origin/sycl' into enableTests
fineg74 Mar 22, 2024
3fe1f81
Add barriers between atomic update and gather
fineg74 Mar 22, 2024
0d4fed0
Undo changes to unrelated changes
fineg74 Mar 23, 2024
dd65486
remove unnecessary memoryoperations
fineg74 Mar 25, 2024
000f11a
Revert "Undo changes to unrelated changes"
fineg74 Mar 25, 2024
72da67a
optimize slm initialization and reenable test
fineg74 Mar 25, 2024
8f28652
Revert "Revert "Undo changes to unrelated changes""
fineg74 Mar 25, 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
2 changes: 0 additions & 2 deletions sycl/test-e2e/ESIMD/dword_local_accessor_atomic_smoke.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
// This test checks DWORD local accessor atomic operations.
//===----------------------------------------------------------------------===//
// REQUIRES-INTEL-DRIVER: lin: 26690, win: 101.4576
// TODO: disabled temporarily because of flaky issue.
// UNSUPPORTED: windows
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
//
Expand Down
14 changes: 9 additions & 5 deletions sycl/test-e2e/ESIMD/lsc/local_accessor_atomic_smoke.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ bool test(queue q) {
auto accessor = local_accessor<T, 1>(size, cgh);

cgh.parallel_for<TestID<T, N, ImplF>>(
rng, [=](id<1> ii) SYCL_ESIMD_KERNEL {
int i = ii;
rng, [=](sycl::nd_item<1> ndi) SYCL_ESIMD_KERNEL {
int i = ndi.get_global_id(0);
#ifndef USE_SCALAR_OFFSET
simd<uint32_t, N> offsets(start_ind * sizeof(T),
stride * sizeof(T));
Expand All @@ -192,7 +192,8 @@ bool test(queue q) {
data.copy_from(arr);

simd<uint32_t, size> LocalOffsets(0, sizeof(T));
scatter<T, size>(accessor, LocalOffsets, data, 0, 1);
if (ndi.get_local_id(0) == 0)
scatter<T, size>(accessor, LocalOffsets, data, 0, 1);
simd_mask<N> m = 1;
if (masked_lane < N)
m[masked_lane] = 0;
Expand Down Expand Up @@ -221,8 +222,11 @@ bool test(queue q) {
;
}
}
auto data0 = gather<T, size>(accessor, LocalOffsets, 0);
data0.copy_to(arr);
barrier();
if (ndi.get_local_id(0) == 0) {
auto data0 = gather<T, size>(accessor, LocalOffsets, 0);
data0.copy_to(arr);
}
});
});
e.wait();
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/ESIMD/lsc/local_accessor_atomic_smoke_cmpxchg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
// This test checks local accessor cmpxchg atomic operations.
//===----------------------------------------------------------------------===//
// REQUIRES: gpu-intel-pvc
// REQUIRES: gpu-intel-pvc || gpu-intel-dg2
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
//
Expand Down
16 changes: 10 additions & 6 deletions sycl/test-e2e/ESIMD/lsc/lsc_slm_atomic_smoke.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//===----------------------------------------------------------------------===//
// This test checks LSC SLM atomic operations.
//===----------------------------------------------------------------------===//
// REQUIRES: gpu-intel-pvc
// REQUIRES: gpu-intel-pvc || gpu-intel-dg2
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

Expand Down Expand Up @@ -123,16 +123,17 @@ bool test(queue q) {
try {
auto e = q.submit([&](handler &cgh) {
cgh.parallel_for<TestID<T, N, ImplF>>(
rng, [=](id<1> ii) SYCL_ESIMD_KERNEL {
int i = ii;
rng, [=](sycl::nd_item<1> ndi) SYCL_ESIMD_KERNEL {
int i = ndi.get_global_id(0);
slm_init<32768>();
simd<uint32_t, N> offsets(start_ind * sizeof(T),
stride * sizeof(T));
simd<T, size> data;
data.copy_from(arr);

simd<uint32_t, size> slm_offsets(0, sizeof(T));
lsc_slm_scatter(slm_offsets, data);
if (ndi.get_local_id(0) == 0)
lsc_slm_scatter(slm_offsets, data);

simd_mask<N> m = 1;
if (masked_lane < N)
Expand Down Expand Up @@ -161,8 +162,11 @@ bool test(queue q) {
;
}
}
auto data0 = lsc_slm_gather<T>(slm_offsets);
data0.copy_to(arr);
barrier();
if (ndi.get_local_id(0) == 0) {
auto data0 = lsc_slm_gather<T>(slm_offsets);
data0.copy_to(arr);
}
});
});
e.wait();
Expand Down