Add ULTs for testing multiple drivers and legacy and ddi ext

Signed-off-by: Neil R. Spruit <[email protected]>

Author: nrspruit

source/drivers/null/CMakeLists.txt

@@ -65,6 +65,10 @@ target_include_directories(ze_null_test2
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+target_compile_definitions(ze_null_test1 PUBLIC ZEL_NULL_DRIVER_ID=1)
+target_compile_definitions(ze_null_test2 PUBLIC ZEL_NULL_DRIVER_ID=2)
+target_compile_definitions(ze_null PUBLIC ZEL_NULL_DRIVER_ID=1)
+
 if(INSTALL_NULL_DRIVER)
     install(TARGETS ze_null_test1
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT level-zero-devel

source/drivers/null/ze_null.cpp

@@ -69,7 +69,12 @@ namespace driver
             auto pNext = reinterpret_cast<ze_base_properties_t *>(pDriverProperties->pNext);
             while (pNext) {
                 auto ddi_test_disable = getenv_string( "ZEL_TEST_NULL_DRIVER_DISABLE_DDI_EXT" );
-                if (pNext->stype == ZE_STRUCTURE_TYPE_DRIVER_DDI_HANDLES_EXT_PROPERTIES && ddi_test_disable != "1") {
+                #ifndef ZEL_NULL_DRIVER_ID
+                #define ZEL_NULL_DRIVER_ID 1
+                #endif
+                std::string null_driver_id_str = std::to_string(ZEL_NULL_DRIVER_ID);
+                if (pNext->stype == ZE_STRUCTURE_TYPE_DRIVER_DDI_HANDLES_EXT_PROPERTIES && (ddi_test_disable != null_driver_id_str && ddi_test_disable != "3")) {
+                    printf("ldr ddi pfnGetProperties, null driver id %d ddi ext\n", ZEL_NULL_DRIVER_ID);
                     ze_driver_ddi_handles_ext_properties_t *pDdiHandlesExtProperties = reinterpret_cast<ze_driver_ddi_handles_ext_properties_t *>(pNext);
                     pDdiHandlesExtProperties->flags = ze_driver_ddi_handle_ext_flag_t::ZE_DRIVER_DDI_HANDLE_EXT_FLAG_DDI_HANDLE_EXT_SUPPORTED;
                     context.ddiExtensionRequested = true;