Revert "feature: add global driver dispatch as prework for DDI handles extens...

This reverts commit dce4ca8.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>

Author: Compute-Runtime-Validation

level_zero/CMakeLists.txt

@@ -208,6 +208,7 @@ if(BUILD_WITH_L0)
   endif()
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdlist${BRANCH_DIR_SUFFIX})
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/core/source/cmdlist/cmdlist_extended${BRANCH_DIR_SUFFIX})
+  include_directories(ddi)
 
   # Create our shared library/DLL
   configure_file(ze_intel_gpu_version.h.in ${NEO_BUILD_DIR}/ze_intel_gpu_version.h)
@@ -342,7 +343,6 @@ if(BUILD_WITH_L0)
   hide_subdir(api)
   add_subdirectory_unique(source)
 
-  hide_subdir(ddi)
   hide_subdir(experimental)
   hide_subdir(include)
   set(L0_RELEASE_LIB_NAME "${TARGET_NAME_L0}_lib")
@@ -360,7 +360,6 @@ if(BUILD_WITH_L0)
                 ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
     )
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/api "${NEO_BUILD_DIR}/${LIB_NAME}/api")
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ddi "${NEO_BUILD_DIR}/${LIB_NAME}/ddi")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/core/source "${NEO_BUILD_DIR}/${LIB_NAME}/core/source")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/experimental "${NEO_BUILD_DIR}/${LIB_NAME}/experimental")
     add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/include "${NEO_BUILD_DIR}/${LIB_NAME}/include")

level_zero/api/core/ze_core_loader.cpp

@@ -11,7 +11,6 @@
 
 #include "level_zero/core/source/driver/driver.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
-#include "level_zero/ddi/ze_ddi_tables.h"
 #include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 
 namespace L0 {
@@ -20,9 +19,6 @@ decltype(&zelLoaderTranslateHandle) loaderTranslateHandleFunc = nullptr;
 decltype(&zelSetDriverTeardown) setDriverTeardownFunc = nullptr;
 
 void globalDriverSetup() {
-    globalDriverDispatch.core.isValidFlag = true;
-    globalDriverDispatch.tools.isValidFlag = true;
-    globalDriverDispatch.sysman.isValidFlag = true;
     if (!globalDriverHandles) {
         globalDriverHandles = new std::vector<_ze_driver_handle_t *>;
     }
@@ -68,8 +64,5 @@ void globalDriverTeardown() {
         delete Sysman::globalSysmanDriver;
         Sysman::globalSysmanDriver = nullptr;
     }
-    globalDriverDispatch.core.isValidFlag = false;
-    globalDriverDispatch.tools.isValidFlag = false;
-    globalDriverDispatch.sysman.isValidFlag = false;
 }
 } // namespace L0

level_zero/api/sysman/ze_sysman_loader.cpp

@@ -9,21 +9,16 @@
 
 #include "level_zero/core/source/driver/driver.h"
 #include "level_zero/core/source/driver/driver_handle_imp.h"
-#include "level_zero/ddi/ze_ddi_tables.h"
 #include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 
 void L0::UltConfigListenerL0::OnTestStart(const ::testing::TestInfo &testInfo) {
     BaseUltConfigListener::OnTestStart(testInfo);
-    globalDriverDispatch.core.isValidFlag = true;
-    globalDriverDispatch.tools.isValidFlag = true;
-    globalDriverDispatch.sysman.isValidFlag = true;
+
     globalDriverHandles->clear();
 }
 
 void L0::UltConfigListenerL0::OnTestEnd(const ::testing::TestInfo &testInfo) {
-    globalDriverDispatch.core.isValidFlag = false;
-    globalDriverDispatch.tools.isValidFlag = false;
-    globalDriverDispatch.sysman.isValidFlag = false;
+
     EXPECT_TRUE(globalDriverHandles->empty());
     EXPECT_EQ(nullptr, L0::Sysman::globalSysmanDriver);
 

level_zero/api/tools/ze_tools_loader.cpp

@@ -16,7 +16,6 @@
 #include "level_zero/core/source/driver/driver_handle_imp.h"
 #include "level_zero/core/source/driver/driver_imp.h"
 #include "level_zero/core/source/global_teardown.h"
-#include "level_zero/ddi/ze_ddi_tables.h"
 #include "level_zero/sysman/source/driver/sysman_driver_handle_imp.h"
 
 namespace L0 {
@@ -192,24 +191,5 @@ TEST_F(GlobalTearDownTests, givenForkedProcessWhenGlobalTearDownFunctionCalledTh
     delete tempDriver;
 }
 
-TEST_F(GlobalTearDownTests, givenGlobalDriverDispatchWhenGlobalSetupAndTeardownAreCalledThenPerApiValidFlagsAreChanged) {
-    VariableBackup<DriverDispatch> globalDispatchBackup{&globalDriverDispatch};
-
-    globalDriverDispatch.core.isValidFlag = false;
-    globalDriverDispatch.tools.isValidFlag = false;
-    globalDriverDispatch.sysman.isValidFlag = false;
-
-    globalDriverSetup();
-
-    EXPECT_TRUE(globalDriverDispatch.core.isValidFlag);
-    EXPECT_TRUE(globalDriverDispatch.tools.isValidFlag);
-    EXPECT_TRUE(globalDriverDispatch.sysman.isValidFlag);
-
-    globalDriverTeardown();
-
-    EXPECT_FALSE(globalDriverDispatch.core.isValidFlag);
-    EXPECT_FALSE(globalDriverDispatch.tools.isValidFlag);
-    EXPECT_FALSE(globalDriverDispatch.sysman.isValidFlag);
-}
 } // namespace ult
 } // namespace L0

level_zero/core/source/global_teardown.cpp

@@ -7,9 +7,10 @@
 
 #include "shared/test/common/test_macros/test.h"
 
-#include "level_zero/ddi/ze_ddi_tables.h"
 #include <level_zero/ze_api.h>
 
+#include "ze_ddi_tables.h"
+
 namespace L0 {
 namespace ult {