From c238738a829a92aceb665beee596e87c74b82745 Mon Sep 17 00:00:00 2001 From: Dmitry Vodopyanov Date: Fri, 26 Mar 2021 20:56:38 +0300 Subject: [PATCH 1/8] [SYCL] Remove -std=c++14 from tests as new SYCL 2020 requires C++17 This patch removes -std=c++14 from SYCL tests because some of the SYCL 2020 features require C++17 features and syntax --- SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp | 2 +- SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp | 2 +- SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp | 2 +- SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp | 2 +- SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp | 2 +- SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp | 2 +- SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp | 2 +- SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp | 2 +- SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp | 2 +- SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp | 2 +- SYCL/ESIMD/fp_call_from_func.cpp | 2 +- SYCL/ESIMD/fp_call_recursive.cpp | 2 +- SYCL/ESIMD/fp_in_phi.cpp | 2 +- SYCL/ESIMD/fp_in_select.cpp | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp index 39f38df192..d80c96ae1e 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_192.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp index cfe71a18bb..cc5ff54340 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_256.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp index 2fee0d351c..f49104e10e 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_512.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp index b33e13e475..fbf8e02d52 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_64.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp index 02f4fecb28..756b3a464b 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_char_int_size_96.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp index 73c7c2f83b..e68556c046 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_192.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp index c098139a48..2d1d9474e4 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_256.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp index 67c4e63c35..482849ad18 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_512.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp index 6ed389d0fd..6e73989cb4 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_64.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp b/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp index 164025654c..66f8a1db9c 100644 --- a/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp +++ b/SYCL/ESIMD/fp_args_size/fp_args_int_size_96.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl -I%S/.. %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl -I%S/.. %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out #include diff --git a/SYCL/ESIMD/fp_call_from_func.cpp b/SYCL/ESIMD/fp_call_from_func.cpp index 692861ead6..ea34d5a34c 100644 --- a/SYCL/ESIMD/fp_call_from_func.cpp +++ b/SYCL/ESIMD/fp_call_from_func.cpp @@ -8,7 +8,7 @@ // REQUIRES: gpu // Issue #162 Test timeouts on Windows // UNSUPPORTED: windows -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // UNSUPPORTED: cuda // diff --git a/SYCL/ESIMD/fp_call_recursive.cpp b/SYCL/ESIMD/fp_call_recursive.cpp index 3d4cc36f56..7fe38532e4 100644 --- a/SYCL/ESIMD/fp_call_recursive.cpp +++ b/SYCL/ESIMD/fp_call_recursive.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // REQUIRES: gpu // UNSUPPORTED: cuda -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // // The test checks that ESIMD kernels support use of function pointers diff --git a/SYCL/ESIMD/fp_in_phi.cpp b/SYCL/ESIMD/fp_in_phi.cpp index 513f825319..0f86ed6c73 100644 --- a/SYCL/ESIMD/fp_in_phi.cpp +++ b/SYCL/ESIMD/fp_in_phi.cpp @@ -10,7 +10,7 @@ // based spirv translator. This test should start working on Windows when the // llvm version is switched to 9. // UNSUPPORTED: windows -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // UNSUPPORTED: cuda // diff --git a/SYCL/ESIMD/fp_in_select.cpp b/SYCL/ESIMD/fp_in_select.cpp index 1182e8dc96..f0e169d113 100644 --- a/SYCL/ESIMD/fp_in_select.cpp +++ b/SYCL/ESIMD/fp_in_select.cpp @@ -10,7 +10,7 @@ // based spirv translator. This test should start working on Windows when the // llvm version is switched to 9. // UNSUPPORTED: windows -// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl %s -o %t.out +// RUN: %clangxx-esimd -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // UNSUPPORTED: cuda // The test fails on JITing due to use of too many registers From 7b65fa2bb984534c537a99cc1267f97ce2e989ca Mon Sep 17 00:00:00 2001 From: Dmitry Vodopyanov Date: Fri, 26 Mar 2021 21:05:45 +0300 Subject: [PATCH 2/8] Removed c++14 from 2 more tests --- SYCL/FunctionPointers/fp-as-kernel-arg.cpp | 2 +- SYCL/FunctionPointers/pass-fp-through-buffer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SYCL/FunctionPointers/fp-as-kernel-arg.cpp b/SYCL/FunctionPointers/fp-as-kernel-arg.cpp index 875878781f..d2de78eb19 100644 --- a/SYCL/FunctionPointers/fp-as-kernel-arg.cpp +++ b/SYCL/FunctionPointers/fp-as-kernel-arg.cpp @@ -1,7 +1,7 @@ // UNSUPPORTED: cuda // CUDA does not support the function pointer as kernel argument extension. -// RUN: %clangxx -Xclang -fsycl-allow-func-ptr %cxx_std_optionc++14 -fsycl %s -o %t.out +// RUN: %clangxx -Xclang -fsycl-allow-func-ptr %cxx_std_option -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/SYCL/FunctionPointers/pass-fp-through-buffer.cpp b/SYCL/FunctionPointers/pass-fp-through-buffer.cpp index 058036e335..17a75c2b86 100644 --- a/SYCL/FunctionPointers/pass-fp-through-buffer.cpp +++ b/SYCL/FunctionPointers/pass-fp-through-buffer.cpp @@ -1,7 +1,7 @@ // UNSUPPORTED: cuda // CUDA does not support the function pointer as kernel argument extension. -// RUN: %clangxx -Xclang -fsycl-allow-func-ptr %cxx_std_optionc++14 -fsycl %s -o %t.out +// RUN: %clangxx -Xclang -fsycl-allow-func-ptr %cxx_std_option -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out From b6bc4a03766cdfabcdcddbaef8b38fd25917488c Mon Sep 17 00:00:00 2001 From: Dmitry Vodopyanov Date: Tue, 30 Mar 2021 11:14:17 +0300 Subject: [PATCH 3/8] Update fp-as-kernel-arg.cpp --- SYCL/FunctionPointers/fp-as-kernel-arg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SYCL/FunctionPointers/fp-as-kernel-arg.cpp b/SYCL/FunctionPointers/fp-as-kernel-arg.cpp index d2de78eb19..dd74040dd3 100644 --- a/SYCL/FunctionPointers/fp-as-kernel-arg.cpp +++ b/SYCL/FunctionPointers/fp-as-kernel-arg.cpp @@ -1,7 +1,7 @@ // UNSUPPORTED: cuda // CUDA does not support the function pointer as kernel argument extension. -// RUN: %clangxx -Xclang -fsycl-allow-func-ptr %cxx_std_option -fsycl %s -o %t.out +// RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out From b938826e5fb65d818d6dd309619e5c814544ec03 Mon Sep 17 00:00:00 2001 From: Dmitry Vodopyanov Date: Tue, 30 Mar 2021 11:14:44 +0300 Subject: [PATCH 4/8] Update pass-fp-through-buffer.cpp --- SYCL/FunctionPointers/pass-fp-through-buffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SYCL/FunctionPointers/pass-fp-through-buffer.cpp b/SYCL/FunctionPointers/pass-fp-through-buffer.cpp index 17a75c2b86..e8c845a49c 100644 --- a/SYCL/FunctionPointers/pass-fp-through-buffer.cpp +++ b/SYCL/FunctionPointers/pass-fp-through-buffer.cpp @@ -1,7 +1,7 @@ // UNSUPPORTED: cuda // CUDA does not support the function pointer as kernel argument extension. -// RUN: %clangxx -Xclang -fsycl-allow-func-ptr %cxx_std_option -fsycl %s -o %t.out +// RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out From 7a0912ca7ba6c9e3926b28fab41b36145a310a70 Mon Sep 17 00:00:00 2001 From: Dmitry Vodopyanov Date: Tue, 30 Mar 2021 20:29:30 +0300 Subject: [PATCH 5/8] Temporarily disabling Sampler/unnormalized-clampedge-nearest.cpp on Windows --- SYCL/Sampler/normalized-clamp-nearest.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SYCL/Sampler/normalized-clamp-nearest.cpp b/SYCL/Sampler/normalized-clamp-nearest.cpp index f343f1089d..5afccd5772 100644 --- a/SYCL/Sampler/normalized-clamp-nearest.cpp +++ b/SYCL/Sampler/normalized-clamp-nearest.cpp @@ -4,6 +4,9 @@ // RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER // XFAIL: level_zero +// TODO: enable this test after flaky bug is gone on Windows +// UNSUPPORTED: windows + // LevelZero has a bug wherein it always returns the first pixel value. // Will re-enable once fixed. From f97c6eb314718e34900856bced97d70f6cdf355f Mon Sep 17 00:00:00 2001 From: Dmitry Vodopyanov Date: Wed, 31 Mar 2021 00:47:10 +0300 Subject: [PATCH 6/8] Update normalized-none-linear-float.cpp --- SYCL/Sampler/normalized-none-linear-float.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SYCL/Sampler/normalized-none-linear-float.cpp b/SYCL/Sampler/normalized-none-linear-float.cpp index 7109a31050..bacbd2d86b 100644 --- a/SYCL/Sampler/normalized-none-linear-float.cpp +++ b/SYCL/Sampler/normalized-none-linear-float.cpp @@ -6,6 +6,9 @@ // XFAIL: cuda // UNSUPPORTED: level_zero && windows +// TODO: enable this test after flaky bug is gone +// UNSUPPORTED: opencl & linux + // CUDA works with image_channel_type::fp32, but not with any 8-bit per channel // type (such as unorm_int8) From 316249058547e7bfbaf8c23a9409f8e60db93280 Mon Sep 17 00:00:00 2001 From: Dmitry Vodopyanov Date: Wed, 31 Mar 2021 00:47:53 +0300 Subject: [PATCH 7/8] Add missing "&" to normalized-none-linear-float.cpp --- SYCL/Sampler/normalized-none-linear-float.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SYCL/Sampler/normalized-none-linear-float.cpp b/SYCL/Sampler/normalized-none-linear-float.cpp index bacbd2d86b..949541a0e9 100644 --- a/SYCL/Sampler/normalized-none-linear-float.cpp +++ b/SYCL/Sampler/normalized-none-linear-float.cpp @@ -7,7 +7,7 @@ // UNSUPPORTED: level_zero && windows // TODO: enable this test after flaky bug is gone -// UNSUPPORTED: opencl & linux +// UNSUPPORTED: opencl && linux // CUDA works with image_channel_type::fp32, but not with any 8-bit per channel // type (such as unorm_int8) From 262acb279c06a3e0c3ed056375c908055c006e6a Mon Sep 17 00:00:00 2001 From: Dmitry Vodopyanov Date: Wed, 31 Mar 2021 11:33:27 +0300 Subject: [PATCH 8/8] Revert changes in normalized-none-linear-float.cpp --- SYCL/Sampler/normalized-none-linear-float.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/SYCL/Sampler/normalized-none-linear-float.cpp b/SYCL/Sampler/normalized-none-linear-float.cpp index 949541a0e9..7109a31050 100644 --- a/SYCL/Sampler/normalized-none-linear-float.cpp +++ b/SYCL/Sampler/normalized-none-linear-float.cpp @@ -6,9 +6,6 @@ // XFAIL: cuda // UNSUPPORTED: level_zero && windows -// TODO: enable this test after flaky bug is gone -// UNSUPPORTED: opencl && linux - // CUDA works with image_channel_type::fp32, but not with any 8-bit per channel // type (such as unorm_int8)