Skip to content

Commit a4a28bd

Browse files
[NFC][SYCL][ESIMD] Don't use boost/mp11 in e2e tests (#16127)
I believe that was the last explicit usage of it in the project. Can't remove CMake support for it still because we use boost's `unordered_*map` that depends on mp11.
1 parent 090c9f3 commit a4a28bd

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

sycl/test-e2e/InvokeSimd/Spec/simd_mask.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* This test also runs with all types of VISA link time optimizations enabled.
1515
*/
1616

17-
#include <sycl/detail/boost/mp11.hpp>
1817
#include <sycl/detail/core.hpp>
1918
#include <sycl/ext/intel/esimd.hpp>
2019
#include <sycl/ext/oneapi/experimental/invoke_simd.hpp>
@@ -141,18 +140,22 @@ int main() {
141140
<< "\n";
142141
bool passed = true;
143142
const bool SupportsDouble = dev.has(aspect::fp64);
144-
using namespace sycl::detail::boost::mp11;
145143
using MaskTypes =
146144
std::tuple<char, char16_t, char32_t, wchar_t, signed char, signed short,
147145
signed int, signed long, signed long long, unsigned char,
148146
unsigned short, unsigned int, unsigned long,
149147
unsigned long long, float, double>;
150-
tuple_for_each(MaskTypes{}, [&](auto &&x) {
151-
using T = std::remove_reference_t<decltype(x)>;
152-
if (std::is_same_v<T, double> && !SupportsDouble)
153-
return;
154-
passed &= !test<T>(q);
155-
});
148+
std::apply(
149+
[&](auto &&...xs) {
150+
auto f = [&](auto &&x) {
151+
using T = std::remove_reference_t<decltype(x)>;
152+
if (std::is_same_v<T, double> && !SupportsDouble)
153+
return;
154+
passed &= !test<T>(q);
155+
};
156+
((f(std::forward<decltype(xs)>(xs)), ...));
157+
},
158+
MaskTypes{});
156159
std::cout << (passed ? "Test passed\n" : "TEST FAILED\n");
157160
return passed ? 0 : 1;
158161
}

sycl/test-e2e/InvokeSimd/Spec/simd_mask_merge.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Check that full compilation works:
22
// RUN: %{build} -fno-sycl-device-code-split-esimd -Xclang -fsycl-allow-func-ptr -o %t.out
33
// RUN: env IGC_VCSaveStackCallLinkage=1 IGC_VCDirectCallsOnly=1 %{run} %t.out
4-
#include <sycl/detail/boost/mp11.hpp>
54
#include <sycl/detail/core.hpp>
65
#include <sycl/ext/intel/esimd.hpp>
76
#include <sycl/ext/oneapi/experimental/invoke_simd.hpp>

0 commit comments

Comments
 (0)