Skip to content

[SYCL][NFC] Refactor addSYCLDefaultTriple #20938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bader merged 4 commits into from
Dec 19, 2025
Merged

[SYCL][NFC] Refactor addSYCLDefaultTriple #20938

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
894dff0
[SYCL][NFC] Refactor addSYCLDefaultTriple
bader Dec 18, 2025
c828f21
Simplify "early exit" conditions for existing triples.
bader Dec 18, 2025
ab5553c
Add default SYCL triple to the end of the SYCL triples vector.
bader Dec 19, 2025
75c6eb0
Align code with the comment.
bader Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 15 additions & 17 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
#include "llvm/Support/raw_ostream.h"
#include "llvm/TargetParser/Host.h"
#include "llvm/TargetParser/RISCVISAInfo.h"
#include <cassert>
#include <cstdlib> // ::getenv
#include <map>
#include <memory>
Expand Down Expand Up @@ -1179,29 +1180,25 @@ llvm::Triple Driver::getSYCLDeviceTriple(StringRef TargetArch,
return llvm::Triple(TargetArch);
}

/// Returns true if a triple is added to SYCLTriples, false otherwise
static bool addSYCLDefaultTriple(Compilation &C,
SmallVectorImpl<llvm::Triple> &SYCLTriples) {
/// Returns true if a triple is added to SYCLTriples, false otherwise
if (!C.getDriver().isSYCLDefaultTripleImplied())
return false;
if (C.getInputArgs().hasArg(options::OPT_fsycl_force_target_EQ))
return false;
llvm::Triple DefaultTriple =
C.getDriver().getSYCLDeviceTriple(getDefaultSYCLArch(C));
for (const auto &SYCLTriple : SYCLTriples) {
if (SYCLTriple == DefaultTriple)
return false;
// If we encounter a known non-spir* target, do not add the default triple.
if (SYCLTriple.isNVPTX() || SYCLTriple.isAMDGCN())
return false;
}
// Check current set of triples to see if the default has already been set.
for (const auto &SYCLTriple : SYCLTriples) {
// Check current set of triples to see if the default (i.e. spir64) has
// already been set.
if (SYCLTriple.getSubArch() == llvm::Triple::NoSubArch &&
SYCLTriple.isSPIROrSPIRV())
return false;
// If we encounter a known non-spir* target, do not add the default triple.
if (!SYCLTriple.isSPIROrSPIRV())
return false;
}
SYCLTriples.insert(SYCLTriples.begin(), DefaultTriple);
SYCLTriples.push_back(
C.getDriver().getSYCLDeviceTriple(getDefaultSYCLArch(C)));
return true;
}

Expand Down Expand Up @@ -1504,9 +1501,10 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
Triples.push_back(T);
}
if (addSYCLDefaultTriple(C, Triples)) {
llvm::Triple TT =
llvm::Triple(getSYCLDeviceTriple(getDefaultSYCLArch(C)));
auto &TC = getOffloadToolChain(C.getInputArgs(), Action::OFK_SYCL, TT,
assert(!Triples.empty() &&
"addSYCLDefaultTriple should add at least one triple");
auto &TC = getOffloadToolChain(C.getInputArgs(), Action::OFK_SYCL,
Triples.back(),
C.getDefaultToolChain().getTriple());
C.addOffloadDeviceToolChain(&TC, Action::OFK_SYCL);
}
Expand Down Expand Up @@ -6322,8 +6320,8 @@ class OffloadingActionBuilder final {
if (addSYCLDefaultTriple(C, SYCLTripleList)) {
// If a SYCLDefaultTriple is added to SYCLTripleList,
// add new target to SYCLTargetInfoList
llvm::Triple TT = SYCLTripleList.front();
auto TCIt = llvm::find_if(
llvm::Triple TT = SYCLTripleList.back();
const auto *TCIt = llvm::find_if(
ToolChains, [&](auto &TC) { return TT == TC->getTriple(); });
SYCLTargetInfoList.emplace_back(*TCIt, nullptr);
}
Expand Down
Loading