More polishing

Author: aelovikov-intel

sycl-jit/CMakeLists.txt

@@ -19,6 +19,7 @@ if (NOT WIN32 AND NOT CYGWIN)
   endif(SYCL_JIT_ENABLE_WERROR)
 endif()
 
+
 add_subdirectory(jit-compiler)
 add_subdirectory(passes)
 

sycl-jit/jit-compiler/CMakeLists.txt

@@ -13,16 +13,16 @@ add_custom_command(
   OUTPUT ${SYCL_JIT_RESOURCE_CPP}
   COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/generate.py --toolchain-dir ${CMAKE_BINARY_DIR} --output ${SYCL_JIT_RESOURCE_CPP} --prefix ${SYCL_JIT_VIRTUAL_TOOLCHAIN_ROOT}
   DEPENDS
-  sycl-headers
+  sycl-headers # include/sycl
+  libclc       # lib/clc
+  clang        # lib/clang
   # TODO: libdevice
   ${CMAKE_CURRENT_SOURCE_DIR}/utils/generate.py
 )
 
 # 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 -std=c++17)
-
 if (WIN32)
   set(clang_exe ${CMAKE_BINARY_DIR}/bin/clang-cl.exe)
   set(SYCL_JIT_RESOURCE_CXX_FLAGS /O2 /std:c++17 /W0)
@@ -43,8 +43,6 @@ add_custom_command(
   DEPENDS
   ${SYCL_JIT_RESOURCE_CPP}
   ${CMAKE_CURRENT_SOURCE_DIR}/include/Resource.h
-  clang
-  libclc
 )
 
 add_llvm_library(sycl-jit

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

@@ -52,8 +52,6 @@
 #include <array>
 #include <sstream>
 
-#include <iostream>
-
 using namespace clang;
 using namespace clang::tooling;
 using namespace clang::driver;
@@ -203,10 +201,6 @@ class SYCLToolchain {
                        FileManager *Files,
                        std::shared_ptr<PCHContainerOperations> PCHContainerOps,
                        DiagnosticConsumer *DiagConsumer) override {
-      for (auto &arg : Invocation->getCC1CommandLine())
-        std::cout << " " << arg;
-      std::cout << std::endl;
-
       // Create a compiler instance to handle the actual work.
       CompilerInstance Compiler(std::move(Invocation),
                                 std::move(PCHContainerOps));
@@ -320,11 +314,6 @@ createCommandLine(const InputArgList &UserArgList, BinaryFormat Format,
   DerivedArgList DAL{UserArgList};
   const auto &OptTable = getDriverOptTable();
   DAL.AddFlagArg(nullptr, OptTable.getOption(OPT_fsycl_device_only));
-  // TODO: Is this needed?
-  DAL.AddJoinedArg(nullptr, OptTable.getOption(OPT_resource_dir_EQ),
-                   (jit_compiler::ToolchainPrefix + "/lib/clang/" +
-                    Twine(CLANG_VERSION_MAJOR))
-                       .str());
   // User args may contain options not intended for the frontend, but we can't
   // claim them here to tell the driver they're used later. Hence, suppress the
   // unused argument warning.