Skip to content

Commit e4f79d9

Browse files
AlexeySachkovAlexeySachkov
committed
Merge remote-tracking branch 'origin/sycl' into private/asachkov/includes-cleanup
2 parents c4174c3 + 51d92a3 commit e4f79d9

File tree

20 files changed

+270
-315
lines changed

20 files changed

+270
-315
lines changed

‎clang/lib/Driver/ToolChains/SYCL.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1889,8 +1889,8 @@ void SYCLToolChain::AddImpliedTargetArgs(const llvm::Triple &Triple,
18891889
DeviceName = DevArg;
18901890
StringRef BackendOptName = SYCL::gen::getGenGRFFlag("auto");
18911891
if (IsGen)
1892-
PerDeviceArgs.push_back(
1893-
{DeviceName, Args.MakeArgString(BackendOptName)});
1892+
PerDeviceArgs.push_back({Args.MakeArgString(DeviceName),
1893+
Args.MakeArgString(BackendOptName)});
18941894
else if (IsJIT)
18951895
BeArgs.push_back(Args.MakeArgString(RegAllocModeOptName + DeviceName +
18961896
":" + BackendOptName));

‎sycl/cmake/modules/UnifiedRuntimeTag.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# commit 9a209aa5fe6f438b682b3a999b9ee505e202f9b7
2-
# Merge: 2eae687a 9339e374
1+
# commit cd92e72bbc4ebddef63c63c0f7e66a410f4b9552
2+
# Merge: 9a209aa5 b1222f08
33
# Author: Callum Fare <[email protected]>
4-
# Date: Tue Nov 12 11:47:03 2024 +0000
5-
# Merge pull request #2179 from Maetveis/wrap_icx_linker_flags
6-
# Wrap linker flags on Windows for IntelLLLVM
7-
set(UNIFIED_RUNTIME_TAG 9a209aa5fe6f438b682b3a999b9ee505e202f9b7)
4+
# Date: Wed Nov 13 09:57:16 2024 +0000
5+
# Merge pull request #2254 from PietroGhg/pietro/events_rr
6+
# [NATIVECPU] Implement events on Native CPU
7+
set(UNIFIED_RUNTIME_TAG cd92e72bbc4ebddef63c63c0f7e66a410f4b9552)

‎sycl/include/sycl/accessor.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <sycl/detail/owner_less_base.hpp> // for OwnerLessBase
2323
#include <sycl/detail/property_helper.hpp> // for PropWithDataKind
2424
#include <sycl/detail/property_list_base.hpp> // for PropertyListBase
25-
#include <sycl/detail/type_list.hpp> // for is_contained
2625
#include <sycl/detail/type_traits.hpp> // for const_if_const_AS
2726
#include <sycl/exception.hpp> // for make_error_code
2827
#include <sycl/ext/oneapi/accessor_property_list.hpp> // for accessor_prope...

‎sycl/include/sycl/builtins_utils_scalar.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <sycl/aliases.hpp>
1313
#include <sycl/detail/defines_elementary.hpp>
1414
#include <sycl/detail/generic_type_traits.hpp>
15-
#include <sycl/detail/type_list.hpp>
1615
#include <sycl/detail/type_traits.hpp>
1716
#include <sycl/half_type.hpp>
1817
#include <sycl/multi_ptr.hpp>

‎sycl/include/sycl/detail/generic_type_traits.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <sycl/access/access.hpp> // for decorated, address_space
1212
#include <sycl/aliases.hpp> // for half, cl_char, cl_double
1313
#include <sycl/detail/helpers.hpp> // for marray
14-
#include <sycl/detail/type_list.hpp> // for is_contained, find_sam...
1514
#include <sycl/detail/type_traits.hpp> // for is_gen_based_on_type_s...
1615
#include <sycl/half_type.hpp> // for BIsRepresentationT
1716
#include <sycl/multi_ptr.hpp> // for multi_ptr, address_spa...

‎sycl/include/sycl/detail/image_accessor_util.hpp‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include <sycl/detail/array.hpp> // for array
1919
#include <sycl/detail/export.hpp> // for __SYCL_EXPORT
2020
#include <sycl/detail/generic_type_traits.hpp> // for max_v, min_v, TryToGe...
21-
#include <sycl/detail/type_list.hpp> // for is_contained, type_list
2221
#include <sycl/exception.hpp>
2322
#include <sycl/id.hpp> // for id
2423
#include <sycl/image.hpp> // for image_channel_type
@@ -35,26 +34,25 @@ inline namespace _V1 {
3534
namespace detail {
3635

3736
template <typename T>
38-
using IsValidCoordType = typename is_contained<
39-
T, boost::mp11::mp_unique<type_list<opencl::cl_int, opencl::cl_float,
40-
std::int32_t, float>>>::type;
37+
inline constexpr bool is_valid_coord_type_v =
38+
check_type_in_v<T, opencl::cl_int, opencl::cl_float, std::int32_t, float>;
4139

4240
// The formula for unnormalization coordinates:
4341
// NormalizedCoords = [UnnormalizedCoords[i] * Range[i] for i in range(0, 3)]
4442
template <typename T>
45-
std::enable_if_t<IsValidCoordType<T>::value, T>
43+
std::enable_if_t<is_valid_coord_type_v<T>, T>
4644
UnnormalizeCoordinates(const T &Coords, const range<3> &Range) {
4745
return Coords * Range[0];
4846
}
4947

5048
template <typename T>
51-
std::enable_if_t<IsValidCoordType<T>::value, vec<T, 2>>
49+
std::enable_if_t<is_valid_coord_type_v<T>, vec<T, 2>>
5250
UnnormalizeCoordinates(const vec<T, 2> &Coords, const range<3> &Range) {
5351
return {Coords.x() * Range[0], Coords.y() * Range[1]};
5452
}
5553

5654
template <typename T>
57-
std::enable_if_t<IsValidCoordType<T>::value, vec<T, 4>>
55+
std::enable_if_t<is_valid_coord_type_v<T>, vec<T, 4>>
5856
UnnormalizeCoordinates(const vec<T, 4> &Coords, const range<3> &Range) {
5957
return {Coords.x() * Range[0], Coords.y() * Range[1], Coords.z() * Range[2],
6058
0};
@@ -65,19 +63,19 @@ UnnormalizeCoordinates(const vec<T, 4> &Coords, const range<3> &Range) {
6563
// calculation won't pass 0.
6664
// Non-valid coordinates are written as 0.
6765
template <typename T>
68-
std::enable_if_t<IsValidCoordType<T>::value, float4> convertToFloat4(T Coords) {
66+
std::enable_if_t<is_valid_coord_type_v<T>, float4> convertToFloat4(T Coords) {
6967
return {static_cast<float>(Coords), 0.5f, 0.5f, 0.f};
7068
}
7169

7270
template <typename T>
73-
std::enable_if_t<IsValidCoordType<T>::value, float4>
71+
std::enable_if_t<is_valid_coord_type_v<T>, float4>
7472
convertToFloat4(vec<T, 2> Coords) {
7573
return {static_cast<float>(Coords.x()), static_cast<float>(Coords.y()), 0.5f,
7674
0.f};
7775
}
7876

7977
template <typename T>
80-
std::enable_if_t<IsValidCoordType<T>::value, float4>
78+
std::enable_if_t<is_valid_coord_type_v<T>, float4>
8179
convertToFloat4(vec<T, 4> Coords) {
8280
return {static_cast<float>(Coords.x()), static_cast<float>(Coords.y()),
8381
static_cast<float>(Coords.z()), 0.f};

‎sycl/include/sycl/detail/spirv.hpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -796,13 +796,11 @@ AtomicMax(multi_ptr<T, AddressSpace, IsDecorated> MPtr, memory_scope Scope,
796796
// variants for all scalar types
797797
#ifndef __NVPTX__
798798

799-
using ProhibitedTypesForShuffleEmulation =
800-
type_list<double, long, long long, unsigned long, unsigned long long, half>;
801-
802799
template <typename T>
803800
struct TypeIsProhibitedForShuffleEmulation
804-
: std::bool_constant<is_contained<
805-
vector_element_t<T>, ProhibitedTypesForShuffleEmulation>::value> {};
801+
: std::bool_constant<
802+
check_type_in_v<vector_element_t<T>, double, long, long long,
803+
unsigned long, unsigned long long, half>> {};
806804

807805
template <typename T>
808806
struct VecTypeIsProhibitedForShuffleEmulation

‎sycl/include/sycl/detail/type_list.hpp‎

Lines changed: 0 additions & 91 deletions
This file was deleted.

‎sycl/include/sycl/detail/type_traits.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
#include <sycl/detail/type_traits/vec_marray_traits.hpp>
1212

13-
#include <sycl/access/access.hpp> // for decorated, address_space
14-
#include <sycl/detail/type_list.hpp> // for is_contained, find_twi...
13+
#include <sycl/access/access.hpp> // for decorated, address_space
1514

1615
#include <array> // for array
1716
#include <cstddef> // for size_t

‎sycl/include/sycl/detail/vector_arith.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <sycl/aliases.hpp> // for half, cl_char, cl_int
1212
#include <sycl/detail/generic_type_traits.hpp> // for is_sigeninteger, is_s...
13-
#include <sycl/detail/type_list.hpp> // for is_contained
1413
#include <sycl/detail/type_traits.hpp> // for is_floating_point
1514

1615
#include <sycl/ext/oneapi/bfloat16.hpp> // bfloat16

0 commit comments

Comments
 (0)