Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit d0423ad

Browse files
DenisBakhvalovDenisBakhvalov
authored
[SYCL][ESIMD] - Enable ESIMD tests through L0 (#57)
Tests that use images are still failing and are not enabled.
1 parent 33b09c2 commit d0423ad

19 files changed

+41
-43
lines changed

‎SYCL/ESIMD/BitonicSortK.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out
1212

‎SYCL/ESIMD/BitonicSortKv2.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out

‎SYCL/ESIMD/PrefixSum.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out 20
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out 20

‎SYCL/ESIMD/Prefix_Local_sum1.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out 20
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out 20

‎SYCL/ESIMD/Prefix_Local_sum2.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out 20
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out 20

‎SYCL/ESIMD/Prefix_Local_sum3.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out

‎SYCL/ESIMD/Stencil.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out

‎SYCL/ESIMD/accessor.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl -D_CRT_SECURE_NO_WARNINGS=1 %s -o %t.out
1111
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out
1212

‎SYCL/ESIMD/kmeans/kmeans.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -I%S/.. -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out %S/points.big.json
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out %S/points.big.json

‎SYCL/ESIMD/matrix_transpose_glb.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out
1212

‎SYCL/ESIMD/matrix_transpose_usm.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out

‎SYCL/ESIMD/reduction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
77
//
88
//===----------------------------------------------------------------------===//
9-
// TODO enable on Windows and Level Zero
10-
// REQUIRES: linux && gpu && opencl
9+
// TODO enable on Windows
10+
// REQUIRES: linux && gpu
1111
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1212
// RUN: %HOST_RUN_PLACEHOLDER %t.out
1313
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out

‎SYCL/ESIMD/slm_barrier.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out
1212

‎SYCL/ESIMD/stencil2.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out

‎SYCL/ESIMD/test_id_3d.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out

‎SYCL/ESIMD/vadd_1d.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out
1212

‎SYCL/ESIMD/vadd_raw_send.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
77
//
88
//===----------------------------------------------------------------------===//
9-
// TODO enable on Windows and Level Zero
10-
// REQUIRES: linux && gpu && opencl
9+
// TODO enable on Windows
10+
// REQUIRES: linux && gpu
1111
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out
1313

‎SYCL/ESIMD/vadd_usm.cpp

Lines changed: 2 additions & 2 deletions
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-
// TODO enable on Windows and Level Zero
9-
// REQUIRES: linux && gpu && opencl
8+
// TODO enable on Windows
9+
// REQUIRES: linux && gpu
1010
// RUN: %clangxx-esimd -fsycl %s -o %t.out
1111
// RUN: %HOST_RUN_PLACEHOLDER %t.out
1212
// RUN: %ESIMD_RUN_PLACEHOLDER %t.out

‎SYCL/lit.cfg.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,11 @@
100100
config.sycl_be +
101101
"' supported values are PI_OPENCL, PI_CUDA, PI_LEVEL_ZERO")
102102

103-
# ESIMD-specific setup. Requires OpenCL for now.
104-
if "opencl" in config.available_features:
105-
esimd_run_substitute = " env SYCL_BE=PI_OPENCL SYCL_DEVICE_TYPE=GPU SYCL_PROGRAM_COMPILE_OPTIONS=-vc-codegen"
106-
config.substitutions.append( ('%ESIMD_RUN_PLACEHOLDER', esimd_run_substitute) )
107-
config.substitutions.append( ('%clangxx-esimd', config.dpcpp_compiler +
108-
' ' + '-fsycl-explicit-simd' + ' ' +
109-
config.cxx_flags ) )
103+
esimd_run_substitute = "env SYCL_BE={SYCL_BE} SYCL_DEVICE_TYPE=GPU SYCL_PROGRAM_COMPILE_OPTIONS=-vc-codegen".format(SYCL_BE=config.sycl_be)
104+
config.substitutions.append( ('%ESIMD_RUN_PLACEHOLDER', esimd_run_substitute) )
105+
config.substitutions.append( ('%clangxx-esimd', config.dpcpp_compiler +
106+
' ' + '-fsycl-explicit-simd' + ' ' +
107+
config.cxx_flags ) )
110108

111109
config.substitutions.append( ('%clangxx', ' '+ config.dpcpp_compiler + ' ' + config.cxx_flags ) )
112110
config.substitutions.append( ('%clang', ' ' + config.dpcpp_compiler + ' ' + config.c_flags ) )

0 commit comments

Comments
 (0)