[SYCL] Warning if use sycl without dynamic C++ RT on Windows

sycl/include/CL/sycl/stl.hpp

@@ -22,34 +22,53 @@
 __SYCL_INLINE_NAMESPACE(cl) {
 namespace sycl {
 
- template < class T, class Alloc = std::allocator<T> >
- using vector_class = std::vector<T, Alloc>;
-
- using string_class = std::string;
-
- template <class Sig>
- using function_class = std::function<Sig>;
-
- using mutex_class = std::mutex;
-
- template <class T, class Deleter = std::default_delete<T>>
- using unique_ptr_class = std::unique_ptr<T, Deleter>;
-
- template <class T>
- using shared_ptr_class = std::shared_ptr<T>;
-
- template <class T>
- using weak_ptr_class = std::weak_ptr<T>;
-
- template <class T>
- using hash_class = std::hash<T>;
-
- using exception_ptr_class = std::exception_ptr;
-
- template <typename T, typename... ArgsT>
- unique_ptr_class<T> make_unique_ptr(ArgsT &&... Args) {
-   return unique_ptr_class<T>(new T(std::forward<ArgsT>(Args)...));
- }
-} // sycl
-} // cl
-
+#if defined(_WIN32) && !defined(_DLL) && !defined(__SYCL_DEVICE_ONLY__)
+// SYCL library is designed such a way that STL objects cross DLL boundary,
+// which is guaranteed to work properly only when the application uses the same
+// C++ runtime that SYCL library uses.
+// The appplications using sycl.dll must be linked with dynamic/release C++ MSVC
+// runtime, i.e. be compiled with /MD switch. Similarly, the applications using
+// sycld.dll must be linked with dynamic/debug C++ runtime and be compiled with
+// /MDd switch.
+// Compiler automatically adds /MD or /MDd when -fsycl switch is used.
+// The options /MD and /MDd that make the code to use dynamic runtime also
+// define the _DLL macro.
+#if defined(_MSC_VER)
+#pragma message(                                                               \
+    "SYCL library is designed to work safely with dynamic C++ runtime."        \
+    "Please use /MD switch with sycl.dll, /MDd switch with sycld.dll, "        \
+    "or -fsycl switch to set C++ runtime automatically.")
+#else
+#warning "SYCL library is designed to work safely with dynamic C++ runtime."\
+    "Please use /MD switch with sycl.dll, /MDd switch with sycld.dll, "\
+    "or -fsycl switch to set C++ runtime automatically."
+#endif
+#endif // defined(_WIN32) && !defined(_DLL) && !defined(__SYCL_DEVICE_ONLY__)
+
+template <class T, class Alloc = std::allocator<T>>
+using vector_class = std::vector<T, Alloc>;
+
+using string_class = std::string;
+
+template <class Sig> using function_class = std::function<Sig>;
+
+using mutex_class = std::mutex;
+
+template <class T, class Deleter = std::default_delete<T>>
+using unique_ptr_class = std::unique_ptr<T, Deleter>;
+
+template <class T> using shared_ptr_class = std::shared_ptr<T>;
+
+template <class T> using weak_ptr_class = std::weak_ptr<T>;
+
+template <class T> using hash_class = std::hash<T>;
+
+using exception_ptr_class = std::exception_ptr;
+
+template <typename T, typename... ArgsT>
+unique_ptr_class<T> make_unique_ptr(ArgsT &&... Args) {
+  return unique_ptr_class<T>(new T(std::forward<ArgsT>(Args)...));
+}
+
+} // namespace sycl
+} // __SYCL_INLINE_NAMESPACE(cl)

sycl/test/basic_tests/aspects.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx %s -o %t.out -I %sycl_include -lsycl
+// RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %t.out
 
 //==--------------- aspects.cpp - SYCL device test ------------------------==//

sycl/test/basic_tests/buffer/buffer_ctad.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
 // expected-no-diagnostics
 
 #include <CL/sycl.hpp>

sycl/test/basic_tests/context.cpp

@@ -1,13 +1,7 @@
-// RUN: %clangxx %s -o %t.out -lsycl -I %sycl_include
+// RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %RUN_ON_HOST %t.out
 
-//==--------------- context.cpp - SYCL context test ------------------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
+// This test performs basic check of the SYCL context class.
 
 #include <sycl/sycl.hpp>
 #include <iostream>

sycl/test/basic_tests/device.cpp

@@ -1,13 +1,7 @@
-// RUN: %clangxx %s -o %t.out -I %sycl_include -lsycl
+// RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %RUN_ON_HOST %t.out
 
-//==--------------- device.cpp - SYCL device test --------------------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
+// This test performs basic check of the SYCL device class.
 
 #include <CL/sycl.hpp>
 #include <cassert>

sycl/test/basic_tests/id_ctad.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
 // expected-no-diagnostics
 //==--------------- id_ctad.cpp - SYCL id CTAD test ----------------------==//
 //

sycl/test/basic_tests/implicit_conversion_error.cpp

@@ -1,5 +1,5 @@
-// RUN: %clangxx -fsyntax-only -Xclang -verify  %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
-//==-- implicit_conversion_error.cpp - Unintended implicit conversion check --==//
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify  %s -Xclang -verify-ignore-unexpected=note,warning
+//=- implicit_conversion_error.cpp - Unintended implicit conversion check -=//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/test/basic_tests/marray/marray.cpp

@@ -1,5 +1,6 @@
-// RUN: %clangxx %s -o %t.out -lsycl -I %sycl_include
-// RUN: %t.out
+// RUN: %clangxx -fsycl %s -o %t.out
+// RUN: %RUN_ON_HOST %t.out
+
 //==--------------- marray.cpp - SYCL marray test --------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test/basic_tests/property_list.cpp

@@ -1,14 +1,10 @@
-// RUN: %clangxx %s -o %t.out -lsycl -I%sycl_include
+// RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %RUN_ON_HOST %t.out
 //
 // CHECK: PASSED
-//==--------------- property_list.cpp - SYCL property list test ------------==//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
+
+// This test performs basic check of the SYCL property_list class.
+
 #include <CL/sycl.hpp>
 #include <iostream>
 

sycl/test/basic_tests/range_ctad.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
 // expected-no-diagnostics
 //==--------------- range_ctad.cpp - SYCL range CTAD test ----------------------==//
 //

sycl/test/basic_tests/range_error.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning -fsyntax-only
+// RUN: %clangxx -fsycl -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning -fsyntax-only
 //==--------------- range_error.cpp - SYCL range error test ----------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

sycl/test/basic_tests/reduction_known_identity.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
 // expected-no-diagnostics
 
 // This test performs basic checks of has_known_identity and known_identity

sycl/test/basic_tests/stdcpp_compat.cpp

@@ -1,7 +1,7 @@
 // RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -c -o %t.out
-// RUN: %clangxx -std=c++14 -fsyntax-only -Xclang -verify -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning %s -o -c %t.out
-// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning %s -o -c %t.out
-// RUN: %clangxx -std=c++20 -fsyntax-only -Xclang -verify -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning %s -o -c %t.out
+// RUN: %clangxx -fsycl -std=c++14 -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -o -c %t.out
+// RUN: %clangxx -fsycl -std=c++17 -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -o -c %t.out
+// RUN: %clangxx -fsycl -std=c++20 -fsyntax-only -Xclang -verify -Xclang -verify-ignore-unexpected=note,warning %s -o -c %t.out
 // expected-no-diagnostics
 
 #include <CL/sycl.hpp>

sycl/test/basic_tests/valid_kernel_args.cpp

@@ -7,10 +7,10 @@
 //===----------------------------------------------------------------------===//
 
 // The test checks that the types can be used to pass kernel parameters by value
-// RUN: %clangxx -fsyntax-only %s -I %sycl_include -Wno-sycl-strict -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -fsycl -fsyntax-only %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 -I %sycl_include -Wno-sycl-strict
+// RUN: %clangxx -fsycl-device-only -fsyntax-only %s -Wno-sycl-strict
 
 #include <CL/sycl.hpp>
 

sycl/test/basic_tests/vectors/ctad.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -std=c++17 -I %sycl_include -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
 // expected-no-diagnostics
 //==--------------- ctad.cpp - SYCL vector CTAD test --------------------==//
 //

sycl/test/basic_tests/vectors/vectors.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx %s -o %t.out -lsycl -I %sycl_include
+// RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %t.out
 //==--------------- vectors.cpp - SYCL vectors test ------------------------==//
 //

sycl/test/esimd/vadd.cpp

@@ -1,5 +1,4 @@
-// TODO ESIMD enable host device under -fsycl
-// RUN: %clangxx -I %sycl_include %s -o %t.out -lsycl
+// RUN: %clangxx -fsycl %s -o %t.out
 // RUN: %RUN_ON_HOST %t.out
 
 // Check that the code compiles with -O0 and -g

sycl/test/multi_ptr/ctad.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -std=c++17 -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
 // expected-no-diagnostics
 //==--------------- ctad.cpp - SYCL multi_ptr CTAD test --------------------==//
 //

sycl/test/on-device/extensions/intel-ext-device.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx %s -o %t.out -I %sycl_include -lsycl
+// RUN: %clangxx -fsycl %s -o %t.out
 // RUN: env SYCL_DEVICE_FILTER=level_zero:gpu %t.out
 // RUN: env SYCL_DEVICE_FILTER=opencl:gpu %t.out
 //

sycl/test/regression/macro_conflict.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsyntax-only -I %sycl_include -Xclang -verify %s -o %t.out -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -o %t.out -Xclang -verify-ignore-unexpected=note,warning
 // expected-no-diagnostics
 //
 //===----------------------------------------------------------------------===//

sycl/test/regression/sub-group-store-const-ref.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
 // expected-no-diagnostics
 //
 //==-- sub-group-store-const-ref.cpp ---------------------------------------==//

sycl/test/regression/unable-to-redeclare-device.cpp

@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsyntax-only -Xclang -verify -DCL_TARGET_OPENCL_VERSION=220 %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -fsycl -fsyntax-only -Xclang -verify -DCL_TARGET_OPENCL_VERSION=220 %s -Xclang -verify-ignore-unexpected=note,warning
 // expected-no-diagnostics
 //
 //==-- unable-to-redeclare-device.cpp --------------------------------------==//

sycl/test/regression/vec-to-half.cpp

@@ -1,4 +1,4 @@
-// RUN: %clang -O0 -fsyntax-only -Xclang -verify %s -I %sycl_include -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clang -fsycl -O0 -fsyntax-only -Xclang -verify %s -Xclang -verify-ignore-unexpected=note,warning
 // expected-no-diagnostics
 
 #include <CL/sycl.hpp>

sycl/test/separate-compile/test.cpp

@@ -3,15 +3,17 @@
 //
 // >> ---- compile src1
 // >> device compilation...
-// RUN: %clangxx -fsycl-device-only -Xclang -fsycl-int-header=sycl_ihdr_a.h %s -c -o a_kernel.bc -I %sycl_include -Wno-sycl-strict
+// RUN: %clangxx -fsycl-device-only -Xclang -fsycl-int-header=sycl_ihdr_a.h %s -c -o a_kernel.bc -Wno-sycl-strict
 // >> host compilation...
-// RUN: %clangxx -include sycl_ihdr_a.h -g -c %s -o a.o -I %sycl_include -Wno-sycl-strict
+// Driver automatically adds -D_DLL and -D_MT on Windows with -fsycl.
+// Add those defines required for Windows and harmless for Linux.
+// RUN: %clangxx -D_DLL -D_MT -include sycl_ihdr_a.h -g -c %s -o a.o -I %sycl_include -Wno-sycl-strict
 //
 // >> ---- compile src2
 // >> device compilation...
-// RUN: %clangxx -DB_CPP=1 -fsycl-device-only -Xclang -fsycl-int-header=sycl_ihdr_b.h %s -c -o b_kernel.bc -I %sycl_include -Wno-sycl-strict
+// RUN: %clangxx -DB_CPP=1 -fsycl-device-only -Xclang -fsycl-int-header=sycl_ihdr_b.h %s -c -o b_kernel.bc -Wno-sycl-strict
 // >> host compilation...
-// RUN: %clangxx -DB_CPP=1 -include sycl_ihdr_b.h -g -c %s -o b.o -I %sycl_include -Wno-sycl-strict
+// RUN: %clangxx -DB_CPP=1 -D_DLL -D_MT -include sycl_ihdr_b.h -g -c %s -o b.o -I %sycl_include -Wno-sycl-strict
 //
 // >> ---- bundle .o with .spv
 // >> run bundler