Skip to content

Commit bc30bef

Browse files
steffenlarsensteffenlarsen
authored
[SYCL][E2E] Fix preview flag detection for CUDA and HIP (#11929)
The detection of support for -fpreview-breaking-changes was failing in E2E unintentionally. This commit fixes this detection. --------- Signed-off-by: Larsen, Steffen <[email protected]>
1 parent 0c6f24f commit bc30bef

File tree

11 files changed

+14
-21
lines changed

11 files changed

+14
-21
lines changed

‎sycl/test-e2e/Basic/built-ins/vec_common.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %{build} -o %t.out
22
// RUN: %{run} %t.out
3-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
3+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
44
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
55

66
#ifdef _WIN32

‎sycl/test-e2e/Basic/built-ins/vec_geometric.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %{build} -o %t.out
22
// RUN: %{run} %t.out
3-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
4-
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
3+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
55

66
#include <sycl/sycl.hpp>
77

‎sycl/test-e2e/Basic/built-ins/vec_math.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// RUN: %{build} %{mathflags} -o %t.out
44
// RUN: %{run} %t.out
5-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %{mathflags} %s -o %t2.out %}
5+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes %{mathflags} -o %t2.out %}
66
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
77

88
#include <sycl/sycl.hpp>

‎sycl/test-e2e/Basic/built-ins/vec_relational.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %{build} -o %t.out
22
// RUN: %{run} %t.out
3-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
4-
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
3+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
55

66
#include <sycl/sycl.hpp>
77

‎sycl/test-e2e/Basic/vec_bool.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %{build} -o %t.out
22
// RUN: %{run} %t.out
33

4-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
5-
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
5+
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
66

77
//==-------------- vec_bool.cpp - SYCL vec<> for bool test -----------------==//
88
//

‎sycl/test-e2e/Basic/vector/int-convert.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// RUN: %{build} -o %t.out -DSYCL2020_DISABLE_DEPRECATION_WARNINGS
1111
// RUN: %{run} %t.out
1212
//
13-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes -DSYCL2020_DISABLE_DEPRECATION_WARNINGS %s -o %t2.out %}
13+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -DSYCL2020_DISABLE_DEPRECATION_WARNINGS -o %t2.out %}
1414
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
1515

1616
#include <sycl/sycl.hpp>

‎sycl/test-e2e/Basic/vector_byte.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %{build} -std=c++17 -o %t.out
22
// RUN: %{run} %t.out
33

4-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes -std=c++17 %s -o %t2.out %}
5-
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -std=c++17 -o %t2.out %}
5+
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
66

77
//==---------- vector_byte.cpp - SYCL vec<> for std::byte test -------------==//
88
//

‎sycl/test-e2e/DeviceLib/built-ins/scalar_integer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %{build} -o %t.out
22
// RUN: %{run} %t.out
33

4-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
55
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
66

77
#include <sycl/sycl.hpp>

‎sycl/test-e2e/Regression/vec_logical_ops.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %{build} -o %t.out
22
// RUN: %{run} %t.out
33

4-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
55
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
66

77
#include <sycl/sycl.hpp>

‎sycl/test-e2e/USM/math.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: %{build} -o %t.out
33
// RUN: %{run} %t.out
44

5-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
5+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
66
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
77

88
#include <sycl/sycl.hpp>

‎sycl/test-e2e/format.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,6 @@ def get_extra_env(sycl_devices):
184184

185185
substitutions.append(('%{run-unfiltered-devices}', run_unfiltered_substitution))
186186

187-
188-
# Temporary fix due to failures in CUDA and HIP behind preview flag.
189-
if ((('ext_oneapi_cuda:gpu' in devices_for_test) or
190-
('ext_oneapi_hip:gpu' in devices_for_test)) and
191-
('preview-breaking-changes-supported' in test.config.available_features)):
192-
test.config.available_features.remove('preview-breaking-changes-supported')
193-
194187
new_script = []
195188
for directive in script:
196189
if not isinstance(directive, lit.TestRunner.CommandDirective):

0 commit comments

Comments
 (0)