Skip to content

[SYCL][Tests] Fix preview flags in testing #11919

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.

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 3 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions sycl/test-e2e/Basic/built-ins/host_math.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{%{build} -o -fpreview %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t_preview.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out %}

#include <cmath>
#include <iomanip>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Basic/built-ins/marray_common.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{%{build} -o -fpreview %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t_preview.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out%}

#ifdef _WIN32
#define _USE_MATH_DEFINES // To use math constants
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Basic/built-ins/marray_geometric.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{%{build} -o -fpreview %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t_preview.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out %}

#include <CL/sycl.hpp>

Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Basic/built-ins/marray_math.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

// RUN: %{build} %{mathflags} -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{%{build} %{mathflags} -o -fpreview %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{ %{build} %{mathflags} -fpreview-breaking-changes -o %t_preview.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out%}

#include <sycl/sycl.hpp>

Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/Basic/built-ins/marray_relational.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{%{build} -o -fpreview %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t_preview.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t_preview.out%}

#include <CL/sycl.hpp>

Expand Down
5 changes: 1 addition & 4 deletions sycl/test-e2e/Basic/built-ins/vec_common.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{%{build} -o -fpreview %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}

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

#ifdef _WIN32
#define _USE_MATH_DEFINES // To use math constants
Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Basic/built-ins/vec_geometric.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{%{build} -o -fpreview %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}

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

Expand Down
5 changes: 1 addition & 4 deletions sycl/test-e2e/Basic/built-ins/vec_math.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

// RUN: %{build} %{mathflags} -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{%{build} %{mathflags} -o -fpreview %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}

// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %{mathflags} %s -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}

#include <sycl/sycl.hpp>

Expand Down
3 changes: 0 additions & 3 deletions sycl/test-e2e/Basic/built-ins/vec_relational.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{%{build} -o -fpreview %t_preview.out%}
// RUN: %if preview-breaking-changes-supported %{%{run} %t_preview.out%}

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

Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/DeviceLib/built-ins/nan.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %{build} -fsycl-device-code-split=per_kernel -o %t.out
// RUN: %{run} %t.out

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

#include <iostream>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/DeviceLib/built-ins/scalar_integer.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// RUN: %if preview-breaking-changes-supported %{ %{build} -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}

#include <sycl/sycl.hpp>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/USM/math.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out

// RUN: %if preview-breaking-changes-supported %{ %{build} -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{build} -fpreview-breaking-changes -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}

#include <sycl/sycl.hpp>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/basic_tests/relational_builtins.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %clangxx -fsycl %s -o %t.out
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl %s -o %t.out %}
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t.out %}

// NOTE: Compile the test fully to ensure the library exports the right host
// symbols.
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/basic_tests/types.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -fsyntax-only
// RUN: %if preview-breaking-changes-supported %{%clangxx -fsycl -fpreview-breaking-changes -fsycl-targets=%sycl_triple %s -fsyntax-only%}
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes -fsycl-targets=%sycl_triple %s -fsyntax-only %}

//==--------------- types.cpp - SYCL types test ----------------------------==//
//
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/basic_tests/valid_kernel_args.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

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

// Check that the test can be compiled with device compiler as well.
// RUN: %clangxx -fsycl-device-only -fsyntax-only %s -Wno-sycl-strict
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/regression/abs_diff_host.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// RUN: %clangxx -fsycl %s -o %t.out
// RUN: %t.out
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl %s -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %clangxx -fsycl -fpreview-breaking-changes %s -o %t2.out %}
// RUN: %if preview-breaking-changes-supported %{ %t2.out %}

// Test checks that sycl::abs_diff correctly handles signed operations that
Expand Down