Skip to content

Commit e44a496

Browse files
fix win build
Signed-off-by: Tikhomirova, Kseniya <[email protected]>
1 parent 95ea264 commit e44a496

File tree

3 files changed

+10
-25
lines changed

3 files changed

+10
-25
lines changed

sycl/source/accessor.cpp

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,12 @@ static void verifyAccessorProps(const property_list &Props) {
4141
return false;
4242
}
4343
};
44-
auto CheckPropertiesWithData = [](int PropertyKind) {
45-
#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)
46-
#define __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME) \
47-
case NS_QUALIFIER::PROP_NAME::getKind(): \
48-
return true;
49-
switch (PropertyKind) {
50-
#include <sycl/properties/runtime_accessor_properties.def>
51-
default:
52-
return false;
53-
}
54-
};
44+
// When new properties with data are added - please implement the second
45+
// function with props include.
46+
// Absence of any properties causes warning (+error) now.
47+
auto NoAllowedPropertiesCheck = [](int) { return false; };
5548
detail::PropertyValidator::checkPropsAndThrow(Props, CheckDataLessProperties,
56-
CheckPropertiesWithData);
49+
NoAllowedPropertiesCheck);
5750
}
5851

5952
AccessorBaseHost::AccessorBaseHost(id<3> Offset, range<3> AccessRange,

sycl/source/detail/reduction.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -191,19 +191,9 @@ __SYCL_EXPORT void verifyReductionProps(const property_list &Props) {
191191
return false;
192192
}
193193
};
194-
auto CheckPropertiesWithData = [](int PropertyKind) {
195-
#define __SYCL_DATA_LESS_PROP(NS_QUALIFIER, PROP_NAME, ENUM_VAL)
196-
#define __SYCL_MANUALLY_DEFINED_PROP(NS_QUALIFIER, PROP_NAME) \
197-
case NS_QUALIFIER::PROP_NAME::getKind(): \
198-
return true;
199-
switch (PropertyKind) {
200-
#include <sycl/properties/reduction_properties.def>
201-
default:
202-
return false;
203-
}
204-
};
194+
auto NoAllowedPropertiesCheck = [](int) { return false; };
205195
detail::PropertyValidator::checkPropsAndThrow(Props, CheckDataLessProperties,
206-
CheckPropertiesWithData);
196+
NoAllowedPropertiesCheck);
207197
}
208198

209199
} // namespace detail

sycl/test/abi/sycl_symbols_windows.dump

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4267,10 +4267,12 @@
42674267
?update@executable_command_graph@detail@experimental@oneapi@ext@_V1@sycl@@QEAAXAEBV?$vector@Vnode@experimental@oneapi@ext@_V1@sycl@@V?$allocator@Vnode@experimental@oneapi@ext@_V1@sycl@@@std@@@std@@@Z
42684268
?update@executable_command_graph@detail@experimental@oneapi@ext@_V1@sycl@@QEAAXAEBVnode@34567@@Z
42694269
?updateAccessor@dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@IEAAXPEBVAccessorBaseHost@267@@Z
4270-
?updateValue@dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@IEAAXPEBX_K@Z
42714270
?updateValue@dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@IEAAXPEBVraw_kernel_arg@34567@_K@Z
4271+
?updateValue@dynamic_parameter_base@detail@experimental@oneapi@ext@_V1@sycl@@IEAAXPEBX_K@Z
42724272
?use_kernel_bundle@handler@_V1@sycl@@QEAAXAEBV?$kernel_bundle@$01@23@@Z
42734273
?verifyDeviceHasProgressGuarantee@handler@_V1@sycl@@AEAAXW4forward_progress_guarantee@experimental@oneapi@ext@23@W4execution_scope@56723@1@Z
4274+
?verifyReductionProps@detail@_V1@sycl@@YAXAEBVproperty_list@23@@Z
4275+
?verifyUSMAllocatorProperties@_V1@sycl@@YAXAEBVproperty_list@12@@Z
42744276
?verifyUsedKernelBundleInternal@handler@_V1@sycl@@AEAAXVstring_view@detail@23@@Z
42754277
?wait@event@_V1@sycl@@QEAAXXZ
42764278
?wait@event@_V1@sycl@@SAXAEBV?$vector@Vevent@_V1@sycl@@V?$allocator@Vevent@_V1@sycl@@@std@@@std@@@Z

0 commit comments

Comments
 (0)