Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

[SYCL] Updated tests to comply with SYCL 2020 aspect list #1685

Merged
merged 4 commits into from
Mar 27, 2023
Merged

[SYCL] Updated tests to comply with SYCL 2020 aspect list #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43c8a7c
Cleaned up test to eliminate removed aspect
Feb 15, 2023
89a82a8
Removed or replaced remove/deprecated aspects in tests
Mar 21, 2023
1d514ef
Fixed issue causes by unwarranted change from host to cpu aspect
Mar 24, 2023
2825443
Formatting fixes
Mar 24, 2023
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: 1 addition & 16 deletions SYCL/Basic/aspects.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@ int main() {
int pltIdx = 0;
for (const auto &plt : platform::get_platforms()) {
pltIdx++;
if (plt.has(aspect::host)) {
std::cout << "Platform #" << pltIdx
<< " type: Host supports:" << std::endl;
} else if (plt.has(aspect::cpu)) {
if (plt.has(aspect::cpu)) {
std::cout << "Platform #" << pltIdx
<< " type: CPU supports:" << std::endl;
} else if (plt.has(aspect::gpu)) {
Expand Down Expand Up @@ -57,12 +54,6 @@ int main() {
if (plt.has(aspect::ext_oneapi_bfloat16_math_functions)) {
std::cout << " ext_oneapi_bfloat16_math_functions" << std::endl;
}
if (plt.has(aspect::int64_base_atomics)) {
std::cout << " base atomic operations" << std::endl;
}
if (plt.has(aspect::int64_extended_atomics)) {
std::cout << " extended atomic operations" << std::endl;
}
if (plt.has(aspect::atomic64)) {
std::cout << " atomic64" << std::endl;
}
Expand Down Expand Up @@ -93,12 +84,6 @@ int main() {
if (plt.has(aspect::usm_atomic_shared_allocations)) {
std::cout << " USM atomic shared allocations" << std::endl;
}
if (plt.has(aspect::usm_restricted_shared_allocations)) {
std::cout << " USM restricted shared allocations" << std::endl;
}
if (plt.has(aspect::usm_system_allocator)) {
std::cout << " USM system allocator" << std::endl;
}
if (plt.has(aspect::usm_system_allocations)) {
std::cout << " USM system allocations" << std::endl;
}
Expand Down
10 changes: 4 additions & 6 deletions SYCL/Basic/diagnostics/non-uniform-wk-gp-test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,10 @@ int test() {
int main() {
int pltCount = 0, ret = 0;
for (const auto &plt : platform::get_platforms()) {
if (!plt.has(aspect::host)) {
std::cout << "Platform #" << pltCount++ << ":" << std::endl;
if (plt.get_backend() == backend::ext_oneapi_level_zero) {
std::cout << "Backend: Level Zero" << std::endl;
ret += test();
}
std::cout << "Platform #" << pltCount++ << ":" << std::endl;
if (plt.get_backend() == backend::ext_oneapi_level_zero) {
std::cout << "Backend: Level Zero" << std::endl;
ret += test();
}
std::cout << std::endl;
}
Expand Down
237 changes: 115 additions & 122 deletions SYCL/Basic/intel-ext-device.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,136 +35,129 @@ int main(int argc, char **argv) {

int pltCount = 1;
for (const auto &plt : platform::get_platforms()) {
if (!plt.has(aspect::host)) {
int devCount = 1;
int totalEUs = 0;
int numSlices = 0;
int numSubslices = 0;
int numEUsPerSubslice = 0;
int numHWThreadsPerEU = 0;
for (const auto &dev : plt.get_devices()) {
std::cout << "Platform #" << pltCount++ << ":" << std::endl;
if (dev.has(aspect::gpu)) {
auto name = dev.get_info<info::device::name>();
std::cout << "Device #" << devCount++ << ": "
<< dev.get_info<info::device::name>() << ":" << std::endl;

std::cout << "Backend: ";
if (plt.get_backend() == backend::ext_oneapi_level_zero) {
std::cout << "Level Zero" << std::endl;
} else if (plt.get_backend() == backend::opencl) {
std::cout << "OpenCL" << std::endl;
} else if (plt.get_backend() == backend::ext_oneapi_cuda) {
std::cout << "CUDA" << std::endl;
} else {
std::cout << "Unknown" << std::endl;
}
int devCount = 1;
int totalEUs = 0;
int numSlices = 0;
int numSubslices = 0;
int numEUsPerSubslice = 0;
int numHWThreadsPerEU = 0;
for (const auto &dev : plt.get_devices()) {
std::cout << "Platform #" << pltCount++ << ":" << std::endl;
if (dev.has(aspect::gpu)) {
auto name = dev.get_info<info::device::name>();
std::cout << "Device #" << devCount++ << ": "
<< dev.get_info<info::device::name>() << ":" << std::endl;

std::cout << "Backend: ";
if (plt.get_backend() == backend::ext_oneapi_level_zero) {
std::cout << "Level Zero" << std::endl;
} else if (plt.get_backend() == backend::opencl) {
std::cout << "OpenCL" << std::endl;
} else if (plt.get_backend() == backend::ext_oneapi_cuda) {
std::cout << "CUDA" << std::endl;
} else {
std::cout << "Unknown" << std::endl;
}

// Use Feature Test macro to see if extensions are supported.
if (SYCL_EXT_INTEL_DEVICE_INFO >= 1) {
// Use Feature Test macro to see if extensions are supported.
if (SYCL_EXT_INTEL_DEVICE_INFO >= 1) {

if (dev.has(aspect::ext_intel_pci_address)) {
std::cout << "PCI address = "
<< dev.get_info<ext::intel::info::device::pci_address>()
<< std::endl;
}
if (dev.has(aspect::ext_intel_gpu_eu_count)) {
totalEUs = dev.get_info<ext::intel::info::device::gpu_eu_count>();
std::cout << "Number of EUs = " << totalEUs << std::endl;
}
if (dev.has(aspect::ext_intel_gpu_eu_simd_width)) {
int w =
dev.get_info<ext::intel::info::device::gpu_eu_simd_width>();
std::cout << "EU SIMD width = " << w << std::endl;
}
if (dev.has(aspect::ext_intel_gpu_slices)) {
numSlices = dev.get_info<ext::intel::info::device::gpu_slices>();
std::cout << "Number of slices = " << numSlices << std::endl;
}
if (dev.has(aspect::ext_intel_gpu_subslices_per_slice)) {
numSubslices = dev.get_info<
ext::intel::info::device::gpu_subslices_per_slice>();
std::cout << "Number of subslices per slice = " << numSubslices
<< std::endl;
}
if (dev.has(aspect::ext_intel_gpu_eu_count_per_subslice)) {
numEUsPerSubslice = dev.get_info<
ext::intel::info::device::gpu_eu_count_per_subslice>();
std::cout << "Number of EUs per subslice = " << numEUsPerSubslice
<< std::endl;
}
if (SYCL_EXT_INTEL_DEVICE_INFO >= 3 &&
dev.has(aspect::ext_intel_gpu_hw_threads_per_eu)) {
numHWThreadsPerEU = dev.get_info<
ext::intel::info::device::gpu_hw_threads_per_eu>();
std::cout << "Number of HW threads per EU = " << numHWThreadsPerEU
<< std::endl;
}
if (dev.has(aspect::ext_intel_max_mem_bandwidth)) {
// not supported yet
long m =
dev.get_info<ext::intel::info::device::max_mem_bandwidth>();
std::cout << "Maximum memory bandwidth = " << m << std::endl;
}
// This is the only data we can verify.
if (totalEUs != numSlices * numSubslices * numEUsPerSubslice) {
std::cout << "Error: EU Count is incorrect!" << std::endl;
std::cout << "Failed!" << std::endl;
return 1;
}
if (SYCL_EXT_INTEL_DEVICE_INFO >= 2 &&
dev.has(aspect::ext_intel_device_info_uuid)) {
auto UUID = dev.get_info<ext::intel::info::device::uuid>();
std::cout << "Device UUID = ";
for (int i = 0; i < 16; i++) {
std::cout << std::to_string(UUID[i]);
}
std::cout << "\n";
}
if (SYCL_EXT_INTEL_DEVICE_INFO >= 5 &&
dev.has(aspect::ext_intel_device_id)) {
int deviceID =
dev.get_info<ext::intel::info::device::device_id>();
std::cout << "Device ID = " << deviceID << std::endl;
if (dev.has(aspect::ext_intel_pci_address)) {
std::cout << "PCI address = "
<< dev.get_info<ext::intel::info::device::pci_address>()
<< std::endl;
}
if (dev.has(aspect::ext_intel_gpu_eu_count)) {
totalEUs = dev.get_info<ext::intel::info::device::gpu_eu_count>();
std::cout << "Number of EUs = " << totalEUs << std::endl;
}
if (dev.has(aspect::ext_intel_gpu_eu_simd_width)) {
int w = dev.get_info<ext::intel::info::device::gpu_eu_simd_width>();
std::cout << "EU SIMD width = " << w << std::endl;
}
if (dev.has(aspect::ext_intel_gpu_slices)) {
numSlices = dev.get_info<ext::intel::info::device::gpu_slices>();
std::cout << "Number of slices = " << numSlices << std::endl;
}
if (dev.has(aspect::ext_intel_gpu_subslices_per_slice)) {
numSubslices = dev.get_info<
ext::intel::info::device::gpu_subslices_per_slice>();
std::cout << "Number of subslices per slice = " << numSubslices
<< std::endl;
}
if (dev.has(aspect::ext_intel_gpu_eu_count_per_subslice)) {
numEUsPerSubslice = dev.get_info<
ext::intel::info::device::gpu_eu_count_per_subslice>();
std::cout << "Number of EUs per subslice = " << numEUsPerSubslice
<< std::endl;
}
if (SYCL_EXT_INTEL_DEVICE_INFO >= 3 &&
dev.has(aspect::ext_intel_gpu_hw_threads_per_eu)) {
numHWThreadsPerEU =
dev.get_info<ext::intel::info::device::gpu_hw_threads_per_eu>();
std::cout << "Number of HW threads per EU = " << numHWThreadsPerEU
<< std::endl;
}
if (dev.has(aspect::ext_intel_max_mem_bandwidth)) {
// not supported yet
long m =
dev.get_info<ext::intel::info::device::max_mem_bandwidth>();
std::cout << "Maximum memory bandwidth = " << m << std::endl;
}
// This is the only data we can verify.
if (totalEUs != numSlices * numSubslices * numEUsPerSubslice) {
std::cout << "Error: EU Count is incorrect!" << std::endl;
std::cout << "Failed!" << std::endl;
return 1;
}
if (SYCL_EXT_INTEL_DEVICE_INFO >= 2 &&
dev.has(aspect::ext_intel_device_info_uuid)) {
auto UUID = dev.get_info<ext::intel::info::device::uuid>();
std::cout << "Device UUID = ";
for (int i = 0; i < 16; i++) {
std::cout << std::to_string(UUID[i]);
}
} // SYCL_EXT_INTEL_DEVICE_INFO
}
std::cout << "\n";
}
if (SYCL_EXT_INTEL_DEVICE_INFO >= 5 &&
dev.has(aspect::ext_intel_device_id)) {
int deviceID = dev.get_info<ext::intel::info::device::device_id>();
std::cout << "Device ID = " << deviceID << std::endl;
}
} // SYCL_EXT_INTEL_DEVICE_INFO
}

// Check if this experimental feature is supported
#ifdef SYCL_EXT_ONEAPI_MAX_WORK_GROUP_QUERY
sycl::id<1> groupD =
dev.get_info<sycl::ext::oneapi::experimental::info::device::
max_work_groups<1>>();
std::cout << "Max work group size in 1D \n";
std::cout << "Dimension 1:" << groupD[0] << std::endl;

sycl::id<2> group2D =
dev.get_info<sycl::ext::oneapi::experimental::info::device::
max_work_groups<2>>();
std::cout << "Max work group size in 2D \n";
std::cout << "Dimension 1:" << group2D[0] << "\n"
<< "Dimension 2:" << group2D[1] << std::endl;

sycl::id<3> group3D =
dev.get_info<sycl::ext::oneapi::experimental::info::device::
max_work_groups<3>>();
std::cout << "Max work group size in 3D \n";
std::cout << "Dimension 1:" << group3D[0] << "\n"
<< "Dimension 2:" << group3D[1] << "\n"
<< "Dimension 3:" << group3D[2] << std::endl;

size_t group_max = dev.get_info<sycl::ext::oneapi::experimental::info::
device::max_global_work_groups>();
std::cout << "Max global work group size:" << group_max << "\n";

assert((group3D[0] <= group_max && group3D[1] <= group_max &&
group3D[2] <= group_max) &&
"Max work-group size of each dimension must be smaller than "
"global work-group size");
sycl::id<1> groupD = dev.get_info<
sycl::ext::oneapi::experimental::info::device::max_work_groups<1>>();
std::cout << "Max work group size in 1D \n";
std::cout << "Dimension 1:" << groupD[0] << std::endl;

sycl::id<2> group2D = dev.get_info<
sycl::ext::oneapi::experimental::info::device::max_work_groups<2>>();
std::cout << "Max work group size in 2D \n";
std::cout << "Dimension 1:" << group2D[0] << "\n"
<< "Dimension 2:" << group2D[1] << std::endl;

sycl::id<3> group3D = dev.get_info<
sycl::ext::oneapi::experimental::info::device::max_work_groups<3>>();
std::cout << "Max work group size in 3D \n";
std::cout << "Dimension 1:" << group3D[0] << "\n"
<< "Dimension 2:" << group3D[1] << "\n"
<< "Dimension 3:" << group3D[2] << std::endl;

size_t group_max = dev.get_info<sycl::ext::oneapi::experimental::info::
device::max_global_work_groups>();
std::cout << "Max global work group size:" << group_max << "\n";

assert((group3D[0] <= group_max && group3D[1] <= group_max &&
group3D[2] <= group_max) &&
"Max work-group size of each dimension must be smaller than "
"global work-group size");
#endif

std::cout << std::endl;
}
std::cout << std::endl;
}
}
std::cout << "Passed!" << std::endl;
Expand Down
Loading