enable test kernels from prebuilt binaries

Signed-off-by: Artur Harasimiuk <[email protected]>

Author: ArturHarasimiuk

cmake/run_aub_test_target.cmake

@@ -55,7 +55,7 @@ if(NOT SKIP_NEO_UNIT_TESTS)
   if(WIN32 OR NOT DEFINED NEO__GMM_LIBRARY_PATH)
     set(aub_test_cmd_prefix $<TARGET_FILE:igdrcl_aub_tests>)
   else()
-    set(aub_test_cmd_prefix LD_LIBRARY_PATH=${NEO__GMM_LIBRARY_PATH} IGDRCL_TEST_SELF_EXEC=off $<TARGET_FILE:igdrcl_aub_tests>)
+    set(aub_test_cmd_prefix LD_LIBRARY_PATH=${NEO__GMM_LIBRARY_PATH} IGDRCL_TEST_SELF_EXEC=off ${NEO_RUN_INTERCEPTOR_LIST} $<TARGET_FILE:igdrcl_aub_tests>)
   endif()
 
   add_custom_command(
@@ -73,7 +73,7 @@ if(NOT SKIP_L0_UNIT_TESTS AND BUILD_WITH_L0)
   if(WIN32 OR NOT DEFINED NEO__GMM_LIBRARY_PATH)
     set(l0_aub_test_cmd_prefix $<TARGET_FILE:ze_intel_gpu_aub_tests>)
   else()
-    set(l0_aub_test_cmd_prefix LD_LIBRARY_PATH=${NEO__GMM_LIBRARY_PATH} $<TARGET_FILE:ze_intel_gpu_aub_tests>)
+    set(l0_aub_test_cmd_prefix LD_LIBRARY_PATH=${NEO__GMM_LIBRARY_PATH} ${NEO_RUN_INTERCEPTOR_LIST} $<TARGET_FILE:ze_intel_gpu_aub_tests>)
   endif()
 
   add_custom_command(

level_zero/core/test/common/gen_kernel.cmake

@@ -6,27 +6,30 @@
 
 function(level_zero_gen_kernels target_list platform_name suffix options)
 
-  if(NOT DEFINED cloc_cmd_prefix)
-    if(WIN32)
-      set(cloc_cmd_prefix ocloc)
-    else()
-      if(DEFINED NEO__IGC_LIBRARY_PATH)
-        set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+  if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
+    if(NOT DEFINED cloc_cmd_prefix)
+      if(WIN32)
+        set(cloc_cmd_prefix ocloc)
       else()
-        set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+        if(DEFINED NEO__IGC_LIBRARY_PATH)
+          set(cloc_cmd_prefix LD_LIBRARY_PATH=${NEO__IGC_LIBRARY_PATH}:$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+        else()
+          set(cloc_cmd_prefix LD_LIBRARY_PATH=$<TARGET_FILE_DIR:ocloc_lib> $<TARGET_FILE:ocloc>)
+        endif()
       endif()
     endif()
+    list(APPEND results copy_compiler_files)
   endif()
 
   set(outputdir "${TargetDir}/level_zero/${suffix}/test_files/${NEO_ARCH}/")
 
-  if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
-    foreach(filepath ${ARGN})
-      get_filename_component(filename ${filepath} NAME)
-      get_filename_component(basename ${filepath} NAME_WE)
-      get_filename_component(workdir ${filepath} DIRECTORY)
+  foreach(filepath ${ARGN})
+    get_filename_component(filename ${filepath} NAME)
+    get_filename_component(basename ${filepath} NAME_WE)
+    get_filename_component(workdir ${filepath} DIRECTORY)
 
-      set(outputpath_base "${outputdir}${basename}_${suffix}")
+    set(outputpath_base "${outputdir}${basename}_${suffix}")
+    if(NOT NEO_DISABLE_BUILTINS_COMPILATION)
       set(output_files
           ${outputpath_base}.bin
           ${outputpath_base}.gen
@@ -41,7 +44,19 @@ function(level_zero_gen_kernels target_list platform_name suffix options)
       )
 
       list(APPEND ${target_list} ${output_files})
-    endforeach()
-  endif()
+    else()
+      foreach(_file_name "bin" "gen")
+        set(_file_prebuilt "${NEO_SOURCE_DIR}/../neo_test_kernels/level_zero/${suffix}/test_files/${NEO_ARCH}/${basename}_${suffix}.${_file_name}")
+        add_custom_command(
+                           OUTPUT ${outputpath_base}.${_file_name}
+                           COMMAND ${CMAKE_COMMAND} -E make_directory ${outputdir}
+                           COMMAND ${CMAKE_COMMAND} -E copy_if_different ${_file_prebuilt} ${outputdir}
+        )
+
+        list(APPEND ${target_list} ${outputpath_base}.${_file_name})
+      endforeach()
+    endif()
+  endforeach()
+
   set(${target_list} ${${target_list}} PARENT_SCOPE)
 endfunction()

manifests/manifest.yml

@@ -20,7 +20,7 @@ components:
   infra:
     branch: master
     dest_dir: infra
-    revision: 5184a3b3a345503276898fd1ab953132cc453085
+    revision: 58a19cb8f5412f458b8faacd1ec8357c2572a14e
     type: git
   internal:
     branch: master