Skip to content

Commit 1aa287e

Browse files
jiejanezhangjiejanezhang
committed
Fix conflicts
Fix conflicts
1 parent 58ca1ea commit 1aa287e

File tree

13 files changed

+5
-126
lines changed

13 files changed

+5
-126
lines changed

‎clang/include/clang/Basic/Cuda.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
#ifndef LLVM_CLANG_BASIC_CUDA_H
1010
#define LLVM_CLANG_BASIC_CUDA_H
1111

12-
<<<<<<< HEAD
1312
#ifdef SYCLomatic_CUSTOMIZATION
1413
#include <string>
1514
#endif // SYCLomatic_CUSTOMIZATION
16-
=======
1715
#include "clang/Basic/OffloadArch.h"
18-
>>>>>>> opensrc/sycl
1916

2017
namespace llvm {
2118
class StringRef;

‎clang/include/clang/Basic/DiagnosticDriverKinds.td

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,8 @@ def err_drv_no_sycl_libspirv : Error<
129129
def warn_flag_no_sycl_libspirv
130130
: Warning<"'-fno-sycl-libspirv' should not be used with target '%0'; "
131131
"libspirv is required for correct behavior">,
132-
<<<<<<< HEAD
133-
InGroup<NoLibspirvHipCuda>;
134-
// SYCLomatic_CUSTOMIZATION begin
135-
=======
136132
InGroup<UnsafeLibspirvNotLinked>;
137-
>>>>>>> opensrc/sycl
133+
// SYCLomatic_CUSTOMIZATION begin
138134
def err_drv_mix_cuda_hip : Error<
139135
"mixed CUDA and HIP migration is not supported">;
140136
// SYCLomatic_CUSTOMIZATION end

‎clang/lib/Driver/Driver.cpp

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6000,57 +6000,10 @@ class OffloadingActionBuilder final {
60006000
// For NVPTX and NativeCPU we need to also link libclc at the same stage
60016001
// that we link all of the unbundled SYCL libdevice objects together.
60026002
if (TC->getTriple().isNVPTX() || isNativeCPU) {
6003-
<<<<<<< HEAD
6004-
std::string LibSpirvFile;
6005-
if (Args.hasArg(options::OPT_fsycl_libspirv_path_EQ)) {
6006-
auto ProvidedPath =
6007-
Args.getLastArgValue(options::OPT_fsycl_libspirv_path_EQ).str();
6008-
if (llvm::sys::fs::exists(ProvidedPath))
6009-
#ifdef SYCLomatic_CUSTOMIZATION
6010-
LibSpirvFile = std::move(ProvidedPath);
6011-
#else
6012-
LibSpirvFile = ProvidedPath;
6013-
#endif
6014-
} else {
6015-
SmallVector<StringRef, 2> LibraryPaths;
6016-
6017-
// Expected path w/out install.
6018-
SmallString<256> WithoutInstallPath(C.getDriver().ResourceDir);
6019-
llvm::sys::path::append(WithoutInstallPath, Twine("../../clc"));
6020-
LibraryPaths.emplace_back(WithoutInstallPath.c_str());
6021-
6022-
// Expected path w/ install.
6023-
SmallString<256> WithInstallPath(C.getDriver().ResourceDir);
6024-
llvm::sys::path::append(WithInstallPath, Twine("../../../share/clc"));
6025-
LibraryPaths.emplace_back(WithInstallPath.c_str());
6026-
6027-
// Select remangled libclc variant
6028-
StringRef LibSpirvTargetNamePref =
6029-
TC->getAuxTriple()->isOSWindows()
6030-
? "remangled-l32-signed_char.libspirv-"
6031-
: "remangled-l64-signed_char.libspirv-";
6032-
6033-
for (StringRef LibraryPath : LibraryPaths) {
6034-
SmallString<128> LibSpirvTargetFile(LibraryPath);
6035-
llvm::sys::path::append(LibSpirvTargetFile,
6036-
LibSpirvTargetNamePref +
6037-
TC->getTripleString() + ".bc");
6038-
if (llvm::sys::fs::exists(LibSpirvTargetFile) ||
6039-
Args.hasArg(options::OPT__HASH_HASH_HASH)) {
6040-
LibSpirvFile = std::string(LibSpirvTargetFile.str());
6041-
break;
6042-
}
6043-
}
6044-
}
6045-
if (!LibSpirvFile.empty()) {
6046-
Arg *LibClcInputArg = MakeInputArg(Args, C.getDriver().getOpts(),
6047-
Args.MakeArgString(LibSpirvFile));
6048-
=======
60496003
if (const char *LibSpirvFile = SYCLInstallation.findLibspirvPath(
60506004
TC->getTriple(), Args, *TC->getAuxTriple())) {
60516005
Arg *LibClcInputArg =
60526006
MakeInputArg(Args, C.getDriver().getOpts(), LibSpirvFile);
6053-
>>>>>>> opensrc/sycl
60546007
auto *SYCLLibClcInputAction =
60556008
C.MakeAction<InputAction>(*LibClcInputArg, types::TY_LLVM_BC);
60566009
DeviceLinkObjects.push_back(SYCLLibClcInputAction);

‎clang/lib/Driver/ToolChains/Cuda.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@ CudaInstallationDetector::CudaInstallationDetector(
424424
Candidates.emplace_back(D.SysRoot + "/usr/lib/cuda");
425425
}
426426

427-
<<<<<<< HEAD
428427
#ifdef SYCLomatic_CUSTOMIZATION
429428
Args.hasArg(options::OPT_nogpulib);
430429
bool IsCudaHeaderFilesIncluded = false;
@@ -457,11 +456,8 @@ CudaInstallationDetector::CudaInstallationDetector(
457456
}
458457
}
459458
#else
460-
bool NoCudaLib = Args.hasArg(options::OPT_nogpulib);
461-
=======
462459
bool NoCudaLib =
463460
!Args.hasFlag(options::OPT_offloadlib, options::OPT_no_offloadlib, true);
464-
>>>>>>> opensrc/sycl
465461

466462
for (const auto &Candidate : Candidates) {
467463
InstallPath = Candidate.Path;

‎clang/lib/Driver/ToolChains/Cuda.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ class CudaInstallationDetector {
9292
std::string getLibDeviceFile(StringRef Gpu) const {
9393
return LibDeviceMap.lookup(Gpu);
9494
}
95-
<<<<<<< HEAD
96-
void WarnIfUnsupportedVersion();
95+
void WarnIfUnsupportedVersion() const;
9796

9897
#ifdef SYCLomatic_CUSTOMIZATION
9998
private:
@@ -102,9 +101,7 @@ class CudaInstallationDetector {
102101
bool FindTargetVersion(const std::string &Line, const std::string DefineStr,
103102
const std::string VersionStr, std::string &Result);
104103
#endif // SYCLomatic_CUSTOMIZATION
105-
=======
106-
void WarnIfUnsupportedVersion() const;
107-
>>>>>>> opensrc/sycl
104+
108105
};
109106

110107
namespace tools {

‎clang/lib/Format/UnwrappedLineParser.cpp

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -215,16 +215,10 @@ UnwrappedLineParser::UnwrappedLineParser(
215215
? IG_Rejected
216216
: IG_Inited),
217217
IncludeGuardToken(nullptr), FirstStartColumn(FirstStartColumn),
218-
<<<<<<< HEAD
219218
#ifdef SYCLomatic_CUSTOMIZATION
220219
SourceMgr(SourceMgr),
221220
#endif // SYCLomatic_CUSTOMIZATION
222-
Macros(Style.Macros, SourceMgr, Style, Allocator, IdentTable) {
223-
assert(IsCpp == LangOpts.CXXOperatorNames);
224-
}
225-
=======
226221
Macros(Style.Macros, SourceMgr, Style, Allocator, IdentTable) {}
227-
>>>>>>> opensrc/sycl
228222

229223
void UnwrappedLineParser::reset() {
230224
PPBranchLevel = -1;
@@ -1213,13 +1207,9 @@ void UnwrappedLineParser::parsePPDefine() {
12131207
return;
12141208
}
12151209

1216-
<<<<<<< HEAD
12171210
#ifdef SYCLomatic_CUSTOMIZATION
12181211
bool MaybeIncludeGuard = false;
12191212
#endif // SYCLomatic_CUSTOMIZATION
1220-
=======
1221-
bool MaybeIncludeGuard = false;
1222-
>>>>>>> opensrc/sycl
12231213
if (IncludeGuard == IG_IfNdefed &&
12241214
IncludeGuardToken->TokenText == FormatTok->TokenText) {
12251215
IncludeGuard = IG_Defined;
@@ -1230,13 +1220,9 @@ void UnwrappedLineParser::parsePPDefine() {
12301220
break;
12311221
}
12321222
}
1233-
<<<<<<< HEAD
12341223
#ifdef SYCLomatic_CUSTOMIZATION
12351224
MaybeIncludeGuard = IncludeGuard == IG_Defined;
12361225
#endif // SYCLomatic_CUSTOMIZATION
1237-
=======
1238-
MaybeIncludeGuard = IncludeGuard == IG_Defined;
1239-
>>>>>>> opensrc/sycl
12401226
}
12411227

12421228
// In the context of a define, even keywords should be treated as normal
@@ -1248,17 +1234,11 @@ void UnwrappedLineParser::parsePPDefine() {
12481234
FormatTok->Tok.setIdentifierInfo(Keywords.kw_internal_ident_after_define);
12491235
nextToken();
12501236

1251-
<<<<<<< HEAD
12521237
#ifdef SYCLomatic_CUSTOMIZATION
12531238
// IncludeGuard can't have a non-empty macro definition.
12541239
if (MaybeIncludeGuard && !eof())
12551240
IncludeGuard = IG_Rejected;
12561241
#endif // SYCLomatic_CUSTOMIZATION
1257-
=======
1258-
// IncludeGuard can't have a non-empty macro definition.
1259-
if (MaybeIncludeGuard && !eof())
1260-
IncludeGuard = IG_Rejected;
1261-
>>>>>>> opensrc/sycl
12621242

12631243
if (FormatTok->Tok.getKind() == tok::l_paren &&
12641244
!FormatTok->hasWhitespaceBefore()) {

‎clang/lib/Sema/SemaDecl.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -461,14 +461,10 @@ ParsedType Sema::getTypeName(const IdentifierInfo &II, SourceLocation NameLoc,
461461
}
462462
Result.suppressDiagnostics();
463463
return nullptr;
464-
<<<<<<< HEAD
465-
case LookupResult::NotFoundInCurrentInstantiation:
464+
case LookupResultKind::NotFoundInCurrentInstantiation:
466465
#ifdef SYCLomatic_CUSTOMIZATION
467466
if (SS && AllowImplicitTypename == ImplicitTypenameContext::Yes) {
468467
#else
469-
=======
470-
case LookupResultKind::NotFoundInCurrentInstantiation:
471-
>>>>>>> opensrc/sycl
472468
if (AllowImplicitTypename == ImplicitTypenameContext::Yes) {
473469
#endif //SYCLomatic_CUSTOMIZATION
474470
QualType T = Context.getDependentNameType(ElaboratedTypeKeyword::None,

‎clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2086,18 +2086,8 @@ Decl *TemplateDeclInstantiator::VisitDecompositionDecl(DecompositionDecl *D) {
20862086
if (!NewDD || NewDD->isInvalidDecl()) {
20872087
for (auto *NewBD : NewBindings)
20882088
NewBD->setInvalidDecl();
2089-
<<<<<<< HEAD
2090-
#ifdef SYCLomatic_CUSTOMIZATION
2091-
if (NewDD && OldResolvedPack) {
2092-
#else
2093-
if (OldResolvedPack) {
2094-
#endif
2095-
// Mark the holding vars (if any) in the pack as instantiated since
2096-
// they are created implicitly.
2097-
=======
20982089
} else if (OldBindingPack) {
20992090
// Mark the bindings in the pack as instantiated.
2100-
>>>>>>> opensrc/sycl
21012091
auto Bindings = NewDD->bindings();
21022092
BindingDecl *NewBindingPack = *llvm::find_if(
21032093
Bindings, [](BindingDecl *D) -> bool { return D->isParameterPack(); });

‎clang/lib/Tooling/Tooling.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -567,29 +567,21 @@ bool ToolInvocation::run() {
567567
for (const std::string &Str : CommandLine)
568568
Argv.push_back(Str.c_str());
569569
const char *const BinaryName = Argv[0];
570-
<<<<<<< HEAD
571-
IntrusiveRefCntPtr<DiagnosticOptions> ParsedDiagOpts;
572-
=======
573570

574571
// Parse diagnostic options from the driver command-line only if none were
575572
// explicitly set.
576573
std::unique_ptr<DiagnosticOptions> ParsedDiagOpts;
577-
>>>>>>> opensrc/sycl
578574
DiagnosticOptions *DiagOpts = this->DiagOpts;
579575
if (!DiagOpts) {
580576
ParsedDiagOpts = CreateAndPopulateDiagOpts(Argv);
581577
DiagOpts = &*ParsedDiagOpts;
582578
}
583-
<<<<<<< HEAD
584579
#ifdef SYCLomatic_CUSTOMIZATION
585580
DiagnosticPrinter =new TextDiagnosticPrinter(DiagnosticsOS(), &*DiagOpts);
586581
DiagConsumer = DiagnosticPrinter;
587582
#endif // SYCLomatic_CUSTOMIZATION
588583
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), DiagOpts);
589-
=======
590584

591-
TextDiagnosticPrinter DiagnosticPrinter(llvm::errs(), *DiagOpts);
592-
>>>>>>> opensrc/sycl
593585
IntrusiveRefCntPtr<DiagnosticsEngine> Diagnostics =
594586
CompilerInstance::createDiagnostics(
595587
Files->getVirtualFileSystem(), *DiagOpts,

‎clang/test/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,13 @@ list(APPEND CLANG_TEST_DEPS
9797
pattern-rewriter-binary
9898
)
9999

100-
<<<<<<< HEAD
101-
=======
102100
if(CLANG_ENABLE_CIR)
103101
list(APPEND CLANG_TEST_DEPS
104102
cir-opt
105103
cir-translate
106104
)
107105
endif()
108106

109-
>>>>>>> opensrc/sycl
110107
if(CLANG_ENABLE_STATIC_ANALYZER)
111108
list(APPEND CLANG_TEST_DEPS
112109
clang-check

‎clang/tools/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,9 @@ add_llvm_external_project(clang-tools-extra extra)
5656
# libclang may require clang-tidy in clang-tools-extra.
5757
add_clang_subdirectory(libclang)
5858

59-
<<<<<<< HEAD
6059
add_clang_subdirectory(dpct)
6160
add_clang_subdirectory(pattern-rewriter)
6261
add_clang_subdirectory(scan-build-py)
6362
add_clang_subdirectory(amdgpu-arch)
6463
add_clang_subdirectory(nvptx-arch)
65-
=======
6664
add_clang_subdirectory(offload-arch)
67-
>>>>>>> opensrc/sycl

‎llvm/docs/requirements-hashed.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,8 @@ imagesize==1.4.1 \
139139
--hash=sha256:69150444affb9cb0d5cc5a92b3676f0b2fb7cd9ae39e947a5e11a36b4497cd4a
140140
# via sphinx
141141
jinja2==3.1.6 \
142-
<<<<<<< HEAD
143-
--hash=sha256:8fefff8dc3034e27bb80d67c671eb8a9bc424c0ef4c0826edbff304cceff43bb \
144-
--hash=sha256:aba0f4dc9ed8013c424088f68a5c226f7d6097ed89b246d7749c2ec4175c6adb
145-
=======
146142
--hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \
147143
--hash=sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67
148-
>>>>>>> opensrc/sycl
149144
# via
150145
# myst-parser
151146
# sphinx
@@ -326,13 +321,10 @@ sphinx==8.1.3 \
326321
# sphinx-automodapi
327322
# sphinx-basic-ng
328323
# sphinx-reredirects
329-
<<<<<<< HEAD
330324
# sphinxcontrib-devhelp
331325
# sphinxcontrib-htmlhelp
332326
# sphinxcontrib-qthelp
333327
# sphinxcontrib-serializinghtml
334-
=======
335-
>>>>>>> opensrc/sycl
336328
sphinx-automodapi==0.20.0 \
337329
--hash=sha256:1d205d4f07c22b1024b270a0340b245b5f819bc4c625ca10db8c06e437cf5d5e \
338330
--hash=sha256:24cc97323f163aeefcefb9bdae9cd0a8ea7b699ece34feab116a2557a44949ac

‎llvm/include/llvm/Support/CommandLine.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ class OptionCategory {
196196
};
197197

198198
// The general Option Category (used as default category).
199-
<<<<<<< HEAD
200-
OptionCategory &getGeneralCategory();
199+
LLVM_ABI OptionCategory &getGeneralCategory();
201200
#ifdef SYCLomatic_CUSTOMIZATION
202201
OptionCategory &getCtHelpCat();
203202
OptionCategory &getCtHelpCatBasic();
@@ -211,9 +210,6 @@ OptionCategory &getCtHelpCatHelpInfo();
211210
OptionCategory &getCtHelpCatInterceptBuild();
212211
OptionCategory &getCtExamplesCategory();
213212
#endif // SYCLomatic_CUSTOMIZATION
214-
=======
215-
LLVM_ABI OptionCategory &getGeneralCategory();
216-
>>>>>>> opensrc/sycl
217213

218214
//===----------------------------------------------------------------------===//
219215
//

0 commit comments

Comments
 (0)