Skip to content

[SYCL] Check that the preferred/chosen GPU RT is Level-Zero #2677

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 3 commits into from
Oct 26, 2020
Merged

[SYCL] Check that the preferred/chosen GPU RT is Level-Zero #2677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1a594f
[SYCL] Check that the preferred/chosen GPU backend is Level-Zero
smaslov-intel Oct 23, 2020
a0aefe5
[SYCL] clang format
smaslov-intel Oct 23, 2020
326ed81
[SYCL] address comment
smaslov-intel Oct 23, 2020
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
8 changes: 4 additions & 4 deletions sycl/test/plugins/sycl-ls-gpu-default.cpp
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// REQUIRES: gpu, level_zero
// REQUIRES: gpu

// RUN: sycl-ls --verbose >%t.default.out
// RUN: env --unset=SYCL_BE sycl-ls --verbose >%t.default.out
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out

// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : 1.0
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : 1.0
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}Level-Zero
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}Level-Zero

//==-- sycl-ls-gpu-default.cpp - SYCL test for default selected gpu device -==//
//
Expand Down
15 changes: 15 additions & 0 deletions sycl/test/plugins/sycl-ls-gpu-level-zero.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// REQUIRES: gpu, level_zero

// RUN: sycl-ls --verbose >%t.default.out
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out

// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}Level-Zero
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}Level-Zero

//==-- sycl-ls-gpu-level-zero.cpp - Test Level-Zero selected gpu device ----==//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
6 changes: 3 additions & 3 deletions sycl/test/plugins/sycl-ls-gpu-opencl.cpp
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// RUN: env SYCL_BE=PI_OPENCL sycl-ls --verbose >%t.opencl.out
// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.opencl.out

// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{[0-9]\.[0-9]}}
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{[0-9]\.[0-9]}}
// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}OpenCL
// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}OpenCL

//==-- sycl-ls-gpu-opencl.cpp - SYCL test for discovered/selected devices -===//
//==-- sycl-ls-gpu-opencl.cpp - SYCL test for selected OpenCL GPU device --===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
Expand Down
7 changes: 5 additions & 2 deletions sycl/tools/sycl-ls/sycl-ls.cpp
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,11 @@ static void printDeviceInfo(const device &Device, const std::string &Prepend) {
std::cout << Prepend << "Vendor : " << DeviceVendor << std::endl;
std::cout << Prepend << "Driver : " << DeviceDriverVersion << std::endl;
} else {
std::cout << Prepend << DeviceTypeName << ": " << DeviceVersion << "[ "
<< DeviceDriverVersion << " ]" << std::endl;
auto DevicePlatform = Device.get_info<info::device::platform>();
auto DevicePlatformName = DevicePlatform.get_info<info::platform::name>();
std::cout << Prepend << DeviceTypeName << ": " << DevicePlatformName << " "
<< DeviceVersion << " [" << DeviceDriverVersion << "]"
<< std::endl;
}
}

Expand Down