[SYCL][NewOffload][NFC] Add SYCLPostLink library component.

clang/tools/clang-linker-wrapper/CMakeLists.txt

@@ -17,6 +17,7 @@ set(LLVM_LINK_COMPONENTS
   LTO
   FrontendOffloading
   SYCLLowerIR
+  SYCLPostLink
   )
 
 set(LLVM_TARGET_DEFINITIONS LinkerWrapperOpts.td)

clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp

@@ -42,7 +42,7 @@
 #include "llvm/Option/Option.h"
 #include "llvm/Passes/PassPlugin.h"
 #include "llvm/Remarks/HotnessThresholdParser.h"
-#include "llvm/SYCLLowerIR/ModuleSplitter.h"
+#include "llvm/SYCLPostLink/ModuleSplitter.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Errc.h"
 #include "llvm/Support/FileOutputBuffer.h"

llvm/include/llvm/SYCLLowerIR/ComputeModuleRuntimeInfo.h → llvm/include/llvm/SYCLPostLink/ComputeModuleRuntimeInfo.h

@@ -11,7 +11,6 @@
 #pragma once
 
 #include "llvm/ADT/SetVector.h"
-#include "llvm/SYCLLowerIR/ModuleSplitter.h"
 #include "llvm/SYCLLowerIR/SYCLDeviceLibReqMask.h"
 #include "llvm/Support/PropertySetIO.h"
 #include <string>

llvm/include/llvm/SYCLLowerIR/ModuleSplitter.h → llvm/include/llvm/SYCLPostLink/ModuleSplitter.h

@@ -13,11 +13,10 @@
 #ifndef LLVM_SYCLLOWERIR_MODULE_SPLITTER_H
 #define LLVM_SYCLLOWERIR_MODULE_SPLITTER_H
 
-#include "SYCLDeviceRequirements.h"
-
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/Function.h"
+#include "llvm/SYCLLowerIR/SYCLDeviceRequirements.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/PropertySetIO.h"
 

llvm/lib/CMakeLists.txt

@@ -41,6 +41,7 @@ add_subdirectory(ProfileData)
 add_subdirectory(Passes)
 add_subdirectory(SYCLLowerIR)
 add_subdirectory(SYCLNativeCPUUtils)
+add_subdirectory(SYCLPostLink)
 add_subdirectory(TargetParser)
 add_subdirectory(TextAPI)
 add_subdirectory(Telemetry)

llvm/lib/SYCLLowerIR/CMakeLists.txt

@@ -47,15 +47,13 @@ add_llvm_component_library(LLVMSYCLLowerIR
   RecordSYCLAspectNames.cpp
   CleanupSYCLMetadata.cpp
   CompileTimePropertiesPass.cpp
-  ComputeModuleRuntimeInfo.cpp
   DeviceGlobals.cpp
   ESIMD/LowerESIMDVLoadVStore.cpp
   ESIMD/LowerESIMDSlmReservation.cpp
   HostPipes.cpp
   LowerInvokeSimd.cpp
   LowerWGLocalMemory.cpp
   LowerWGScope.cpp
-  ModuleSplitter.cpp
   MutatePrintfAddrspace.cpp
   SpecConstants.cpp
   SYCLAddOptLevelAttribute.cpp

llvm/lib/SYCLLowerIR/SYCLDeviceRequirements.cpp

@@ -12,7 +12,6 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Module.h"
-#include "llvm/SYCLLowerIR/ModuleSplitter.h"
 #include "llvm/Support/PropertySetIO.h"
 
 #include <set>

llvm/lib/SYCLPostLink/CMakeLists.txt

@@ -0,0 +1,27 @@
+add_llvm_component_library(LLVMSYCLPostLink
+  ComputeModuleRuntimeInfo.cpp
+  ModuleSplitter.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/SYCLPostLink
+
+  DEPENDS
+  intrinsics_gen
+  LLVMDemangle
+  LLVMTransformUtils
+
+  LINK_LIBS
+  LLVMDemangle
+  LLVMTargetParser
+  LLVMTransformUtils
+
+  LINK_COMPONENTS
+  Analysis
+  BitWriter
+  Core
+  Demangle
+  IRPrinter
+  Passes
+  Support
+  ipo
+  )

llvm/lib/SYCLLowerIR/ComputeModuleRuntimeInfo.cpp → llvm/lib/SYCLPostLink/ComputeModuleRuntimeInfo.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 // See comments in the header.
 //===----------------------------------------------------------------------===//
-#include "llvm/SYCLLowerIR/ComputeModuleRuntimeInfo.h"
+#include "llvm/SYCLPostLink/ComputeModuleRuntimeInfo.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringSet.h"
@@ -17,11 +17,11 @@
 #include "llvm/SYCLLowerIR/DeviceGlobals.h"
 #include "llvm/SYCLLowerIR/HostPipes.h"
 #include "llvm/SYCLLowerIR/LowerWGLocalMemory.h"
-#include "llvm/SYCLLowerIR/ModuleSplitter.h"
 #include "llvm/SYCLLowerIR/SYCLDeviceLibReqMask.h"
 #include "llvm/SYCLLowerIR/SYCLKernelParamOptInfo.h"
 #include "llvm/SYCLLowerIR/SYCLUtils.h"
 #include "llvm/SYCLLowerIR/SpecConstants.h"
+#include "llvm/SYCLPostLink/ModuleSplitter.h"
 #include <queue>
 #include <unordered_set>
 #ifndef NDEBUG

llvm/lib/SYCLLowerIR/ModuleSplitter.cpp → llvm/lib/SYCLPostLink/ModuleSplitter.cpp

@@ -8,7 +8,7 @@
 // See comments in the header.
 //===----------------------------------------------------------------------===//
 
-#include "llvm/SYCLLowerIR/ModuleSplitter.h"
+#include "llvm/SYCLPostLink/ModuleSplitter.h"
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/StringExtras.h"
@@ -24,7 +24,6 @@
 #include "llvm/IR/PassManagerImpl.h"
 #include "llvm/IRPrinter/IRPrintingPasses.h"
 #include "llvm/SYCLLowerIR/CleanupSYCLMetadata.h"
-#include "llvm/SYCLLowerIR/ComputeModuleRuntimeInfo.h"
 #include "llvm/SYCLLowerIR/DeviceGlobals.h"
 #include "llvm/SYCLLowerIR/ESIMD/LowerESIMD.h"
 #include "llvm/SYCLLowerIR/LowerInvokeSimd.h"
@@ -33,6 +32,7 @@
 #include "llvm/SYCLLowerIR/SYCLUtils.h"
 #include "llvm/SYCLLowerIR/SanitizerKernelMetadata.h"
 #include "llvm/SYCLLowerIR/SpecConstants.h"
+#include "llvm/SYCLPostLink/ComputeModuleRuntimeInfo.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/FileSystem.h"

llvm/tools/sycl-module-split/CMakeLists.txt

@@ -2,7 +2,7 @@ set(LLVM_LINK_COMPONENTS
   Core
   IRReader
   Support
-  SYCLLowerIR
+  SYCLPostLink
   )
 
 add_llvm_tool(sycl-module-split

llvm/tools/sycl-module-split/sycl-module-split.cpp

@@ -13,7 +13,7 @@
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
 #include "llvm/IRReader/IRReader.h"
-#include "llvm/SYCLLowerIR/ModuleSplitter.h"
+#include "llvm/SYCLPostLink/ModuleSplitter.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/PropertySetIO.h"

llvm/tools/sycl-post-link/CMakeLists.txt

@@ -8,6 +8,7 @@ set(LLVM_LINK_COMPONENTS
   TargetParser
   TransformUtils
   SYCLLowerIR
+  SYCLPostLink
   InstCombine
   ScalarOpts
   Linker

llvm/tools/sycl-post-link/sycl-post-link.cpp

@@ -30,16 +30,17 @@
 #include "llvm/Linker/Linker.h"
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/SYCLLowerIR/CompileTimePropertiesPass.h"
-#include "llvm/SYCLLowerIR/ComputeModuleRuntimeInfo.h"
 #include "llvm/SYCLLowerIR/DeviceConfigFile.hpp"
 #include "llvm/SYCLLowerIR/ESIMD/ESIMDUtils.h"
 #include "llvm/SYCLLowerIR/ESIMD/LowerESIMD.h"
 #include "llvm/SYCLLowerIR/HostPipes.h"
 #include "llvm/SYCLLowerIR/LowerInvokeSimd.h"
-#include "llvm/SYCLLowerIR/ModuleSplitter.h"
+#include "llvm/SYCLLowerIR/SYCLJointMatrixTransform.h"
 #include "llvm/SYCLLowerIR/SYCLUtils.h"
 #include "llvm/SYCLLowerIR/SpecConstants.h"
 #include "llvm/SYCLLowerIR/Support.h"
+#include "llvm/SYCLPostLink/ComputeModuleRuntimeInfo.h"
+#include "llvm/SYCLPostLink/ModuleSplitter.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/InitLLVM.h"

sycl-jit/jit-compiler/CMakeLists.txt

@@ -34,6 +34,7 @@ add_llvm_library(sycl-jit
    TargetParser
    MC
    SYCLLowerIR
+   SYCLPostLink
    GenXIntrinsics
    ${LLVM_TARGETS_TO_BUILD}
 

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

@@ -29,11 +29,11 @@
 #include <llvm/IR/PassManager.h>
 #include <llvm/IRReader/IRReader.h>
 #include <llvm/Linker/Linker.h>
-#include <llvm/SYCLLowerIR/ComputeModuleRuntimeInfo.h>
 #include <llvm/SYCLLowerIR/ESIMD/LowerESIMD.h>
 #include <llvm/SYCLLowerIR/LowerInvokeSimd.h>
-#include <llvm/SYCLLowerIR/ModuleSplitter.h>
 #include <llvm/SYCLLowerIR/SYCLJointMatrixTransform.h>
+#include <llvm/SYCLPostLink/ComputeModuleRuntimeInfo.h>
+#include <llvm/SYCLPostLink/ModuleSplitter.h>
 #include <llvm/Support/BLAKE3.h>
 #include <llvm/Support/Base64.h>
 #include <llvm/Support/PropertySetIO.h>

sycl-jit/jit-compiler/lib/rtc/ESIMD.h

@@ -9,7 +9,7 @@
 #ifndef SYCL_JIT_COMPILER_RTC_ESIMD_H
 #define SYCL_JIT_COMPILER_RTC_ESIMD_H
 
-#include "llvm/SYCLLowerIR/ModuleSplitter.h"
+#include "llvm/SYCLPostLink/ModuleSplitter.h"
 
 namespace jit_compiler {