Skip to content
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

Jump to bottom

[SYCL][NFC] Drop Gen9 detection from E2E tests #14452

Open
wants to merge 9 commits into
base: sycl
Choose a base branch
from
Open

[SYCL][NFC] Drop Gen9 detection from E2E tests #14452

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ce18b54
[SYCL][NFC] Drop Gen9 detection from E2E tests
AlexeySachkov Jul 4, 2024
6be1581
Merge remote-tracking branch 'origin/sycl' into private/asachkov/drop…
AlexeySachkov Jul 10, 2024
5d244cb
An attempt to fix bfloat16 example test
AlexeySachkov Jul 10, 2024
c1283bf
Fix missed gen12 -> gen12lp
AlexeySachkov Jul 11, 2024
915e9c9
Merge branch 'sycl' into private/asachkov/drop-gen9-e2e-tests
steffenlarsen Sep 13, 2024
3e50079
Merge remote-tracking branch 'intel/sycl' into private/asachkov/drop-…
steffenlarsen Sep 20, 2024
1326e5d
Split bfloat16_example
steffenlarsen Sep 20, 2024
625c4a7
Change restrictions on bfloat16_example
steffenlarsen Sep 20, 2024
4c8a400
Redisable for CUDA and fix if statements
steffenlarsen Sep 20, 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
8 changes: 4 additions & 4 deletions sycl/test-e2e/BFloat16/bfloat16_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/// Check if bfloat16 example works using fallback libraries
///

// REQUIRES: opencl-aot, ocloc, gpu-intel-gen9
// REQUIRES: opencl-aot, ocloc, gpu-intel-gen12
// UNSUPPORTED: cuda
// CUDA is not compatible with SPIR.
// UNSUPPORTED: accelerator
Expand All @@ -13,16 +13,16 @@
// RUN: %clangxx -fsycl -fsycl-targets=spir64 %s -o %t.out
// RUN: %{run} %t.out

// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend "-device gen9" %s -o %t.out
// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend "-device gen12" %s -o %t.out
// RUN: %{run} %t.out
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems to me like this is GPU AOT, so it should be limited to only run on GPU.

Suggested change
// RUN: %{run} %t.out
// RUN: %if gpu %{ %{run} %t.out %}


// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend "-device *" %s -o %t.out
// RUN: %if gpu %{ %{run} %t.out %}

// RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_gen -Xsycl-target-backend=spir64_gen "-device gen9" %s -o %t.out
// RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_gen -Xsycl-target-backend=spir64_gen "-device gen12" %s -o %t.out
// RUN: %{run} %t.out

// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64,spir64_gen -Xsycl-target-backend=spir64_gen "-device gen9" %s -o %t.out
// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64,spir64_gen -Xsycl-target-backend=spir64_gen "-device gen12" %s -o %t.out
// RUN: %{run} %t.out

// RUN: %clangxx -fsycl -fsycl-targets=spir64,spir64_gen -Xsycl-target-backend=spir64_gen "-device pvc" %s -o %t.out
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/ESIMD/ext_math_ieee_sqrt_div.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
// REQUIRES: gpu-intel-gen9 || gpu-intel-pvc
// REQUIRES: gpu-intel-pvc

// DEFINE: %{mathflags} = %if cl_options %{/clang:-fno-fast-math%} %else %{-fno-fast-math%}
// RUN: %{build} -fsycl-device-code-split=per_kernel %{mathflags} -o %t.out
Expand Down
297 changes: 0 additions & 297 deletions sycl/test-e2e/ESIMD/histogram_raw_send.cpp
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm submitting this as a draft for now to wait for #14451 to reduce amount of conflicts. However, I think that it worth to do an early review of removed files.

@intel/dpcpp-esimd-reviewers, could you please take a look at them? I simply removed them because they require gen9 and nothing else, but I'm not that familiar with ESIMD to say for sure that it was a correct decision and we shouldn't rewrite those tests instead.

Copy link
Contributor

Choose a reason for hiding this comment

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

im gonna add new tests for gen12 soon, this test is dead so its okay to remove it

This file was deleted.

3 changes: 0 additions & 3 deletions sycl/test-e2e/ESIMD/lit.local.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import platform
config.unsupported_features += ['cuda', 'hip']
config.required_features += ['gpu']

if 'gpu-intel-gen9' in config.available_features and platform.system() == 'Windows':
config.unsupported = True

# We need this to fix failures when run on OCL.
# The current DG2 postcommit job only runs L0 anyway,
# so there's no difference in coverage.
Expand Down
Loading
Loading