Update debug key to override timestamp event settings

Related-To: NEO-5968

Signed-off-by: Aravind Gopalakrishnan <[email protected]>

Author: aravindksg

level_zero/core/source/event/event.h

@@ -197,8 +197,9 @@ struct EventPool : _ze_event_pool_handle_t {
     virtual void setEventAlignment(uint32_t) = 0;
 
     bool isEventPoolTimestampFlagSet() {
-        if (NEO::DebugManager.flags.DisableTimestampEvents.get()) {
-            return false;
+        if (NEO::DebugManager.flags.OverrideTimestampEvents.get() != -1) {
+            auto timestampOverride = !!NEO::DebugManager.flags.OverrideTimestampEvents.get();
+            return timestampOverride;
         }
         if (eventPoolFlags & ZE_EVENT_POOL_FLAG_KERNEL_TIMESTAMP) {
             return true;

level_zero/core/test/unit_tests/sources/event/test_event.cpp

@@ -182,9 +182,9 @@ TEST_F(EventPoolCreate, givenEventPoolCreatedWithNoTimestampFlagThenHasTimestamp
     EXPECT_FALSE(eventPoolImp->isEventPoolTimestampFlagSet());
 }
 
-TEST_F(EventPoolCreate, givenEventPoolCreatedWithTimestampFlagAndDisableTimestampEventsFlagThenHasTimestampEventsReturnsFalse) {
+TEST_F(EventPoolCreate, givenEventPoolCreatedWithTimestampFlagAndOverrideTimestampEventsFlagThenHasTimestampEventsReturnsFalse) {
     DebugManagerStateRestore restore;
-    NEO::DebugManager.flags.DisableTimestampEvents.set(1);
+    NEO::DebugManager.flags.OverrideTimestampEvents.set(0);
 
     ze_event_pool_desc_t eventPoolDesc = {};
     eventPoolDesc.count = 1;
@@ -198,6 +198,22 @@ TEST_F(EventPoolCreate, givenEventPoolCreatedWithTimestampFlagAndDisableTimestam
     EXPECT_FALSE(eventPoolImp->isEventPoolTimestampFlagSet());
 }
 
+TEST_F(EventPoolCreate, givenEventPoolCreatedWithoutTimestampFlagAndOverrideTimestampEventsFlagThenHasTimestampEventsReturnsTrue) {
+    DebugManagerStateRestore restore;
+    NEO::DebugManager.flags.OverrideTimestampEvents.set(1);
+
+    ze_event_pool_desc_t eventPoolDesc = {};
+    eventPoolDesc.count = 1;
+    eventPoolDesc.flags = 0;
+
+    ze_result_t result = ZE_RESULT_SUCCESS;
+    std::unique_ptr<L0::EventPool> eventPool(EventPool::create(driverHandle.get(), context, 0, nullptr, &eventPoolDesc, result));
+    EXPECT_EQ(ZE_RESULT_SUCCESS, result);
+    ASSERT_NE(nullptr, eventPool);
+    EventPoolImp *eventPoolImp = static_cast<EventPoolImp *>(eventPool.get());
+    EXPECT_TRUE(eventPoolImp->isEventPoolTimestampFlagSet());
+}
+
 TEST_F(EventPoolCreate, givenAnEventIsCreatedFromThisEventPoolThenEventContainsDeviceCommandStreamReceiver) {
     ze_event_pool_desc_t eventPoolDesc = {};
     eventPoolDesc.count = 1;

opencl/test/unit_test/test_files/igdrcl.config

@@ -242,7 +242,7 @@ GpuScratchRegWriteAfterWalker = -1
 GpuScratchRegWriteRegisterData = 0
 GpuScratchRegWriteRegisterOffset = 0
 UseBindlessDebugSip = 0
-DisableTimestampEvents = 0
+OverrideTimestampEvents= -1
 OverrideSlmAllocationSize = -1
 OverrideSlmSize = -1
 UseCyclesPerSecondTimer = 0

shared/source/debug_settings/debug_variables_base.inl

@@ -66,7 +66,6 @@ DECLARE_DEBUG_VARIABLE(bool, EnableMultiGpuAtomicsOptimization, true, "Enable mu
 DECLARE_DEBUG_VARIABLE(bool, DisableCachingForHeaps, false, "When set driver will not cache heaps in L3/L1.")
 DECLARE_DEBUG_VARIABLE(bool, GlobalSequencerFlushOnCopyEngine, false, "false: disable (default), true: enable. If set then global sequencer flash is added for blitter")
 DECLARE_DEBUG_VARIABLE(bool, UseImmDataWriteModeOnPostSyncOperation, false, "Use IMM data write mode as post sync operation in Compute Walker")
-DECLARE_DEBUG_VARIABLE(bool, DisableTimestampEvents, false, "Timestamp info will not be reported and events will only perform regular synchronization functions")
 DECLARE_DEBUG_VARIABLE(bool, EnableResourceTags, false, "Enable resource tagging in GMM")
 DECLARE_DEBUG_VARIABLE(bool, DoNotFreeResources, false, "true: driver stops freeing resources")
 DECLARE_DEBUG_VARIABLE(bool, AllowMixingRegularAndCooperativeKernels, false, "true: driver allows mixing regular and cooperative kernels in a single command list and in a single execute")
@@ -192,6 +191,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, AccessCountersTrigger, -1, "-1: default - disabl
 DECLARE_DEBUG_VARIABLE(int32_t, AccessCountersGranularity, -1, "-1: default - ACG_2MB, >= 0: granularites - 0: ACG_128K, 1: ACG_2M, 2: ACG_16M, 3: ACG_16M")
 DECLARE_DEBUG_VARIABLE(int32_t, OverridePatIndex, -1, "-1: default, >=0: PatIndex to override")
 DECLARE_DEBUG_VARIABLE(int32_t, UseTileMemoryBankInVirtualMemoryCreation, -1, "-1: default - on, 0: do not assign tile memory bank to virtual memory space, 1: assign tile memory bank to virtual memory space")
+DECLARE_DEBUG_VARIABLE(int32_t, OverrideTimestampEvents, -1, "-1: default (based on user settings), 0: Force disable timestamp events (no timestamps will be reported), 1: Force enable timestamp events")
 DECLARE_DEBUG_VARIABLE(bool, DisableScratchPages, false, "Disable scratch pages during VM creations")
 /*LOGGING FLAGS*/
 DECLARE_DEBUG_VARIABLE(int32_t, PrintDriverDiagnostics, -1, "prints driver diagnostics messages to standard output, value corresponds to hint level")