Skip to content

Commit f680bb8

Browse files
author
iclsrc
committed
Merge from 'sycl' to 'sycl-web'
2 parents f030004 + 60d62b0 commit f680bb8

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* @bader
1+
* @pvchupin
22

33
# Front-end compiler
44
clang/ @intel/dpcpp-cfe-reviewers
@@ -48,7 +48,7 @@ xptifw/ @intel/llvm-reviewers-runtime
4848
llvm/ @intel/dpcpp-tools-reviewers
4949

5050
# Clang offload tools
51-
clang/tools/clang-offload-*/ @sndmitriev @intel/dpcpp-tools-reviewers
51+
clang/tools/clang-offload-*/ @intel/dpcpp-tools-reviewers
5252

5353
# Explicit SIMD
5454
ESIMD/ @intel/dpcpp-esimd-reviewers

buildbot/dependency.conf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ ocl_cpu_rt_ver=2022.13.3.0.16
44
# https://github.com/intel/llvm/releases/download/2022-WW13/win-oclcpuexp-2022.13.3.0.16_rel.zip
55
ocl_cpu_rt_ver_win=2022.13.3.0.16
66
# Same GPU driver supports Level Zero and OpenCL
7-
# https://github.com/intel/compute-runtime/releases/tag/22.10.22597
8-
ocl_gpu_rt_ver=22.10.22597
7+
# https://github.com/intel/compute-runtime/releases/tag/22.15.22905
8+
ocl_gpu_rt_ver=22.15.22905
99
# Same GPU driver supports Level Zero and OpenCL
1010
# https://downloadmirror.intel.com/723911/igfx_win_101.1404.zip
1111
ocl_gpu_rt_ver_win=101.1404
@@ -31,7 +31,7 @@ ocloc_ver_win=101.1404
3131
[DRIVER VERSIONS]
3232
cpu_driver_lin=2022.13.3.0.16
3333
cpu_driver_win=2022.13.3.0.16
34-
gpu_driver_lin=22.10.22597
34+
gpu_driver_lin=22.15.22905
3535
gpu_driver_win=101.1404
3636
fpga_driver_lin=2022.13.3.0.16
3737
fpga_driver_win=2022.13.3.0.16

sycl/plugins/level_zero/pi_level_zero.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2838,12 +2838,14 @@ pi_result piDeviceGetInfo(pi_device Device, pi_device_info ParamName,
28382838
}
28392839
ZesStruct<zes_pci_properties_t> ZeDevicePciProperties;
28402840
ZE_CALL(zesDevicePciGetProperties, (ZeDevice, &ZeDevicePciProperties));
2841-
std::stringstream ss;
2842-
ss << ZeDevicePciProperties.address.domain << ":"
2843-
<< ZeDevicePciProperties.address.bus << ":"
2844-
<< ZeDevicePciProperties.address.device << "."
2845-
<< ZeDevicePciProperties.address.function;
2846-
return ReturnValue(ss.str().c_str());
2841+
constexpr size_t AddressBufferSize = 13;
2842+
char AddressBuffer[AddressBufferSize];
2843+
std::snprintf(AddressBuffer, AddressBufferSize, "%04x:%02x:%02x.%01x",
2844+
ZeDevicePciProperties.address.domain,
2845+
ZeDevicePciProperties.address.bus,
2846+
ZeDevicePciProperties.address.device,
2847+
ZeDevicePciProperties.address.function);
2848+
return ReturnValue(AddressBuffer);
28472849
}
28482850
case PI_DEVICE_INFO_GPU_EU_COUNT: {
28492851
pi_uint32 count = Device->ZeDeviceProperties->numEUsPerSubslice *

sycl/source/detail/device_impl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,8 @@ bool device_impl::has(aspect Aspect) const {
315315
return get_info<info::device::usm_system_allocations>();
316316
case aspect::ext_intel_pci_address:
317317
return getPlugin().call_nocheck<detail::PiApiKind::piDeviceGetInfo>(
318-
MDevice, PI_DEVICE_INFO_PCI_ADDRESS, sizeof(pi_device_type),
319-
&device_type, &return_size) == PI_SUCCESS;
318+
MDevice, PI_DEVICE_INFO_PCI_ADDRESS, 0, nullptr, &return_size) ==
319+
PI_SUCCESS;
320320
case aspect::ext_intel_gpu_eu_count:
321321
return getPlugin().call_nocheck<detail::PiApiKind::piDeviceGetInfo>(
322322
MDevice, PI_DEVICE_INFO_GPU_EU_COUNT, sizeof(pi_device_type),

0 commit comments

Comments
 (0)