[SYCL] Minor fixes after stream class implementation.

  * Warnings were fixed.
  * Bug in assertion was fixed.

Signed-off-by: Artur Gainullin <[email protected]>

Author: againull

sycl/include/CL/sycl/buffer.hpp

@@ -120,8 +120,8 @@ class buffer {
 
   buffer(buffer<T, dimensions, AllocatorT> &b, const id<dimensions> &baseIndex,
          const range<dimensions> &subRange)
-      : impl(b.impl), Offset(baseIndex + b.Offset), Range(subRange), MemRange(b.MemRange),
-        IsSubBuffer(true) {}
+      : impl(b.impl), Range(subRange), MemRange(b.MemRange), IsSubBuffer(true),
+        Offset(baseIndex + b.Offset) {}
 
   template <int N = dimensions, typename = EnableIfOneDimension<N>>
   buffer(cl_mem MemObject, const context &SyclContext,
@@ -237,11 +237,11 @@ class buffer {
   template <typename DataT, int dims, access::mode mode,
             access::target target, access::placeholder isPlaceholder>
   friend class accessor;
+  range<dimensions> Range;
   // If this buffer is subbuffer - this range represents range of the parent
   // buffer
   range<dimensions> MemRange;
   bool IsSubBuffer = false;
-  range<dimensions> Range;
   // If this buffer is sub-buffer - offset field specifies the origin of the
   // sub-buffer inside the parent buffer
   id<dimensions> Offset;

sycl/source/detail/scheduler/commands.cpp

@@ -204,7 +204,7 @@ AllocaCommand *ExecCGCommand::getAllocaForReq(Requirement *Req) {
 }
 
 void ExecCGCommand::flushStreams() {
-  assert(CommandGroup->getType() == CG::KERNEL && "Expected kernel");
+  assert(MCommandGroup->getType() == CG::KERNEL && "Expected kernel");
   for (auto StreamImplPtr :
        ((CGExecKernel *)MCommandGroup.get())->getStreams()) {
     StreamImplPtr->flush();

sycl/source/detail/stream_impl.cpp

@@ -15,16 +15,15 @@ namespace detail {
 
 stream_impl::stream_impl(size_t BufferSize, size_t MaxStatementSize,
                          handler &CGH)
-    : BufferSize_(BufferSize),
+    : BufferSize_(BufferSize), MaxStatementSize_(MaxStatementSize),
       // Allocate additional place for the offset variable and the end of line
       // symbol. Initialize buffer with zeros, this is needed for two reasons:
       // 1. We don't need to care about end of line when printing out streamed
       // data.
       // 2. Offset is properly initialized.
       Data(BufferSize + OffsetSize + 1, 0),
       Buf(Data.data(), range<1>(BufferSize + OffsetSize + 1),
-          {property::buffer::use_host_ptr()}),
-      MaxStatementSize_(MaxStatementSize) {}
+          {property::buffer::use_host_ptr()}) {}
 
 size_t stream_impl::get_size() const { return BufferSize_; }