Skip to content

[SYCL] Fix sycl-ls device indexing #4704

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
Oct 6, 2021
Merged

[SYCL] Fix sycl-ls device indexing #4704

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
17 changes: 9 additions & 8 deletions sycl/tools/sycl-ls/sycl-ls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

#include <cstdlib>
#include <iostream>
#include <map>
#include <stdlib.h>

using namespace cl::sycl;
Expand Down Expand Up @@ -116,18 +117,17 @@ int main(int argc, char **argv) {

const auto &Platforms = platform::get_platforms();

// For each backend, device num starts at zero.
std::vector<uint32_t> DeviceNums(static_cast<int>(backend::all), 0);
// Keep track of the number of devices per backend
std::map<backend, size_t> DeviceNums;

for (const auto &Platform : Platforms) {
backend Backend = Platform.get_backend();
auto PlatformName = Platform.get_info<info::platform::name>();
const auto &Devices = Platform.get_devices();
for (const auto &Device : Devices) {
uint32_t DeviceNum = DeviceNums[(int)Backend]++;
std::cout << "[" << Backend << ":" << getDeviceTypeName(Device) << ":"
<< DeviceNum << "] ";
++DeviceNum;
<< DeviceNums[Backend] << "] ";
++DeviceNums[Backend];
// Verbose parameter is set to false to print regular devices output first
printDeviceInfo(Device, false, PlatformName);
}
Expand All @@ -136,6 +136,7 @@ int main(int argc, char **argv) {
if (verbose) {
std::cout << "\nPlatforms: " << Platforms.size() << std::endl;
uint32_t PlatformNum = 0;
DeviceNums.clear();
for (const auto &Platform : Platforms) {
backend Backend = Platform.get_backend();
++PlatformNum;
Expand All @@ -150,9 +151,9 @@ int main(int argc, char **argv) {
const auto &Devices = Platform.get_devices();
std::cout << " Devices : " << Devices.size() << std::endl;
for (const auto &Device : Devices) {
uint32_t DeviceNum = DeviceNums[(int)Backend]++;
std::cout << " Device [#" << DeviceNum << "]:" << std::endl;
++DeviceNum;
std::cout << " Device [#" << DeviceNums[Backend]
<< "]:" << std::endl;
++DeviceNums[Backend];
printDeviceInfo(Device, true, " ");
}
}
Expand Down