Skip to content

Commit 6bfb33d

Browse files
aelovikov-intelaelovikov-intel
authored
[SYCL][Test E2E] Use %{build}/%{run} in Scheduler tests (#9343)
1 parent 38d0536 commit 6bfb33d

9 files changed

+20
-31
lines changed

‎sycl/test-e2e/Scheduler/BasicSchedulerTests.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER %t.out
3-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
4-
// RUN: %ACC_RUN_PLACEHOLDER %t.out
1+
// RUN: %{build} -o %t.out
2+
// RUN: %{run} %t.out
53
//==------------------- BasicSchedulerTests.cpp ----------------------------==//
64
//
75
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

‎sycl/test-e2e/Scheduler/CommandCleanupThreadSafety.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// UNSUPPORTED: windows
2-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -lpthread
3-
// RUN: %CPU_RUN_PLACEHOLDER %t.out
4-
// RUN: %ACC_RUN_PLACEHOLDER %t.out
5-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
2+
// RUN: %{build} -o %t.out -lpthread
3+
// RUN: %{run} %t.out
64

75
#include <sycl/sycl.hpp>
86

‎sycl/test-e2e/Scheduler/DataMovement.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %debug_option
2-
// RUN: %CPU_RUN_PLACEHOLDER %t.out
3-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
1+
// RUN: %{build} -o %t.out %debug_option
2+
// RUN: %{run} %t.out
3+
//
4+
// UNSUPPORTED: accelerator
45
//
56
//==-------------------------- DataMovement.cpp ----------------------------==//
67
//

‎sycl/test-e2e/Scheduler/HandleException.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out
2-
// RUN: %CPU_RUN_PLACEHOLDER %t.out
3-
// RUN: %ACC_RUN_PLACEHOLDER %t.out
4-
// RUN: %GPU_RUN_PLACEHOLDER %t.out
1+
// RUN: %{build} -fsycl-dead-args-optimization -o %t.out
2+
// RUN: %{run} %t.out
53

64
// Expected exception is generated for OpenCL backend only.
75
// REQUIRES: opencl

‎sycl/test-e2e/Scheduler/HostAccDestruction.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// RUN: %clangxx -fsycl -fsycl-dead-args-optimization -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
3-
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
4-
// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
1+
// RUN: %{build} -fsycl-dead-args-optimization -o %t.out
2+
// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
53
// UNSUPPORTED: hip
64
//==---------------------- HostAccDestruction.cpp --------------------------==//
75
//

‎sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
3-
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
4-
// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
1+
// RUN: %{build} -o %t.out
2+
// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
53
//
64
// XFAIL: hip_nvidia
75

‎sycl/test-e2e/Scheduler/MemObjRemapping.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
3-
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
1+
// RUN: %{build} -o %t.out
2+
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
43
//
4+
// UNSUPPORTED: accelerator
55
// XFAIL: hip_nvidia
66
#include <cassert>
77
#include <cstddef>

‎sycl/test-e2e/Scheduler/MultipleDevices.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
1+
// RUN: %{build} -o %t.out
22
// RUN: %BE_RUN_PLACEHOLDER %t.out
33
//
44
// XFAIL: hip_nvidia

‎sycl/test-e2e/Scheduler/ReleaseResourcesTest.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out
2-
// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
3-
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
4-
// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
1+
// RUN: %{build} -fsycl-dead-args-optimization -o %t.out
2+
// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
53
//
64
// XFAIL: hip_nvidia
75

0 commit comments

Comments
 (0)