From dc54a26f8468a6d36d9a2f6ff807f94f66c40138 Mon Sep 17 00:00:00 2001 From: "Agarwal, Udit" Date: Wed, 31 Jan 2024 13:33:36 -0800 Subject: [PATCH] Fix more tests --- sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp | 8 ++++---- sycl/test-e2e/FilterSelector/select_device.cpp | 4 ++-- sycl/test-e2e/FilterSelector/select_device_acc.cpp | 2 +- sycl/test-e2e/OneapiDeviceSelector/illegal_input.cpp | 1 + .../is_compatible/is_compatible_several_targets.cpp | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp b/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp index ab3154380fe07..5e9022054cb33 100644 --- a/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp +++ b/sycl/test-e2e/FilterSelector/filter_list_cpu_gpu_acc.cpp @@ -10,14 +10,14 @@ // RUN: %clangxx -fsycl %S/Inputs/filter_list_queries.cpp -o %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR="*:acc" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-ONLY +// RUN: env ONEAPI_DEVICE_SELECTOR="*:fpga" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-ONLY // RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-GPU-ONLY // RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-CPU-ONLY // -// RUN: env ONEAPI_DEVICE_SELECTOR="*:acc,gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU -// RUN: env ONEAPI_DEVICE_SELECTOR="*:acc,cpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU +// RUN: env ONEAPI_DEVICE_SELECTOR="*:fpga,gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU +// RUN: env ONEAPI_DEVICE_SELECTOR="*:fpga,cpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-CPU // -// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu,acc,gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU +// RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu,fpga,gpu" %{run-unfiltered-devices} %t.out | FileCheck %s --check-prefixes=CHECK-ACC-GPU-CPU // // CHECK-ACC-ONLY: Device: acc // CHECK-ACC-ONLY-NOT: Device: cpu diff --git a/sycl/test-e2e/FilterSelector/select_device.cpp b/sycl/test-e2e/FilterSelector/select_device.cpp index 7516545ab59fd..ddb725b0523a4 100644 --- a/sycl/test-e2e/FilterSelector/select_device.cpp +++ b/sycl/test-e2e/FilterSelector/select_device.cpp @@ -4,7 +4,7 @@ // RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run-unfiltered-devices} %t.out // RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run-unfiltered-devices} %t.out // RUN: env ONEAPI_DEVICE_SELECTOR='*:cpu;level_zero:gpu' %{run-unfiltered-devices} %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:acc %{run-unfiltered-devices} %t.out +// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga %{run-unfiltered-devices} %t.out // // Checks if only specified device types can be acquired from select_device // when ONEAPI_DEVICE_SELECTOR is set @@ -45,7 +45,7 @@ int main() { device d = cs.select_device(); } if (!envVal || forcedPIs == "*" || - forcedPIs.find("acc") != std::string::npos) { + forcedPIs.find("fpga") != std::string::npos) { accelerator_selector as; device d = as.select_device(); } diff --git a/sycl/test-e2e/FilterSelector/select_device_acc.cpp b/sycl/test-e2e/FilterSelector/select_device_acc.cpp index 38d97652f8441..f5b94b535bbd4 100644 --- a/sycl/test-e2e/FilterSelector/select_device_acc.cpp +++ b/sycl/test-e2e/FilterSelector/select_device_acc.cpp @@ -1,5 +1,5 @@ // RUN: %{build} -o %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR='*:acc' %{run-unfiltered-devices} %t.out +// RUN: env ONEAPI_DEVICE_SELECTOR='*:fpga' %{run-unfiltered-devices} %t.out // // Checks if only specified device types can be acquired from select_device // when ONEAPI_DEVICE_SELECTOR is set diff --git a/sycl/test-e2e/OneapiDeviceSelector/illegal_input.cpp b/sycl/test-e2e/OneapiDeviceSelector/illegal_input.cpp index 59129cf820abe..02f2f5e183653 100644 --- a/sycl/test-e2e/OneapiDeviceSelector/illegal_input.cpp +++ b/sycl/test-e2e/OneapiDeviceSelector/illegal_input.cpp @@ -9,6 +9,7 @@ // RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:" %{run-unfiltered-devices} %t.out // RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:::gpu" %{run-unfiltered-devices} %t.out // RUN: env ONEAPI_DEVICE_SELECTOR="level_zero:.1" %{run-unfiltered-devices} %t.out +// RUN: env ONEAPI_DEVICE_SELECTOR="*:acc" %{run-unfiltered-devices} %t.out // XFAIL: * // Calling ONEAPI_DEVICE_SELECTOR with an illegal input should result in an diff --git a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp index 6dcc4690880d6..042874b90290c 100644 --- a/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp +++ b/sycl/test-e2e/OptionalKernelFeatures/is_compatible/is_compatible_several_targets.cpp @@ -3,6 +3,6 @@ // RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga,spir64_gen -Xsycl-target-backend "-device *" %S/Inputs/is_compatible_with_env.cpp -o %t.out // RUN: env ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run} not %t.out -// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:acc %{run} %t.out +// RUN: env ONEAPI_DEVICE_SELECTOR=opencl:fpga %{run} %t.out // RUN: env ONEAPI_DEVICE_SELECTOR=opencl:gpu %{run} %t.out // RUN: env ONEAPI_DEVICE_SELECTOR=level_zero:gpu %{run} %t.out