Revert "refactor: reduce batch buffer struct size"

This reverts commit 97ecf58. Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>

Author: KamilKoprykIntel

shared/source/command_stream/submissions_aggregator.cpp

@@ -100,9 +100,10 @@ NEO::BatchBuffer::BatchBuffer(GraphicsAllocation *commandBufferAllocation, size_
  bool hasRelaxedOrderingDependencies, bool dispatchMonitorFence)
  : commandBufferAllocation(commandBufferAllocation), startOffset(startOffset),
  chainedBatchBufferStartOffset(chainedBatchBufferStartOffset), taskStartAddress(taskStartAddress), chainedBatchBuffer(chainedBatchBuffer),
- sliceCount(sliceCount), usedSize(usedSize), stream(stream), endCmdPtr(endCmdPtr), numCsrClients(numCsrClients),
- throttle(throttle), dispatchMonitorFence(dispatchMonitorFence), hasRelaxedOrderingDependencies(hasRelaxedOrderingDependencies),
- hasStallingCmds(hasStallingCmds), lowPriority(lowPriority) {}
+ lowPriority(lowPriority),
+ throttle(throttle), sliceCount(sliceCount),
+ usedSize(usedSize), stream(stream), endCmdPtr(endCmdPtr), numCsrClients(numCsrClients), hasStallingCmds(hasStallingCmds),
+ hasRelaxedOrderingDependencies(hasRelaxedOrderingDependencies), dispatchMonitorFence(dispatchMonitorFence) {}
 
 NEO::CommandBuffer::CommandBuffer(Device &device) : device(device) {
  flushStamp.reset(new FlushStampTracker(false));

shared/source/command_stream/submissions_aggregator.h

@@ -43,6 +43,8 @@ struct BatchBuffer {
  uint64_t taskStartAddress = 0; // if task not available, use CSR stream
 
  GraphicsAllocation *chainedBatchBuffer = nullptr;
+ bool lowPriority = false;
+ QueueThrottle throttle = QueueThrottle::MEDIUM;
  uint64_t sliceCount = QueueSliceCount::defaultSliceCount;
  size_t usedSize = 0u;
 
@@ -51,13 +53,11 @@ struct BatchBuffer {
  void *endCmdPtr = nullptr;
  uint32_t numCsrClients = 0;
 
- QueueThrottle throttle = QueueThrottle::MEDIUM;
- bool disableFlatRingBuffer = false;
- bool dispatchMonitorFence = false;
- bool hasRelaxedOrderingDependencies = false;
  bool hasStallingCmds = false;
- bool lowPriority = false;
+ bool hasRelaxedOrderingDependencies = false;
  bool ringBufferRestartRequest = false;
+ bool disableFlatRingBuffer = false;
+ bool dispatchMonitorFence = false;
 };
 
 struct CommandBuffer : public IDNode<CommandBuffer> {