Skip to content

[SYCL][Test E2E] Use %{build}/%{run} in Scheduler tests #9343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions sycl/test-e2e/Scheduler/BasicSchedulerTests.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
//==------------------- BasicSchedulerTests.cpp ----------------------------==//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
Expand Down
6 changes: 2 additions & 4 deletions sycl/test-e2e/Scheduler/CommandCleanupThreadSafety.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// UNSUPPORTED: windows
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -lpthread
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} -o %t.out -lpthread
// RUN: %{run} %t.out

#include <sycl/sycl.hpp>

Expand Down
7 changes: 4 additions & 3 deletions sycl/test-e2e/Scheduler/DataMovement.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out %debug_option
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} -o %t.out %debug_option
// RUN: %{run} %t.out
//
// UNSUPPORTED: accelerator
//
//==-------------------------- DataMovement.cpp ----------------------------==//
//
Expand Down
6 changes: 2 additions & 4 deletions sycl/test-e2e/Scheduler/HandleException.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %{build} -fsycl-dead-args-optimization -o %t.out
// RUN: %{run} %t.out

// Expected exception is generated for OpenCL backend only.
// REQUIRES: opencl
Expand Down
6 changes: 2 additions & 4 deletions sycl/test-e2e/Scheduler/HostAccDestruction.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %clangxx -fsycl -fsycl-dead-args-optimization -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
// RUN: %{build} -fsycl-dead-args-optimization -o %t.out
// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
// UNSUPPORTED: hip
//==---------------------- HostAccDestruction.cpp --------------------------==//
//
Expand Down
6 changes: 2 additions & 4 deletions sycl/test-e2e/Scheduler/InOrderQueueDeps.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
// RUN: %{build} -o %t.out
// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
//
// XFAIL: hip_nvidia

Expand Down
6 changes: 3 additions & 3 deletions sycl/test-e2e/Scheduler/MemObjRemapping.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
// RUN: %{build} -o %t.out
// RUN: env SYCL_HOST_UNIFIED_MEMORY=1 SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
//
// UNSUPPORTED: accelerator
// XFAIL: hip_nvidia
#include <cassert>
#include <cstddef>
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/Scheduler/MultipleDevices.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %{build} -o %t.out
// RUN: %BE_RUN_PLACEHOLDER %t.out
//
// XFAIL: hip_nvidia
Expand Down
6 changes: 2 additions & 4 deletions sycl/test-e2e/Scheduler/ReleaseResourcesTest.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out
// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
// RUN: env SYCL_PI_TRACE=2 %ACC_RUN_PLACEHOLDER %t.out 2>&1 %ACC_CHECK_PLACEHOLDER
// RUN: %{build} -fsycl-dead-args-optimization -o %t.out
// RUN: env SYCL_PI_TRACE=2 %{run} %t.out 2>&1 | FileCheck %s
//
// XFAIL: hip_nvidia

Expand Down