Remove auto-generated extension file

Author: bandoti

ggml/src/ggml-vulkan/CMakeLists.txt

@@ -21,29 +21,23 @@ endfunction()
 #  TEST_SHADER_FILE - Path to the test shader file
 #  RESULT_VARIABLE - Name of the variable to set (ON/OFF) based on test result
 function(test_shader_extension_support EXTENSION_NAME TEST_SHADER_FILE RESULT_VARIABLE)
-    # Compile the test shader to determine whether the extension is supported
     execute_process(
         COMMAND ${Vulkan_GLSLC_EXECUTABLE} -o - -fshader-stage=compute --target-env=vulkan1.3 "${TEST_SHADER_FILE}"
         OUTPUT_VARIABLE glslc_output
         ERROR_VARIABLE glslc_error
     )
 
-    # Check if error message contains extension not supported
     if (${glslc_error} MATCHES ".*extension not supported: ${EXTENSION_NAME}.*")
         message(STATUS "${EXTENSION_NAME} not supported by glslc")
         set(${RESULT_VARIABLE} OFF PARENT_SCOPE)
-
-        # Append to the shader extensions definitions file
-        file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shader-extension-defs.cmake
-             "set(${RESULT_VARIABLE} OFF)\n")
     else()
         message(STATUS "${EXTENSION_NAME} supported by glslc")
         set(${RESULT_VARIABLE} ON PARENT_SCOPE)
         add_compile_definitions(${RESULT_VARIABLE})
 
-        # Append to the shader extensions definitions file
-        file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shader-extension-defs.cmake
-             "set(${RESULT_VARIABLE} ON)\nadd_compile_definitions(${RESULT_VARIABLE})\n")
+        # Ensure the extension support is forwarded to vulkan-shaders-gen
+        list(APPEND VULKAN_SHADER_GEN_CMAKE_ARGS -D${RESULT_VARIABLE}=ON)
+        set(VULKAN_SHADER_GEN_CMAKE_ARGS "${VULKAN_SHADER_GEN_CMAKE_ARGS}" PARENT_SCOPE)
     endif()
 endfunction()
 
@@ -55,9 +49,10 @@ if (Vulkan_FOUND)
                              ../../include/ggml-vulkan.h
                             )
 
-    # Create the shader extensions definitions file
-    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/vulkan-shader-extension-defs.cmake
-         "# Auto-generated file with Vulkan shader extension support definitions\n\n")
+    set(VULKAN_SHADER_GEN_CMAKE_ARGS
+        -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
+        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+    )
 
     # Test all shader extensions
     test_shader_extension_support(
@@ -143,13 +138,6 @@ if (Vulkan_FOUND)
     # Always use ExternalProject_Add approach
     include(ExternalProject)
 
-    # Construct CMake arguments
-    set(VULKAN_SHADER_GEN_CMAKE_ARGS
-        -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-        -DVULKAN_SHADER_EXTENSIONS_FILE=${CMAKE_CURRENT_BINARY_DIR}/vulkan-shader-extension-defs.cmake
-        -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-    )
-
     # Add toolchain file if cross-compiling
     if (CMAKE_CROSSCOMPILING)
         list(APPEND VULKAN_SHADER_GEN_CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${HOST_CMAKE_TOOLCHAIN_FILE})

ggml/src/ggml-vulkan/vulkan-shaders/CMakeLists.txt

@@ -1,15 +1,24 @@
 cmake_minimum_required(VERSION 3.19)
 project("vulkan-shaders-gen" C CXX)
 
-find_package(Threads REQUIRED)
+find_package (Threads REQUIRED)
 
-# Include the shader extensions definitions file
-if(NOT DEFINED VULKAN_SHADER_EXTENSIONS_FILE OR NOT EXISTS "${VULKAN_SHADER_EXTENSIONS_FILE}")
-    message(FATAL_ERROR "VULKAN_SHADER_EXTENSIONS_FILE must be defined and must exist")
+if (GGML_VULKAN_COOPMAT_GLSLC_SUPPORT)
+    add_compile_definitions(GGML_VULKAN_COOPMAT_GLSLC_SUPPORT)
+    message(STATUS "Enabling coopmat glslc support")
+endif()
+if (GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
+    add_compile_definitions(GGML_VULKAN_COOPMAT2_GLSLC_SUPPORT)
+    message(STATUS "Enabling coopmat2 glslc support")
+endif()
+if (GGML_VULKAN_INTEGER_DOT_GLSLC_SUPPORT)
+    add_compile_definitions(GGML_VULKAN_INTEGER_DOT_GLSLC_SUPPORT)
+    message(STATUS "Enabling dot glslc support")
+endif()
+if (GGML_VULKAN_BFLOAT16_GLSLC_SUPPORT)
+    add_compile_definitions(GGML_VULKAN_BFLOAT16_GLSLC_SUPPORT)
+    message(STATUS "Enabling bfloat16 glslc support")
 endif()
-
-message(STATUS "Loading shader extension definitions from: ${VULKAN_SHADER_EXTENSIONS_FILE}")
-include("${VULKAN_SHADER_EXTENSIONS_FILE}")
 
 set(TARGET vulkan-shaders-gen)
 add_executable(${TARGET} vulkan-shaders-gen.cpp)