Skip to content

Commit 877af07

Browse files
jinge90jinge90
committed
fix clang format issue
Signed-off-by: jinge90 <[email protected]>
1 parent 11f2a13 commit 877af07

15 files changed

+40
-66
lines changed

‎libdevice/sort_helper.hpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,6 @@ void private_merge_sort_key_value_close(KeyT *keys, ValT *vals, size_t n,
339339
private_merge_sort_key_value_helper(keys, vals, n, scratch, comp, &keys_back,
340340
&vals_back);
341341

342-
343342
const size_t local_idx = __get_wg_local_linear_id();
344343
for (size_t i = 0; i < n; ++i) {
345344
keys[i] = keys_back[local_idx * n + i];
@@ -349,14 +348,13 @@ void private_merge_sort_key_value_close(KeyT *keys, ValT *vals, size_t n,
349348

350349
template <typename KeyT, typename ValT, typename Compare>
351350
void private_merge_sort_key_value_spread(KeyT *keys, ValT *vals, size_t n,
352-
uint8_t *scratch, Compare comp) {
351+
uint8_t *scratch, Compare comp) {
353352

354353
KeyT *keys_back = nullptr;
355354
ValT *vals_back = nullptr;
356355
private_merge_sort_key_value_helper(keys, vals, n, scratch, comp, &keys_back,
357356
&vals_back);
358357

359-
360358
const size_t local_idx = __get_wg_local_linear_id();
361359
const size_t wg_size = __get_wg_local_range();
362360

‎sycl/test-e2e/DeviceLib/group_sort/group_private_KV_sort_p1p1_p1.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,8 +1166,10 @@ void test_work_group_KV_private_sort(sycl::queue &q, const KeyT keys[NUM],
11661166
for (size_t idx = 0; idx < NUM; ++idx) {
11671167
size_t idx1 = idx / WG_SZ;
11681168
size_t idx2 = idx % WG_SZ;
1169-
if ((output_keys[idx2 * num_per_work_item + idx1] != std::get<0>(sorted_vec[idx])) ||
1170-
(output_vals[idx2 * num_per_work_item + idx1] != std::get<1>(sorted_vec[idx]))) {
1169+
if ((output_keys[idx2 * num_per_work_item + idx1] !=
1170+
std::get<0>(sorted_vec[idx])) ||
1171+
(output_vals[idx2 * num_per_work_item + idx1] !=
1172+
std::get<1>(sorted_vec[idx]))) {
11711173
std::cout << "idx: " << idx << std::endl;
11721174
fails = true;
11731175
break;

‎sycl/test-e2e/DeviceLib/group_sort/workgroup_private_KV_sort_i16.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out
55
// RUN: %{run} %t.out
66

7-
87
// RUN: %{build} -DDES -o %t.out
98
// RUN: %{run} %t.out
109

1110
// RUN: %{build} -DDES -fsycl-device-lib-jit-link -o %t.out
1211
// RUN: %{run} %t.out
1312

14-
1513
// RUN: %{build} -DSPREAD -o %t.out
1614
// RUN: %{run} %t.out
1715

@@ -32,10 +30,10 @@ int main() {
3230
queue q;
3331
{
3432
constexpr static int NUM = 35;
35-
int16_t ikeys[NUM] = {1, -11, 1, 9, -3, 100, 34, 8, 121,
36-
-77, 125, 23, 36, -2, -111, 91, 88, -2,
37-
51, -23, -81, 83, 31, 42, 2, 1, -99,
38-
124, 12, 0, -81, 17, 15, 101, 44};
33+
int16_t ikeys[NUM] = {1, -11, 1, 9, -3, 100, 34, 8, 121,
34+
-77, 125, 23, 36, -2, -111, 91, 88, -2,
35+
51, -23, -81, 83, 31, 42, 2, 1, -99,
36+
124, 12, 0, -81, 17, 15, 101, 44};
3937
uint32_t ivals[NUM] = {99, 32, 1, 2, 67, 9123, 453,
4038
435, 91111, 777, 165, 145, 2456, 88811,
4139
761, 96, 765, 10000, 6364, 90, 525,

‎sycl/test-e2e/DeviceLib/group_sort/workgroup_private_KV_sort_i32.cpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out
55
// RUN: %{run} %t.out
66

7-
87
// RUN: %{build} -DDES -o %t.out
98
// RUN: %{run} %t.out
109

1110
// RUN: %{build} -DDES -fsycl-device-lib-jit-link -o %t.out
1211
// RUN: %{run} %t.out
1312

14-
1513
// RUN: %{build} -DSPREAD -o %t.out
1614
// RUN: %{run} %t.out
1715

@@ -34,11 +32,11 @@ int main() {
3432
{
3533
constexpr static int NUM = 40;
3634
int32_t ikeys[NUM] = {
37-
1, 11, 1, 9, 3, 100, 34, 8,
38-
121, 77, 125, 23, 222336, 2, 111, 91,
39-
881112, -2, -62451, 213, 199181, 3183, 310910, 11242,
40-
3216, 1, 199, -7712423, 0, 0, -181, 17,
41-
15, -101, 44, 103934, 1, 11, 193, 213};
35+
1, 11, 1, 9, 3, 100, 34, 8,
36+
121, 77, 125, 23, 222336, 2, 111, 91,
37+
881112, -2, -62451, 213, 199181, 3183, 310910, 11242,
38+
3216, 1, 199, -7712423, 0, 0, -181, 17,
39+
15, -101, 44, 103934, 1, 11, 193, 213};
4240
uint8_t ivals1[NUM] = {99, 32, 1, 2, 67, 91, 45, 43, 91, 77,
4341
16, 14, 24, 88, 76, 96, 76, 100, 63, 90,
4442
52, 82, 1, 22, 9, 225, 127, 0, 12, 128,

‎sycl/test-e2e/DeviceLib/group_sort/workgroup_private_KV_sort_i64.cpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out
55
// RUN: %{run} %t.out
66

7-
87
// RUN: %{build} -DDES -o %t.out
98
// RUN: %{run} %t.out
109

1110
// RUN: %{build} -DDES -fsycl-device-lib-jit-link -o %t.out
1211
// RUN: %{run} %t.out
1312

14-
1513
// RUN: %{build} -DSPREAD -o %t.out
1614
// RUN: %{run} %t.out
1715

@@ -34,11 +32,11 @@ int main() {
3432
{
3533
constexpr static int NUM = 40;
3634
int64_t ikeys[NUM] = {
37-
1, 11, -1, 9, 3, 100, -34, 8,
38-
121, 77, 125, 23, 222336, 2, 111, 91,
39-
-881112, 2, 6662451, 213, 199181, -3183, 310910, 11242,
40-
3216, 1, -199, 7712423, 0, 0, 181, 17,
41-
15, -101, 44, 103934, 1, -11, 193, 213};
35+
1, 11, -1, 9, 3, 100, -34, 8,
36+
121, 77, 125, 23, 222336, 2, 111, 91,
37+
-881112, 2, 6662451, 213, 199181, -3183, 310910, 11242,
38+
3216, 1, -199, 7712423, 0, 0, 181, 17,
39+
15, -101, 44, 103934, 1, -11, 193, 213};
4240
uint8_t ivals1[NUM] = {99, 32, 1, 2, 67, 91, 45, 43, 91, 77,
4341
16, 14, 24, 88, 76, 96, 76, 100, 63, 90,
4442
52, 82, 1, 22, 9, 225, 127, 0, 12, 128,

‎sycl/test-e2e/DeviceLib/group_sort/workgroup_private_KV_sort_i8.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out
55
// RUN: %{run} %t.out
66

7-
87
// RUN: %{build} -DDES -o %t.out
98
// RUN: %{run} %t.out
109

1110
// RUN: %{build} -DDES -fsycl-device-lib-jit-link -o %t.out
1211
// RUN: %{run} %t.out
1312

14-
1513
// RUN: %{build} -DSPREAD -o %t.out
1614
// RUN: %{run} %t.out
1715

@@ -33,10 +31,10 @@ int main() {
3331

3432
{
3533
constexpr static int NUM = 35;
36-
int8_t ikeys[NUM] = {1, -11, 1, 9, -3, 100, 34, 8, 121,
37-
-77, 125, 23, 36, -2, -111, 91, 88, -2,
38-
51, -23, -81, 83, 31, 42, 2, 1, -99,
39-
124, 12, 0, -81, 17, 15, 101, 44};
34+
int8_t ikeys[NUM] = {1, -11, 1, 9, -3, 100, 34, 8, 121,
35+
-77, 125, 23, 36, -2, -111, 91, 88, -2,
36+
51, -23, -81, 83, 31, 42, 2, 1, -99,
37+
124, 12, 0, -81, 17, 15, 101, 44};
4038
uint32_t ivals[NUM] = {99, 32, 1, 2, 67, 9123, 453,
4139
435, 91111, 777, 165, 145, 2456, 88811,
4240
761, 96, 765, 10000, 6364, 90, 525,

‎sycl/test-e2e/DeviceLib/group_sort/workgroup_private_KV_sort_p3_i32.cpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out
55
// RUN: %{run} %t.out
66

7-
87
// RUN: %{build} -DDES -o %t.out
98
// RUN: %{run} %t.out
109

1110
// RUN: %{build} -DDES -fsycl-device-lib-jit-link -o %t.out
1211
// RUN: %{run} %t.out
1312

14-
1513
// RUN: %{build} -DSPREAD -o %t.out
1614
// RUN: %{run} %t.out
1715

@@ -34,11 +32,11 @@ int main() {
3432
{
3533
constexpr static int NUM = 40;
3634
int32_t ikeys[NUM] = {
37-
1, 11, 1, 9, 3, 100, 34, 8,
38-
121, 77, 125, 23, 222336, 2, 111, 91,
39-
881112, -2, -62451, 213, 199181, 3183, 310910, 11242,
40-
3216, 1, 199, -7712423, 0, 0, -181, 17,
41-
15, -101, 44, 103934, 1, 11, 193, 213};
35+
1, 11, 1, 9, 3, 100, 34, 8,
36+
121, 77, 125, 23, 222336, 2, 111, 91,
37+
881112, -2, -62451, 213, 199181, 3183, 310910, 11242,
38+
3216, 1, 199, -7712423, 0, 0, -181, 17,
39+
15, -101, 44, 103934, 1, 11, 193, 213};
4240
uint8_t ivals1[NUM] = {99, 32, 1, 2, 67, 91, 45, 43, 91, 77,
4341
16, 14, 24, 88, 76, 96, 76, 100, 63, 90,
4442
52, 82, 1, 22, 9, 225, 127, 0, 12, 128,

‎sycl/test-e2e/DeviceLib/group_sort/workgroup_private_KV_sort_p3_i64.cpp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out
55
// RUN: %{run} %t.out
66

7-
87
// RUN: %{build} -DDES -o %t.out
98
// RUN: %{run} %t.out
109

1110
// RUN: %{build} -DDES -fsycl-device-lib-jit-link -o %t.out
1211
// RUN: %{run} %t.out
1312

14-
1513
// RUN: %{build} -DSPREAD -o %t.out
1614
// RUN: %{run} %t.out
1715

@@ -34,11 +32,11 @@ int main() {
3432
{
3533
constexpr static int NUM = 40;
3634
int64_t ikeys[NUM] = {
37-
1, 11, -1, 9, 3, 100, -34, 8,
38-
121, 77, 125, 23, 222336, 2, 111, 91,
39-
-881112, 2, 6662451, 213, 199181, -3183, 310910, 11242,
40-
3216, 1, -199, 7712423, 0, 0, 181, 17,
41-
15, -101, 44, 103934, 1, -11, 193, 213};
35+
1, 11, -1, 9, 3, 100, -34, 8,
36+
121, 77, 125, 23, 222336, 2, 111, 91,
37+
-881112, 2, 6662451, 213, 199181, -3183, 310910, 11242,
38+
3216, 1, -199, 7712423, 0, 0, 181, 17,
39+
15, -101, 44, 103934, 1, -11, 193, 213};
4240
uint8_t ivals1[NUM] = {99, 32, 1, 2, 67, 91, 45, 43, 91, 77,
4341
16, 14, 24, 88, 76, 96, 76, 100, 63, 90,
4442
52, 82, 1, 22, 9, 225, 127, 0, 12, 128,

‎sycl/test-e2e/DeviceLib/group_sort/workgroup_private_KV_sort_p3_i8.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out
55
// RUN: %{run} %t.out
66

7-
87
// RUN: %{build} -DDES -o %t.out
98
// RUN: %{run} %t.out
109

1110
// RUN: %{build} -DDES -fsycl-device-lib-jit-link -o %t.out
1211
// RUN: %{run} %t.out
1312

14-
1513
// RUN: %{build} -DSPREAD -o %t.out
1614
// RUN: %{run} %t.out
1715

@@ -33,10 +31,10 @@ int main() {
3331

3432
{
3533
constexpr static int NUM = 35;
36-
int8_t ikeys[NUM] = {1, -11, 1, 9, -3, 100, 34, 8, 121,
37-
-77, 125, 23, 36, -2, -111, 91, 88, -2,
38-
51, -23, -81, 83, 31, 42, 2, 1, -99,
39-
124, 12, 0, -81, 17, 15, 101, 44};
34+
int8_t ikeys[NUM] = {1, -11, 1, 9, -3, 100, 34, 8, 121,
35+
-77, 125, 23, 36, -2, -111, 91, 88, -2,
36+
51, -23, -81, 83, 31, 42, 2, 1, -99,
37+
124, 12, 0, -81, 17, 15, 101, 44};
4038
uint32_t ivals[NUM] = {99, 32, 1, 2, 67, 9123, 453,
4139
435, 91111, 777, 165, 145, 2456, 88811,
4240
761, 96, 765, 10000, 6364, 90, 525,

‎sycl/test-e2e/DeviceLib/group_sort/workgroup_private_KV_sort_p3_u64.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@
44
// RUN: %{build} -fsycl-device-lib-jit-link -o %t.out
55
// RUN: %{run} %t.out
66

7-
87
// RUN: %{build} -DDES -o %t.out
98
// RUN: %{run} %t.out
109

1110
// RUN: %{build} -DDES -fsycl-device-lib-jit-link -o %t.out
1211
// RUN: %{run} %t.out
1312

14-
1513
// RUN: %{build} -DSPREAD -o %t.out
1614
// RUN: %{run} %t.out
1715

0 commit comments

Comments
 (0)