Skip to content

Commit a9bcb4f

Browse files
committed
Merge from 'sycl' to 'sycl-web' (#1)
CONFLICT (content): Merge conflict in clang/test/Driver/sycl.c
2 parents cb7b12c + 39501f6 commit a9bcb4f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+131
-77
lines changed

clang/lib/Driver/ToolChains/SYCL.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,12 @@ SYCLToolChain::GetCXXStdlibType(const ArgList &Args) const {
532532

533533
void SYCLToolChain::AddClangSystemIncludeArgs(const ArgList &DriverArgs,
534534
ArgStringList &CC1Args) const {
535+
SmallString<128> P(getDriver().getInstalledDir());
536+
llvm::sys::path::append(P, "..");
537+
llvm::sys::path::append(P, "include");
538+
llvm::sys::path::append(P, "sycl");
539+
CC1Args.push_back("-internal-isystem");
540+
CC1Args.push_back(DriverArgs.MakeArgString(P));
535541
HostTC.AddClangSystemIncludeArgs(DriverArgs, CC1Args);
536542
}
537543

clang/test/Driver/sycl.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
// ENABLED: "-cc1"{{.*}} "-fsycl-is-device"
1818
// ENABLED-SAME: "-sycl-std={{[-.sycl0-9]+}}"
19+
// ENABLED-SAME: "-internal-isystem" "{{.*}}bin{{[/\\]+}}..{{[/\\]+}}include{{[/\\]+}}sycl"
20+
1921
// DISABLED-NOT: "-fsycl-is-device"
2022
// DISABLED-NOT: "-sycl-std="
2123

sycl/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ endif()
5454
# Unlike PACKAGE_VERSION, CLANG_VERSION does not include LLVM_VERSION_SUFFIX.
5555
set(CLANG_VERSION "${CLANG_VERSION_MAJOR}.${CLANG_VERSION_MINOR}.${CLANG_VERSION_PATCHLEVEL}")
5656

57-
set(LLVM_INST_INC_DIRECTORY "lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include")
58-
set(dst_dir ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/include)
59-
set(dst_deploy_dir ${CMAKE_INSTALL_PREFIX}/lib/clang/${CLANG_VERSION}/include)
57+
set(SYCL_INCLUDE_DIR "include/sycl")
58+
set(SYCL_INCLUDE_BUILD_DIR ${LLVM_BINARY_DIR}/${SYCL_INCLUDE_DIR})
59+
set(SYCL_INCLUDE_DEPLOY_DIR ${CMAKE_INSTALL_PREFIX}/${SYCL_INCLUDE_DIR})
6060

6161
# Find OpenCL headers and libraries installed in the system and use them to
6262
# build SYCL runtime.
@@ -78,15 +78,15 @@ if( NOT OpenCL_INCLUDE_DIRS )
7878
GIT_TAG origin/master
7979
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/OpenCL/inc"
8080
CONFIGURE_COMMAND ""
81-
BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${OpenCL_INCLUDE_DIRS}/CL ${dst_dir}/CL
81+
BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory ${OpenCL_INCLUDE_DIRS}/CL ${SYCL_INCLUDE_BUILD_DIR}/CL
8282
INSTALL_COMMAND ""
8383
STEP_TARGETS build
8484
COMMENT "Downloading OpenCL headers."
8585
)
8686
else()
8787
add_custom_target( ocl-headers ALL
8888
DEPENDS ${OpenCL_INCLUDE_DIRS}
89-
COMMAND ${CMAKE_COMMAND} -E copy_directory ${OpenCL_INCLUDE_DIRS}/CL ${dst_dir}/CL
89+
COMMAND ${CMAKE_COMMAND} -E copy_directory ${OpenCL_INCLUDE_DIRS}/CL ${SYCL_INCLUDE_BUILD_DIR}/CL
9090
COMMENT "Copying OpenCL headers ..."
9191
)
9292
endif()
@@ -137,7 +137,7 @@ target_include_directories(OpenCL-Headers
137137
INTERFACE ${OPENCL_INCLUDE}
138138
)
139139
install(DIRECTORY ${OPENCL_INCLUDE}/CL
140-
DESTINATION ${LLVM_INST_INC_DIRECTORY}
140+
DESTINATION ${SYCL_INCLUDE_DEPLOY_DIR}
141141
COMPONENT opencl-headers
142142
)
143143

@@ -155,11 +155,11 @@ configure_file("${version_header}.in" "${version_header}")
155155

156156
# Copy SYCL headers
157157
add_custom_target(sycl-headers ALL
158-
COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/CL ${dst_dir}/CL
158+
COMMAND ${CMAKE_COMMAND} -E copy_directory ${sycl_inc_dir}/CL ${SYCL_INCLUDE_BUILD_DIR}/CL
159159
COMMENT "Copying SYCL headers ...")
160160

161161
# Configure SYCL headers
162-
install(DIRECTORY "${sycl_inc_dir}/." DESTINATION "${LLVM_INST_INC_DIRECTORY}" COMPONENT sycl-headers)
162+
install(DIRECTORY "${sycl_inc_dir}/." DESTINATION ${SYCL_INCLUDE_DEPLOY_DIR} COMPONENT sycl-headers)
163163

164164
set(SYCL_RT_LIBS sycl)
165165
if (MSVC)

sycl/doc/doxygen.cfg.in

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,9 @@ STRIP_FROM_PATH = @abs_srcdir@/..
171171
# specify the list of include paths that are normally passed to the compiler
172172
# using the -I flag.
173173

174-
STRIP_FROM_INC_PATH = @abs_srcdir@/../include
174+
STRIP_FROM_INC_PATH = @abs_srcdir@/../include \
175+
@abs_srcdir@/../source \
176+
@abs_srcdir@/../plugins
175177

176178
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
177179
# less readable) file names. This can be useful is your file systems doesn't
@@ -791,7 +793,8 @@ WARN_LOGFILE =
791793
# Note: If this tag is empty the current directory is searched.
792794

793795
INPUT = @abs_srcdir@/../include \
794-
@abs_srcdir@/../source
796+
@abs_srcdir@/../source \
797+
@abs_srcdir@/../plugins
795798

796799
# This tag can be used to specify the character encoding of the source files
797800
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1062,7 +1065,7 @@ SOURCE_TOOLTIPS = YES
10621065
# The default value is: NO.
10631066
# This tag requires that the tag SOURCE_BROWSER is set to YES.
10641067

1065-
USE_HTAGS = YES
1068+
USE_HTAGS = NO
10661069

10671070
# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
10681071
# verbatim copy of the header file for each class for which an include is

sycl/include/CL/sycl/detail/pi.h

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,20 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
//
9-
// This is the definition of a generic offload Plugin Interface (PI), which is
10-
// used by the SYCL implementation to connect to multiple device back-ends,
11-
// e.g. to OpenCL. The interface is intentionally kept C-only for the
12-
// purpose of having full flexibility and interoperability with different
13-
// environments.
14-
//
8+
9+
/// \defgroup sycl_pi The Plugin Interface
10+
// TODO: link to sphinx page
11+
12+
/// \file Main Plugin Interface header file.
13+
///
14+
/// This is the definition of a generic offload Plugin Interface (PI), which is
15+
/// used by the SYCL implementation to connect to multiple device back-ends,
16+
/// e.g. to OpenCL. The interface is intentionally kept C-only for the
17+
/// purpose of having full flexibility and interoperability with different
18+
/// environments.
19+
///
20+
/// \ingroup sycl_pi
21+
1522
#ifndef _PI_H_
1623
#define _PI_H_
1724

sycl/include/CL/sycl/detail/pi.hpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// C++ wrapper of extern "C" PI interfaces
10-
//
9+
/// \file pi.hpp
10+
/// C++ wrapper of extern "C" PI interfaces
11+
///
12+
/// \ingroup sycl_pi
13+
1114
#pragma once
1215

1316
#include <CL/sycl/detail/common.hpp>

sycl/plugins/cuda/pi_cuda.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
/// \file pi_cuda.cpp
10+
/// Implementation of CUDA Plugin.
11+
///
12+
/// \ingroup sycl_pi_cuda
13+
914
#include <CL/sycl/backend/cuda.hpp>
1015
#include <CL/sycl/detail/pi.hpp>
1116
#include <pi_cuda.hpp>

sycl/plugins/cuda/pi_cuda.hpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
/// This source is the definition of the SYCL Plugin Interface
10-
/// (PI). It is the interface between the device-agnostic SYCL runtime layer
11-
/// and underlying "native" runtimes such as OpenCL.
9+
/// \defgroup sycl_pi_cuda CUDA Plugin
10+
/// \ingroup sycl_pi
11+
12+
/// \file pi_cuda.hpp
13+
/// Definition of CUDA Plugin. It is the interface between the device-agnostic
14+
/// SYCL runtime layer and underlying CUDA runtime.
15+
///
16+
/// \ingroup sycl_pi_cuda
1217

1318
#ifndef PI_CUDA_HPP
1419
#define PI_CUDA_HPP

sycl/plugins/opencl/pi_opencl.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8+
9+
/// \defgroup sycl_pi_ocl OpenCL Plugin
10+
/// \ingroup sycl_pi
11+
12+
/// \file pi_opencl.cpp
13+
/// Implementation of OpenCL Plugin. It is the interface between device-agnostic
14+
/// SYCL runtime layer and underlying OpenCL runtime.
15+
///
16+
/// \ingroup sycl_pi_ocl
17+
818
#include "CL/opencl.h"
919
#include <CL/sycl/detail/pi.h>
1020

sycl/source/detail/pi.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8+
9+
/// \file pi.cpp
10+
/// Implementation of C++ wrappers for PI interface.
11+
///
12+
/// \ingroup sycl_pi
13+
814
#include <CL/sycl/detail/common.hpp>
915
#include <CL/sycl/detail/pi.hpp>
1016
#include <detail/plugin.hpp>

sycl/source/detail/plugin.hpp

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ __SYCL_INLINE_NAMESPACE(cl) {
1515
namespace sycl {
1616
namespace detail {
1717

18+
/// The plugin class provides a unified interface to the underlying low-level
19+
/// runtimes for the device-agnostic SYCL runtime.
20+
///
21+
/// \ingroup sycl_pi
1822
class plugin {
1923
public:
2024
plugin() = delete;
@@ -25,21 +29,24 @@ class plugin {
2529

2630
~plugin() = default;
2731

28-
// Utility function to check return from PI calls.
29-
// Throws if pi_result is not a PI_SUCCESS.
30-
// Exception - The type of exception to throw if PiResult of a call is not
31-
// PI_SUCCESS. Default value is cl::sycl::runtime_error.
32+
/// Checks return value from PI calls.
33+
///
34+
/// \throw Exception if pi_result is not a PI_SUCCESS.
3235
template <typename Exception = cl::sycl::runtime_error>
3336
void checkPiResult(RT::PiResult pi_result) const {
3437
CHECK_OCL_CODE_THROW(pi_result, Exception);
3538
}
3639

37-
// Call the PiApi, trace the call and return the result.
38-
// To check the result use checkPiResult.
39-
// Usage:
40-
// PiResult Err = plugin.call<PiApiKind::pi>(Args);
41-
// Plugin.checkPiResult(Err); <- Checks Result and throws a runtime_error
42-
// exception.
40+
/// Calls the PiApi, traces the call, and returns the result.
41+
///
42+
/// Usage:
43+
/// \code{cpp}
44+
/// PiResult Err = plugin.call<PiApiKind::pi>(Args);
45+
/// Plugin.checkPiResult(Err); // Checks Result and throws a runtime_error
46+
/// // exception.
47+
/// \endcode
48+
///
49+
/// \sa plugin::checkPiResult
4350
template <PiApiKind PiApiOffset, typename... ArgsT>
4451
RT::PiResult call_nocheck(ArgsT... Args) const {
4552
RT::PiFuncInfo<PiApiOffset> PiCallInfo;
@@ -56,8 +63,9 @@ class plugin {
5663
return R;
5764
}
5865

59-
// Call the API, trace the call, check the result and throw
60-
// a runtime_error Exception
66+
/// Calls the API, traces the call, checks the result
67+
///
68+
/// \throw cl::sycl::runtime_exception if the call was not successful.
6169
template <PiApiKind PiApiOffset, typename... ArgsT>
6270
void call(ArgsT... Args) const {
6371
RT::PiResult Err = call_nocheck<PiApiOffset>(Args...);

sycl/test/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ set(LLVM_TOOLS_DIR "${LLVM_BINARY_DIR}/bin/")
22

33
get_target_property(SYCL_BINARY_DIR sycl-toolchain BINARY_DIR)
44

5-
set(SYCL_INCLUDE "${dst_dir}")
5+
set(SYCL_INCLUDE "${SYCL_INCLUDE_BUILD_DIR}")
66

77
set(RT_TEST_ARGS ${RT_TEST_ARGS} "-v")
8-
set(DEPLOY_RT_TEST_ARGS ${DEPLOY_RT_TEST_ARGS} "-v -D SYCL_TOOLS_DIR=${CMAKE_INSTALL_PREFIX}/bin -D SYCL_LIBS_DIR=${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX} -D SYCL_INCLUDE=${dst_deploy_dir}")
8+
set(DEPLOY_RT_TEST_ARGS ${DEPLOY_RT_TEST_ARGS} "-v -D SYCL_TOOLS_DIR=${CMAKE_INSTALL_PREFIX}/bin -D SYCL_LIBS_DIR=${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX} -D SYCL_INCLUDE=${SYCL_INCLUDE_BUILD_DIR}")
99

1010
configure_lit_site_cfg(
1111
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in

sycl/test/basic_tests/buffer/buffer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// REQUIRES: opencl
22

3-
// RUN: %clangxx %s -o %t1.out -lsycl
3+
// RUN: %clangxx %s -o %t1.out -lsycl -I %sycl_include
44
// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
55
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out
66
// RUN: env SYCL_DEVICE_TYPE=HOST %t2.out

sycl/test/basic_tests/buffer/buffer_ctad.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify %s
1+
// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
22
// expected-no-diagnostics
33
//==------------------- buffer_ctad.cpp - SYCL buffer CTAD test ----------------==//
44
//

sycl/test/basic_tests/buffer/buffer_dev_to_dev.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
1+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
22
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out

sycl/test/basic_tests/buffer/buffer_full_copy.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// RUN: %clangxx %s -o %t1.out -lsycl
1+
// RUN: %clangxx %s -o %t1.out -lsycl -I %sycl_include
22
// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
3-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out
3+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out
44
// RUN: env SYCL_DEVICE_TYPE=HOST %t2.out
55
// RUN: %CPU_RUN_PLACEHOLDER %t2.out
66
// RUN: %GPU_RUN_PLACEHOLDER %t2.out

sycl/test/basic_tests/context.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx %s -o %t.out -lsycl
1+
// RUN: %clangxx %s -o %t.out -lsycl -I %sycl_include
22
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
33

44
//==--------------- context.cpp - SYCL context test ------------------------==//

sycl/test/basic_tests/device.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx %s -o %t.out -lsycl
1+
// RUN: %clangxx %s -o %t.out -I %sycl_include -lsycl
22
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
33

44
//==--------------- device.cpp - SYCL device test --------------------------==//

sycl/test/basic_tests/id_ctad.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify %s
1+
// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
22
// expected-no-diagnostics
33
//==--------------- id_ctad.cpp - SYCL id CTAD test ----------------------==//
44
//

sycl/test/basic_tests/image_accessor_types.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: not %clangxx -fsyntax-only %s 2>&1 | FileCheck %s
1+
// RUN: not %clangxx -fsyntax-only %s -I %sycl_include 2>&1 | FileCheck %s
22
#include <CL/sycl.hpp>
33
#include <iostream>
44

sycl/test/basic_tests/image_api.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
// REQUIRES: opencl
22

33
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -I %sycl_source_dir %s -o %t1.out
4-
// RUN: %clangxx -I %sycl_source_dir %s -o %t3.out -lsycl
4+
// RUN: %clangxx -I %sycl_source_dir %s -o %t3.out -lsycl -I %sycl_include
55
// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
66
// RUN: env SYCL_DEVICE_TYPE=HOST %t3.out
77
// RUN: %CPU_RUN_PLACEHOLDER %t1.out
88
// RUN: %GPU_RUN_PLACEHOLDER %t1.out
99
// RUN: %ACC_RUN_PLACEHOLDER %t1.out
1010

11-
1211
#include <CL/sycl.hpp>
1312
// FIXME do not use internal methods in tests.
1413
#include <CL/sycl/detail/cg.hpp>

sycl/test/basic_tests/image_constructors.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx %s -o %t1.out -lsycl
1+
// RUN: %clangxx %s -o %t1.out -lsycl -I %sycl_include
22
// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
33
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out
44
// RUN: env SYCL_DEVICE_TYPE=HOST %t2.out

sycl/test/basic_tests/implicit_conversion_error.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
1+
// RUN: %clangxx -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
22
//==-- implicit_conversion_error.cpp - Unintended implicit conversion check --==//
33
//
44
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test/basic_tests/kernel_info.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL
1+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
22
// RUN: %CPU_RUN_PLACEHOLDER %t.out
33
// RUN: %GPU_RUN_PLACEHOLDER %t.out
44
// RUN: %ACC_RUN_PLACEHOLDER %t.out
@@ -64,4 +64,4 @@ int main() {
6464
const cl_ulong prvMemSize =
6565
krn.get_work_group_info<info::kernel_work_group::private_mem_size>(dev);
6666
CHECK(prvMemSize == 0);
67-
}
67+
}

sycl/test/basic_tests/parallel_for_indexers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx %s -o %t1.out -lsycl
1+
// RUN: %clangxx %s -o %t1.out -lsycl -I %sycl_include -Wno-sycl-strict -Xclang -verify-ignore-unexpected=note,warning
22
// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out
33
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out
44
// RUN: env SYCL_DEVICE_TYPE=HOST %t2.out

sycl/test/basic_tests/property_list.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx %s -o %t.out -lsycl
1+
// RUN: %clangxx %s -o %t.out -lsycl -I%sycl_include
22
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
33
//
44
// CHECK: PASSED

sycl/test/basic_tests/range_ctad.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify %s
1+
// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
22
// expected-no-diagnostics
33
//==--------------- range_ctad.cpp - SYCL range CTAD test ----------------------==//
44
//

sycl/test/basic_tests/range_error.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning -fsyntax-only
1+
// RUN: %clangxx -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning -fsyntax-only
22
//==--------------- range_error.cpp - SYCL range error test ----------------==//
33
//
44
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

0 commit comments

Comments
 (0)