Skip to content

Commit a27547d

Browse files
bmyatesbmyates
committed
[SYCL][UR] Update UR loader version
Signed-off-by: Brandon Yates <brandon.yates@intel.com>
1 parent 3d6917f commit a27547d

File tree

4 files changed

+22
-27
lines changed

4 files changed

+22
-27
lines changed

‎sycl/plugins/unified_runtime/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if (NOT DEFINED UNIFIED_RUNTIME_LIBRARY OR NOT DEFINED UNIFIED_RUNTIME_INCLUDE_D
44
include(FetchContent)
55

66
set(UNIFIED_RUNTIME_REPO "https://github.com/oneapi-src/unified-runtime.git")
7-
set(UNIFIED_RUNTIME_TAG d6af758779db6eebdc419fd5e249302f566eb5de)
7+
set(UNIFIED_RUNTIME_TAG 7d22f806c45872dd6326a123915fe3c75be25b0e)
88

99
message(STATUS "Will fetch Unified Runtime from ${UNIFIED_RUNTIME_REPO}")
1010
FetchContent_Declare(unified-runtime

‎sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_level_zero.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -662,25 +662,25 @@ ur_result_t urDeviceGetInfo(
662662
ze_device_fp_flags_t ZeSingleFPCapabilities =
663663
Device->ZeDeviceModuleProperties->fp32flags;
664664
if (ZE_DEVICE_FP_FLAG_DENORM & ZeSingleFPCapabilities) {
665-
SingleFPValue |= UR_FP_CAPABILITY_FLAG_DENORM;
665+
SingleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_DENORM;
666666
}
667667
if (ZE_DEVICE_FP_FLAG_INF_NAN & ZeSingleFPCapabilities) {
668-
SingleFPValue |= UR_FP_CAPABILITY_FLAG_INF_NAN;
668+
SingleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_INF_NAN;
669669
}
670670
if (ZE_DEVICE_FP_FLAG_ROUND_TO_NEAREST & ZeSingleFPCapabilities) {
671-
SingleFPValue |= UR_FP_CAPABILITY_FLAG_ROUND_TO_NEAREST;
671+
SingleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_ROUND_TO_NEAREST;
672672
}
673673
if (ZE_DEVICE_FP_FLAG_ROUND_TO_ZERO & ZeSingleFPCapabilities) {
674-
SingleFPValue |= UR_FP_CAPABILITY_FLAG_ROUND_TO_ZERO;
674+
SingleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_ROUND_TO_ZERO;
675675
}
676676
if (ZE_DEVICE_FP_FLAG_ROUND_TO_INF & ZeSingleFPCapabilities) {
677-
SingleFPValue |= UR_FP_CAPABILITY_FLAG_ROUND_TO_INF;
677+
SingleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_ROUND_TO_INF;
678678
}
679679
if (ZE_DEVICE_FP_FLAG_FMA & ZeSingleFPCapabilities) {
680-
SingleFPValue |= UR_FP_CAPABILITY_FLAG_FMA;
680+
SingleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_FMA;
681681
}
682682
if (ZE_DEVICE_FP_FLAG_ROUNDED_DIVIDE_SQRT & ZeSingleFPCapabilities) {
683-
SingleFPValue |= UR_FP_CAPABILITY_FLAG_CORRECTLY_ROUNDED_DIVIDE_SQRT;
683+
SingleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_CORRECTLY_ROUNDED_DIVIDE_SQRT;
684684
}
685685
return ReturnValue(uint64_t{SingleFPValue});
686686
}
@@ -689,25 +689,25 @@ ur_result_t urDeviceGetInfo(
689689
ze_device_fp_flags_t ZeHalfFPCapabilities =
690690
Device->ZeDeviceModuleProperties->fp16flags;
691691
if (ZE_DEVICE_FP_FLAG_DENORM & ZeHalfFPCapabilities) {
692-
HalfFPValue |= UR_FP_CAPABILITY_FLAG_DENORM;
692+
HalfFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_DENORM;
693693
}
694694
if (ZE_DEVICE_FP_FLAG_INF_NAN & ZeHalfFPCapabilities) {
695-
HalfFPValue |= UR_FP_CAPABILITY_FLAG_INF_NAN;
695+
HalfFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_INF_NAN;
696696
}
697697
if (ZE_DEVICE_FP_FLAG_ROUND_TO_NEAREST & ZeHalfFPCapabilities) {
698-
HalfFPValue |= UR_FP_CAPABILITY_FLAG_ROUND_TO_NEAREST;
698+
HalfFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_ROUND_TO_NEAREST;
699699
}
700700
if (ZE_DEVICE_FP_FLAG_ROUND_TO_ZERO & ZeHalfFPCapabilities) {
701-
HalfFPValue |= UR_FP_CAPABILITY_FLAG_ROUND_TO_ZERO;
701+
HalfFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_ROUND_TO_ZERO;
702702
}
703703
if (ZE_DEVICE_FP_FLAG_ROUND_TO_INF & ZeHalfFPCapabilities) {
704-
HalfFPValue |= UR_FP_CAPABILITY_FLAG_ROUND_TO_INF;
704+
HalfFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_ROUND_TO_INF;
705705
}
706706
if (ZE_DEVICE_FP_FLAG_FMA & ZeHalfFPCapabilities) {
707-
HalfFPValue |= UR_FP_CAPABILITY_FLAG_FMA;
707+
HalfFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_FMA;
708708
}
709709
if (ZE_DEVICE_FP_FLAG_ROUNDED_DIVIDE_SQRT & ZeHalfFPCapabilities) {
710-
HalfFPValue |= UR_FP_CAPABILITY_FLAG_CORRECTLY_ROUNDED_DIVIDE_SQRT;
710+
HalfFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_CORRECTLY_ROUNDED_DIVIDE_SQRT;
711711
}
712712
return ReturnValue(uint64_t{HalfFPValue});
713713
}
@@ -716,25 +716,25 @@ ur_result_t urDeviceGetInfo(
716716
ze_device_fp_flags_t ZeDoubleFPCapabilities =
717717
Device->ZeDeviceModuleProperties->fp64flags;
718718
if (ZE_DEVICE_FP_FLAG_DENORM & ZeDoubleFPCapabilities) {
719-
DoubleFPValue |= UR_FP_CAPABILITY_FLAG_DENORM;
719+
DoubleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_DENORM;
720720
}
721721
if (ZE_DEVICE_FP_FLAG_INF_NAN & ZeDoubleFPCapabilities) {
722-
DoubleFPValue |= UR_FP_CAPABILITY_FLAG_INF_NAN;
722+
DoubleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_INF_NAN;
723723
}
724724
if (ZE_DEVICE_FP_FLAG_ROUND_TO_NEAREST & ZeDoubleFPCapabilities) {
725-
DoubleFPValue |= UR_FP_CAPABILITY_FLAG_ROUND_TO_NEAREST;
725+
DoubleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_ROUND_TO_NEAREST;
726726
}
727727
if (ZE_DEVICE_FP_FLAG_ROUND_TO_ZERO & ZeDoubleFPCapabilities) {
728-
DoubleFPValue |= UR_FP_CAPABILITY_FLAG_ROUND_TO_ZERO;
728+
DoubleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_ROUND_TO_ZERO;
729729
}
730730
if (ZE_DEVICE_FP_FLAG_ROUND_TO_INF & ZeDoubleFPCapabilities) {
731-
DoubleFPValue |= UR_FP_CAPABILITY_FLAG_ROUND_TO_INF;
731+
DoubleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_ROUND_TO_INF;
732732
}
733733
if (ZE_DEVICE_FP_FLAG_FMA & ZeDoubleFPCapabilities) {
734-
DoubleFPValue |= UR_FP_CAPABILITY_FLAG_FMA;
734+
DoubleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_FMA;
735735
}
736736
if (ZE_DEVICE_FP_FLAG_ROUNDED_DIVIDE_SQRT & ZeDoubleFPCapabilities) {
737-
DoubleFPValue |= UR_FP_CAPABILITY_FLAG_CORRECTLY_ROUNDED_DIVIDE_SQRT;
737+
DoubleFPValue |= UR_DEVICE_FP_CAPABILITY_FLAG_CORRECTLY_ROUNDED_DIVIDE_SQRT;
738738
}
739739
return ReturnValue(uint64_t{DoubleFPValue});
740740
}

‎sycl/plugins/unified_runtime/ur/adapters/level_zero/ur_loader_interface.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetEnqueueProcAddrTable(
8686
pDdiTable->pfnMemUnmap = nullptr;
8787
pDdiTable->pfnUSMMemcpy = nullptr;
8888
pDdiTable->pfnUSMPrefetch = nullptr;
89-
pDdiTable->pfnUSMMemAdvise = nullptr;
9089
pDdiTable->pfnUSMFill2D = nullptr;
9190
pDdiTable->pfnUSMMemcpy2D = nullptr;
9291
pDdiTable->pfnDeviceGlobalVariableWrite = nullptr;

‎sycl/plugins/unified_runtime/ur/ur.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ const int UR_EXT_DEVICE_INFO_FREE_MEMORY = UR_EXT_DEVICE_INFO_END - 13;
4343
// const int ZER_EXT_DEVICE_INFO_DEVICE_ID = UR_EXT_DEVICE_INFO_END - 14;
4444
// const int ZER_EXT_DEVICE_INFO_IMAGE_MAX_ARRAY_SIZE =
4545
// UR_DEVICE_INFO_IMAGE_MAX_ARRAY_SIZE;
46-
const int UR_DEVICE_INFO_ATOMIC_FENCE_ORDER_CAPABILITIES =
47-
UR_EXT_DEVICE_INFO_END - 16;
48-
const int UR_DEVICE_INFO_ATOMIC_FENCE_SCOPE_CAPABILITIES =
49-
UR_EXT_DEVICE_INFO_END - 17;
5046

5147
const ur_device_info_t UR_EXT_DEVICE_INFO_OPENCL_C_VERSION =
5248
(ur_device_info_t)0x103D;

0 commit comments

Comments
 (0)