[SYCL][E2E] remove old flags

Author: dklochkov-emb

sycl/test-e2e/Config/kernel_from_file.cpp

@@ -14,7 +14,7 @@
 // RUN: %if linux %{ llvm-link -o=%t_app.bc %t.bc %t_compiler_wrappers.bc %t_asan.bc %} %else %{ llvm-link -o=%t_app.bc %t.bc %t_compiler_wrappers.bc %}
 // >> ---- translate to SPIR-V
 // RUN: llvm-spirv -o %t.spv %t_app.bc
-// RUN: %clangxx -Wno-error=ignored-attributes -isystem %sycl_include -DSYCL_DISABLE_FALLBACK_ASSERT %cxx_std_optionc++17 %include_option %t.h %s -o %t.out %sycl_options -fno-sycl-dead-args-optimization -Xclang -verify-ignore-unexpected=note,warning
+// RUN: %clangxx -Wno-error=ignored-attributes %sycl_include -DSYCL_DISABLE_FALLBACK_ASSERT %cxx_std_optionc++17 %include_option %t.h %s -o %t.out %sycl_options -fno-sycl-dead-args-optimization -Xclang -verify-ignore-unexpected=note,warning
 // RUN: env SYCL_USE_KERNEL_SPV=%t.spv %{run} %t.out | FileCheck %s
 // CHECK: Passed
 

sycl/test-e2e/DeviceLib/separate_compile_test.cpp

@@ -3,7 +3,7 @@
 // RUN: %clangxx -fsycl -fsycl-link %S/std_complex_math_test.cpp -o %t_device.o %{mathflags}
 // RUN: %clangxx -fsycl-device-only -Xclang -fsycl-int-header=std_complex_math_test_ihdr.h %S/std_complex_math_test.cpp -Wno-sycl-strict %{mathflags}
 // >> host compilation...
-// RUN: %clangxx -Wno-error=unused-command-line-argument -isystem %sycl_include -Wno-error=ignored-attributes %cxx_std_optionc++17 %include_option std_complex_math_test_ihdr.h -c %S/std_complex_math_test.cpp -o %t_host.o %sycl_options -Wno-sycl-strict %{mathflags}
+// RUN: %clangxx -Wno-error=unused-command-line-argument %sycl_include -Wno-error=ignored-attributes %cxx_std_optionc++17 %include_option std_complex_math_test_ihdr.h -c %S/std_complex_math_test.cpp -o %t_host.o %sycl_options -Wno-sycl-strict %{mathflags}
 // RUN: %clangxx %t_host.o %t_device.o -Wno-unused-command-line-argument -o %t.out %sycl_options %{mathflags}
 // RUN: %{run} %t.out
 

sycl/test-e2e/lit.cfg.py

@@ -146,16 +146,6 @@
             llvm_config.with_environment(var, "")
 
 config.substitutions.append(("%sycl_libs_dir", config.sycl_libs_dir))
-if platform.system() == "Windows":
-    config.substitutions.append(
-        ("%sycl_static_libs_dir", config.sycl_libs_dir + "/../lib")
-    )
-    config.substitutions.append(("%obj_ext", ".obj"))
-    config.substitutions.append(("%sycl_include", "/imsvc " + config.sycl_include))
-elif platform.system() == "Linux":
-    config.substitutions.append(("%sycl_static_libs_dir", config.sycl_libs_dir))
-    config.substitutions.append(("%obj_ext", ".o"))
-    config.substitutions.append(("%sycl_include", "-isystem " + config.sycl_include))
 
 # Intel GPU FAMILY availability
 if lit_config.params.get("gpu-intel-gen11", False):
@@ -213,6 +203,20 @@ def open_check_file(file_name):
     cl_options = True
     config.available_features.add("cl_options")
 
+if platform.system() == "Windows":
+    config.substitutions.append(
+        ("%sycl_static_libs_dir", config.sycl_libs_dir + "/../lib")
+    )
+    config.substitutions.append(("%obj_ext", ".obj"))
+    if cl_options:
+        config.substitutions.append(("%sycl_include", "/imsvc " + config.sycl_include))
+    else:
+        config.substitutions.append(("%sycl_include", "-isystem " + config.sycl_include))
+elif platform.system() == "Linux":
+    config.substitutions.append(("%sycl_static_libs_dir", config.sycl_libs_dir))
+    config.substitutions.append(("%obj_ext", ".o"))
+    config.substitutions.append(("%sycl_include", "-isystem " + config.sycl_include))
+
 # check if the compiler was built in NDEBUG configuration
 has_ndebug = False
 ps = subprocess.Popen(