From b98c79db4f989f586a4073d4b7e8887bb4482c7b Mon Sep 17 00:00:00 2001
From: Alexander Batashev <alexander.batashev@intel.com>
Date: Thu, 22 Jul 2021 13:52:49 +0300
Subject: [PATCH] [SYCL] Revert barrier deprecation note

New barrier is different from SYCL 1.2.1 and is known to cause
performance regressions on some configurations. Remove deprecation
notice from older barrier until the issue is sorted out.
---
 sycl/include/CL/sycl/nd_item.hpp              | 1 -
 sycl/test/warnings/sycl_2020_deprecations.cpp | 2 --
 2 files changed, 3 deletions(-)

diff --git a/sycl/include/CL/sycl/nd_item.hpp b/sycl/include/CL/sycl/nd_item.hpp
index b0d35c95e705d..6423d1f7bae33 100644
--- a/sycl/include/CL/sycl/nd_item.hpp
+++ b/sycl/include/CL/sycl/nd_item.hpp
@@ -112,7 +112,6 @@ template <int dimensions = 1> class nd_item {
                                 get_offset());
   }
 
-  __SYCL2020_DEPRECATED("use sycl::group_barrier() free function instead")
   void barrier(access::fence_space accessSpace =
                    access::fence_space::global_and_local) const {
     uint32_t flags = detail::getSPIRVMemorySemanticsMask(accessSpace);
diff --git a/sycl/test/warnings/sycl_2020_deprecations.cpp b/sycl/test/warnings/sycl_2020_deprecations.cpp
index 218f2ac5e0591..3c431afae5eba 100644
--- a/sycl/test/warnings/sycl_2020_deprecations.cpp
+++ b/sycl/test/warnings/sycl_2020_deprecations.cpp
@@ -116,8 +116,6 @@ int main() {
     CGH.parallel_for<class Test>(
         sycl::nd_range<1>{sycl::range{10}, sycl::range{10}, sycl::range{1}},
         [](sycl::nd_item<1> it) {
-          // expected-warning@+1{{'barrier' is deprecated: use sycl::group_barrier() free function instead}}
-          it.barrier();
           // expected-warning@+2{{'mem_fence' is deprecated: use sycl::group_barrier() free function instead}}
           // expected-warning@+1{{'mem_fence<sycl::access::mode::read_write>' is deprecated: use sycl::group_barrier() free function instead}}
           it.mem_fence();