Skip to content

Commit cee6122

Browse files
steffenlarsensteffenlarsen
authored
[SYCL][Tests] Fix preview flags in testing (#11919)
The preview flag was intended to be used in a number of builtins tests but were not correctly added to the build steps. This commit amends these tests. --------- Signed-off-by: Larsen, Steffen <[email protected]>
1 parent 75b877f commit cee6122

16 files changed

+19
-31
lines changed

‎sycl/test-e2e/Basic/built-ins/host_math.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 %{%{build} -o -fpreview %t_preview.out%}
4-
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
3+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t_preview.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out %}
55

66
#include <cmath>
77
#include <iomanip>

‎sycl/test-e2e/Basic/built-ins/marray_common.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 %{%{build} -o -fpreview %t_preview.out%}
4-
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
3+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t_preview.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out%}
55

66
#ifdef _WIN32
77
#define _USE_MATH_DEFINES // To use math constants

‎sycl/test-e2e/Basic/built-ins/marray_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 %{%{build} -o -fpreview %t_preview.out%}
4-
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
3+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t_preview.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out %}
55

66
#include <CL/sycl.hpp>
77

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
// RUN: %{build} %{mathflags} -o %t.out
44
// RUN: %{run} %t.out
5-
// RUN: %if preview-breaking-changes-supported %{%{build} %{mathflags} -o -fpreview %t_preview.out%}
6-
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
5+
// RUN: %if preview-breaking-changes-supported %{ %{build} %{mathflags} -fpreview-breaking-changes -o %t_preview.out %}
6+
// RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out%}
77

88
#include <sycl/sycl.hpp>
99

‎sycl/test-e2e/Basic/built-ins/marray_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 %{%{build} -o -fpreview %t_preview.out%}
4-
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
3+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t_preview.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out%}
55

66
#include <CL/sycl.hpp>
77

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

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

96
#ifdef _WIN32
107
#define _USE_MATH_DEFINES // To use math constants

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

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

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22

33
// RUN: %{build} %{mathflags} -o %t.out
44
// RUN: %{run} %t.out
5-
// RUN: %if preview-breaking-changes-supported %{%{build} %{mathflags} -o -fpreview %t_preview.out%}
6-
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
7-
85
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %{mathflags} %s -o %t2.out %}
9-
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
6+
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
107

118
#include <sycl/sycl.hpp>
129

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

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

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

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

4-
// RUN: %if preview-breaking-changes-supported %{ %{build} -fsycl-device-code-split=per_kernel -o %t2.out %}
4+
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -fsycl-device-code-split=per_kernel -o %t2.out %}
55
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
66

77
#include <iostream>

‎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 %{ %{build} -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 %{ %{build} -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/basic_tests/relational_builtins.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %clangxx -fsycl %s -o %t.out
2-
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl %s -o %t.out %}
2+
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t.out %}
33

44
// NOTE: Compile the test fully to ensure the library exports the right host
55
// symbols.

‎sycl/test/basic_tests/types.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -fsyntax-only
2-
// RUN: %if preview-breaking-changes-supported %{%clangxx -fsycl -fpreview-breaking-changes -fsycl-targets=%sycl_triple %s -fsyntax-only%}
2+
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes -fsycl-targets=%sycl_triple %s -fsyntax-only %}
33

44
//==--------------- types.cpp - SYCL types test ----------------------------==//
55
//

‎sycl/test/basic_tests/valid_kernel_args.cpp

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

99
// The test checks that the types can be used to pass kernel parameters by value
1010
// RUN: %clangxx -fsycl -fsyntax-only %s -Wno-sycl-strict -Xclang -verify-ignore-unexpected=note,warning
11-
// RUN: %if preview-breaking-changes-supported %{%clangxx -fsycl -fsyntax-only -fpreview-breaking-changes %s -Wno-sycl-strict -Xclang -verify-ignore-unexpected=note,warning%}
11+
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fsyntax-only -fpreview-breaking-changes %s -Wno-sycl-strict -Xclang -verify-ignore-unexpected=note,warning %}
1212

1313
// Check that the test can be compiled with device compiler as well.
1414
// RUN: %clangxx -fsycl-device-only -fsyntax-only %s -Wno-sycl-strict

‎sycl/test/regression/abs_diff_host.cpp

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

66
// Test checks that sycl::abs_diff correctly handles signed operations that

0 commit comments

Comments
 (0)