Skip to content

Commit 3683c23

Browse files
mylermyler
authored
Merge pull request intel#1034 from bb-sycl/xmain
Auto pulldown and update tc files for xmain branch on 20220722
2 parents df18db5 + 61fff5b commit 3683c23

File tree

623 files changed

+712
-652
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

623 files changed

+712
-652
lines changed

‎SYCL/AOT/Inputs/aot.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===---------------------------------------------------------------------===//
88

9-
#include <CL/sycl.hpp>
9+
#include <sycl/sycl.hpp>
1010

1111
#include <array>
1212
#include <iostream>

‎SYCL/Assert/Inputs/kernels_in_file2.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <CL/sycl.hpp>
1+
#include <sycl/sycl.hpp>
22

33
SYCL_EXTERNAL int calculus(int X);
44

‎SYCL/Assert/assert_in_kernels.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include <CL/sycl.hpp>
21
#include <cassert>
32
#include <iostream>
3+
#include <sycl/sycl.hpp>
44

55
using namespace cl::sycl;
66
using namespace cl::sycl::access;

‎SYCL/Assert/assert_in_multiple_tus.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "Inputs/kernels_in_file2.hpp"
2-
#include <CL/sycl.hpp>
32
#include <iostream>
3+
#include <sycl/sycl.hpp>
44

55
#ifdef DEFINE_NDEBUG_INFILE1
66
#define NDEBUG

‎SYCL/Assert/assert_in_one_kernel.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#include <CL/sycl.hpp>
21
#include <cassert>
32
#include <iostream>
3+
#include <sycl/sycl.hpp>
44

55
using namespace cl::sycl;
66
using namespace cl::sycl::access;

‎SYCL/Assert/assert_in_simultaneous_kernels.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
// too early. This is necessary because currently SYCL RT sets indirect access
1111
// flag for all kernels and the Level Zero runtime doesn't support deferred
1212
// release yet.
13-
// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
13+
// Suppress runtime from printing out error messages, so that the test can
14+
// match on assert message generated by the toolchains.
15+
// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
1416
// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
1517
// Shouldn't fail on ACC as fallback assert isn't enqueued there
1618
// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt

‎SYCL/Assert/assert_in_simultaneous_kernels.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#include <CL/sycl.hpp>
21
#include <cassert>
32
#include <cstdio>
43
#include <iostream>
4+
#include <sycl/sycl.hpp>
55
#include <thread>
66

77
using namespace cl::sycl;

‎SYCL/Assert/assert_in_simultaneously_multiple_tus.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
// too early. This is necessary because currently SYCL RT sets indirect access
1111
// flag for all kernels and the Level Zero runtime doesn't support deferred
1212
// release yet.
13-
// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
13+
// Suppress runtime from printing out error messages, so that the test can
14+
// match on assert message generated by the toolchains.
15+
// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
1416
// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
1517
// Shouldn't fail on ACC as fallback assert isn't enqueued there
1618
// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt
@@ -23,9 +25,9 @@
2325
// CHECK-ACC: The test ended.
2426

2527
#include "Inputs/kernels_in_file2.hpp"
26-
#include <CL/sycl.hpp>
2728
#include <cstdio>
2829
#include <iostream>
30+
#include <sycl/sycl.hpp>
2931
#include <thread>
3032

3133
#ifdef DEFINE_NDEBUG_INFILE1

‎SYCL/Assert/assert_in_simultaneously_multiple_tus_one_ndebug.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
// too early. This is necessary because currently SYCL RT sets indirect access
1010
// flag for all kernels and the Level Zero runtime doesn't support deferred
1111
// release yet.
12-
// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
12+
// Suppress runtime from printing out error messages, so that the test can
13+
// match on assert message generated by the toolchains.
14+
// RUN: env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1 %GPU_RUN_PLACEHOLDER %t.out &> %t.txt || true
1315
// RUN: %GPU_RUN_PLACEHOLDER FileCheck %s --input-file %t.txt
1416
// Shouldn't fail on ACC as fallback assert isn't enqueued there
1517
// RUN: %ACC_RUN_PLACEHOLDER %t.out &> %t.txt

‎SYCL/AtomicRef/accessor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out
55

6-
#include <CL/sycl.hpp>
76
#include <algorithm>
87
#include <cassert>
98
#include <iostream>
109
#include <numeric>
10+
#include <sycl/sycl.hpp>
1111
#include <vector>
1212
using namespace sycl;
1313
using namespace sycl::ext::oneapi;

‎SYCL/AtomicRef/add.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <type_traits>
1313
#include <vector>
1414

‎SYCL/AtomicRef/and.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <vector>
1313

1414
using namespace sycl;

‎SYCL/AtomicRef/assignment.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

3-
#include <CL/sycl.hpp>
43
#include <algorithm>
54
#include <cassert>
65
#include <numeric>
6+
#include <sycl/sycl.hpp>
77
#include <vector>
88

99
using namespace sycl;

‎SYCL/AtomicRef/atomic_memory_order.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include <CL/sycl.hpp>
43
#include <algorithm>
4+
#include <sycl/sycl.hpp>
55

66
using namespace sycl;
77

‎SYCL/AtomicRef/compare_exchange.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <vector>
1313

1414
using namespace sycl;

‎SYCL/AtomicRef/exchange.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <vector>
1313

1414
using namespace sycl;

‎SYCL/AtomicRef/load.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <vector>
1313

1414
using namespace sycl;

‎SYCL/AtomicRef/max.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <vector>
1313

1414
using namespace sycl;

‎SYCL/AtomicRef/min.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <vector>
1313

1414
using namespace sycl;

‎SYCL/AtomicRef/or.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <vector>
1313

1414
using namespace sycl;

‎SYCL/AtomicRef/store.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <vector>
1313

1414
using namespace sycl;

‎SYCL/AtomicRef/sub.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <type_traits>
1313
#include <vector>
1414

‎SYCL/AtomicRef/xor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#define TEST_GENERIC_IN_LOCAL 0
55
#endif
66

7-
#include <CL/sycl.hpp>
87
#include <algorithm>
98
#include <cassert>
109
#include <iostream>
1110
#include <numeric>
11+
#include <sycl/sycl.hpp>
1212
#include <vector>
1313

1414
using namespace sycl;

‎SYCL/BFloat16/bfloat16_builtins.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
//
77
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -Xsycl-target-backend --cuda-gpu-arch=sm_80
88
// RUN: %t.out
9-
#include <sycl/ext/oneapi/experimental/builtins.hpp>
109
#include <sycl/sycl.hpp>
1110

1211
#include <cmath>

‎SYCL/BFloat16/bfloat16_type.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#include <CL/sycl.hpp>
21
#include <sycl/ext/oneapi/experimental/bfloat16.hpp>
2+
#include <sycl/sycl.hpp>
33

44
#include <cmath>
55

‎SYCL/Basic/access_to_subset.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
1212
//
1313
//===----------------------------------------------------------------------===//
14-
#include <CL/sycl.hpp>
14+
#include <sycl/sycl.hpp>
1515

1616
using namespace cl::sycl;
1717
using acc_w = accessor<int, 2, access::mode::write, access::target::device>;

‎SYCL/Basic/accessor/Inputs/device_accessor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
#include <CL/sycl.hpp>
98
#include <cassert>
9+
#include <sycl/sycl.hpp>
1010

1111
int main() {
1212
// Non-placeholder accessors.

‎SYCL/Basic/accessor/Inputs/host_accessor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
#include <CL/sycl.hpp>
98
#include <cassert>
9+
#include <sycl/sycl.hpp>
1010

1111
int main() {
1212
{

‎SYCL/Basic/accessor/Inputs/host_task_accessor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
66
//
77
//===----------------------------------------------------------------------===//
8-
#include <CL/sycl.hpp>
98
#include <cassert>
9+
#include <sycl/sycl.hpp>
1010

1111
int main() {
1212
// Non-placeholder accessors.

‎SYCL/Basic/alloc_pinned_host_memory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// RUN: %GPU_RUN_PLACEHOLDER %t2.out
88
// RUN: %ACC_RUN_PLACEHOLDER %t2.out
99

10-
#include <CL/sycl.hpp>
10+
#include <sycl/sycl.hpp>
1111

1212
#include <cassert>
1313
#include <string>

‎SYCL/Basic/aspects.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
//
1818
//===----------------------------------------------------------------------===//
1919

20-
#include <CL/sycl.hpp>
2120
#include <iostream>
21+
#include <sycl/sycl.hpp>
2222

2323
using namespace cl::sycl;
2424

‎SYCL/Basic/barrier_order.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// RUN: %CPU_RUN_PLACEHOLDER %t.out
55
// RUN: %GPU_RUN_PLACEHOLDER %t.out
66

7-
#include <CL/sycl.hpp>
87
#include <stdlib.h>
8+
#include <sycl/sycl.hpp>
99

1010
int main() {
1111
sycl::device dev{sycl::default_selector{}};

‎SYCL/Basic/bit_cast/bit_cast.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out
55
// RUN: %ACC_RUN_PLACEHOLDER %t.out
66

7-
#include <CL/sycl.hpp>
7+
#include <sycl/sycl.hpp>
88

99
#include <iostream>
1010
#include <math.h>

‎SYCL/Basic/boolean.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out
55
// RUN: %ACC_RUN_PLACEHOLDER %t.out
6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
#include <cassert>
99

‎SYCL/Basic/buffer/buffer_allocator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
// buffers are as defined by the spec and will allocate the right amount of
2020
// memory on the device.
2121

22-
#include <CL/sycl.hpp>
2322
#include <iostream>
23+
#include <sycl/sycl.hpp>
2424

2525
constexpr size_t NumElems = 67;
2626

‎SYCL/Basic/buffer/buffer_container.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// RUN: %GPU_RUN_PLACEHOLDER %t2.out
77
// RUN: %ACC_RUN_PLACEHOLDER %t2.out
88

9-
#include <CL/sycl.hpp>
9+
#include <sycl/sycl.hpp>
1010

1111
using namespace cl::sycl;
1212

‎SYCL/Basic/buffer/buffer_create.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: env ZE_DEBUG=1 %GPU_RUN_PLACEHOLDER %t.out 2> %t1.out; cat %t1.out %GPU_CHECK_PLACEHOLDER
44
// UNSUPPORTED: ze_debug-1,ze_debug4
55

6-
#include <CL/sycl.hpp>
6+
#include <sycl/sycl.hpp>
77

88
using namespace cl::sycl;
99

0 commit comments

Comments
 (0)