Skip to content

Commit 512741d

Browse files
nyallocnyalloc
committed
Clang format
Signed-off-by: Stuart Adams <[email protected]>
1 parent 95977a6 commit 512741d

13 files changed

+119
-160
lines changed

‎sycl/unittests/pi/EnqueueMemTest.cpp

Lines changed: 34 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,11 @@ class EnqueueMemTest : public testing::TestWithParam<detail::plugin> {
6161

6262
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piMemRelease>(_mem)),
6363
PI_SUCCESS);
64+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piQueueRelease>(_queue)),
65+
PI_SUCCESS);
6466
ASSERT_EQ(
65-
(plugin.call_nocheck<detail::PiApiKind::piQueueRelease>(_queue)),
67+
(plugin.call_nocheck<detail::PiApiKind::piContextRelease>(_context)),
6668
PI_SUCCESS);
67-
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piContextRelease>(
68-
_context)),
69-
PI_SUCCESS);
7069
}
7170

7271
template <typename T> void TestBufferFill(const T &pattern) {
@@ -79,24 +78,21 @@ class EnqueueMemTest : public testing::TestWithParam<detail::plugin> {
7978
ASSERT_NE(pattern, inValues[i]);
8079
}
8180

82-
ASSERT_EQ(
83-
(plugin.call_nocheck<detail::PiApiKind::piEnqueueMemBufferWrite>(
84-
_queue, _mem, PI_TRUE, 0, _numElementsX * sizeof(T), inValues, 0,
85-
nullptr, nullptr)),
86-
PI_SUCCESS);
81+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEnqueueMemBufferWrite>(
82+
_queue, _mem, PI_TRUE, 0, _numElementsX * sizeof(T), inValues,
83+
0, nullptr, nullptr)),
84+
PI_SUCCESS);
8785

88-
ASSERT_EQ(
89-
(plugin.call_nocheck<detail::PiApiKind::piEnqueueMemBufferFill>(
90-
_queue, _mem, &pattern, sizeof(T), 0, sizeof(inValues), 0, nullptr,
91-
nullptr)),
92-
PI_SUCCESS);
86+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEnqueueMemBufferFill>(
87+
_queue, _mem, &pattern, sizeof(T), 0, sizeof(inValues), 0,
88+
nullptr, nullptr)),
89+
PI_SUCCESS);
9390

9491
T outValues[_numElementsX] = {};
95-
ASSERT_EQ(
96-
(plugin.call_nocheck<detail::PiApiKind::piEnqueueMemBufferRead>(
97-
_queue, _mem, PI_TRUE, 0, _numElementsX * sizeof(T), outValues, 0,
98-
nullptr, nullptr)),
99-
PI_SUCCESS);
92+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEnqueueMemBufferRead>(
93+
_queue, _mem, PI_TRUE, 0, _numElementsX * sizeof(T),
94+
outValues, 0, nullptr, nullptr)),
95+
PI_SUCCESS);
10096

10197
for (size_t i = 0; i < _numElementsX; ++i) {
10298
ASSERT_EQ(pattern, outValues[i]);
@@ -106,52 +102,43 @@ class EnqueueMemTest : public testing::TestWithParam<detail::plugin> {
106102

107103
static std::vector<detail::plugin> Plugins = detail::pi::initialize();
108104

109-
INSTANTIATE_TEST_CASE_P(EnqueueMemTestImpl,
110-
EnqueueMemTest,
111-
testing::ValuesIn(Plugins),);
105+
INSTANTIATE_TEST_CASE_P(EnqueueMemTestImpl, EnqueueMemTest,
106+
testing::ValuesIn(Plugins), );
112107

113-
template<typename T>
114-
struct vec4 {
108+
template <typename T> struct vec4 {
115109
T x, y, z, w;
116110

117111
bool operator==(const vec4 &rhs) const {
118112
return x == rhs.x && y == rhs.y && z == rhs.z && w == rhs.w;
119113
}
120114

121-
bool operator!=(const vec4 &rhs) const {
122-
return !(*this == rhs);
123-
}
115+
bool operator!=(const vec4 &rhs) const { return !(*this == rhs); }
124116
};
125117

126-
template<typename T>
127-
struct vec2 {
118+
template <typename T> struct vec2 {
128119
T x, y;
129120

130-
bool operator==(const vec2 &rhs) const {
131-
return x == rhs.x && y == rhs.y;
132-
}
121+
bool operator==(const vec2 &rhs) const { return x == rhs.x && y == rhs.y; }
133122

134-
bool operator!=(const vec2 &rhs) const {
135-
return !(*this == rhs);
136-
}
123+
bool operator!=(const vec2 &rhs) const { return !(*this == rhs); }
137124
};
138125

139126
TEST_P(EnqueueMemTest, piEnqueueMemBufferFill) {
140127

141-
TestBufferFill(float{1});
142-
TestBufferFill(vec2<float>{1, 2});
143-
TestBufferFill(vec4<float>{1, 2, 3, 4});
128+
TestBufferFill(float{1});
129+
TestBufferFill(vec2<float>{1, 2});
130+
TestBufferFill(vec4<float>{1, 2, 3, 4});
144131

145-
TestBufferFill(uint8_t{1});
146-
TestBufferFill(vec2<uint8_t>{1, 2});
147-
TestBufferFill(vec4<uint8_t>{1, 2, 3, 4});
132+
TestBufferFill(uint8_t{1});
133+
TestBufferFill(vec2<uint8_t>{1, 2});
134+
TestBufferFill(vec4<uint8_t>{1, 2, 3, 4});
148135

149-
TestBufferFill(uint16_t{1});
150-
TestBufferFill(vec2<uint16_t>{1, 2});
151-
TestBufferFill(vec4<uint16_t>{1, 2, 3, 4});
136+
TestBufferFill(uint16_t{1});
137+
TestBufferFill(vec2<uint16_t>{1, 2});
138+
TestBufferFill(vec4<uint16_t>{1, 2, 3, 4});
152139

153-
TestBufferFill(uint32_t{1});
154-
TestBufferFill(vec2<uint32_t>{1, 2});
155-
TestBufferFill(vec4<uint32_t>{1, 2, 3, 4});
140+
TestBufferFill(uint32_t{1});
141+
TestBufferFill(vec2<uint32_t>{1, 2});
142+
TestBufferFill(vec4<uint32_t>{1, 2, 3, 4});
156143
}
157144
} // namespace

‎sycl/unittests/pi/EventTest.cpp

Lines changed: 36 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "CL/sycl/detail/pi.hpp"
10-
#include <detail/plugin.hpp>
1110
#include <atomic>
11+
#include <detail/plugin.hpp>
1212
#include <gtest/gtest.h>
1313
#include <thread>
1414

@@ -25,8 +25,7 @@ class EventTest : public testing::TestWithParam<detail::plugin> {
2525

2626
EventTest()
2727
: _context{nullptr}, _queue{nullptr}, _device{nullptr},
28-
_result{PI_INVALID_VALUE} {
29-
}
28+
_result{PI_INVALID_VALUE} {}
3029

3130
~EventTest() override = default;
3231

@@ -65,21 +64,18 @@ class EventTest : public testing::TestWithParam<detail::plugin> {
6564

6665
detail::plugin plugin = GetParam();
6766

67+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piQueueRelease>(_queue)),
68+
PI_SUCCESS);
69+
6870
ASSERT_EQ(
69-
(plugin.call_nocheck<detail::PiApiKind::piQueueRelease>(_queue)),
71+
(plugin.call_nocheck<detail::PiApiKind::piContextRelease>(_context)),
7072
PI_SUCCESS);
71-
72-
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piContextRelease>(
73-
_context)),
74-
PI_SUCCESS);
7573
}
7674
};
7775

7876
static std::vector<detail::plugin> Plugins = detail::pi::initialize();
7977

80-
INSTANTIATE_TEST_CASE_P(EventTestImpl,
81-
EventTest,
82-
testing::ValuesIn(Plugins),);
78+
INSTANTIATE_TEST_CASE_P(EventTestImpl, EventTest, testing::ValuesIn(Plugins), );
8379

8480
// TODO: need more negative tests to show errors being reported when expected
8581
// (invalid arguments etc).
@@ -89,9 +85,9 @@ TEST_P(EventTest, PICreateEvent) {
8985

9086
detail::plugin plugin = GetParam();
9187

92-
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventCreate>(_context,
93-
&foo)),
94-
PI_SUCCESS);
88+
ASSERT_EQ(
89+
(plugin.call_nocheck<detail::PiApiKind::piEventCreate>(_context, &foo)),
90+
PI_SUCCESS);
9591
ASSERT_NE(foo, nullptr);
9692

9793
EXPECT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventRelease>(foo)),
@@ -131,8 +127,8 @@ TEST_P(EventTest, piEventSetCallback) {
131127
// gate event lets us register callbacks before letting the enqueued work be
132128
// executed.
133129
pi_event gateEvent;
134-
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventCreate>(
135-
_context, &gateEvent)),
130+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventCreate>(_context,
131+
&gateEvent)),
136132
PI_SUCCESS);
137133

138134
constexpr const size_t dataCount = 1000u;
@@ -146,11 +142,10 @@ TEST_P(EventTest, piEventSetCallback) {
146142
PI_SUCCESS);
147143

148144
pi_event syncEvent;
149-
ASSERT_EQ(
150-
(plugin.call_nocheck<detail::PiApiKind::piEnqueueMemBufferWrite>(
151-
_queue, memObj, false, 0, size_in_bytes, data.data(), 1, &gateEvent,
152-
&syncEvent)),
153-
PI_SUCCESS);
145+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEnqueueMemBufferWrite>(
146+
_queue, memObj, false, 0, size_in_bytes, data.data(), 1,
147+
&gateEvent, &syncEvent)),
148+
PI_SUCCESS);
154149

155150
for (size_t i = 0; i < event_type_count; i++) {
156151
user_data[i].event_type = event_callback_types[i];
@@ -174,22 +169,20 @@ TEST_P(EventTest, piEventSetCallback) {
174169
EXPECT_TRUE(triggered_flag[k]);
175170
}
176171

177-
ASSERT_EQ(
178-
(plugin.call_nocheck<detail::PiApiKind::piEventRelease>(gateEvent)),
179-
PI_SUCCESS);
180-
ASSERT_EQ(
181-
(plugin.call_nocheck<detail::PiApiKind::piEventRelease>(syncEvent)),
182-
PI_SUCCESS);
172+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventRelease>(gateEvent)),
173+
PI_SUCCESS);
174+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventRelease>(syncEvent)),
175+
PI_SUCCESS);
183176
}
184177

185178
TEST_P(EventTest, piEventGetInfo) {
186179

187180
detail::plugin plugin = GetParam();
188181

189182
pi_event foo;
190-
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventCreate>(_context,
191-
&foo)),
192-
PI_SUCCESS);
183+
ASSERT_EQ(
184+
(plugin.call_nocheck<detail::PiApiKind::piEventCreate>(_context, &foo)),
185+
PI_SUCCESS);
193186
ASSERT_NE(foo, nullptr);
194187

195188
pi_uint64 paramValue = 0;
@@ -211,9 +204,9 @@ TEST_P(EventTest, piEventSetStatus) {
211204
detail::plugin plugin = GetParam();
212205

213206
pi_event foo;
214-
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventCreate>(_context,
215-
&foo)),
216-
PI_SUCCESS);
207+
ASSERT_EQ(
208+
(plugin.call_nocheck<detail::PiApiKind::piEventCreate>(_context, &foo)),
209+
PI_SUCCESS);
217210
ASSERT_NE(foo, nullptr);
218211

219212
pi_event_status paramValue = PI_EVENT_QUEUED;
@@ -243,9 +236,9 @@ TEST_P(EventTest, WaitForManualEventOnOtherThread) {
243236
detail::plugin plugin = GetParam();
244237

245238
pi_event foo;
246-
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventCreate>(_context,
247-
&foo)),
248-
PI_SUCCESS);
239+
ASSERT_EQ(
240+
(plugin.call_nocheck<detail::PiApiKind::piEventCreate>(_context, &foo)),
241+
PI_SUCCESS);
249242
ASSERT_NE(foo, nullptr);
250243

251244
pi_event_status paramValue = {};
@@ -260,9 +253,8 @@ TEST_P(EventTest, WaitForManualEventOnOtherThread) {
260253

261254
auto tWaiter = std::thread([&]() {
262255
started = true;
263-
ASSERT_EQ(
264-
(plugin.call_nocheck<detail::PiApiKind::piEventsWait>(1, &foo)),
265-
PI_SUCCESS);
256+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventsWait>(1, &foo)),
257+
PI_SUCCESS);
266258
});
267259

268260
while (!started) {
@@ -302,10 +294,9 @@ TEST_P(EventTest, piEnqueueEventsWait) {
302294

303295
pi_event events[4] = {nullptr, nullptr, nullptr, nullptr};
304296

305-
ASSERT_EQ(
306-
(plugin.call_nocheck<detail::PiApiKind::piEnqueueMemBufferWrite>(
307-
_queue, memObj, true, 0, bytes, data, 0, nullptr, &events[0])),
308-
PI_SUCCESS);
297+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEnqueueMemBufferWrite>(
298+
_queue, memObj, true, 0, bytes, data, 0, nullptr, &events[0])),
299+
PI_SUCCESS);
309300
ASSERT_NE(events[0], nullptr);
310301

311302
ASSERT_EQ(
@@ -314,8 +305,8 @@ TEST_P(EventTest, piEnqueueEventsWait) {
314305
PI_SUCCESS);
315306
ASSERT_NE(events[1], nullptr);
316307

317-
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventCreate>(
318-
_context, &events[2])),
308+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piEventCreate>(_context,
309+
&events[2])),
319310
PI_SUCCESS);
320311
ASSERT_NE(events[2], nullptr);
321312

‎sycl/unittests/pi/PlatformTest.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ class PlatformTest : public testing::TestWithParam<detail::plugin> {
4646
RecordProperty(platform_count_key, platform_count);
4747

4848
if (platform_count == 0u) {
49-
std::cout
50-
<< "WARNING: piPlatformsGet does not find any PI platforms.\n";
49+
std::cout << "WARNING: piPlatformsGet does not find any PI platforms.\n";
5150

5251
// Do not call into OpenCL below as a platform count of 0 might fail with
5352
// OpenCL implementations if the platforms pointer is not `nullptr`.
@@ -64,9 +63,8 @@ class PlatformTest : public testing::TestWithParam<detail::plugin> {
6463

6564
static std::vector<detail::plugin> Plugins = detail::pi::initialize();
6665

67-
INSTANTIATE_TEST_CASE_P(PlatformTestImpl,
68-
PlatformTest,
69-
testing::ValuesIn(Plugins),);
66+
INSTANTIATE_TEST_CASE_P(PlatformTestImpl, PlatformTest,
67+
testing::ValuesIn(Plugins), );
7068

7169
TEST_P(PlatformTest, piPlatformsGet) {
7270
// The PlatformTest::SetUp method is called to prepare for this test case

‎sycl/unittests/pi/cuda/test_base_objects.cpp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010

1111
#include <cuda.h>
1212

13+
#include "test_get_plugin.hpp"
1314
#include <CL/sycl.hpp>
1415
#include <CL/sycl/detail/cuda_definitions.hpp>
1516
#include <CL/sycl/detail/pi.hpp>
1617
#include <detail/plugin.hpp>
1718
#include <pi_cuda.hpp>
1819
#include <thread>
19-
#include "test_get_plugin.hpp"
2020

2121
const unsigned int LATEST_KNOWN_CUDA_DRIVER_API_VERSION = 3020u;
2222

@@ -115,9 +115,8 @@ TEST_F(CudaBaseObjectsTest, piContextCreatePrimaryTrue) {
115115
cuErr = cuCtxGetCurrent(&current);
116116
ASSERT_EQ(cuErr, CUDA_SUCCESS);
117117
ASSERT_EQ(current, cudaContext);
118-
ASSERT_EQ(
119-
(plugin.call_nocheck<detail::PiApiKind::piContextRelease>(ctxt)),
120-
PI_SUCCESS);
118+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piContextRelease>(ctxt)),
119+
PI_SUCCESS);
121120
}
122121

123122
TEST_F(CudaBaseObjectsTest, piContextCreatePrimaryFalse) {
@@ -161,9 +160,8 @@ TEST_F(CudaBaseObjectsTest, piContextCreatePrimaryFalse) {
161160
cuErr = cuCtxGetCurrent(&current);
162161
ASSERT_EQ(cuErr, CUDA_SUCCESS);
163162
ASSERT_EQ(current, cudaContext);
164-
ASSERT_EQ(
165-
(plugin.call_nocheck<detail::PiApiKind::piContextRelease>(ctxt)),
166-
PI_SUCCESS);
163+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piContextRelease>(ctxt)),
164+
PI_SUCCESS);
167165
}
168166

169167
TEST_F(CudaBaseObjectsTest, piContextCreateChildThread) {
@@ -217,7 +215,6 @@ TEST_F(CudaBaseObjectsTest, piContextCreateChildThread) {
217215

218216
callContextFromOtherThread.join();
219217

220-
ASSERT_EQ(
221-
(plugin.call_nocheck<detail::PiApiKind::piContextRelease>(ctxt)),
222-
PI_SUCCESS);
218+
ASSERT_EQ((plugin.call_nocheck<detail::PiApiKind::piContextRelease>(ctxt)),
219+
PI_SUCCESS);
223220
}

0 commit comments

Comments
 (0)