Skip to content

Commit 003fa58

Browse files
authored
[SYCL][COMPAT] Move non-e2e tests to correct dir (#15828)
This PR moves tests which don't execute anything on a device into `sycl/test/syclcompat` instead of `sycl/test-e2e/syclcompat/`. Also fix an issue with `kernel_properties.cpp` test setup.
1 parent f2d2ffb commit 003fa58

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

Diff for: sycl/test-e2e/syclcompat/launch/kernel_properties.cpp renamed to sycl/test/syclcompat/launch/kernel_properties.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
// We need hardware which can support at least 2 sub-group sizes, since that
2424
// hardware (presumably) supports the `intel_reqd_sub_group_size` attribute.
2525
// REQUIRES: sg-32 && sg-16
26-
// RUN: %{build} %if cl_options %{/clang:-S /clang:-emit-llvm%} %else %{-S -emit-llvm%} -o - | FileCheck %s
27-
26+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %if cl_options %{/clang:-S /clang:-emit-llvm%} %else %{-S -emit-llvm%} -o - | FileCheck %s
2827
#include <sycl/ext/oneapi/kernel_properties/properties.hpp>
2928
#include <sycl/detail/core.hpp>
3029
#include <sycl/ext/oneapi/properties/properties.hpp>

Diff for: sycl/test-e2e/syclcompat/launch/launch_policy_lmem_neg.cpp renamed to sycl/test/syclcompat/launch/launch_policy_lmem_neg.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* templates as tests in launch_policy_neg.cpp
2323
**************************************************************************/
2424

25-
// RUN: not %{build} -o %t.out 2>&1 | FileCheck -vv %s
25+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out 2>&1 | FileCheck -vv %s
2626

2727
#include <sycl/detail/core.hpp>
2828
#include <sycl/ext/oneapi/properties/properties.hpp>

Diff for: sycl/test-e2e/syclcompat/launch/launch_policy_neg.cpp renamed to sycl/test/syclcompat/launch/launch_policy_neg.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@
2020
* Negative tests for new launch_policy.
2121
**************************************************************************/
2222

23-
// RUN: not %{build} -DCHECK1 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK1
24-
// RUN: not %{build} -DCHECK2 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK2
25-
// RUN: not %{build} -DCHECK3 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK3
26-
// RUN: not %{build} -DCHECK4 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK4
27-
// RUN: not %{build} -DCHECK5 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK5
28-
// RUN: not %{build} -DCHECK6 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK6
29-
// RUN: not %{build} -DCHECK7 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK7
30-
// RUN: not %{build} -DCHECK8 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK8
31-
// RUN: not %{build} -DCHECK9 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK9
32-
// RUN: not %{build} -DCHECK10 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK10
33-
// RUN: not %{build} -DCHECK11 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK11
34-
// RUN: not %{build} -DCHECK12 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK12
23+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK1 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK1
24+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK2 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK2
25+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK3 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK3
26+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK4 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK4
27+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK5 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK5
28+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK6 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK6
29+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK7 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK7
30+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK8 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK8
31+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK9 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK9
32+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK10 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK10
33+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK11 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK11
34+
// RUN: not %clangxx -fsycl -fsycl-targets=%sycl_triple %s -DCHECK12 -o %t.out 2>&1 | FileCheck -vv %s --check-prefixes=CHECK12
3535

3636
#include <sycl/ext/oneapi/kernel_properties/properties.hpp>
3737
#include <sycl/detail/core.hpp>

0 commit comments

Comments
 (0)