Skip to content

update sycldevice warning #21

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
merged 1 commit into from
Aug 2, 2021
Merged

update sycldevice warning #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 10 additions & 13 deletions clang/lib/Driver/Driver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,18 +909,7 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
if (SYCLTargetsValues) {
if (SYCLTargetsValues->getNumValues()) {
for (StringRef Val : SYCLTargetsValues->getValues()) {
SmallString<64> Target = Val;
constexpr StringRef SyclDeviceTripleSuffix = "-sycldevice";
if (Val.endswith(SyclDeviceTripleSuffix)) {
Diag(clang::diag::warn_drv_sycldevice_in_environment_deprecated) <<
Val;

Target = StringRef(Val.begin(),
Val.size() - SyclDeviceTripleSuffix.size());
Target += StringRef("-unknown");
}

llvm::Triple TT(MakeSYCLDeviceTriple(Target));
llvm::Triple TT(MakeSYCLDeviceTriple(Val));
if (!isValidSYCLTriple(TT)) {
Diag(clang::diag::err_drv_invalid_sycl_target) << Val;
continue;
Expand All @@ -935,9 +924,17 @@ void Driver::CreateOffloadingDeviceToolChains(Compilation &C,
continue;
}

// Warn about deprated `sycldevice` environment component
if (TT.getEnvironmentName() == "sycldevice") {
Diag(clang::diag::warn_drv_sycl_deprecated_triple_component)
<< TT.getEnvironmentName();
TT.setEnvironment(
llvm::Triple::EnvironmentType::UnknownEnvironment);
}

// Store the current triple so that we can check for duplicates in
// the following iterations.
FoundNormalizedTriples[NormalizedName] = Target;
FoundNormalizedTriples[NormalizedName] = Val;
UniqueSYCLTriplesVec.push_back(TT);
}
} else
Expand Down
4 changes: 2 additions & 2 deletions clang/test/Driver/sycl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
// DISABLED-NOT: "-sycl-std={{.*}}"
// DISABLED-NOT: "-fsycl-std-layout-kernel-params"

// RUN: %clangxx -fsycl -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 | FileCheck %s --check-prefix=CHECK_WARNING
// CHECK_WARNING: Usage of spir64-unknown-unknown-sycldevice option is deprecated, please don't specify sycldevice environment.
// RUN: %clangxx -fsycl -fsycl-targets=spir64-unknown-unknown-sycldevice -c %s 2>&1 | FileCheck %s --check-prefix=CHECK_WARNING
// CHECK_WARNING: The SYCL offloading target triple 'sycldevice' component is deprecated - will be ignored.

// RUN: %clang -### -fsycl-device-only -c %s 2>&1 | FileCheck %s --check-prefix=DEFAULT
// RUN: %clang -### -fsycl-device-only %s 2>&1 | FileCheck %s --check-prefix=DEFAULT
Expand Down