Skip to content

Commit 3cd8ed9

Browse files
mylermyler
authored
Merge pull request intel#1587 from bb-sycl/xmain-cand
Auto pulldown and update tc files for xmain-cand branch on 20230210
2 parents e74ce3a + fad9855 commit 3cd8ed9

File tree

348 files changed

+7527
-3415
lines changed

Some content is hidden

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

348 files changed

+7527
-3415
lines changed

‎.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
* @pvchupin
1+
* @bader
22

33
# Use runtime team as the umbrella for most of the tests
44
/SYCL/ @intel/llvm-reviewers-runtime
@@ -95,4 +95,4 @@ SYCL/XPTI @intel/llvm-reviewers-runtime
9595
/SYCL/SeparateCompile/ @intel/dpcpp-tools-reviewers
9696

9797
# invoke_simd
98-
/SYCL/InvokeSimd/ @rolandschulz @kbobrovs
98+
/SYCL/InvokeSimd/ @intel/dpcpp-esimd-reviewers

‎CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ option(TEST_SUITE_FORTRAN "Enable Fortran test suite" OFF)
66

77
project(test-suite C CXX)
88

9+
if("Fortran" IN_LIST TEST_SUITE_SUBDIRS)
10+
set(TEST_SUITE_FORTRAN_default ON)
11+
else()
12+
set(TEST_SUITE_FORTRAN_default OFF)
13+
endif()
14+
option(TEST_SUITE_FORTRAN "Enable Fortran test suite" ${TEST_SUITE_FORTRAN_default})
15+
916
if(TEST_SUITE_FORTRAN)
1017
enable_language(Fortran)
1118
endif()

‎External/SPEC/CINT2017rate/502.gcc_r/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ speccpu2017_benchmark(RATE)
88

99
add_definitions(-DSPEC_502 -DIN_GCC -DHAVE_CONFIG_H)
1010
speccpu2017_add_include_dirs(. include spec_qsort)
11-
add_compile_options(-fgnu89-inline)
11+
add_compile_options(-fgnu89-inline -fno-strict-aliasing)
1212

1313
## test ########################################################################
1414

‎External/SPEC/CINT2017rate/505.mcf_r/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ endif ()
77
speccpu2017_benchmark(RATE)
88

99
speccpu2017_add_include_dirs(spec_qsort)
10+
add_compile_options(-fno-strict-aliasing)
1011

1112
## test ########################################################################
1213

‎External/sollve_vv/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ set(TEST_SUITE_SOLLVEVV_EXPECT_PASS
146146
5.0/target/test_target_uses_allocators_high_bw.c
147147
5.0/target/test_target_uses_allocators_large_cap.c
148148
5.0/target/test_target_uses_allocators_low_lat.c
149-
5.0/target/test_target_uses_allocators_pteam.c
150149
5.0/target/test_target_uses_allocators_thread.c
151150
5.0/target_data/test_target_data_use_device_addr.c
152151
5.0/target_data/test_target_data_use_device_ptr.c
@@ -157,7 +156,6 @@ set(TEST_SUITE_SOLLVEVV_EXPECT_PASS
157156
5.0/target_teams_distribute_parallel_for_simd/test_target_teams_distribute_parallel_for_simd_atomic.c
158157
5.0/target_update/test_target_update_mapper_to_discontiguous.c
159158
5.0/task/test_parallel_for_reduction_task.c
160-
5.0/task/test_parallel_for_reduction_task_device.c
161159
5.0/task/test_task_depend_mutexinoutset.c
162160
5.0/task/test_task_detach.c
163161
5.0/task/test_task_in_reduction.c

‎SYCL/AOT/Inputs/aot.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,9 @@ void simple_vadd(const std::array<T, N> &VA, const std::array<T, N> &VB,
5151

5252
int main() {
5353
const size_t array_size = 4;
54-
std::array<sycl::cl_int, array_size> A = {{1, 2, 3, 4}}, B = {{1, 2, 3, 4}},
55-
C;
56-
std::array<sycl::cl_float, array_size> D = {{1.f, 2.f, 3.f, 4.f}},
57-
E = {{1.f, 2.f, 3.f, 4.f}}, F;
54+
std::array<int, array_size> A = {{1, 2, 3, 4}}, B = {{1, 2, 3, 4}}, C;
55+
std::array<float, array_size> D = {{1.f, 2.f, 3.f, 4.f}},
56+
E = {{1.f, 2.f, 3.f, 4.f}}, F;
5857
simple_vadd(A, B, C);
5958
simple_vadd(D, E, F);
6059
for (unsigned int i = 0; i < array_size; i++) {

‎SYCL/Basic/device_event.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ int test_strideN(size_t stride) {
8080
myQueue.submit([&](handler &cgh) {
8181
auto out_ptr = out_buf.get_access<access::mode::write>(cgh);
8282
#ifdef USE_DEPRECATED_LOCAL_ACC
83-
accessor<sycl::cl_int, 1, access::mode::read_write, access::target::local>
83+
accessor<int, 1, access::mode::read_write, access::target::local>
8484
local_acc(range<1>(16), cgh);
8585
#else
86-
local_accessor<sycl::cl_int, 1> local_acc(range<1>(16), cgh);
86+
local_accessor<int, 1> local_acc(range<1>(16), cgh);
8787
#endif
8888

8989
// Create work-groups with 16 work items in each group.

‎SYCL/Basic/event_profiling_info.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
//===----------------------------------------------------------------------===//
1313

1414
// Flaky with CUDA and HIP (https://github.com/intel/llvm/issues/6495).
15-
// UNSUPPORTED: cuda, hip
15+
// TODO: Test is failing for acc backend, enable back when the issue
16+
// fixed.
17+
// UNSUPPORTED: cuda, hip, accelerator
1618

1719
#include <cassert>
1820
#include <sycl/sycl.hpp>

‎SYCL/Basic/image/image.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: hip
1+
// UNSUPPORTED: hip || gpu-intel-pvc
22
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out

‎SYCL/Basic/image/image_accessor_range.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// FIXME: Investigate OS-agnostic failures
22
// REQUIRES: TEMPORARY_DISABLED
33

4-
// UNSUPPORTED: cuda || hip
4+
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
55
// CUDA does not support SYCL 1.2.1 images.
66
//
77
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out

‎SYCL/Basic/image/image_accessor_readsampler.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: cuda || hip || (windows && level_zero)
1+
// UNSUPPORTED: cuda || hip || (windows && level_zero) || gpu-intel-pvc
22
// unsupported on windows (level-zero) due to fail of Jenkins/pre-ci-windows
33
// CUDA cannot support SYCL 1.2.1 images.
44
//
@@ -67,10 +67,10 @@ void checkReadSampler(char *host_ptr, s::sampler Sampler, s::cl_float4 Coord,
6767
s::accessor<s::cl_float4, 1, s::access::mode::write> ReadDataBufAcc(
6868
ReadDataBuf, cgh);
6969

70-
cgh.single_task<class kernel_class<i>>([=](){
71-
s::cl_float4 RetColor = ReadAcc.read(Coord, Sampler);
72-
ReadDataBufAcc[0] = RetColor;
73-
});
70+
cgh.single_task<class kernel_class<i>>([=]() {
71+
s::cl_float4 RetColor = ReadAcc.read(Coord, Sampler);
72+
ReadDataBufAcc[0] = RetColor;
73+
});
7474
});
7575
}
7676
validateReadData(ReadData, ExpectedColor, precision);

‎SYCL/Basic/image/image_accessor_readwrite.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: cuda || hip
1+
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
22
// CUDA cannot support SYCL 1.2.1 images.
33
//
44
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
@@ -106,9 +106,9 @@ void write_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
106106
s::queue Queue;
107107
Queue.submit([&](s::handler &cgh) {
108108
auto WriteAcc = Img.get_access<WriteDataT, s::access::mode::write>(cgh);
109-
cgh.single_task<class kernel_class<WriteDataT, static_cast<int>(ImgType), 0>>([=](){
110-
WriteAcc.write(Coord, Color);
111-
});
109+
cgh.single_task<
110+
class kernel_class<WriteDataT, static_cast<int>(ImgType), 0>>(
111+
[=]() { WriteAcc.write(Coord, Color); });
112112
});
113113
}
114114
}
@@ -129,10 +129,11 @@ void check_read_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
129129
s::accessor<ReadDataT, 1, s::access::mode::write> ReadDataBufAcc(
130130
ReadDataBuf, cgh);
131131

132-
cgh.single_task<class kernel_class<ReadDataT, static_cast<int>(ImgType), 1>>([=](){
133-
ReadDataT RetColor = ReadAcc.read(Coord);
134-
ReadDataBufAcc[0] = RetColor;
135-
});
132+
cgh.single_task<
133+
class kernel_class<ReadDataT, static_cast<int>(ImgType), 1>>([=]() {
134+
ReadDataT RetColor = ReadAcc.read(Coord);
135+
ReadDataBufAcc[0] = RetColor;
136+
});
136137
});
137138
}
138139
check_read_data(ReadData, ExpectedColor);

‎SYCL/Basic/image/image_accessor_readwrite_half.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: cuda || hip
1+
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
22
// CUDA cannot support SYCL 1.2.1 images.
33
//
44
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
@@ -73,9 +73,9 @@ void write_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
7373
s::queue Queue;
7474
Queue.submit([&](s::handler &cgh) {
7575
auto WriteAcc = Img.get_access<WriteDataT, s::access::mode::write>(cgh);
76-
cgh.single_task<class kernel_class<WriteDataT, static_cast<int>(ImgType), 0>>([=](){
77-
WriteAcc.write(Coord, Color);
78-
});
76+
cgh.single_task<
77+
class kernel_class<WriteDataT, static_cast<int>(ImgType), 0>>(
78+
[=]() { WriteAcc.write(Coord, Color); });
7979
});
8080
}
8181
}
@@ -96,10 +96,11 @@ void check_read_type_order(char *HostPtr, const s::image_channel_order ImgOrder,
9696
s::accessor<ReadDataT, 1, s::access::mode::write> ReadDataBufAcc(
9797
ReadDataBuf, cgh);
9898

99-
cgh.single_task<class kernel_class<ReadDataT, static_cast<int>(ImgType), 1>>([=](){
100-
ReadDataT RetColor = ReadAcc.read(Coord);
101-
ReadDataBufAcc[0] = RetColor;
102-
});
99+
cgh.single_task<
100+
class kernel_class<ReadDataT, static_cast<int>(ImgType), 1>>([=]() {
101+
ReadDataT RetColor = ReadAcc.read(Coord);
102+
ReadDataBufAcc[0] = RetColor;
103+
});
103104
});
104105
}
105106
check_read_data(ReadData, ExpectedColor);

‎SYCL/Basic/image/image_max_size.cpp

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

5-
// UNSUPPORTED: cuda || hip || (windows && opencl && gpu)
5+
// UNSUPPORTED: cuda || hip || (windows && opencl && gpu) || gpu-intel-pvc
66
// CUDA does not support info::device::image3d_max_width query.
77
// TODO: Irregular runtime fails on Windows/opencl:gpu require analysis.
88

‎SYCL/Basic/image/image_read.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: hip
1+
// UNSUPPORTED: hip || gpu-intel-pvc
22
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out

‎SYCL/Basic/image/image_read_fp16.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: hip
1+
// UNSUPPORTED: hip || gpu-intel-pvc
22
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out

‎SYCL/Basic/image/image_sample.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// RUN: %CPU_RUN_PLACEHOLDER %t.out
33
// RUN: %GPU_RUN_PLACEHOLDER %t.out
44
// Temporarily disable test on Windows due to regressions in GPU driver.
5-
// UNSUPPORTED: hip, windows
5+
// UNSUPPORTED: hip, windows, gpu-intel-pvc
66

77
#include <sycl/sycl.hpp>
88

‎SYCL/Basic/image/image_write.cpp

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

5-
// UNSUPPORTED: cuda || hip
5+
// UNSUPPORTED: cuda || hip || gpu-intel-pvc
66
// TODO: re-enable on cuda device.
77
// See https://github.com/intel/llvm/issues/1542#issuecomment-707877817 for more
88
// details.

‎SYCL/Basic/image/image_write_fp16.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: hip || cuda
1+
// UNSUPPORTED: hip || cuda || gpu-intel-pvc
22
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
33
// RUN: %CPU_RUN_PLACEHOLDER %t.out
44
// RUN: %GPU_RUN_PLACEHOLDER %t.out

0 commit comments

Comments
 (0)