Add CMake function to embed source files into a target

Author: stijnh

CMakeLists.txt

@@ -25,6 +25,80 @@ target_link_libraries(${PROJECT_NAME} PRIVATE CUDA::cudart_static)
 target_link_libraries(${PROJECT_NAME} PRIVATE CUDA::cuda_driver)
 target_link_libraries(${PROJECT_NAME} PRIVATE CUDA::nvrtc)
 
+
+##
+# Embed files from a directory into a target.
+#
+# Parameters:
+#   target: The target for which the embedded files are created
+#   directory: The directory where the files are located
+#   files...: Multiple files can be listed
+#
+# Usage:
+#   kernel_launcher_embed(my_target my_directory file1.bin file2.bin)
+##
+function(kernel_launcher_embed target directory)
+    string(MAKE_C_IDENTIFIER ${target}_embed_${directory} output_target)
+    set(deps "")
+
+    foreach(input IN LISTS ARGN)
+        string(MAKE_C_IDENTIFIER ${input} input_identifier)
+        set(output "${CMAKE_CURRENT_BINARY_DIR}/${input_identifier}.o")
+
+        add_custom_command(
+            OUTPUT ${output}
+            COMMAND ${CMAKE_LINKER} --relocatable --format binary --output ${output} ${input}
+            WORKING_DIRECTORY ${directory}
+            DEPENDS ${input}
+        )
+
+        set(deps ${deps} "${output}")
+    endforeach()
+
+    add_custom_target(${output_target} ALL DEPENDS ${deps})
+
+    add_dependencies(${target} ${output_target})
+    target_link_libraries(${target} ${output})
+endfunction()
+
+##
+# Embed files from a directory into a target with the ability to specify the embedded files using a glob pattern.
+#
+# Parameters:
+#   target: The target for which the embedded files are created
+#   directory: The directory where the files are located
+#   patterns...: Multiple patterns can be listed
+#
+# Usage:
+#   kernel_launcher_embed_glob(my_target my_directory *.cuh *.h)
+##
+function(kernel_launcher_embed_glob target directory)
+    file(GLOB_RECURSE files LIST_DIRECTORIES false RELATIVE "${directory}" ${ARGN})
+    kernel_launcher_embed("${target}" "${directory}" ${files})
+endfunction()
+
+##
+# Embed all files from a directory into a target.
+#
+# Parameters:
+#   target: The target for which the embedded files are created
+#   directory: The directory where the files are located
+#
+# Usage:
+#   kernel_launcher_embed_directory(my_target my_directory)
+##
+function(kernel_launcher_embed_directory target directory)
+    kernel_launcher_embed_glob(target directory "*")
+endfunction()
+
+if (NOT DEFINED KERNEL_LAUNCHER_EMBEDDED_DATA)
+    set(KERNEL_LAUNCHER_EMBEDDED_DATA 1)
+endif()
+
+if (KERNEL_LAUNCHER_EMBEDDED_DATA)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE KERNEL_LAUNCHER_EMBEDDED_DATA=1)
+endif()
+
 if (KERNEL_LAUNCHER_BUILD_TEST)
     add_subdirectory(tests)
 endif()
@@ -39,3 +113,4 @@ if (KERNEL_LAUNCHER_ZLIB)
     target_link_libraries(${PROJECT_NAME} PRIVATE ${ZLIB_LIBRARIES})
     target_compile_definitions(${PROJECT_NAME} PRIVATE KERNEL_LAUNCHER_USE_ZLIB=1)
 endif()
+

examples/matmul/CMakeLists.txt

@@ -6,3 +6,4 @@ project(${PROJECT_NAME} LANGUAGES CXX CUDA)
 add_executable(${PROJECT_NAME} "${PROJECT_SOURCE_DIR}/main.cu")
 target_link_libraries(${PROJECT_NAME} kernel_launcher)
 
+kernel_launcher_embed_glob(${PROJECT_NAME} ${PROJECT_SOURCE_DIR} *.cuh *.cu)

examples/matmul/main.cu

@@ -21,10 +21,7 @@ int main() {
         B[i] = TF(i % 13);
     }
 
-    std::string this_file = __FILE__;
-    std::string this_directory = this_file.substr(0, this_file.rfind('/'));
-
-    kl::KernelBuilder builder("matmul_kernel", this_directory + "/matmul.cu");
+    kl::KernelBuilder builder("matmul_kernel", "matmul.cu");
 
     auto bx = builder.tune("block_size_x", {16, 32, 48}, 32);
     auto by = builder.tune("block_size_y", {1, 2, 4, 8, 16, 32}, 32);

src/fs.cpp

@@ -140,7 +140,7 @@ struct EmbeddedData {
     }
 
     ~EmbeddedData() {
-        if (app_) {
+        if (app_ != nullptr) {
             dlclose(app_);
         }
     }
@@ -154,28 +154,26 @@ struct EmbeddedData {
             i = key.find_first_of(illegal_symbols, i + 1);
         }
 
-        if (app_) {
+        if (app_ != nullptr) {
             const char* data = (const char*)dlsym(app_, key.c_str());
 
-            if (data) {
+            if (data != nullptr) {
                 return data;
             }
         }
 
         return nullptr;
     }
 
-    bool find(const std::string& key, std::vector<char>& result) {
+    bool find(const std::string& key, std::string& result) const {
         const char* begin = resolve_symbol("_binary_" + key + "_start");
         const char* end = resolve_symbol("_binary_" + key + "_end");
 
-        if (!begin || !end || begin > end) {
+        if (begin == nullptr || end == nullptr || begin > end) {
             return false;
         }
 
-        size_t length = end - begin;
-        result.resize(length);
-        std::copy(begin, end, result.data());
+        result = std::string(begin, end);
         return true;
     }
 
@@ -258,4 +256,4 @@ std::string ForwardLoader::load(const std::string& file_name) const {
     return parent_->load(file_name);
 }
 
-}  // namespace kernel_launcher
+}  // namespace kernel_launcher