Address review comments and fix CI fails

Author: againull

sycl/source/detail/scheduler/scheduler.cpp

@@ -246,6 +246,11 @@ void Scheduler::allocateStreamBuffers(stream_impl *Impl,
       {Impl, StreamBuffers(StreamBufferSize, FlushBufferSize)});
 }
 
+void Scheduler::deallocateStreamBuffers(stream_impl *Impl) {
+  std::lock_guard<std::mutex> lock(StreamBuffersPoolMutex);
+  StreamBuffersPool.erase(Impl);
+}
+
 Scheduler::Scheduler() {
   sycl::device HostDevice;
   DefaultHostQueue = QueueImplPtr(

sycl/source/detail/scheduler/scheduler.hpp

@@ -716,8 +716,10 @@ class Scheduler {
   friend class Command;
   friend class DispatchHostTask;
 
-  class StreamBuffers {
-  public:
+  /// Stream buffers structure.
+  ///
+  /// The structure contains all buffers for a stream object.
+  struct StreamBuffers {
     StreamBuffers(size_t StreamBufferSize, size_t FlushBufferSize)
         // Initialize stream buffer with zeros, this is needed for two reasons:
         // 1. We don't need to care about end of line when printing out
@@ -745,8 +747,11 @@ class Scheduler {
   std::mutex StreamBuffersPoolMutex;
   std::map<stream_impl *, StreamBuffers> StreamBuffersPool;
 
-  // Allocate buffers in the pool for a provided stream
+  /// Allocate buffers in the pool for a provided stream
   void allocateStreamBuffers(stream_impl *, size_t, size_t);
+
+  /// Deallocate buffers in the pool for a provided stream
+  void deallocateStreamBuffers(stream_impl *);
 };
 
 } // namespace detail

sycl/source/detail/stream_impl.cpp

@@ -62,13 +62,18 @@ size_t stream_impl::get_max_statement_size() const { return MaxStatementSize_; }
 void stream_impl::flush() {
   // Access the stream buffer on the host. This access guarantees that kernel is
   // executed and buffer contains streamed data.
-  auto HostAcc = detail::Scheduler::getInstance()
-                     .StreamBuffersPool.find(this)
-                     ->second.Buf.get_access<cl::sycl::access::mode::read>(
-                         range<1>(BufferSize_), id<1>(OffsetSize));
+  {
+    auto HostAcc = detail::Scheduler::getInstance()
+                       .StreamBuffersPool.find(this)
+                       ->second.Buf.get_access<cl::sycl::access::mode::read>(
+                           range<1>(BufferSize_), id<1>(OffsetSize));
 
-  printf("%s", HostAcc.get_pointer());
-  fflush(stdout);
+    printf("%s", HostAcc.get_pointer());
+    fflush(stdout);
+  }
+
+  // Flushed the stream, can deallocate the buffers now.
+  detail::Scheduler::getInstance().deallocateStreamBuffers(this);
 }
 } // namespace detail
 } // namespace sycl

sycl/test/basic_tests/stream/release_resources_test.cpp

@@ -3,14 +3,6 @@
 // RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER
 // RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER
 
-//==----------------------- release_resources_test.cpp ---------------------==//
-//
-// 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
-//
-//===----------------------------------------------------------------------===//
-
 // Check that buffer used by a stream object is released.
 
 #include <CL/sycl.hpp>