Another attempt at CMake

Author: aelovikov-intel

sycl-jit/jit-compiler/CMakeLists.txt

@@ -1,8 +1,7 @@
 get_host_tool_path( clang CLANG clang_exe clang_target )
 
 set(SYCL_JIT_RESOURCE_CPP "${CMAKE_CURRENT_BINARY_DIR}/resource.cpp")
-# NOTE: has to have a name different from the "default" object target:
-set(SYCL_JIT_RESOURCE_OBJ "${CMAKE_CURRENT_BINARY_DIR}/resource.cpp.custom.o")
+set(SYCL_JIT_RESOURCE_OBJ "${CMAKE_CURRENT_BINARY_DIR}/resource.cpp.o")
 
 add_custom_command(
   OUTPUT ${SYCL_JIT_RESOURCE_CPP}
@@ -16,10 +15,22 @@ add_custom_command(
 # We use C23/C++26's `#embed` to implement this resource creation, and "current"
 # CMAKE_CXX_COMPILER might not have support for it. As such, use freshly built
 # `clang++` instead.
+set(SYCL_JIT_RESOURCE_CXX_FLAGS -O2 -Wno-c23-extensions)
+if (LLVM_ENABLE_PIC)
+list(APPEND SYCL_JIT_RESOURCE_CXX_FLAGS -fPIC)
+endif()
+
+if (NOT WIN32)
+list(APPEND SYCL_JIT_RESOURCE_CXX_FLAGS -fvisibility=hidden)
+endif()
+
 add_custom_command(
   OUTPUT ${SYCL_JIT_RESOURCE_OBJ}
-  COMMAND ${clang_exe} ${SYCL_JIT_RESOURCE_CPP} -c -o ${SYCL_JIT_RESOURCE_OBJ} -O2 -Wno-c23-extensions -fPIC
-  DEPENDS ${SYCL_JIT_RESOURCE_CPP}
+  COMMAND
+  ${clang_exe} ${SYCL_JIT_RESOURCE_CPP} -I ${CMAKE_CURRENT_SOURCE_DIR}/include -c -o ${SYCL_JIT_RESOURCE_OBJ} ${SYCL_JIT_RESOURCE_CXX_FLAGS}
+  DEPENDS
+  ${SYCL_JIT_RESOURCE_CPP}
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/Resource.h
 )
 
 add_llvm_library(sycl-jit

sycl-jit/jit-compiler/include/Resource.h

@@ -0,0 +1,19 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include <string_view>
+#include <utility>
+
+namespace jit_compiler {
+// Defined in the auto-generated file:
+extern const std::pair<std::string_view, std::string_view> ToolchainFiles[];
+extern size_t NumToolchainFiles;
+extern std::string_view ToolchainPrefix;
+} // namespace jit_compiler

sycl-jit/jit-compiler/lib/rtc/DeviceCompilation.cpp

@@ -9,6 +9,7 @@
 #include "DeviceCompilation.h"
 #include "ESIMD.h"
 #include "JITBinaryInfo.h"
+#include "Resource.h"
 #include "translation/Translation.h"
 
 #include <clang/Basic/DiagnosticDriver.h>
@@ -51,13 +52,6 @@
 #include <array>
 #include <sstream>
 
-namespace jit_compiler {
-// Defined in the auto-generated file:
-extern const std::pair<std::string_view, std::string_view> ToolchainFiles[];
-extern size_t NumToolchainFiles;
-extern std::string_view ToolchainPrefix;
-} // namespace jit_compiler
-
 using namespace clang;
 using namespace clang::tooling;
 using namespace clang::driver;

sycl-jit/jit-compiler/utils/generate.py

@@ -25,11 +25,9 @@ def main():
     with open(args.output, "w") as out:
         out.write(
             """
-#include <utility>
-#include <string_view>
+#include <Resource.h>
 
 namespace jit_compiler {
-extern const std::pair<std::string_view, std::string_view> ToolchainFiles[];
 const std::pair<std::string_view, std::string_view> ToolchainFiles[] = {"""
         )
 
@@ -57,9 +55,7 @@ def process_dir(dir):
             f"""
 }};
 
-extern size_t NumToolchainFiles;
 size_t NumToolchainFiles = std::size(ToolchainFiles);
-extern std::string_view ToolchainPrefix;
 std::string_view ToolchainPrefix = "{args.prefix}";
 }} // namespace jit_compiler
 """