pulldown from Sycl on 20250704

clang/include/clang/Basic/Cuda.h

@@ -9,13 +9,10 @@
 #ifndef LLVM_CLANG_BASIC_CUDA_H
 #define LLVM_CLANG_BASIC_CUDA_H
 
-<<<<<<< HEAD
 #ifdef SYCLomatic_CUSTOMIZATION
 #include <string>
 #endif // SYCLomatic_CUSTOMIZATION
-=======
 #include "clang/Basic/OffloadArch.h"
->>>>>>> opensrc/sycl
 
 namespace llvm {
 class StringRef;

clang/include/clang/Basic/DiagnosticDriverKinds.td

@@ -129,12 +129,8 @@ def err_drv_no_sycl_libspirv : Error<
 def warn_flag_no_sycl_libspirv
     : Warning<"'-fno-sycl-libspirv' should not be used with target '%0'; "
               "libspirv is required for correct behavior">,
-<<<<<<< HEAD
-      InGroup<NoLibspirvHipCuda>;
-// SYCLomatic_CUSTOMIZATION begin
-=======
       InGroup<UnsafeLibspirvNotLinked>;
->>>>>>> opensrc/sycl
+// SYCLomatic_CUSTOMIZATION begin
 def err_drv_mix_cuda_hip : Error<
   "mixed CUDA and HIP migration is not supported">;
 // SYCLomatic_CUSTOMIZATION end

clang/lib/Driver/Driver.cpp

@@ -6000,57 +6000,10 @@ class OffloadingActionBuilder final {
       // For NVPTX and NativeCPU we need to also link libclc at the same stage
       // that we link all of the unbundled SYCL libdevice objects together.
       if (TC->getTriple().isNVPTX() || isNativeCPU) {
-<<<<<<< HEAD
-        std::string LibSpirvFile;
-        if (Args.hasArg(options::OPT_fsycl_libspirv_path_EQ)) {
-          auto ProvidedPath =
-              Args.getLastArgValue(options::OPT_fsycl_libspirv_path_EQ).str();
-          if (llvm::sys::fs::exists(ProvidedPath))
-#ifdef SYCLomatic_CUSTOMIZATION
-            LibSpirvFile = std::move(ProvidedPath);
-#else
-            LibSpirvFile = ProvidedPath;
-#endif
-        } else {
-          SmallVector<StringRef, 2> LibraryPaths;
-
-          // Expected path w/out install.
-          SmallString<256> WithoutInstallPath(C.getDriver().ResourceDir);
-          llvm::sys::path::append(WithoutInstallPath, Twine("../../clc"));
-          LibraryPaths.emplace_back(WithoutInstallPath.c_str());
-
-          // Expected path w/ install.
-          SmallString<256> WithInstallPath(C.getDriver().ResourceDir);
-          llvm::sys::path::append(WithInstallPath, Twine("../../../share/clc"));
-          LibraryPaths.emplace_back(WithInstallPath.c_str());
-
-          // Select remangled libclc variant
-          StringRef LibSpirvTargetNamePref =
-              TC->getAuxTriple()->isOSWindows()
-                  ? "remangled-l32-signed_char.libspirv-"
-                  : "remangled-l64-signed_char.libspirv-";
-
-          for (StringRef LibraryPath : LibraryPaths) {
-            SmallString<128> LibSpirvTargetFile(LibraryPath);
-            llvm::sys::path::append(LibSpirvTargetFile,
-                                    LibSpirvTargetNamePref +
-                                        TC->getTripleString() + ".bc");
-            if (llvm::sys::fs::exists(LibSpirvTargetFile) ||
-                Args.hasArg(options::OPT__HASH_HASH_HASH)) {
-              LibSpirvFile = std::string(LibSpirvTargetFile.str());
-              break;
-            }
-          }
-        }
-        if (!LibSpirvFile.empty()) {
-          Arg *LibClcInputArg = MakeInputArg(Args, C.getDriver().getOpts(),
-                                             Args.MakeArgString(LibSpirvFile));
-=======
         if (const char *LibSpirvFile = SYCLInstallation.findLibspirvPath(
                 TC->getTriple(), Args, *TC->getAuxTriple())) {
           Arg *LibClcInputArg =
               MakeInputArg(Args, C.getDriver().getOpts(), LibSpirvFile);
->>>>>>> opensrc/sycl
           auto *SYCLLibClcInputAction =
               C.MakeAction<InputAction>(*LibClcInputArg, types::TY_LLVM_BC);
           DeviceLinkObjects.push_back(SYCLLibClcInputAction);

clang/lib/Driver/ToolChains/Cuda.cpp

@@ -424,7 +424,6 @@ CudaInstallationDetector::CudaInstallationDetector(
       Candidates.emplace_back(D.SysRoot + "/usr/lib/cuda");
   }
 
-<<<<<<< HEAD
 #ifdef SYCLomatic_CUSTOMIZATION
   Args.hasArg(options::OPT_nogpulib);
   bool IsCudaHeaderFilesIncluded = false;
@@ -457,11 +456,8 @@ CudaInstallationDetector::CudaInstallationDetector(
     }
   }
 #else
-  bool NoCudaLib = Args.hasArg(options::OPT_nogpulib);
-=======
   bool NoCudaLib =
       !Args.hasFlag(options::OPT_offloadlib, options::OPT_no_offloadlib, true);
->>>>>>> opensrc/sycl
 
   for (const auto &Candidate : Candidates) {
     InstallPath = Candidate.Path;

clang/lib/Driver/ToolChains/Cuda.h

@@ -92,8 +92,7 @@ class CudaInstallationDetector {
   std::string getLibDeviceFile(StringRef Gpu) const {
     return LibDeviceMap.lookup(Gpu);
   }
-<<<<<<< HEAD
-  void WarnIfUnsupportedVersion();
+  void WarnIfUnsupportedVersion() const;
 
 #ifdef SYCLomatic_CUSTOMIZATION
 private:
@@ -102,9 +101,7 @@ class CudaInstallationDetector {
   bool FindTargetVersion(const std::string &Line, const std::string DefineStr,
                          const std::string VersionStr, std::string &Result);
 #endif // SYCLomatic_CUSTOMIZATION
-=======
-  void WarnIfUnsupportedVersion() const;
->>>>>>> opensrc/sycl
+
 };
 
 namespace tools {

clang/lib/Format/UnwrappedLineParser.cpp

@@ -215,16 +215,10 @@ UnwrappedLineParser::UnwrappedLineParser(
                        ? IG_Rejected
                        : IG_Inited),
       IncludeGuardToken(nullptr), FirstStartColumn(FirstStartColumn),
-<<<<<<< HEAD
 #ifdef SYCLomatic_CUSTOMIZATION
       SourceMgr(SourceMgr),
 #endif // SYCLomatic_CUSTOMIZATION
-      Macros(Style.Macros, SourceMgr, Style, Allocator, IdentTable) {
-  assert(IsCpp == LangOpts.CXXOperatorNames);
-}
-=======
       Macros(Style.Macros, SourceMgr, Style, Allocator, IdentTable) {}
->>>>>>> opensrc/sycl
 
 void UnwrappedLineParser::reset() {
   PPBranchLevel = -1;
@@ -1213,13 +1207,9 @@ void UnwrappedLineParser::parsePPDefine() {
     return;
   }
 
-<<<<<<< HEAD
 #ifdef SYCLomatic_CUSTOMIZATION
   bool MaybeIncludeGuard = false;
 #endif // SYCLomatic_CUSTOMIZATION
-=======
-  bool MaybeIncludeGuard = false;
->>>>>>> opensrc/sycl
   if (IncludeGuard == IG_IfNdefed &&
       IncludeGuardToken->TokenText == FormatTok->TokenText) {
     IncludeGuard = IG_Defined;
@@ -1230,13 +1220,9 @@ void UnwrappedLineParser::parsePPDefine() {
         break;
       }
     }
-<<<<<<< HEAD
 #ifdef SYCLomatic_CUSTOMIZATION
     MaybeIncludeGuard = IncludeGuard == IG_Defined;
 #endif // SYCLomatic_CUSTOMIZATION
-=======
-    MaybeIncludeGuard = IncludeGuard == IG_Defined;
->>>>>>> opensrc/sycl
   }
 
   // In the context of a define, even keywords should be treated as normal
@@ -1248,17 +1234,11 @@ void UnwrappedLineParser::parsePPDefine() {
   FormatTok->Tok.setIdentifierInfo(Keywords.kw_internal_ident_after_define);
   nextToken();
 
-<<<<<<< HEAD
 #ifdef SYCLomatic_CUSTOMIZATION
   // IncludeGuard can't have a non-empty macro definition.
   if (MaybeIncludeGuard && !eof())
     IncludeGuard = IG_Rejected;
 #endif // SYCLomatic_CUSTOMIZATION
-=======
-  // IncludeGuard can't have a non-empty macro definition.
-  if (MaybeIncludeGuard && !eof())
-    IncludeGuard = IG_Rejected;
->>>>>>> opensrc/sycl
 
   if (FormatTok->Tok.getKind() == tok::l_paren &&
       !FormatTok->hasWhitespaceBefore()) {

clang/lib/Sema/SemaDecl.cpp

@@ -461,14 +461,10 @@ ParsedType Sema::getTypeName(const IdentifierInfo &II, SourceLocation NameLoc,
     }
     Result.suppressDiagnostics();
     return nullptr;
-<<<<<<< HEAD
-  case LookupResult::NotFoundInCurrentInstantiation:
+  case LookupResultKind::NotFoundInCurrentInstantiation:
 #ifdef SYCLomatic_CUSTOMIZATION
     if (SS && AllowImplicitTypename == ImplicitTypenameContext::Yes) {
 #else
-=======
-  case LookupResultKind::NotFoundInCurrentInstantiation:
->>>>>>> opensrc/sycl
     if (AllowImplicitTypename == ImplicitTypenameContext::Yes) {
 #endif //SYCLomatic_CUSTOMIZATION
       QualType T = Context.getDependentNameType(ElaboratedTypeKeyword::None,

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

@@ -2086,18 +2086,8 @@ Decl *TemplateDeclInstantiator::VisitDecompositionDecl(DecompositionDecl *D) {
   if (!NewDD || NewDD->isInvalidDecl()) {
     for (auto *NewBD : NewBindings)
       NewBD->setInvalidDecl();
-<<<<<<< HEAD
-#ifdef SYCLomatic_CUSTOMIZATION
-  if (NewDD && OldResolvedPack) {
-#else
-  if (OldResolvedPack) {
-#endif
-    // Mark the holding vars (if any) in the pack as instantiated since
-    // they are created implicitly.
-=======
   } else if (OldBindingPack) {
     // Mark the bindings in the pack as instantiated.
->>>>>>> opensrc/sycl
     auto Bindings = NewDD->bindings();
     BindingDecl *NewBindingPack = *llvm::find_if(
         Bindings, [](BindingDecl *D) -> bool { return D->isParameterPack(); });

clang/lib/Tooling/Tooling.cpp

@@ -567,29 +567,21 @@ bool ToolInvocation::run() {
   for (const std::string &Str : CommandLine)
     Argv.push_back(Str.c_str());
   const char *const BinaryName = Argv[0];
-<<<<<<< HEAD
-  IntrusiveRefCntPtr<DiagnosticOptions> ParsedDiagOpts;
-=======
 
   // Parse diagnostic options from the driver command-line only if none were
   // explicitly set.
   std::unique_ptr<DiagnosticOptions> ParsedDiagOpts;
->>>>>>> opensrc/sycl
   DiagnosticOptions *DiagOpts = this->DiagOpts;
   if (!DiagOpts) {
     ParsedDiagOpts = CreateAndPopulateDiagOpts(Argv);
     DiagOpts = &*ParsedDiagOpts;
   }
-<<<<<<< HEAD
 #ifdef SYCLomatic_CUSTOMIZATION
   DiagnosticPrinter =new TextDiagnosticPrinter(DiagnosticsOS(), &*DiagOpts);
   DiagConsumer = DiagnosticPrinter;
 #endif // SYCLomatic_CUSTOMIZATION
   TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), DiagOpts);
-=======
 
-  TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), *DiagOpts);
->>>>>>> opensrc/sycl
   IntrusiveRefCntPtr<DiagnosticsEngine> Diagnostics =
       CompilerInstance::createDiagnostics(
           Files->getVirtualFileSystem(), *DiagOpts,

clang/test/CMakeLists.txt

@@ -97,16 +97,13 @@ list(APPEND CLANG_TEST_DEPS
   pattern-rewriter-binary
   )
 
-<<<<<<< HEAD
-=======
 if(CLANG_ENABLE_CIR)
   list(APPEND CLANG_TEST_DEPS
     cir-opt
     cir-translate
     )
 endif()
 
->>>>>>> opensrc/sycl
 if(CLANG_ENABLE_STATIC_ANALYZER)
   list(APPEND CLANG_TEST_DEPS
     clang-check

clang/tools/CMakeLists.txt

@@ -56,12 +56,9 @@ add_llvm_external_project(clang-tools-extra extra)
 # libclang may require clang-tidy in clang-tools-extra.
 add_clang_subdirectory(libclang)
 
-<<<<<<< HEAD
 add_clang_subdirectory(dpct)
 add_clang_subdirectory(pattern-rewriter)
 add_clang_subdirectory(scan-build-py)
 add_clang_subdirectory(amdgpu-arch)
 add_clang_subdirectory(nvptx-arch)
-=======
 add_clang_subdirectory(offload-arch)
->>>>>>> opensrc/sycl

llvm/docs/requirements-hashed.txt

@@ -139,13 +139,8 @@ imagesize==1.4.1 \
     --hash=sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a
     # via sphinx
 jinja2==3.1.6 \
-<<<<<<< HEAD
-    --hash=sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb \
-    --hash=sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb
-=======
     --hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \
     --hash=sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
->>>>>>> opensrc/sycl
     # via
     #   myst-parser
     #   sphinx
@@ -326,13 +321,10 @@ sphinx==8.1.3 \
     #   sphinx-automodapi
     #   sphinx-basic-ng
     #   sphinx-reredirects
-<<<<<<< HEAD
     #   sphinxcontrib-devhelp
     #   sphinxcontrib-htmlhelp
     #   sphinxcontrib-qthelp
     #   sphinxcontrib-serializinghtml
-=======
->>>>>>> opensrc/sycl
 sphinx-automodapi==0.20.0 \
     --hash=sha256:1d205d4f07c22b1024b270a0340b245b5f819bc4c625ca10db8c06e437cf5d5e \
     --hash=sha256:24cc97323f163aeefcefb9bdae9cd0a8ea7b699ece34feab116a2557a44949ac

llvm/include/llvm/Support/CommandLine.h

@@ -196,8 +196,7 @@ class OptionCategory {
 };
 
 // The general Option Category (used as default category).
-<<<<<<< HEAD
-OptionCategory &getGeneralCategory();
+LLVM_ABI OptionCategory &getGeneralCategory();
 #ifdef SYCLomatic_CUSTOMIZATION
 OptionCategory &getCtHelpCat();
 OptionCategory &getCtHelpCatBasic();
@@ -211,9 +210,6 @@ OptionCategory &getCtHelpCatHelpInfo();
 OptionCategory &getCtHelpCatInterceptBuild();
 OptionCategory &getCtExamplesCategory();
 #endif // SYCLomatic_CUSTOMIZATION
-=======
-LLVM_ABI OptionCategory &getGeneralCategory();
->>>>>>> opensrc/sycl
 
 //===----------------------------------------------------------------------===//
 //