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

Commit 6a053ff

Browse files
author
Alexander Batashev
committed
fix redirects
1 parent e30ef09 commit 6a053ff

15 files changed

+49
-37
lines changed

‎SYCL/Basic/buffer/native_buffer_creation_flags.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %CPU_CHECK_PLACEHOLDER
2+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
33

44
#include <CL/sycl.hpp>
55

‎SYCL/Basic/enqueue_barrier.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clangxx -fsycl %s -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_CHECK_PLACEHOLDER
3-
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_CHECK_PLACEHOLDER
4-
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %ACC_CHECK_PLACEHOLDER
2+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
3+
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_ERR_REDIRECT %GPU_CHECK_PLACEHOLDER
4+
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %ACC_ERR_REDIRECT %ACC_CHECK_PLACEHOLDER
55

66
// The test is failing sporadically on Windows OpenCL RTs
77
// Disabling on windows until fixed

‎SYCL/Basic/event_release.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %clangxx -fsycl %s -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_CHECK_PLACEHOLDER
2+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
33
#include <CL/sycl.hpp>
44
#include <cassert>
55
#include <iostream>

‎SYCL/Basic/host-task-dependency.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %threads_lib
2-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %CPU_CHECK_PLACEHOLDER
3-
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %GPU_CHECK_PLACEHOLDER
4-
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %ACC_CHECK_PLACEHOLDER
2+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
3+
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %GPU_ERR_REDIRECT %GPU_CHECK_PLACEHOLDER
4+
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %ACC_ERR_REDIRECT %ACC_CHECK_PLACEHOLDER
55
//
66
// TODO: Behaviour is unstable for level zero on Windows. Enable when fixed.
77
// TODO: The test is sporadically fails on CUDA. Enable when fixed.

‎SYCL/Basic/use_pinned_host_memory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_CHECK_PLACEHOLDER
2+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
33

44
#include <CL/sycl.hpp>
55

‎SYCL/InorderQueue/in_order_property_trace.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_CHECK_PLACEHOLDER
3-
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_CHECK_PLACEHOLDER
2+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
3+
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_ERR_REDIRECT %GPU_CHECK_PLACEHOLDER
44
// SYCL in order and default queue property trace test
55
//
66
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

‎SYCL/Regression/image_access.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
22
// RUN: %HOST_RUN_PLACEHOLDER %t.out
3-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_CHECK_PLACEHOLDER
4-
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_CHECK_PLACEHOLDER
3+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
4+
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_ERR_REDIRECT %GPU_CHECK_PLACEHOLDER
55
// No execution of FPGA because it does not support images
66
//
77
// UNSUPPORTED: cuda || hip

‎SYCL/Regression/pi_release.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// REQUIRES: opencl || level_zero || cuda
22
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
3-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %CPU_CHECK_PLACEHOLDER
4-
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %ACC_CHECK_PLACEHOLDER
5-
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %GPU_CHECK_PLACEHOLDER
3+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
4+
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %ACC_ERR_REDIRECT %ACC_CHECK_PLACEHOLDER
5+
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=-1 %t.out %GPU_ERR_REDIRECT %GPU_CHECK_PLACEHOLDER
66

77
#include <CL/sycl.hpp>
88

‎SYCL/Scheduler/HostAccDestruction.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %clangxx -fsycl -fsycl-dead-args-optimization %s -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_CHECK_PLACEHOLDER
3-
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_CHECK_PLACEHOLDER
4-
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %ACC_CHECK_PLACEHOLDER
2+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
3+
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_ERR_REDIRECT %GPU_CHECK_PLACEHOLDER
4+
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %ACC_ERR_REDIRECT %ACC_CHECK_PLACEHOLDER
55
// UNSUPPORTED: cuda || hip
66
//==---------------------- HostAccDestruction.cpp --------------------------==//
77
//

‎SYCL/Scheduler/InOrderQueueDeps.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
22
// RUN: %HOST_RUN_PLACEHOLDER %t.out
3-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_CHECK_PLACEHOLDER
4-
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_CHECK_PLACEHOLDER
5-
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %ACC_CHECK_PLACEHOLDER
3+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
4+
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_ERR_REDIRECT %GPU_CHECK_PLACEHOLDER
5+
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %ACC_ERR_REDIRECT %ACC_CHECK_PLACEHOLDER
66

77
// The tested functionality is disabled with Level Zero until it is supported by
88
// the plugin.

‎SYCL/Scheduler/MemObjRemapping.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %t.out %CPU_CHECK_PLACEHOLDER
3-
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %t.out %GPU_CHECK_PLACEHOLDER
2+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
3+
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %t.out %GPU_ERR_REDIRECT %GPU_CHECK_PLACEHOLDER
44
#include <CL/sycl.hpp>
55
#include <cassert>
66
#include <cstddef>

‎SYCL/Scheduler/ReleaseResourcesTest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out
22
// RUN: %HOST_RUN_PLACEHOLDER %t.out
3-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_CHECK_PLACEHOLDER
4-
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_CHECK_PLACEHOLDER
5-
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %ACC_CHECK_PLACEHOLDER
3+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
4+
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_ERR_REDIRECT %GPU_CHECK_PLACEHOLDER
5+
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %ACC_ERR_REDIRECT %ACC_CHECK_PLACEHOLDER
66

77
//==------------------- ReleaseResourcesTests.cpp --------------------------==//
88
//

‎SYCL/SpecConstants/1.2.1/spec_const_redefine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
// program builds at run-time
55
// RUN: %clangxx -DSYCL_DISABLE_FALLBACK_ASSERT -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
66
// RUN: %HOST_RUN_PLACEHOLDER %t.out
7-
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_CHECK_PLACEHOLDER
8-
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_CHECK_PLACEHOLDER
7+
// RUN: %CPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %CPU_ERR_REDIRECT %CPU_CHECK_PLACEHOLDER
8+
// RUN: %GPU_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %GPU_ERR_REDIRECT %GPU_CHECK_PLACEHOLDER
99
//
1010
//==----------- spec_const_redefine.cpp ------------------------------------==//
1111
//

‎SYCL/SpecConstants/1.2.1/spec_const_redefine_accelerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
// XFAIL: opencl && accelerator
1717
// UNSUPPORTED: cuda || level_zero
1818
#include "spec_const_redefine_accelerator.cpp"
19-
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
19+
// RUN: %ACC_RUN_PLACEHOLDER env SYCL_PI_TRACE=2 %t.out %ACC_ERR_REDIRECT %ACC_CHECK_PLACEHOLDER

‎SYCL/lit.cfg.py

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@
218218
host_run_on_linux_substitute = "echo "
219219
host_check_substitute = ""
220220
host_check_on_linux_substitute = ""
221+
host_err_redirect_substitute = ""
221222
supported_device_types=['cpu', 'gpu', 'acc', 'host']
222223

223224
for target_device in config.target_devices.split(','):
@@ -230,60 +231,67 @@
230231
found_at_least_one_device = True
231232
lit_config.note("Test HOST device")
232233
host_run_substitute = "env SYCL_DEVICE_FILTER=host "
233-
host_check_substitute = "2>&1 | FileCheck %s"
234+
host_check_substitute = "| FileCheck %s"
235+
host_err_redirect_substitute = " 2>&1 "
234236
config.available_features.add('host')
235237
if platform.system() == "Linux":
236238
host_run_on_linux_substitute = "env SYCL_DEVICE_FILTER=host "
237-
host_check_on_linux_substitute = "2>&1 | FileCheck %s"
239+
host_check_on_linux_substitute = "| FileCheck %s"
238240
else:
239241
lit_config.warning("HOST device not used")
240242

241243
config.substitutions.append( ('%HOST_RUN_PLACEHOLDER', host_run_substitute) )
242244
config.substitutions.append( ('%HOST_RUN_ON_LINUX_PLACEHOLDER', host_run_on_linux_substitute) )
243245
config.substitutions.append( ('%HOST_CHECK_PLACEHOLDER', host_check_substitute) )
244246
config.substitutions.append( ('%HOST_CHECK_ON_LINUX_PLACEHOLDER', host_check_on_linux_substitute) )
247+
config.substitutions.append( ('%HOST_ERR_REDIRECT', host_err_redirect_substitute) )
245248

246249
cpu_run_substitute = "echo "
247250
cpu_run_on_linux_substitute = "echo "
248251
cpu_check_substitute = ""
252+
cpu_err_redirect_substitute = ""
249253
cpu_check_on_linux_substitute = ""
250254

251255
if 'cpu' in config.target_devices.split(','):
252256
found_at_least_one_device = True
253257
lit_config.note("Test CPU device")
254258
cpu_run_substitute = "env SYCL_DEVICE_FILTER=cpu,host "
255-
cpu_check_substitute = "2>&1 | FileCheck %s"
259+
cpu_check_substitute = "| FileCheck %s"
260+
cpu_err_redirect_substitute = " 2>&1 "
256261
config.available_features.add('cpu')
257262
if platform.system() == "Linux":
258263
cpu_run_on_linux_substitute = "env SYCL_DEVICE_FILTER=cpu,host "
259-
cpu_check_on_linux_substitute = "2>&1 | FileCheck %s"
264+
cpu_check_on_linux_substitute = "| FileCheck %s"
260265
else:
261266
lit_config.warning("CPU device not used")
262267

263268
config.substitutions.append( ('%CPU_RUN_PLACEHOLDER', cpu_run_substitute) )
264269
config.substitutions.append( ('%CPU_RUN_ON_LINUX_PLACEHOLDER', cpu_run_on_linux_substitute) )
265270
config.substitutions.append( ('%CPU_CHECK_PLACEHOLDER', cpu_check_substitute) )
266271
config.substitutions.append( ('%CPU_CHECK_ON_LINUX_PLACEHOLDER', cpu_check_on_linux_substitute) )
272+
config.substitutions.append( ('%CPU_ERR_REDIRECT', cpu_err_redirect_substitute) )
267273

268274
gpu_run_substitute = "echo "
269275
gpu_run_on_linux_substitute = "echo "
270276
gpu_check_substitute = ""
271277
gpu_l0_check_substitute = ""
272278
gpu_check_on_linux_substitute = ""
279+
gpu_err_redirect_substitute = ""
273280

274281
if 'gpu' in config.target_devices.split(','):
275282
found_at_least_one_device = True
276283
lit_config.note("Test GPU device")
277284
gpu_run_substitute = " env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:gpu,host ".format(SYCL_PLUGIN=config.sycl_be)
278-
gpu_check_substitute = "2>&1 | FileCheck %s"
285+
gpu_check_substitute = "| FileCheck %s"
286+
gpu_err_redirect_substitute = " 2>&1 "
279287
config.available_features.add('gpu')
280288

281289
if config.sycl_be == "level_zero":
282290
gpu_l0_check_substitute = "| FileCheck %s"
283291

284292
if platform.system() == "Linux":
285293
gpu_run_on_linux_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:gpu,host ".format(SYCL_PLUGIN=config.sycl_be)
286-
gpu_check_on_linux_substitute = "2>&1 | FileCheck %s"
294+
gpu_check_on_linux_substitute = "| FileCheck %s"
287295

288296
else:
289297
lit_config.warning("GPU device not used")
@@ -293,19 +301,23 @@
293301
config.substitutions.append( ('%GPU_CHECK_PLACEHOLDER', gpu_check_substitute) )
294302
config.substitutions.append( ('%GPU_L0_CHECK_PLACEHOLDER', gpu_l0_check_substitute) )
295303
config.substitutions.append( ('%GPU_CHECK_ON_LINUX_PLACEHOLDER', gpu_check_on_linux_substitute) )
304+
config.substitutions.append( ('%GPU_ERR_REDIRECT', gpu_err_redirect_substitute) )
296305

297306
acc_run_substitute = "echo "
298307
acc_check_substitute = ""
308+
acc_err_redirect_substitute = ""
299309
if 'acc' in config.target_devices.split(','):
300310
found_at_least_one_device = True
301311
lit_config.note("Tests accelerator device")
302312
acc_run_substitute = " env SYCL_DEVICE_FILTER=acc "
303-
acc_check_substitute = "2>&1 | FileCheck %s"
313+
acc_check_substitute = "| FileCheck %s"
314+
acc_err_redirect_substitute = " 2>&1 "
304315
config.available_features.add('accelerator')
305316
else:
306317
lit_config.warning("Accelerator device not used")
307318
config.substitutions.append( ('%ACC_RUN_PLACEHOLDER', acc_run_substitute) )
308319
config.substitutions.append( ('%ACC_CHECK_PLACEHOLDER', acc_check_substitute) )
320+
config.substitutions.append( ('%ACC_ERR_REDIRECT', acc_err_redirect_substitute) )
309321

310322
if config.sycl_be == 'cuda' or (config.sycl_be == 'hip' and config.hip_platform == 'NVIDIA'):
311323
config.substitutions.append( ('%sycl_triple', "nvptx64-nvidia-cuda" ) )

0 commit comments

Comments
 (0)