Skip to content

[SYCL][NFC] Use unique (or no at all) output files in LIT tests #7872

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

Merged
merged 1 commit into from
Dec 27, 2022
Merged

[SYCL][NFC] Use unique (or no at all) output files in LIT tests #7872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sycl/test/abi/layout_accessors_host.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s | FileCheck %s
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | FileCheck %s
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note for reviewers: most of abi tests started to fail with -fsyntax-only because output from clang was different. I haven't investigated it and simply decided to switch to -o %t.out instead.

// REQUIRES: linux
// UNSUPPORTED: libcxx

Expand Down
4 changes: 2 additions & 2 deletions sycl/test/abi/layout_array.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s | FileCheck %s
// RUN: %clangxx -fsycl -fsycl-device-only -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s | FileCheck %s
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | FileCheck %s
// RUN: %clangxx -fsycl -fsycl-device-only -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | FileCheck %s
// REQUIRES: linux
// UNSUPPORTED: libcxx

Expand Down
2 changes: 1 addition & 1 deletion sycl/test/abi/layout_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s | FileCheck %s
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | FileCheck %s
// REQUIRES: linux
// UNSUPPORTED: libcxx

Expand Down
2 changes: 1 addition & 1 deletion sycl/test/abi/layout_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s | FileCheck %s
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | FileCheck %s
// REQUIRES: linux
// UNSUPPORTED: libcxx

Expand Down
2 changes: 1 addition & 1 deletion sycl/test/abi/layout_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s | FileCheck %s
// RUN: %clangxx -fsycl -fsyntax-only -fno-color-diagnostics -Xclang -fdump-record-layouts %s | FileCheck %s
// REQUIRES: linux
// UNSUPPORTED: libcxx

Expand Down
4 changes: 2 additions & 2 deletions sycl/test/abi/layout_vec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s | FileCheck %s
// RUN: %clangxx -fsycl -fsycl-device-only -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s | FileCheck %s
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | FileCheck %s
// RUN: %clangxx -fsycl -fsycl-device-only -c -fno-color-diagnostics -Xclang -fdump-record-layouts %s -o %t.out | FileCheck %s
// REQUIRES: linux
// UNSUPPORTED: libcxx

Expand Down
2 changes: 1 addition & 1 deletion sycl/test/abi/vtable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-vtable-layouts %s | FileCheck %s
// RUN: %clangxx -fsycl -c -fno-color-diagnostics -Xclang -fdump-vtable-layouts %s -o %t.out | FileCheck %s
// REQUIRES: linux

#include <sycl/sycl.hpp>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/basic_tests/accessor/iterator-member-types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -fsycl -c %s
// RUN: %clangxx -fsycl -fsyntax-only %s
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note for reviewers: -c still creates an output file, which is a fat object file in case of -fsycl compilation and that temporary file may still cause races. Therefore, I switched -c tests to -fsyntax-only: those tests do not check LLVM IR anyway and -fsyntax-only doesn't create output files, which should make them a tiny bit faster (less I/O)

//
// Purpose of this test is to check that [accessor|host_accessor]::iterator and
// ::const_iterator are aliased to the correct type.
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/basic_tests/boost_mp11_import_sanity_check.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// http://www.boost.org/LICENSE_1_0.txt
//===----------------------------------------------------------------------===//

// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c %s
// RUN: %clangxx -fsycl -fsyntax-only -fsycl-targets=%sycl_triple %s

// This is a sanity check test to verify that the automatic boost/mp11 import
// into SYCL is not badly broken.
Expand Down
10 changes: 5 additions & 5 deletions sycl/test/basic_tests/interop-backend-traits.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// RUN: %clangxx -fsycl -DUSE_OPENCL %s
// RUN: %clangxx %fsycl-host-only -DUSE_L0 %s
// RUN: %clangxx -fsycl -DUSE_CUDA %s
// RUN: %clangxx -fsycl -DUSE_HIP %s
// RUN: %clangxx -fsycl -DUSE_CUDA_EXPERIMENTAL %s
// RUN: %clangxx -fsycl -fsyntax-only -DUSE_OPENCL %s
// RUN: %clangxx %fsycl-host-only -fsyntax-only -DUSE_L0 %s
// RUN: %clangxx -fsycl -fsyntax-only -DUSE_CUDA %s
// RUN: %clangxx -fsycl -fsyntax-only -DUSE_HIP %s
// RUN: %clangxx -fsycl -fsyntax-only -DUSE_CUDA_EXPERIMENTAL %s

#ifdef USE_OPENCL
#include <CL/cl.h>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test/basic_tests/iostream_clean_compile_1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %clangxx -Wno-unused-command-line-argument -Werror -fsycl %s -c
// RUN: %clangxx -Wno-unused-command-line-argument -Werror -fsycl -fsyntax-only %s

#include <iostream>
#include <sycl/sycl.hpp>
void foo() { std::cout << 42; }
void foo() { std::cout << 42; }
4 changes: 2 additions & 2 deletions sycl/test/basic_tests/iostream_clean_compile_2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %clangxx -Wno-unused-command-line-argument -Werror -fsycl %s -c
// RUN: %clangxx -Wno-unused-command-line-argument -Werror -fsycl -fsyntax-only %s

// clang-format off
#include <sycl/sycl.hpp>
#include <iostream>
// clang-format on
void foo() { std::cout << 42; }
void foo() { std::cout << 42; }
4 changes: 2 additions & 2 deletions sycl/test/basic_tests/relational_builtins.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// RUN: %clangxx -DSYCL2020_CONFORMANT_APIS -fsycl %s
// RUN: %clangxx -sycl-std=121 -fsycl %s
// RUN: %clangxx -DSYCL2020_CONFORMANT_APIS -fsycl -fsyntax-only %s
// RUN: %clangxx -sycl-std=121 -fsycl -fsyntax-only %s

#include <CL/sycl.hpp>

Expand Down
2 changes: 1 addition & 1 deletion sycl/test/basic_tests/span.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -fsycl -c %s
// RUN: %clangxx -fsycl -fsyntax-only %s

//==--------------- span.cpp - SYCL span test ------------------------------==//
//
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/gdb/accessors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -c -fno-color-diagnostics -std=c++17 -I %sycl_include/sycl -I %sycl_include -Xclang -ast-dump %s | FileCheck %s
// RUN: %clangxx -fsyntax-only -fno-color-diagnostics -std=c++17 -I %sycl_include/sycl -I %sycl_include -Xclang -ast-dump %s | FileCheck %s
// RUN: %clangxx -c -fno-color-diagnostics -std=c++17 -I %sycl_include/sycl -I %sycl_include -Xclang -emit-llvm -g %s -o - | FileCheck %s --check-prefixes CHECK-DEBUG-INFO
// UNSUPPORTED: windows
#include <sycl/sycl.hpp>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/gdb/printers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -c -fno-color-diagnostics -std=c++17 -I %sycl_include/sycl -I %sycl_include -Xclang -ast-dump %s | FileCheck %s
// RUN: %clangxx -fsyntax-only -fno-color-diagnostics -std=c++17 -I %sycl_include/sycl -I %sycl_include -Xclang -ast-dump %s | FileCheck %s
// UNSUPPORTED: windows
#include <sycl/buffer.hpp>
#include <sycl/detail/array.hpp>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test/gdb/private-memory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -c -fsycl -fno-color-diagnostics -Xclang -ast-dump %s | FileCheck %s
// RUN: %clangxx -fsyntax-only -fsycl -fno-color-diagnostics -Xclang -ast-dump %s | FileCheck %s
// UNSUPPORTED: windows
#include <sycl/group.hpp>
#include <sycl/id.hpp>
Expand Down
4 changes: 3 additions & 1 deletion sycl/test/invoke_simd/invoke_simd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
// RUN: %clangxx -c -fsycl -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr %s
// RUN: %clangxx -fsycl -fsyntax-only -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr %s
// FIXME: check if -fno-sycl-device-code-split-esimd affects any pre-link steps
// and remove the flag if that is not the case

// The tests checks that invoke_simd API is compileable.

Expand Down
2 changes: 1 addition & 1 deletion sycl/test/regression/print_args.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -fsycl %s -c
// RUN: %clangxx -fsycl -fsyntax-only %s

// Regression tests for https://github.com/intel/llvm/issues/1011
// Checks that SYCL headers call internal templated function 'printArgs'
Expand Down