From 87c3c12acdddb7f4a75104bd244334201b2859fe Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Thu, 2 Sep 2021 10:42:01 +0300 Subject: [PATCH 1/2] [SYCL] Remove function pointers extension --- .github/CODEOWNERS | 3 --- .../FunctionPointers/fp-as-kernel-arg.cpp | 3 ++- .../FunctionPointers/pass-fp-through-buffer.cpp | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) rename SYCL/{ => DeprecatedFeatures}/FunctionPointers/fp-as-kernel-arg.cpp (94%) rename SYCL/{ => DeprecatedFeatures}/FunctionPointers/pass-fp-through-buffer.cpp (95%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f8847ead4e..c358a70a79 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -29,9 +29,6 @@ SYCL/DotProduct @rdeodhar # Explicit SIMD SYCL/ESIMD @kbobrovs @DenisBakhvalov -# Function pointers -SYCL/FunctionPointers @AlexeySachkov - # Functor SYCL/Functor @AlexeySachkov diff --git a/SYCL/FunctionPointers/fp-as-kernel-arg.cpp b/SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp similarity index 94% rename from SYCL/FunctionPointers/fp-as-kernel-arg.cpp rename to SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp index 999ea1dfc1..f629a95b03 100644 --- a/SYCL/FunctionPointers/fp-as-kernel-arg.cpp +++ b/SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp @@ -1,7 +1,7 @@ // UNSUPPORTED: cuda || rocm // CUDA does not support the function pointer as kernel argument extension. -// RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out +// RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -D__SYCL_INTERNAL_API %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out @@ -9,6 +9,7 @@ // corresponding extension is implemented #include +#include #include #include diff --git a/SYCL/FunctionPointers/pass-fp-through-buffer.cpp b/SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp similarity index 95% rename from SYCL/FunctionPointers/pass-fp-through-buffer.cpp rename to SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp index ccddf6341b..bedfc1e873 100644 --- a/SYCL/FunctionPointers/pass-fp-through-buffer.cpp +++ b/SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp @@ -1,7 +1,7 @@ // UNSUPPORTED: cuda || rocm // CUDA does not support the function pointer as kernel argument extension. -// RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl %s -o %t.out +// RUN: %clangxx -Xclang -fsycl-allow-func-ptr -fsycl -D__SYCL_INTERNAL_API %s -o %t.out // RUN: %HOST_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out @@ -9,6 +9,7 @@ // corresponding extension is implemented #include +#include #include #include From 82a8ef229472ee5ae7a7621998fee00cec72f1ad Mon Sep 17 00:00:00 2001 From: Alexander Batashev Date: Mon, 6 Sep 2021 16:08:44 +0300 Subject: [PATCH 2/2] temporarily disable --- SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp | 1 + .../FunctionPointers/pass-fp-through-buffer.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp b/SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp index f629a95b03..13168032e2 100644 --- a/SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp +++ b/SYCL/DeprecatedFeatures/FunctionPointers/fp-as-kernel-arg.cpp @@ -1,3 +1,4 @@ +// REQUIRES: TEMPORARILY_DISABLED // UNSUPPORTED: cuda || rocm // CUDA does not support the function pointer as kernel argument extension. diff --git a/SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp b/SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp index bedfc1e873..ee26e47089 100644 --- a/SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp +++ b/SYCL/DeprecatedFeatures/FunctionPointers/pass-fp-through-buffer.cpp @@ -1,3 +1,4 @@ +// REQUIRES: TEMPORARILY_DISABLED // UNSUPPORTED: cuda || rocm // CUDA does not support the function pointer as kernel argument extension.