Merge branch 'sycl' into sycl-web

Author: jsji

.github/workflows/pr-code-format.yml

@@ -6,7 +6,7 @@ permissions:
 jobs:
   code_formatter:
     runs-on: ubuntu-latest
-    if: github.repository == 'llvm/llvm-project' || github.repository == 'intel/llvm'
+    if: (github.repository == 'llvm/llvm-project' || github.repository == 'intel/llvm') && !contains(github.event.pull_request.labels.*.name, 'disable-lint')
     steps:
       - name: Fetch LLVM sources
         uses: actions/checkout@v4

clang/lib/Driver/Driver.cpp

@@ -198,8 +198,8 @@ std::string Driver::GetResourcesPath(StringRef BinaryPath,
 Driver::Driver(StringRef ClangExecutable, StringRef TargetTriple,
                DiagnosticsEngine &Diags, std::string Title,
                IntrusiveRefCntPtr<llvm::vfs::FileSystem> VFS)
-    : Diags(Diags), VFS(std::move(VFS)), Mode(GCCMode),
-      SaveTemps(SaveTempsNone), DumpDeviceCode(false), BitcodeEmbed(EmbedNone),
+    : Diags(Diags), VFS(std::move(VFS)), DumpDeviceCode(false), Mode(GCCMode),
+      SaveTemps(SaveTempsNone), BitcodeEmbed(EmbedNone),
       Offload(OffloadHostDevice), CXX20HeaderType(HeaderMode_None),
       ModulesModeCXX20(false), LTOMode(LTOK_None), OffloadLTOMode(LTOK_None),
       ClangExecutable(ClangExecutable), SysRoot(DEFAULT_SYSROOT),

clang/lib/Driver/ToolChains/Clang.cpp

@@ -10283,7 +10283,8 @@ void SYCLPostLink::ConstructJob(Compilation &C, const JobAction &JA,
   // TODO: Try to extend this feature for non-Intel GPUs.
   if (!TCArgs.hasFlag(options::OPT_fno_sycl_remove_unused_external_funcs,
                       options::OPT_fsycl_remove_unused_external_funcs, false) &&
-      !T.isNVPTX() && !T.isAMDGPU())
+      !T.isNVPTX() && !T.isAMDGPU() &&
+      !isSYCLNativeCPU(getToolChain(), C.getDefaultToolChain()))
     addArgs(CmdArgs, TCArgs, {"-emit-only-kernels-as-entry-points"});
 
   // OPT_fsycl_device_code_split is not checked as it is an alias to

clang/test/Driver/sycl-native-cpu-fsycl.cpp

@@ -39,6 +39,7 @@
 
 //CHECK_INVO:{{.*}}clang{{.*}}-fsycl-is-device{{.*}}"-fsycl-is-native-cpu" "-D" "__SYCL_NATIVE_CPU__" 
 //CHECK_INVO:{{.*}}clang{{.*}}"-x" "ir"
+//CHECK_INVO-NOT:{{.*}}sycl-post-link{{.*}}-emit-only-kernels-as-entry-points
 //CHECK_INVO:{{.*}}clang{{.*}}"-fsycl-is-host"{{.*}}
 
 // checks that the device and host triple is correct in the generated actions when it is set explicitly

sycl-fusion/jit-compiler/CMakeLists.txt

@@ -1,11 +1,11 @@
 
 add_llvm_library(sycl-fusion
    lib/KernelFusion.cpp
-   lib/JITContext.cpp
    lib/translation/KernelTranslation.cpp
    lib/translation/SPIRVLLVMTranslation.cpp
    lib/fusion/FusionPipeline.cpp
    lib/fusion/FusionHelper.cpp
+   lib/fusion/JITContext.cpp
    lib/fusion/ModuleHelper.cpp
    lib/helper/ConfigHelper.cpp
 

sycl-fusion/jit-compiler/include/KernelFusion.h

@@ -9,7 +9,6 @@
 #ifndef SYCL_FUSION_JIT_COMPILER_KERNELFUSION_H
 #define SYCL_FUSION_JIT_COMPILER_KERNELFUSION_H
 
-#include "JITContext.h"
 #include "Kernel.h"
 #include "Options.h"
 #include "Parameter.h"
@@ -55,16 +54,14 @@ class FusionResult {
 class KernelFusion {
 
 public:
-  static FusionResult
-  fuseKernels(JITContext &JITCtx, Config &&JITConfig,
-              const std::vector<SYCLKernelInfo> &KernelInformation,
-              const std::vector<std::string> &KernelsToFuse,
-              const std::string &FusedKernelName,
-              jit_compiler::ParamIdentList &Identities,
-              BarrierFlags BarriersFlags,
-              const std::vector<jit_compiler::ParameterInternalization>
-                  &Internalization,
-              const std::vector<jit_compiler::JITConstant> &JITConstants);
+  static FusionResult fuseKernels(
+      Config &&JITConfig, const std::vector<SYCLKernelInfo> &KernelInformation,
+      const std::vector<std::string> &KernelsToFuse,
+      const std::string &FusedKernelName,
+      jit_compiler::ParamIdentList &Identities, BarrierFlags BarriersFlags,
+      const std::vector<jit_compiler::ParameterInternalization>
+          &Internalization,
+      const std::vector<jit_compiler::JITConstant> &JITConstants);
 };
 
 } // namespace jit_compiler

sycl-fusion/jit-compiler/lib/KernelFusion.cpp

@@ -72,8 +72,7 @@ static bool isTargetFormatSupported(BinaryFormat TargetFormat) {
 }
 
 FusionResult KernelFusion::fuseKernels(
-    JITContext &JITCtx, Config &&JITConfig,
-    const std::vector<SYCLKernelInfo> &KernelInformation,
+    Config &&JITConfig, const std::vector<SYCLKernelInfo> &KernelInformation,
     const std::vector<std::string> &KernelsToFuse,
     const std::string &FusedKernelName, ParamIdentList &Identities,
     BarrierFlags BarriersFlags,
@@ -103,6 +102,7 @@ FusionResult KernelFusion::fuseKernels(
         "Fusion output target format not supported by this build");
   }
 
+  auto &JITCtx = JITContext::getInstance();
   bool CachingEnabled = ConfigHelper::get<option::JITEnableCaching>();
   CacheKeyT CacheKey{TargetArch,
                      KernelsToFuse,

sycl-fusion/jit-compiler/include/Hashing.h renamed to sycl-fusion/jit-compiler/lib/fusion/Hashing.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SYCL_FUSION_JIT_COMPILER_HASHING_H
-#define SYCL_FUSION_JIT_COMPILER_HASHING_H
+#ifndef SYCL_FUSION_JIT_COMPILER_FUSION_HASHING_H
+#define SYCL_FUSION_JIT_COMPILER_FUSION_HASHING_H
 
 #include "Kernel.h"
 #include "Parameter.h"
@@ -57,4 +57,4 @@ template <typename... T> struct hash<tuple<T...>> {
 };
 } // namespace std
 
-#endif // SYCL_FUSION_JIT_COMPILER_HASHING_H
+#endif // SYCL_FUSION_JIT_COMPILER_FUSION_HASHING_H

sycl-fusion/jit-compiler/lib/JITContext.cpp renamed to sycl-fusion/jit-compiler/lib/fusion/JITContext.cpp

@@ -25,8 +25,6 @@ BinaryFormat KernelBinary::format() const { return Format; }
 
 JITContext::JITContext() : LLVMCtx{new llvm::LLVMContext}, Binaries{} {}
 
-JITContext::~JITContext() = default;
-
 llvm::LLVMContext *JITContext::getLLVMContext() { return LLVMCtx.get(); }
 
 std::optional<SYCLKernelInfo>

sycl-fusion/jit-compiler/include/JITContext.h renamed to sycl-fusion/jit-compiler/lib/fusion/JITContext.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SYCL_FUSION_JIT_COMPILER_JITCONTEXT_H
-#define SYCL_FUSION_JIT_COMPILER_JITCONTEXT_H
+#ifndef SYCL_FUSION_JIT_COMPILER_FUSION_JITCONTEXT_H
+#define SYCL_FUSION_JIT_COMPILER_FUSION_JITCONTEXT_H
 
 #include <memory>
 #include <mutex>
@@ -61,9 +61,10 @@ class KernelBinary {
 class JITContext {
 
 public:
-  JITContext();
-
-  ~JITContext();
+  static JITContext &getInstance() {
+    static JITContext Instance{};
+    return Instance;
+  }
 
   llvm::LLVMContext *getLLVMContext();
 
@@ -77,6 +78,13 @@ class JITContext {
   void addCacheEntry(CacheKeyT &Identifier, SYCLKernelInfo &Kernel);
 
 private:
+  JITContext();
+  ~JITContext() = default;
+  JITContext(const JITContext &) = delete;
+  JITContext(JITContext &&) = delete;
+  JITContext &operator=(const JITContext &) = delete;
+  JITContext &operator=(const JITContext &&) = delete;
+
   // FIXME: Change this to std::shared_mutex after switching to C++17.
   using MutexT = std::shared_timed_mutex;
 
@@ -96,4 +104,4 @@ class JITContext {
 };
 } // namespace jit_compiler
 
-#endif // SYCL_FUSION_JIT_COMPILER_JITCONTEXT_H
+#endif // SYCL_FUSION_JIT_COMPILER_FUSION_JITCONTEXT_H