Add debug flag to override command queue synchronous mode

Signed-off-by: Zbigniew Zdanowicz <[email protected]>

Author: zzdanowicz

level_zero/core/source/cmdqueue/cmdqueue.cpp

@@ -23,6 +23,14 @@ namespace L0 {
 
 CommandQueueAllocatorFn commandQueueFactory[IGFX_MAX_PRODUCT] = {};
 
+CommandQueueImp::CommandQueueImp(Device *device, NEO::CommandStreamReceiver *csr, const ze_command_queue_desc_t *desc)
+    : device(device), csr(csr), desc(*desc) {
+    int overrideCmdQueueSyncMode = NEO::DebugManager.flags.OverrideCmdQueueSynchronousMode.get();
+    if (overrideCmdQueueSyncMode != -1) {
+        this->desc.mode = static_cast<ze_command_queue_mode_t>(overrideCmdQueueSyncMode);
+    }
+}
+
 ze_result_t CommandQueueImp::destroy() {
     delete this;
     return ZE_RESULT_SUCCESS;
@@ -130,7 +138,7 @@ CommandQueue *CommandQueue::create(uint32_t productFamily, Device *device, NEO::
     return commandQueue;
 }
 
-ze_command_queue_mode_t CommandQueueImp::getSynchronousMode() {
+ze_command_queue_mode_t CommandQueueImp::getSynchronousMode() const {
     return desc.mode;
 }
 

level_zero/core/source/cmdqueue/cmdqueue_imp.h

@@ -60,9 +60,7 @@ struct CommandQueueImp : public CommandQueue {
         NEO::CSRequirements::csOverfetchSize;
 
     CommandQueueImp() = delete;
-    CommandQueueImp(Device *device, NEO::CommandStreamReceiver *csr, const ze_command_queue_desc_t *desc)
-        : device(device), csr(csr), desc(*desc) {
-    }
+    CommandQueueImp(Device *device, NEO::CommandStreamReceiver *csr, const ze_command_queue_desc_t *desc);
 
     ze_result_t destroy() override;
 
@@ -77,7 +75,7 @@ struct CommandQueueImp : public CommandQueue {
     NEO::CommandStreamReceiver *getCsr() { return csr; }
 
     void reserveLinearStreamSize(size_t size);
-    ze_command_queue_mode_t getSynchronousMode();
+    ze_command_queue_mode_t getSynchronousMode() const;
     virtual void dispatchTaskCountWrite(NEO::LinearStream &commandStream, bool flushDataCache) = 0;
     virtual bool getPreemptionCmdProgramming() = 0;
 
@@ -90,7 +88,7 @@ struct CommandQueueImp : public CommandQueue {
 
     Device *device = nullptr;
     NEO::CommandStreamReceiver *csr = nullptr;
-    const ze_command_queue_desc_t desc;
+    ze_command_queue_desc_t desc;
     NEO::LinearStream *commandStream = nullptr;
     std::atomic<uint32_t> taskCount{0};
     std::vector<Kernel *> printfFunctionContainer;

level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue.cpp

@@ -1576,5 +1576,71 @@ TEST_F(CommandQueueInitTests, givenMultipleSubDevicesWhenInitializingThenAllocat
 
     commandQueue->destroy();
 }
+
+TEST_F(CommandQueueCreate, givenOverrideCmdQueueSyncModeToDefaultWhenCommandQueueIsCreatedWithSynchronousModeThenDefaultModeIsSelected) {
+    DebugManagerStateRestore restore;
+    NEO::DebugManager.flags.OverrideCmdQueueSynchronousMode.set(0);
+
+    ze_command_queue_desc_t desc = {ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC};
+    desc.mode = ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS;
+    ze_result_t returnValue = ZE_RESULT_ERROR_DEVICE_LOST;
+    L0::CommandQueue *commandQueue = CommandQueue::create(productFamily,
+                                                          device,
+                                                          neoDevice->getDefaultEngine().commandStreamReceiver,
+                                                          &desc,
+                                                          false,
+                                                          false,
+                                                          returnValue);
+    ASSERT_NE(nullptr, commandQueue);
+    EXPECT_EQ(returnValue, ZE_RESULT_SUCCESS);
+    auto cmdQueueSynchronousMode = reinterpret_cast<L0::CommandQueueImp *>(commandQueue)->getSynchronousMode();
+    EXPECT_EQ(ZE_COMMAND_QUEUE_MODE_DEFAULT, cmdQueueSynchronousMode);
+
+    commandQueue->destroy();
+}
+
+TEST_F(CommandQueueCreate, givenOverrideCmdQueueSyncModeToAsynchronousWhenCommandQueueIsCreatedWithSynchronousModeThenAsynchronousModeIsSelected) {
+    DebugManagerStateRestore restore;
+    NEO::DebugManager.flags.OverrideCmdQueueSynchronousMode.set(2);
+
+    ze_command_queue_desc_t desc = {ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC};
+    desc.mode = ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS;
+    ze_result_t returnValue = ZE_RESULT_ERROR_DEVICE_LOST;
+    L0::CommandQueue *commandQueue = CommandQueue::create(productFamily,
+                                                          device,
+                                                          neoDevice->getDefaultEngine().commandStreamReceiver,
+                                                          &desc,
+                                                          false,
+                                                          false,
+                                                          returnValue);
+    ASSERT_NE(nullptr, commandQueue);
+    EXPECT_EQ(returnValue, ZE_RESULT_SUCCESS);
+    auto cmdQueueSynchronousMode = reinterpret_cast<L0::CommandQueueImp *>(commandQueue)->getSynchronousMode();
+    EXPECT_EQ(ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS, cmdQueueSynchronousMode);
+
+    commandQueue->destroy();
+}
+
+TEST_F(CommandQueueCreate, givenOverrideCmdQueueSyncModeToSynchronousWhenCommandQueueIsCreatedWithAsynchronousModeThenSynchronousModeIsSelected) {
+    DebugManagerStateRestore restore;
+    NEO::DebugManager.flags.OverrideCmdQueueSynchronousMode.set(1);
+
+    ze_command_queue_desc_t desc = {ZE_STRUCTURE_TYPE_COMMAND_QUEUE_DESC};
+    desc.mode = ZE_COMMAND_QUEUE_MODE_ASYNCHRONOUS;
+    ze_result_t returnValue = ZE_RESULT_ERROR_DEVICE_LOST;
+    L0::CommandQueue *commandQueue = CommandQueue::create(productFamily,
+                                                          device,
+                                                          neoDevice->getDefaultEngine().commandStreamReceiver,
+                                                          &desc,
+                                                          false,
+                                                          false,
+                                                          returnValue);
+    ASSERT_NE(nullptr, commandQueue);
+    EXPECT_EQ(returnValue, ZE_RESULT_SUCCESS);
+    auto cmdQueueSynchronousMode = reinterpret_cast<L0::CommandQueueImp *>(commandQueue)->getSynchronousMode();
+    EXPECT_EQ(ZE_COMMAND_QUEUE_MODE_SYNCHRONOUS, cmdQueueSynchronousMode);
+
+    commandQueue->destroy();
+}
 } // namespace ult
 } // namespace L0

opencl/test/unit_test/test_files/igdrcl.config

@@ -299,4 +299,5 @@ EnableUserFenceUseCtxId = -1
 EnableResourceTags = 0
 SetKmdWaitTimeout = -1
 OverrideNotifyEnableForTagUpdatePostSync = -1
-Force32BitDriverSupport = -1
+Force32BitDriverSupport = -1
+OverrideCmdQueueSynchronousMode = -1

shared/source/debug_settings/debug_variables_base.inl

@@ -149,6 +149,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, EnableImmediateVmBindExt, -1, "Use immediate bin
 DECLARE_DEBUG_VARIABLE(int32_t, ForceExecutionTile, -1, "-1: default, 0+: given tile is choosen as submission, must be used with EnableWalkerPartition = 0.")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideTimestampPacketSize, -1, "-1: default, >0: size in bytes. 4 and 8 supported for experiments")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideMaxWorkGroupCount, -1, "-1: default, >0: Max WG size")
+DECLARE_DEBUG_VARIABLE(int32_t, OverrideCmdQueueSynchronousMode, -1, "Overrides all command queues synchronous mode: -1: do not override, 0: implicit driver behavior, 1: synchronous, 2: asynchronous")
 
 /*LOGGING FLAGS*/
 DECLARE_DEBUG_VARIABLE(int32_t, PrintDriverDiagnostics, -1, "prints driver diagnostics messages to standard output, value corresponds to hint level")