diff --git a/sycl/test/CMakeLists.txt b/sycl/test/CMakeLists.txt index 5cd037e21caa..c29937017478 100644 --- a/sycl/test/CMakeLists.txt +++ b/sycl/test/CMakeLists.txt @@ -45,7 +45,7 @@ list(APPEND SYCL_DEPLOY_TEST_DEPS add_lit_testsuite(check-sycl-deploy "Running the SYCL regression tests" ${CMAKE_CURRENT_BINARY_DIR} ARGS ${DEPLOY_RT_TEST_ARGS} - PARAMS "SYCL_BE=PI_OPENCL" + PARAMS "SYCL_PLUGIN=opencl" DEPENDS ${SYCL_DEPLOY_TEST_DEPS} EXCLUDE_FROM_CHECK_ALL ) @@ -58,7 +58,7 @@ add_lit_testsuites(SYCL ${CMAKE_CURRENT_SOURCE_DIR} add_lit_testsuites(SYCL-DEPLOY ${CMAKE_CURRENT_SOURCE_DIR} ARGS ${DEPLOY_RT_TEST_ARGS} - PARAMS "SYCL_BE=PI_OPENCL" + PARAMS "SYCL_PLUGIN=opencl" DEPENDS ${SYCL_DEPLOY_TEST_DEPS} EXCLUDE_FROM_CHECK_ALL ) @@ -66,7 +66,7 @@ add_lit_testsuites(SYCL-DEPLOY ${CMAKE_CURRENT_SOURCE_DIR} add_lit_testsuite(check-sycl-opencl "Running the SYCL regression tests for OpenCL" ${CMAKE_CURRENT_BINARY_DIR} ARGS ${RT_TEST_ARGS} - PARAMS "SYCL_BE=PI_OPENCL" + PARAMS "SYCL_PLUGIN=opencl" DEPENDS ${SYCL_TEST_DEPS} EXCLUDE_FROM_CHECK_ALL ) @@ -75,7 +75,7 @@ set_target_properties(check-sycl-opencl PROPERTIES FOLDER "SYCL tests") add_lit_testsuite(check-sycl-level-zero "Running the SYCL regression tests for Level Zero" ${CMAKE_CURRENT_BINARY_DIR} ARGS ${RT_TEST_ARGS} - PARAMS "SYCL_BE=PI_LEVEL_ZERO" + PARAMS "SYCL_PLUGIN=level_zero" DEPENDS ${SYCL_TEST_DEPS} EXCLUDE_FROM_CHECK_ALL ) @@ -89,7 +89,7 @@ if(SYCL_BUILD_PI_CUDA) add_lit_testsuite(check-sycl-cuda "Running the SYCL regression tests for CUDA" ${CMAKE_CURRENT_BINARY_DIR} ARGS ${RT_TEST_ARGS} - PARAMS "SYCL_BE=PI_CUDA" + PARAMS "SYCL_PLUGIN=cuda" DEPENDS ${SYCL_TEST_DEPS} EXCLUDE_FROM_CHECK_ALL ) @@ -98,7 +98,7 @@ if(SYCL_BUILD_PI_CUDA) add_dependencies(check-sycl check-sycl-cuda) add_lit_testsuites(SYCL-CUDA ${CMAKE_CURRENT_SOURCE_DIR} - PARAMS "SYCL_BE=PI_CUDA" + PARAMS "SYCL_PLUGIN=cuda" DEPENDS ${SYCL_TEST_DEPS} EXCLUDE_FROM_CHECK_ALL ) diff --git a/sycl/test/Unit/lit.cfg.py b/sycl/test/Unit/lit.cfg.py index e97e732996ab..2dbc0d14e9f2 100644 --- a/sycl/test/Unit/lit.cfg.py +++ b/sycl/test/Unit/lit.cfg.py @@ -73,5 +73,5 @@ def find_shlibpath_var(): lit_config.warning("unable to inject shared library path on '{}'" .format(platform.system())) -config.environment['SYCL_BE'] = lit_config.params.get('SYCL_BE', "PI_OPENCL") -lit_config.note("Backend (SYCL_BE): {}".format(config.environment['SYCL_BE'])) +config.environment['SYCL_DEVICE_FILTER'] = lit_config.params.get('SYCL_PLUGIN', "opencl") +lit_config.note("Backend: {}".format(config.environment['SYCL_DEVICE_FILTER'])) diff --git a/sycl/test/atomic_ref/accessor.cpp b/sycl/test/atomic_ref/accessor.cpp index 5e488a578f2b..f9f3278628cc 100644 --- a/sycl/test/atomic_ref/accessor.cpp +++ b/sycl/test/atomic_ref/accessor.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/atomic_ref/add.cpp b/sycl/test/atomic_ref/add.cpp index decf99a6dec8..b678198a6a20 100644 --- a/sycl/test/atomic_ref/add.cpp +++ b/sycl/test/atomic_ref/add.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/atomic_ref/compare_exchange.cpp b/sycl/test/atomic_ref/compare_exchange.cpp index 5dce9390c998..026138127e20 100644 --- a/sycl/test/atomic_ref/compare_exchange.cpp +++ b/sycl/test/atomic_ref/compare_exchange.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/atomic_ref/exchange.cpp b/sycl/test/atomic_ref/exchange.cpp index 755b40d75c1a..62f03bee1f98 100644 --- a/sycl/test/atomic_ref/exchange.cpp +++ b/sycl/test/atomic_ref/exchange.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/atomic_ref/load.cpp b/sycl/test/atomic_ref/load.cpp index 1e0c5c2b8979..e05cdce576d3 100644 --- a/sycl/test/atomic_ref/load.cpp +++ b/sycl/test/atomic_ref/load.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/atomic_ref/max.cpp b/sycl/test/atomic_ref/max.cpp index 6dc4db05f968..8b003ca7b59a 100644 --- a/sycl/test/atomic_ref/max.cpp +++ b/sycl/test/atomic_ref/max.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/atomic_ref/min.cpp b/sycl/test/atomic_ref/min.cpp index 2e5f03c2ec0e..4b6c20fc1a80 100644 --- a/sycl/test/atomic_ref/min.cpp +++ b/sycl/test/atomic_ref/min.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/atomic_ref/store.cpp b/sycl/test/atomic_ref/store.cpp index c191794a0ef7..6f9de6e032e3 100644 --- a/sycl/test/atomic_ref/store.cpp +++ b/sycl/test/atomic_ref/store.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/atomic_ref/sub.cpp b/sycl/test/atomic_ref/sub.cpp index d3ca9fe09672..a09de3c710bc 100644 --- a/sycl/test/atomic_ref/sub.cpp +++ b/sycl/test/atomic_ref/sub.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/basic_tests/accessor/accessor_property_list_rt.cpp b/sycl/test/basic_tests/accessor/accessor_property_list_rt.cpp index b794f6efdf15..ec3e80d7b37e 100644 --- a/sycl/test/basic_tests/accessor/accessor_property_list_rt.cpp +++ b/sycl/test/basic_tests/accessor/accessor_property_list_rt.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include diff --git a/sycl/test/basic_tests/built-ins.cpp b/sycl/test/basic_tests/built-ins.cpp index 0d45607302dd..fe209a7685f1 100644 --- a/sycl/test/basic_tests/built-ins.cpp +++ b/sycl/test/basic_tests/built-ins.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // CUDA does not support printf. // UNSUPPORTED: cuda diff --git a/sycl/test/basic_tests/context.cpp b/sycl/test/basic_tests/context.cpp index f9e312116bdb..a376beff527e 100644 --- a/sycl/test/basic_tests/context.cpp +++ b/sycl/test/basic_tests/context.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx %s -o %t.out -lsycl -I %sycl_include -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==--------------- context.cpp - SYCL context test ------------------------==// // diff --git a/sycl/test/basic_tests/device.cpp b/sycl/test/basic_tests/device.cpp index a67ee05774fd..0b84d40de236 100644 --- a/sycl/test/basic_tests/device.cpp +++ b/sycl/test/basic_tests/device.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx %s -o %t.out -I %sycl_include -lsycl -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==--------------- device.cpp - SYCL device test --------------------------==// // diff --git a/sycl/test/basic_tests/device_selector.cpp b/sycl/test/basic_tests/device_selector.cpp index acd5c8010a36..6241b662844c 100644 --- a/sycl/test/basic_tests/device_selector.cpp +++ b/sycl/test/basic_tests/device_selector.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_BE=%sycl_be %t.out +// RUN: %BE_RUN_PLACEHOLDER %t.out // // Checks that no device is selected when no device of desired type is // available. diff --git a/sycl/test/basic_tests/esimd/vadd.cpp b/sycl/test/basic_tests/esimd/vadd.cpp index 8de695c44525..68208337d2eb 100644 --- a/sycl/test/basic_tests/esimd/vadd.cpp +++ b/sycl/test/basic_tests/esimd/vadd.cpp @@ -1,27 +1,30 @@ // TODO ESIMD enable host device under -fsycl // RUN: %clangxx -I %sycl_include %s -o %t.out -lsycl -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include #include +#include using namespace cl::sycl; class ESIMDSelector : public device_selector { - // Require GPU device unless HOST is requested in SYCL_DEVICE_TYPE env + // Require GPU device unless HOST is requested in SYCL_DEVICE_FILTER env virtual int operator()(const device &device) const { - if (const char *dev_type = getenv("SYCL_DEVICE_TYPE")) { - if (!strcmp(dev_type, "GPU")) + if (const char *dev_filter = getenv("SYCL_DEVICE_FILTER")) { + std::string filter_string(dev_filter); + if (filter_string.find("gpu") != std::string::npos) return device.is_gpu() ? 1000 : -1; - if (!strcmp(dev_type, "HOST")) + if (filter_string.find("host") != std::string::npos) return device.is_host() ? 1000 : -1; - std::cerr << "Supported 'SYCL_DEVICE_TYPE' env var values are 'GPU' and " - "'HOST', '" - << dev_type << "' is not.\n"; + std::cerr + << "Supported 'SYCL_DEVICE_FILTER' env var values are 'gpu' and " + "'host', '" + << filter_string << "' does not contain such substrings.\n"; return -1; } - // If "SYCL_DEVICE_TYPE" not defined, only allow gpu device + // If "SYCL_DEVICE_FILTER" not defined, only allow gpu device return device.is_gpu() ? 1000 : -1; } }; diff --git a/sycl/test/basic_tests/event_async_exception.cpp b/sycl/test/basic_tests/event_async_exception.cpp index 0dd803dc5d10..1f39ebd20e5f 100644 --- a/sycl/test/basic_tests/event_async_exception.cpp +++ b/sycl/test/basic_tests/event_async_exception.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==---- event_async_exception.cpp - Test for event async exceptions -------==// // diff --git a/sycl/test/basic_tests/host_image_accessor_read.cpp b/sycl/test/basic_tests/host_image_accessor_read.cpp index fa84859c136f..2bcd820b77bf 100644 --- a/sycl/test/basic_tests/host_image_accessor_read.cpp +++ b/sycl/test/basic_tests/host_image_accessor_read.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==---- host_image_accessor_read.cpp - SYCL host image accessor check ----==// // diff --git a/sycl/test/basic_tests/linear-host-dev.cpp b/sycl/test/basic_tests/linear-host-dev.cpp index ff1ff837251f..2f7843941bdd 100644 --- a/sycl/test/basic_tests/linear-host-dev.cpp +++ b/sycl/test/basic_tests/linear-host-dev.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s +// RUN: %RUN_ON_HOST %t.out | FileCheck %s #include #include diff --git a/sycl/test/basic_tests/parallel_for_range_host.cpp b/sycl/test/basic_tests/parallel_for_range_host.cpp index 9b79cb5ae5f8..27b02ca58949 100644 --- a/sycl/test/basic_tests/parallel_for_range_host.cpp +++ b/sycl/test/basic_tests/parallel_for_range_host.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include diff --git a/sycl/test/basic_tests/property_list.cpp b/sycl/test/basic_tests/property_list.cpp index e65d02150222..0150fb92daab 100644 --- a/sycl/test/basic_tests/property_list.cpp +++ b/sycl/test/basic_tests/property_list.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx %s -o %t.out -lsycl -I%sycl_include -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // // CHECK: PASSED //==--------------- property_list.cpp - SYCL property list test ------------==// diff --git a/sycl/test/basic_tests/reduction_ctor.cpp b/sycl/test/basic_tests/reduction_ctor.cpp index d160f6339ea5..7764f937d03d 100644 --- a/sycl/test/basic_tests/reduction_ctor.cpp +++ b/sycl/test/basic_tests/reduction_ctor.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // This performs basic checks such as reduction creation, getIdentity() method, // and the combine() method of the aux class 'reducer'. diff --git a/sycl/test/bit_cast/bit_cast.cpp b/sycl/test/bit_cast/bit_cast.cpp index 5c6c1ad3504d..f383bf70ca31 100644 --- a/sycl/test/bit_cast/bit_cast.cpp +++ b/sycl/test/bit_cast/bit_cast.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include diff --git a/sycl/test/extensions/usm.cpp b/sycl/test/extensions/usm.cpp index aa7b1f614188..a03c9201fbb5 100644 --- a/sycl/test/extensions/usm.cpp +++ b/sycl/test/extensions/usm.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out +// RUN: %RUN_ON_HOST %t1.out //==---------- allocator_equal.cpp - Allocator Equality test ---------------==// // diff --git a/sycl/test/function-pointers/fp-as-kernel-arg.cpp b/sycl/test/function-pointers/fp-as-kernel-arg.cpp index 522c4c05f651..5973c2b419bc 100644 --- a/sycl/test/function-pointers/fp-as-kernel-arg.cpp +++ b/sycl/test/function-pointers/fp-as-kernel-arg.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // FIXME: This test should use runtime early exit once correct check for // corresponding extension is implemented diff --git a/sycl/test/function-pointers/pass-fp-through-buffer.cpp b/sycl/test/function-pointers/pass-fp-through-buffer.cpp index abb83e25dbd4..60ca4cd5f4c7 100644 --- a/sycl/test/function-pointers/pass-fp-through-buffer.cpp +++ b/sycl/test/function-pointers/pass-fp-through-buffer.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -Xclang -fsycl-allow-func-ptr -std=c++14 -fsycl %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // FIXME: This test should use runtime early exit once correct check for // corresponding extension is implemented diff --git a/sycl/test/functor/functor_inheritance.cpp b/sycl/test/functor/functor_inheritance.cpp index 06cb3e9d8152..c96e2efcd0f9 100644 --- a/sycl/test/functor/functor_inheritance.cpp +++ b/sycl/test/functor/functor_inheritance.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -o %t.out %s -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/functor/kernel_functor.cpp b/sycl/test/functor/kernel_functor.cpp index bea05fcc4dcd..fe7085322669 100644 --- a/sycl/test/functor/kernel_functor.cpp +++ b/sycl/test/functor/kernel_functor.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -o %t.out %s // RUN: cd %T -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==--- kernel_functor.cpp - Functors as SYCL kernel test ------------------==// // diff --git a/sycl/test/kernel_param/array-kernel-param-nested-run.cpp b/sycl/test/kernel_param/array-kernel-param-nested-run.cpp index d36da50b8fca..f27ea5f607db 100755 --- a/sycl/test/kernel_param/array-kernel-param-nested-run.cpp +++ b/sycl/test/kernel_param/array-kernel-param-nested-run.cpp @@ -1,7 +1,7 @@ // This test checks kernel execution with array parameters inside structs. // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/kernel_param/array-kernel-param-run.cpp b/sycl/test/kernel_param/array-kernel-param-run.cpp index f7cc3d9391b6..ab79b4590c55 100755 --- a/sycl/test/kernel_param/array-kernel-param-run.cpp +++ b/sycl/test/kernel_param/array-kernel-param-run.cpp @@ -1,7 +1,7 @@ // This test checks kernel execution with array kernel parameters. // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/kernel_param/non-standard-layout.cpp b/sycl/test/kernel_param/non-standard-layout.cpp index 1acb9b0aac6d..31ece6d0f34a 100644 --- a/sycl/test/kernel_param/non-standard-layout.cpp +++ b/sycl/test/kernel_param/non-standard-layout.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include diff --git a/sycl/test/kernel_param/struct_kernel_param.cpp b/sycl/test/kernel_param/struct_kernel_param.cpp index 1a6490ef2342..0c6c278a4f1e 100644 --- a/sycl/test/kernel_param/struct_kernel_param.cpp +++ b/sycl/test/kernel_param/struct_kernel_param.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==-struct_kernel_param.cpp-Checks passing structs as kernel params--------==// // diff --git a/sycl/test/kernel_param/union_kernel_param.cpp b/sycl/test/kernel_param/union_kernel_param.cpp index 4b0980537e4c..4290467ac136 100644 --- a/sycl/test/kernel_param/union_kernel_param.cpp +++ b/sycl/test/kernel_param/union_kernel_param.cpp @@ -1,7 +1,7 @@ // This test checks kernel execution with union type as kernel parameters. // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/lit.cfg.py b/sycl/test/lit.cfg.py index 55ed6e80d17c..00f46f774cf3 100644 --- a/sycl/test/lit.cfg.py +++ b/sycl/test/lit.cfg.py @@ -75,9 +75,11 @@ llvm_config.add_tool_substitutions(['llvm-spirv'], [config.sycl_tools_dir]) -backend=lit_config.params.get('SYCL_BE', "PI_OPENCL") -lit_config.note("Backend (SYCL_BE): {}".format(backend)) -config.substitutions.append( ('%sycl_be', backend) ) +backend=lit_config.params.get('SYCL_PLUGIN', "opencl") +lit_config.note("Backend: {}".format(backend)) +config.substitutions.append( ('%sycl_be', { 'opencl': 'PI_OPENCL', 'cuda': 'PI_CUDA', 'level_zero': 'PI_LEVEL_ZERO'}[backend]) ) +config.substitutions.append( ('%BE_RUN_PLACEHOLDER', "env SYCL_DEVICE_FILTER={SYCL_PLUGIN} ".format(SYCL_PLUGIN=backend)) ) +config.substitutions.append( ('%RUN_ON_HOST', "env SYCL_DEVICE_FILTER=host ") ) get_device_count_by_type_path = os.path.join(config.llvm_tools_dir, "get_device_count_by_type") @@ -131,11 +133,11 @@ def getDeviceCount(device_type): if getDeviceCount("cpu")[0]: found_at_least_one_device = True lit_config.note("Found available CPU device") - cpu_run_substitute = "env SYCL_DEVICE_TYPE=CPU SYCL_BE={SYCL_BE} ".format(SYCL_BE=backend) + cpu_run_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:cpu ".format(SYCL_PLUGIN=backend) cpu_check_substitute = "| FileCheck %s" config.available_features.add('cpu') if platform.system() == "Linux": - cpu_run_on_linux_substitute = "env SYCL_DEVICE_TYPE=CPU SYCL_BE={SYCL_BE} ".format(SYCL_BE=backend) + cpu_run_on_linux_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:cpu ".format(SYCL_PLUGIN=backend) cpu_check_on_linux_substitute = "| FileCheck %s" else: lit_config.warning("CPU device not found") @@ -157,7 +159,7 @@ def getDeviceCount(device_type): if gpu_count > 0: found_at_least_one_device = True lit_config.note("Found available GPU device") - gpu_run_substitute = " env SYCL_DEVICE_TYPE=GPU SYCL_BE={SYCL_BE} ".format(SYCL_BE=backend) + gpu_run_substitute = " env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:gpu ".format(SYCL_PLUGIN=backend) gpu_check_substitute = "| FileCheck %s" config.available_features.add('gpu') if cuda: @@ -166,10 +168,10 @@ def getDeviceCount(device_type): config.available_features.add('level_zero') if platform.system() == "Linux": - gpu_run_on_linux_substitute = "env SYCL_DEVICE_TYPE=GPU SYCL_BE={SYCL_BE} ".format(SYCL_BE=backend) + gpu_run_on_linux_substitute = "env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:gpu ".format(SYCL_PLUGIN=backend) gpu_check_on_linux_substitute = "| FileCheck %s" # ESIMD-specific setup. Requires OpenCL for now. - esimd_run_substitute = " env SYCL_BE=PI_OPENCL SYCL_DEVICE_TYPE=GPU SYCL_PROGRAM_COMPILE_OPTIONS=-vc-codegen" + esimd_run_substitute = " env SYCL_DEVICE_FILTER=opencl:gpu SYCL_PROGRAM_COMPILE_OPTIONS=-vc-codegen" config.substitutions.append( ('%ESIMD_RUN_PLACEHOLDER', esimd_run_substitute) ) config.substitutions.append( ('%clangxx-esimd', "clang++ -fsycl-explicit-simd" ) ) else: @@ -185,7 +187,7 @@ def getDeviceCount(device_type): if getDeviceCount("accelerator")[0]: found_at_least_one_device = True lit_config.note("Found available accelerator device") - acc_run_substitute = " env SYCL_DEVICE_TYPE=ACC " + acc_run_substitute = " env SYCL_DEVICE_FILTER={SYCL_PLUGIN}:acc ".format(SYCL_PLUGIN=backend) acc_check_substitute = "| FileCheck %s" config.available_features.add('accelerator') else: diff --git a/sycl/test/multi_ptr/multi_ptr.cpp b/sycl/test/multi_ptr/multi_ptr.cpp index dea8dd3ee22a..2c011872fff5 100644 --- a/sycl/test/multi_ptr/multi_ptr.cpp +++ b/sycl/test/multi_ptr/multi_ptr.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %clangxx -DRESTRICT_WRITE_ACCESS_TO_CONSTANT_PTR -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization %s -o %t1.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out +// RUN: %RUN_ON_HOST %t1.out //==--------------- multi_ptr.cpp - SYCL multi_ptr test --------------------==// // diff --git a/sycl/test/multisource/multisource.cpp b/sycl/test/multisource/multisource.cpp index 0797b37ab4e0..ef6a882d778a 100644 --- a/sycl/test/multisource/multisource.cpp +++ b/sycl/test/multisource/multisource.cpp @@ -10,15 +10,14 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.kernel.o %s -DINIT_KERNEL -DCALC_KERNEL // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.main.o %s -DMAIN_APP // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %t.kernel.o %t.main.o -o %t.fat -// RUN: env SYCL_DEVICE_TYPE=HOST %t.fat +// RUN: %RUN_ON_HOST %t.fat // Multiple sources with kernel code // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.init.o %s -DINIT_KERNEL // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.calc.o %s -DCALC_KERNEL // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -c -o %t.main.o %s -DMAIN_APP // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %t.init.o %t.calc.o %t.main.o -o %t.fat -// RUN: env SYCL_DEVICE_TYPE=HOST %t.fat - +// RUN: %RUN_ON_HOST %t.fat #include @@ -27,9 +26,9 @@ using namespace cl::sycl; #ifdef MAIN_APP -void init_buf(queue &q, buffer &b, range<1> &r, int i) ; +void init_buf(queue &q, buffer &b, range<1> &r, int i); #elif INIT_KERNEL -void init_buf(queue &q, buffer &b, range<1> &r, int i){ +void init_buf(queue &q, buffer &b, range<1> &r, int i) { q.submit([&](handler &cgh) { auto B = b.get_access(cgh); cgh.parallel_for(r, [=](id<1> index) { B[index] = i; }); @@ -38,11 +37,11 @@ void init_buf(queue &q, buffer &b, range<1> &r, int i){ #endif #ifdef MAIN_APP -void calc_buf(queue &q, buffer &a, buffer &b, - buffer &c, range<1> &r); +void calc_buf(queue &q, buffer &a, buffer &b, buffer &c, + range<1> &r); #elif CALC_KERNEL -void calc_buf(queue &q, buffer &a, buffer &b, - buffer &c, range<1> &r){ +void calc_buf(queue &q, buffer &a, buffer &b, buffer &c, + range<1> &r) { q.submit([&](handler &cgh) { auto A = a.get_access(cgh); auto B = b.get_access(cgh); @@ -83,4 +82,3 @@ int main() { return 0; } #endif - diff --git a/sycl/test/on-device/basic_tests/access_to_subset.cpp b/sycl/test/on-device/basic_tests/access_to_subset.cpp index ecbcaf298441..a9e64755631e 100644 --- a/sycl/test/on-device/basic_tests/access_to_subset.cpp +++ b/sycl/test/on-device/basic_tests/access_to_subset.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/boolean.cpp b/sycl/test/on-device/basic_tests/boolean.cpp index 031a0afafda0..eaeb3d7dcbdb 100644 --- a/sycl/test/on-device/basic_tests/boolean.cpp +++ b/sycl/test/on-device/basic_tests/boolean.cpp @@ -3,7 +3,7 @@ // XFAIL: gpu && (level_zero || opencl) // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/buffer/buffer.cpp b/sycl/test/on-device/basic_tests/buffer/buffer.cpp index 6bc8a4c21de8..ce357f188c9f 100644 --- a/sycl/test/on-device/basic_tests/buffer/buffer.cpp +++ b/sycl/test/on-device/basic_tests/buffer/buffer.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx %s -o %t1.out -lsycl -I %sycl_include -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out +// RUN: %RUN_ON_HOST %t1.out // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t2.out +// RUN: %RUN_ON_HOST %t2.out // RUN: %CPU_RUN_PLACEHOLDER %t2.out // RUN: %GPU_RUN_PLACEHOLDER %t2.out // RUN: %ACC_RUN_PLACEHOLDER %t2.out diff --git a/sycl/test/on-device/basic_tests/buffer/buffer_container.cpp b/sycl/test/on-device/basic_tests/buffer/buffer_container.cpp index b2e5efa2f43f..bb25092a329c 100644 --- a/sycl/test/on-device/basic_tests/buffer/buffer_container.cpp +++ b/sycl/test/on-device/basic_tests/buffer/buffer_container.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx %s -std=c++17 -o %t1.out -lsycl -I %sycl_include -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out +// RUN: %RUN_ON_HOST %t1.out // RUN: %clangxx -std=c++17 -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t2.out +// RUN: %RUN_ON_HOST %t2.out // RUN: %CPU_RUN_PLACEHOLDER %t2.out // RUN: %GPU_RUN_PLACEHOLDER %t2.out // RUN: %ACC_RUN_PLACEHOLDER %t2.out diff --git a/sycl/test/on-device/basic_tests/buffer/buffer_dev_to_dev.cpp b/sycl/test/on-device/basic_tests/buffer/buffer_dev_to_dev.cpp index c84a06bbbace..c95ecc13d872 100644 --- a/sycl/test/on-device/basic_tests/buffer/buffer_dev_to_dev.cpp +++ b/sycl/test/on-device/basic_tests/buffer/buffer_dev_to_dev.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/buffer/buffer_full_copy.cpp b/sycl/test/on-device/basic_tests/buffer/buffer_full_copy.cpp index 4c32a8b2c6b1..c7bc615f64f8 100644 --- a/sycl/test/on-device/basic_tests/buffer/buffer_full_copy.cpp +++ b/sycl/test/on-device/basic_tests/buffer/buffer_full_copy.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx %s -o %t1.out -lsycl -I %sycl_include -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out +// RUN: %RUN_ON_HOST %t1.out // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t2.out +// RUN: %RUN_ON_HOST %t2.out // RUN: %CPU_RUN_PLACEHOLDER %t2.out // RUN: %GPU_RUN_PLACEHOLDER %t2.out // RUN: %ACC_RUN_PLACEHOLDER %t2.out diff --git a/sycl/test/on-device/basic_tests/buffer/subbuffer.cpp b/sycl/test/on-device/basic_tests/buffer/subbuffer.cpp index c614c76cb03c..39fcd590beea 100644 --- a/sycl/test/on-device/basic_tests/buffer/subbuffer.cpp +++ b/sycl/test/on-device/basic_tests/buffer/subbuffer.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/device_equality.cpp b/sycl/test/on-device/basic_tests/device_equality.cpp index 9b027c4c1168..0600e8b06426 100644 --- a/sycl/test/on-device/basic_tests/device_equality.cpp +++ b/sycl/test/on-device/basic_tests/device_equality.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out +// RUN: %RUN_ON_HOST %t1.out // RUN: %CPU_RUN_PLACEHOLDER %t1.out // RUN: %GPU_RUN_PLACEHOLDER %t1.out diff --git a/sycl/test/on-device/basic_tests/device_event.cpp b/sycl/test/on-device/basic_tests/device_event.cpp index 79231031d8e5..8995c06ffdf7 100644 --- a/sycl/test/on-device/basic_tests/device_event.cpp +++ b/sycl/test/on-device/basic_tests/device_event.cpp @@ -2,7 +2,8 @@ // RUN: %GPU_RUN_PLACEHOLDER %t.run // RUN: %CPU_RUN_PLACEHOLDER %t.run // RUN: %ACC_RUN_PLACEHOLDER %t.run -// RUNx (TODO: nd_item::barrier() is not implemented on HOST): env SYCL_DEVICE_TYPE=HOST %t.run +// TODO: nd_item::barrier() is not implemented on HOST +// RUNx: %RUN_ON_HOST %t.run //==--------device_event.cpp - SYCL class device_event test ----------------==// // @@ -17,7 +18,7 @@ using namespace cl::sycl; // Define the number of work items to enqueue. -const int nElems = 128*1024u; +const int nElems = 128 * 1024u; const int workGroupSize = 16; // Check the result is correct. @@ -31,8 +32,7 @@ int check_results(int *data, size_t stride) { if ((j % stride) == 0) { expectedVal = 300 + copiedVal; copiedVal++; - } - else { + } else { expectedVal = i + j + 700; } if (data[i + j] != expectedVal) { @@ -62,7 +62,7 @@ int test_strideN(size_t stride) { for (auto ep : l) { try { std::rethrow_exception(ep); - } catch (std::exception& e) { + } catch (std::exception &e) { std::cout << e.what(); } } @@ -70,10 +70,10 @@ int test_strideN(size_t stride) { buffer out_buf(out_data, range<1>(nElems)); - myQueue.submit([&](handler& cgh) { - + myQueue.submit([&](handler &cgh) { auto out_ptr = out_buf.get_access(cgh); - accessor + accessor local_acc(range<1>(16), cgh); // Create work-groups with 16 work items in each group. @@ -100,7 +100,8 @@ int test_strideN(size_t stride) { item.barrier(); // Copy from local memory to global memory. - device_event dev_event = grp.async_work_group_copy(gptr, lptr, nElemsToCopy, stride); + device_event dev_event = + grp.async_work_group_copy(gptr, lptr, nElemsToCopy, stride); grp.wait_for(dev_event); }); diff --git a/sycl/test/on-device/basic_tests/diagnostics/handler.cpp b/sycl/test/on-device/basic_tests/diagnostics/handler.cpp index 8f3406893d05..8143a621eb91 100644 --- a/sycl/test/on-device/basic_tests/diagnostics/handler.cpp +++ b/sycl/test/on-device/basic_tests/diagnostics/handler.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_BE=%sycl_be %t.out | FileCheck %s +// RUN: %BE_RUN_PLACEHOLDER %t.out | FileCheck %s //==------------------- handler.cpp ----------------------------------------==// // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. diff --git a/sycl/test/on-device/basic_tests/event.cpp b/sycl/test/on-device/basic_tests/event.cpp index df315e59b641..fcfe5095af1c 100644 --- a/sycl/test/on-device/basic_tests/event.cpp +++ b/sycl/test/on-device/basic_tests/event.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/event_creation.cpp b/sycl/test/on-device/basic_tests/event_creation.cpp index edb8b27d6c8d..aa190deeccd5 100644 --- a/sycl/test/on-device/basic_tests/event_creation.cpp +++ b/sycl/test/on-device/basic_tests/event_creation.cpp @@ -1,7 +1,7 @@ // REQUIRES: opencl // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/event_profiling_info.cpp b/sycl/test/on-device/basic_tests/event_profiling_info.cpp index 0a71ebac93c2..0a9eee7ca7af 100644 --- a/sycl/test/on-device/basic_tests/event_profiling_info.cpp +++ b/sycl/test/on-device/basic_tests/event_profiling_info.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out // -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/get_backend.cpp b/sycl/test/on-device/basic_tests/get_backend.cpp index a312304e0741..2dab19cfd986 100644 --- a/sycl/test/on-device/basic_tests/get_backend.cpp +++ b/sycl/test/on-device/basic_tests/get_backend.cpp @@ -3,7 +3,8 @@ // //==----------------- get_backend.cpp ------------------------==// // This is a test of get_backend(). -// Do not set SYCL_BE. We do not want the preferred backend. +// Do not set SYCL_DEVICE_FILTER. We do not want the preferred +// backend. //==----------------------------------------------------------==// #include diff --git a/sycl/test/on-device/basic_tests/get_nonhost_devices.cpp b/sycl/test/on-device/basic_tests/get_nonhost_devices.cpp index 536dcafb5ac7..20fe65455435 100644 --- a/sycl/test/on-device/basic_tests/get_nonhost_devices.cpp +++ b/sycl/test/on-device/basic_tests/get_nonhost_devices.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_BE=%sycl_be %t.out +// RUN: %BE_RUN_PLACEHOLDER %t.out // // Check that the host device is not included in devices returned by // get_devices() if a non-host device type is specified. diff --git a/sycl/test/on-device/basic_tests/half_type.cpp b/sycl/test/on-device/basic_tests/half_type.cpp index dfff5037cdbf..a3bcdf98f7cb 100644 --- a/sycl/test/on-device/basic_tests/half_type.cpp +++ b/sycl/test/on-device/basic_tests/half_type.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/host_always_works.cpp b/sycl/test/on-device/basic_tests/host_always_works.cpp index 4b79b3211f43..bb61b6e6a7b1 100644 --- a/sycl/test/on-device/basic_tests/host_always_works.cpp +++ b/sycl/test/on-device/basic_tests/host_always_works.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t1.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out +// RUN: %RUN_ON_HOST %t1.out // RUN: %CPU_RUN_PLACEHOLDER %t1.out // RUN: %GPU_RUN_PLACEHOLDER %t1.out // RUN: %ACC_RUN_PLACEHOLDER %t1.out diff --git a/sycl/test/on-device/basic_tests/host_platform_avail.cpp b/sycl/test/on-device/basic_tests/host_platform_avail.cpp index 3364137fa633..d30c475a4022 100644 --- a/sycl/test/on-device/basic_tests/host_platform_avail.cpp +++ b/sycl/test/on-device/basic_tests/host_platform_avail.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t1.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out +// RUN: %RUN_ON_HOST %t1.out // RUN: %CPU_RUN_PLACEHOLDER %t1.out // RUN: %GPU_RUN_PLACEHOLDER %t1.out // RUN: %ACC_RUN_PLACEHOLDER %t1.out diff --git a/sycl/test/on-device/basic_tests/image.cpp b/sycl/test/on-device/basic_tests/image.cpp index e20096f4d022..c4f17654b1a4 100644 --- a/sycl/test/on-device/basic_tests/image.cpp +++ b/sycl/test/on-device/basic_tests/image.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/image/image_read.cpp b/sycl/test/on-device/basic_tests/image/image_read.cpp index d9c5cc36d5e7..222827ba8446 100644 --- a/sycl/test/on-device/basic_tests/image/image_read.cpp +++ b/sycl/test/on-device/basic_tests/image/image_read.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/image/image_read_fp16.cpp b/sycl/test/on-device/basic_tests/image/image_read_fp16.cpp index 4b9685617dbe..1dffd2cdae9e 100644 --- a/sycl/test/on-device/basic_tests/image/image_read_fp16.cpp +++ b/sycl/test/on-device/basic_tests/image/image_read_fp16.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/image/image_write.cpp b/sycl/test/on-device/basic_tests/image/image_write.cpp index 79959d368f5f..50ef4995d484 100644 --- a/sycl/test/on-device/basic_tests/image/image_write.cpp +++ b/sycl/test/on-device/basic_tests/image/image_write.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/image/image_write_fp16.cpp b/sycl/test/on-device/basic_tests/image/image_write_fp16.cpp index 11fc41842599..f3096ab73a4d 100644 --- a/sycl/test/on-device/basic_tests/image/image_write_fp16.cpp +++ b/sycl/test/on-device/basic_tests/image/image_write_fp16.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/image_accessor_readsampler.cpp b/sycl/test/on-device/basic_tests/image_accessor_readsampler.cpp index 847a4b83e6c9..4b73caa05cce 100644 --- a/sycl/test/on-device/basic_tests/image_accessor_readsampler.cpp +++ b/sycl/test/on-device/basic_tests/image_accessor_readsampler.cpp @@ -2,7 +2,7 @@ // CUDA cannot support SYCL 1.2.1 images. // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // diff --git a/sycl/test/on-device/basic_tests/image_accessor_readwrite.cpp b/sycl/test/on-device/basic_tests/image_accessor_readwrite.cpp index 4fc035daea42..f0e115809208 100644 --- a/sycl/test/on-device/basic_tests/image_accessor_readwrite.cpp +++ b/sycl/test/on-device/basic_tests/image_accessor_readwrite.cpp @@ -2,7 +2,7 @@ // CUDA cannot support SYCL 1.2.1 images. // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/image_accessor_readwrite_half.cpp b/sycl/test/on-device/basic_tests/image_accessor_readwrite_half.cpp index 72cda15bf464..089585020cc2 100644 --- a/sycl/test/on-device/basic_tests/image_accessor_readwrite_half.cpp +++ b/sycl/test/on-device/basic_tests/image_accessor_readwrite_half.cpp @@ -2,7 +2,7 @@ // CUDA cannot support SYCL 1.2.1 images. // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/image_array.cpp b/sycl/test/on-device/basic_tests/image_array.cpp index 478f5412ffdc..cc0ff5af48b9 100644 --- a/sycl/test/on-device/basic_tests/image_array.cpp +++ b/sycl/test/on-device/basic_tests/image_array.cpp @@ -2,7 +2,7 @@ // CUDA cannot support SYCL 1.2.1 images. // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUNx: %GPU_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/image_constructors.cpp b/sycl/test/on-device/basic_tests/image_constructors.cpp index 8891393f9f1f..f2945a196ae4 100644 --- a/sycl/test/on-device/basic_tests/image_constructors.cpp +++ b/sycl/test/on-device/basic_tests/image_constructors.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx %s -o %t1.out -lsycl -I %sycl_include -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out +// RUN: %RUN_ON_HOST %t1.out // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t2.out +// RUN: %RUN_ON_HOST %t2.out // RUN: %CPU_RUN_PLACEHOLDER %t2.out // RUN: %GPU_RUN_PLACEHOLDER %t2.out // RUN: %ACC_RUN_PLACEHOLDER %t2.out diff --git a/sycl/test/on-device/basic_tests/info.cpp b/sycl/test/on-device/basic_tests/info.cpp index 9b4d4d7cc203..6ab192967e89 100644 --- a/sycl/test/on-device/basic_tests/info.cpp +++ b/sycl/test/on-device/basic_tests/info.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/info_ocl_version.cpp b/sycl/test/on-device/basic_tests/info_ocl_version.cpp index e42383bbe3e7..f64f853b4443 100644 --- a/sycl/test/on-device/basic_tests/info_ocl_version.cpp +++ b/sycl/test/on-device/basic_tests/info_ocl_version.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: env %CPU_RUN_PLACEHOLDER %t.out // RUN: env %GPU_RUN_PLACEHOLDER %t.out // RUN: env %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/parallel_for_indexers.cpp b/sycl/test/on-device/basic_tests/parallel_for_indexers.cpp index a4ec46b42bc9..6c671159ca10 100644 --- a/sycl/test/on-device/basic_tests/parallel_for_indexers.cpp +++ b/sycl/test/on-device/basic_tests/parallel_for_indexers.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx %s -o %t1.out -lsycl -I %sycl_include -Wno-sycl-strict -Xclang -verify-ignore-unexpected=note,warning -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.out +// RUN: %RUN_ON_HOST %t1.out // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t2.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t2.out +// RUN: %RUN_ON_HOST %t2.out // RUN: %CPU_RUN_PLACEHOLDER %t2.out // RUN: %GPU_RUN_PLACEHOLDER %t2.out // RUN: %ACC_RUN_PLACEHOLDER %t2.out diff --git a/sycl/test/on-device/basic_tests/scalar_vec_access.cpp b/sycl/test/on-device/basic_tests/scalar_vec_access.cpp index e163ae0aa22c..8b84a4ec1815 100644 --- a/sycl/test/on-device/basic_tests/scalar_vec_access.cpp +++ b/sycl/test/on-device/basic_tests/scalar_vec_access.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s +// RUN: %RUN_ON_HOST %t.out | FileCheck %s // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER diff --git a/sycl/test/on-device/basic_tests/stream/stream.cpp b/sycl/test/on-device/basic_tests/stream/stream.cpp index 5e5110a8ee35..866636fbc199 100644 --- a/sycl/test/on-device/basic_tests/stream/stream.cpp +++ b/sycl/test/on-device/basic_tests/stream/stream.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out | FileCheck %s +// RUN: %RUN_ON_HOST %t.out | FileCheck %s // RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER // RUN: %GPU_RUN_ON_LINUX_PLACEHOLDER %t.out %GPU_CHECK_ON_LINUX_PLACEHOLDER // RUN: %ACC_RUN_PLACEHOLDER %t.out %ACC_CHECK_PLACEHOLDER diff --git a/sycl/test/on-device/basic_tests/subdevice.cpp b/sycl/test/on-device/basic_tests/subdevice.cpp index bd4e237f8034..56a78197a58c 100644 --- a/sycl/test/on-device/basic_tests/subdevice.cpp +++ b/sycl/test/on-device/basic_tests/subdevice.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/swizzle_op.cpp b/sycl/test/on-device/basic_tests/swizzle_op.cpp index 49b997bb38c9..ee2e514bacbd 100644 --- a/sycl/test/on-device/basic_tests/swizzle_op.cpp +++ b/sycl/test/on-device/basic_tests/swizzle_op.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/sycl-namespace.cpp b/sycl/test/on-device/basic_tests/sycl-namespace.cpp index 64832e14b266..9cfba72e8e4b 100644 --- a/sycl/test/on-device/basic_tests/sycl-namespace.cpp +++ b/sycl/test/on-device/basic_tests/sycl-namespace.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/basic_tests/unused_pointer.cpp b/sycl/test/on-device/basic_tests/unused_pointer.cpp index a1c5dbb26934..75118e8fb554 100644 --- a/sycl/test/on-device/basic_tests/unused_pointer.cpp +++ b/sycl/test/on-device/basic_tests/unused_pointer.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/config/select_device.cpp b/sycl/test/on-device/config/select_device.cpp index 49407f4d6f0d..d032c52e10fa 100644 --- a/sycl/test/on-device/config/select_device.cpp +++ b/sycl/test/on-device/config/select_device.cpp @@ -173,9 +173,9 @@ static std::vector getAllowListDesc(std::string allowList) { int main() { bool passed = false; - std::string sycl_be("PI_OPENCL"); - if (getenv("SYCL_BE")) { - sycl_be = getenv("SYCL_BE"); + std::string sycl_be("opencl"); + if (getenv("SYCL_DEVICE_FILTER")) { + sycl_be = getenv("SYCL_DEVICE_FILTER"); } // Test the GPU devices name and version number. @@ -191,13 +191,13 @@ int main() { addEscapeSymbolToSpecialCharacters(name); std::string ver = dev.get_info(); if ((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) { + (sycl_be.find("opencl") != std::string::npos)) { fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver << "}}" << std::endl; passed = true; break; } else if ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos)) { + (sycl_be.find("level_zero") != std::string::npos)) { fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver << "}}" << std::endl; passed = true; @@ -251,9 +251,9 @@ int main() { addEscapeSymbolToSpecialCharacters(name); std::string ver = plt.get_info(); if (((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) || + (sycl_be.find("opencl") != std::string::npos)) || ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos))) { + (sycl_be.find("level_zero") != std::string::npos))) { fs << "PlatformName:{{" << name << "}},PlatformVersion:{{" << ver << "}}" << std::endl; passed = true; @@ -307,9 +307,9 @@ int main() { addEscapeSymbolToSpecialCharacters(name); std::string ver("98.76.54321"); if (((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) || + (sycl_be.find("opencl") != std::string::npos)) || ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos))) { + (sycl_be.find("level_zero") != std::string::npos))) { fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver << "}}" << std::endl; passed = true; @@ -361,14 +361,14 @@ int main() { std::string name = plt.get_info(); addEscapeSymbolToSpecialCharacters(name); if ((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) { + (sycl_be.find("opencl") != std::string::npos)) { std::string ver("OpenCL 12.34"); fs << "PlatformName:{{" << name << "}},PlatformVersion:{{" << ver << "}}" << std::endl; passed = true; break; } else if ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos)) { + (sycl_be.find("level_zero") != std::string::npos)) { std::string ver("12.34"); fs << "PlatformName:{{" << name << "}},PlatformVersion:{{" << ver << "}}" << std::endl; @@ -432,9 +432,9 @@ int main() { } ver.replace(start, pos - start, "*"); if (((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) || + (sycl_be.find("opencl") != std::string::npos)) || ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos))) { + (sycl_be.find("level_zero") != std::string::npos))) { fs << "DeviceName:{{" << name << "}},DriverVersion:{{" << ver << "}}" << std::endl; passed = true; @@ -489,9 +489,9 @@ int main() { std::string name = dev.get_info(); addEscapeSymbolToSpecialCharacters(name); if (((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) || + (sycl_be.find("opencl") != std::string::npos)) || ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos))) { + (sycl_be.find("level_zero") != std::string::npos))) { fs << "DeviceName:{{" << name << "}}" << std::endl; passed = true; break; @@ -538,9 +538,9 @@ int main() { std::string name = plt.get_info(); addEscapeSymbolToSpecialCharacters(name); if (((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) || + (sycl_be.find("opencl") != std::string::npos)) || ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos))) { + (sycl_be.find("level_zero") != std::string::npos))) { fs << "PlatformName:{{" << name << "}}" << std::endl; passed = true; break; @@ -591,9 +591,9 @@ int main() { addEscapeSymbolToSpecialCharacters(name); std::string ver = dev.get_info(); if (((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) || + (sycl_be.find("opencl") != std::string::npos)) || ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos))) { + (sycl_be.find("level_zero") != std::string::npos))) { if (count > 0) { ss << " | "; } @@ -653,9 +653,9 @@ int main() { std::string name = dev.get_info(); addEscapeSymbolToSpecialCharacters(name); if (((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) || + (sycl_be.find("opencl") != std::string::npos)) || ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos))) { + (sycl_be.find("level_zero") != std::string::npos))) { fs << "DeviceName:HAHA{{" << name << "}}" << std::endl; passed = true; break; @@ -706,9 +706,9 @@ int main() { std::string name = plt.get_info(); addEscapeSymbolToSpecialCharacters(name); if (((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) || + (sycl_be.find("opencl") != std::string::npos)) || ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos))) { + (sycl_be.find("level_zero") != std::string::npos))) { fs << "PlatformName:HAHA{{" << name << "}}" << std::endl; passed = true; break; @@ -760,9 +760,9 @@ int main() { addEscapeSymbolToSpecialCharacters(name); std::string ver = dev.get_info(); if (((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) || + (sycl_be.find("opencl") != std::string::npos)) || ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos))) { + (sycl_be.find("level_zero") != std::string::npos))) { fs << "DeviceName:{{" << name << "}},DriverVersion:HAHA{{" << ver << "}}" << std::endl; passed = true; @@ -815,9 +815,9 @@ int main() { addEscapeSymbolToSpecialCharacters(name); std::string ver = plt.get_info(); if (((plt.get_backend() == backend::opencl) && - (sycl_be.find("OPENCL") != std::string::npos)) || + (sycl_be.find("opencl") != std::string::npos)) || ((plt.get_backend() == backend::level_zero) && - (sycl_be.find("LEVEL_ZERO") != std::string::npos))) { + (sycl_be.find("level_zero") != std::string::npos))) { fs << "PlatformName:{{" << name << "}},PlatformVersion:HAHA{{" << ver << "}}" << std::endl; passed = true; diff --git a/sycl/test/on-device/dot_product/dot_product_int_test.cpp b/sycl/test/on-device/dot_product/dot_product_int_test.cpp index e68d32144642..4110459ee1bb 100755 --- a/sycl/test/on-device/dot_product/dot_product_int_test.cpp +++ b/sycl/test/on-device/dot_product/dot_product_int_test.cpp @@ -2,7 +2,7 @@ // For now we only check fallback support because DG1 hardware is not widespread // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/dot_product/dot_product_vec_test.cpp b/sycl/test/on-device/dot_product/dot_product_vec_test.cpp index e6277b17f2d6..00f0a338a4af 100644 --- a/sycl/test/on-device/dot_product/dot_product_vec_test.cpp +++ b/sycl/test/on-device/dot_product/dot_product_vec_test.cpp @@ -2,7 +2,7 @@ // For now we only check fallback support because DG1 hardware is not widespread // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/hier_par/hier_par_basic.cpp b/sycl/test/on-device/hier_par/hier_par_basic.cpp index 5670663e2e14..ac6ad7568774 100644 --- a/sycl/test/on-device/hier_par/hier_par_basic.cpp +++ b/sycl/test/on-device/hier_par/hier_par_basic.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/hier_par/hier_par_wgscope.cpp b/sycl/test/on-device/hier_par/hier_par_wgscope.cpp index 5dfbb61a187b..98e55fa7ffb0 100644 --- a/sycl/test/on-device/hier_par/hier_par_wgscope.cpp +++ b/sycl/test/on-device/hier_par/hier_par_wgscope.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/hier_par/hier_par_wgscope_O0.cpp b/sycl/test/on-device/hier_par/hier_par_wgscope_O0.cpp index 1041199f8c11..f497579af48e 100644 --- a/sycl/test/on-device/hier_par/hier_par_wgscope_O0.cpp +++ b/sycl/test/on-device/hier_par/hier_par_wgscope_O0.cpp @@ -8,7 +8,7 @@ // RUN: %clangxx -O0 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/plugins/interop-opencl.cpp b/sycl/test/on-device/plugins/interop-opencl.cpp index d46cd5ac315d..e0d41a933b1b 100644 --- a/sycl/test/on-device/plugins/interop-opencl.cpp +++ b/sycl/test/on-device/plugins/interop-opencl.cpp @@ -1,9 +1,9 @@ // REQUIRES: opencl // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -I %sycl_source_dir %s -o %t.out -// RUN: env SYCL_BE=PI_OPENCL %CPU_RUN_PLACEHOLDER %t.out -// RUN: env SYCL_BE=PI_OPENCL %GPU_RUN_PLACEHOLDER %t.out -// RUN: env SYCL_BE=PI_OPENCL %ACC_RUN_PLACEHOLDER %t.out +// RUN: %CPU_RUN_PLACEHOLDER %t.out +// RUN: %GPU_RUN_PLACEHOLDER %t.out +// RUN: %ACC_RUN_PLACEHOLDER %t.out //==-- interop-opencl.cpp - SYCL test for OpenCL interop API --------------===// // diff --git a/sycl/test/on-device/plugins/sycl-ls-gpu-cuda.cpp b/sycl/test/on-device/plugins/sycl-ls-gpu-cuda.cpp index 8a2a9aca5b2c..a1ed5449d560 100755 --- a/sycl/test/on-device/plugins/sycl-ls-gpu-cuda.cpp +++ b/sycl/test/on-device/plugins/sycl-ls-gpu-cuda.cpp @@ -1,6 +1,6 @@ // REQUIRES: gpu, cuda -// RUN: env SYCL_BE=PI_CUDA sycl-ls --verbose >%t.cuda.out +// RUN: %BE_RUN_PLACEHOLDER sycl-ls --verbose >%t.cuda.out // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out // CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}GPU :{{.*}}CUDA diff --git a/sycl/test/on-device/plugins/sycl-ls-gpu-default.cpp b/sycl/test/on-device/plugins/sycl-ls-gpu-default.cpp index 11165b63197d..a7f65df00689 100644 --- a/sycl/test/on-device/plugins/sycl-ls-gpu-default.cpp +++ b/sycl/test/on-device/plugins/sycl-ls-gpu-default.cpp @@ -1,6 +1,6 @@ // REQUIRES: gpu -// RUN: env --unset=SYCL_BE sycl-ls --verbose >%t.default.out +// RUN: env --unset=SYCL_DEVICE_FILTER sycl-ls --verbose >%t.default.out // RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out // CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}Level-Zero diff --git a/sycl/test/on-device/plugins/sycl-ls-gpu-opencl.cpp b/sycl/test/on-device/plugins/sycl-ls-gpu-opencl.cpp index 23dec78cdd10..148118e4dc81 100644 --- a/sycl/test/on-device/plugins/sycl-ls-gpu-opencl.cpp +++ b/sycl/test/on-device/plugins/sycl-ls-gpu-opencl.cpp @@ -1,6 +1,6 @@ // REQUIRES: gpu, opencl -// RUN: env SYCL_BE=PI_OPENCL sycl-ls --verbose >%t.opencl.out +// RUN: %BE_RUN_PLACEHOLDER sycl-ls --verbose >%t.opencl.out // RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.opencl.out // CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}OpenCL diff --git a/sycl/test/on-device/plugins/sycl-ls-gpu-sycl-be.cpp b/sycl/test/on-device/plugins/sycl-ls-gpu-sycl-be.cpp index 02d217941de2..ad8e673682da 100755 --- a/sycl/test/on-device/plugins/sycl-ls-gpu-sycl-be.cpp +++ b/sycl/test/on-device/plugins/sycl-ls-gpu-sycl-be.cpp @@ -3,13 +3,13 @@ // RUN: sycl-ls --verbose >%t.default.out // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-OPENCL,CHECK-CUSTOM-GPU-OPENCL --input-file %t.default.out -// RUN: env SYCL_BE=PI_OPENCL sycl-ls --verbose >%t.opencl.out +// RUN: env SYCL_DEVICE_FILTER=opencl sycl-ls --verbose >%t.opencl.out // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-OPENCL,CHECK-CUSTOM-GPU-OPENCL --input-file %t.opencl.out // CHECK-BUILTIN-GPU-OPENCL: gpu_selector(){{.*}}GPU : OpenCL // CHECK-CUSTOM-GPU-OPENCL: custom_selector(gpu){{.*}}GPU : OpenCL -// RUN: env SYCL_BE=PI_CUDA sycl-ls --verbose >%t.cuda.out +// RUN: env SYCL_DEVICE_FILTER=cuda sycl-ls --verbose >%t.cuda.out // RUN: FileCheck %s --check-prefixes=CHECK-BUILTIN-GPU-CUDA,CHECK-CUSTOM-GPU-CUDA --input-file %t.cuda.out // CHECK-BUILTIN-GPU-CUDA: gpu_selector(){{.*}}GPU : CUDA diff --git a/sycl/test/on-device/plugins/sycl-targets-order.cpp b/sycl/test/on-device/plugins/sycl-targets-order.cpp index d94ef572eff5..8143c677066d 100644 --- a/sycl/test/on-device/plugins/sycl-targets-order.cpp +++ b/sycl/test/on-device/plugins/sycl-targets-order.cpp @@ -1,9 +1,9 @@ // RUN: %clangxx -fsycl -fsycl-targets=spir64-unknown-unknown-sycldevice,nvptx64-unknown-unknown-sycldevice %s -o %t-spir64-nvptx64.out -// RUN: env SYCL_BE=PI_OPENCL %t-spir64-nvptx64.out -// RUN: env SYCL_BE=PI_CUDA %t-spir64-nvptx64.out +// RUN: env SYCL_DEVICE_FILTER=opencl %t-spir64-nvptx64.out +// RUN: env SYCL_DEVICE_FILTER=cuda %t-spir64-nvptx64.out // RUN: %clangxx -fsycl -fsycl-targets=nvptx64-unknown-unknown-sycldevice,spir64-unknown-unknown-sycldevice %s -o %t-nvptx64-spir64.out -// RUN: env SYCL_BE=PI_OPENCL %t-nvptx64-spir64.out -// RUN: env SYCL_BE=PI_CUDA %t-nvptx64-spir64.out +// RUN: env SYCL_DEVICE_FILTER=opencl %t-nvptx64-spir64.out +// RUN: env SYCL_DEVICE_FILTER=cuda %t-nvptx64-spir64.out // REQUIRES: opencl, cuda diff --git a/sycl/test/on-device/reduction/reduction_nd_conditional.cpp b/sycl/test/on-device/reduction/reduction_nd_conditional.cpp index d8c6d5607806..a2b4940c53a4 100644 --- a/sycl/test/on-device/reduction/reduction_nd_conditional.cpp +++ b/sycl/test/on-device/reduction/reduction_nd_conditional.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/reduction/reduction_nd_ext_double.cpp b/sycl/test/on-device/reduction/reduction_nd_ext_double.cpp index c45f5254661a..235defad000e 100644 --- a/sycl/test/on-device/reduction/reduction_nd_ext_double.cpp +++ b/sycl/test/on-device/reduction/reduction_nd_ext_double.cpp @@ -4,7 +4,7 @@ // RUN: %ACC_RUN_PLACEHOLDER %t.out // TODO: Enable the test for HOST when it supports intel::reduce() and barrier() -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // This test performs basic checks of parallel_for(nd_range, reduction, func) // used with 'double' type. diff --git a/sycl/test/on-device/reduction/reduction_nd_ext_half.cpp b/sycl/test/on-device/reduction/reduction_nd_ext_half.cpp index 47d147491021..55e91d3b9e44 100644 --- a/sycl/test/on-device/reduction/reduction_nd_ext_half.cpp +++ b/sycl/test/on-device/reduction/reduction_nd_ext_half.cpp @@ -6,7 +6,7 @@ // RUNx: %ACC_RUN_PLACEHOLDER %t.out // TODO: Enable the test for HOST when it supports intel::reduce() and barrier() -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // This test performs basic checks of parallel_for(nd_range, reduction, func) // used with 'half' type. diff --git a/sycl/test/on-device/reduction/reduction_nd_lambda.cpp b/sycl/test/on-device/reduction/reduction_nd_lambda.cpp index 26bb6c9fb357..1628b92218e3 100644 --- a/sycl/test/on-device/reduction/reduction_nd_lambda.cpp +++ b/sycl/test/on-device/reduction/reduction_nd_lambda.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/reduction/reduction_nd_s0_dw.cpp b/sycl/test/on-device/reduction/reduction_nd_s0_dw.cpp index 1853822bea5e..24fef3f0eef1 100644 --- a/sycl/test/on-device/reduction/reduction_nd_s0_dw.cpp +++ b/sycl/test/on-device/reduction/reduction_nd_s0_dw.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/reduction/reduction_nd_s0_rw.cpp b/sycl/test/on-device/reduction/reduction_nd_s0_rw.cpp index a71634371cd8..af1d3685fa24 100644 --- a/sycl/test/on-device/reduction/reduction_nd_s0_rw.cpp +++ b/sycl/test/on-device/reduction/reduction_nd_s0_rw.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/reduction/reduction_nd_s1_dw.cpp b/sycl/test/on-device/reduction/reduction_nd_s1_dw.cpp index f5728345f0cc..0e553477e655 100644 --- a/sycl/test/on-device/reduction/reduction_nd_s1_dw.cpp +++ b/sycl/test/on-device/reduction/reduction_nd_s1_dw.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/reduction/reduction_nd_s1_rw.cpp b/sycl/test/on-device/reduction/reduction_nd_s1_rw.cpp index bfc2c85d171d..43bd9ac3d05f 100644 --- a/sycl/test/on-device/reduction/reduction_nd_s1_rw.cpp +++ b/sycl/test/on-device/reduction/reduction_nd_s1_rw.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/reduction/reduction_placeholder.cpp b/sycl/test/on-device/reduction/reduction_placeholder.cpp index 4187fc52fbaf..d948b8cfc3a5 100644 --- a/sycl/test/on-device/reduction/reduction_placeholder.cpp +++ b/sycl/test/on-device/reduction/reduction_placeholder.cpp @@ -3,7 +3,7 @@ // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // TODO: Enable the test for HOST when it supports ONEAPI::reduce() and // barrier() diff --git a/sycl/test/on-device/reduction/reduction_queue_parallel_for.cpp b/sycl/test/on-device/reduction/reduction_queue_parallel_for.cpp index 415e87dd506c..ef319fcd45df 100644 --- a/sycl/test/on-device/reduction/reduction_queue_parallel_for.cpp +++ b/sycl/test/on-device/reduction/reduction_queue_parallel_for.cpp @@ -3,7 +3,7 @@ // RUN: %ACC_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // TODO: Enable the test for HOST when it supports ONEAPI::reduce() and // barrier() diff --git a/sycl/test/on-device/reduction/reduction_transparent.cpp b/sycl/test/on-device/reduction/reduction_transparent.cpp index 40cf1e4826ea..40347467b47d 100644 --- a/sycl/test/on-device/reduction/reduction_transparent.cpp +++ b/sycl/test/on-device/reduction/reduction_transparent.cpp @@ -3,7 +3,7 @@ // RUN: %ACC_RUN_PLACEHOLDER %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // TODO: Enable the test for HOST when it supports ONEAPI::reduce() and // barrier() diff --git a/sycl/test/on-device/reduction/reduction_usm.cpp b/sycl/test/on-device/reduction/reduction_usm.cpp index 4bf249f8d53c..a06c4d83c39a 100644 --- a/sycl/test/on-device/reduction/reduction_usm.cpp +++ b/sycl/test/on-device/reduction/reduction_usm.cpp @@ -3,7 +3,7 @@ // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out -// RUNx: env SYCL_DEVICE_TYPE=HOST %t.out +// RUNx: %RUN_ON_HOST %t.out // TODO: Enable the test for HOST when it supports ONEAPI::reduce() and // barrier() diff --git a/sycl/test/on-device/regression/usm_malloc_shared.cpp b/sycl/test/on-device/regression/usm_malloc_shared.cpp index c078d225791f..37c2181712f1 100644 --- a/sycl/test/on-device/regression/usm_malloc_shared.cpp +++ b/sycl/test/on-device/regression/usm_malloc_shared.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // This test checks if users will successfully allocate 160, 0, and -16 bytes of diff --git a/sycl/test/on-device/spec_const/spec_const_hw.cpp b/sycl/test/on-device/spec_const/spec_const_hw.cpp index bbb579b74a0a..3d992766dd37 100644 --- a/sycl/test/on-device/spec_const/spec_const_hw.cpp +++ b/sycl/test/on-device/spec_const/spec_const_hw.cpp @@ -1,7 +1,7 @@ // UNSUPPORTED: cuda // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // diff --git a/sycl/test/on-device/spec_const/spec_const_neg.cpp b/sycl/test/on-device/spec_const/spec_const_neg.cpp index d08b77b88437..34d7a3564406 100644 --- a/sycl/test/on-device/spec_const/spec_const_neg.cpp +++ b/sycl/test/on-device/spec_const/spec_const_neg.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // Specialization constants are not supported on FPGA h/w and emulator. diff --git a/sycl/test/on-device/spec_const/spec_const_redefine.cpp b/sycl/test/on-device/spec_const/spec_const_redefine.cpp index 8621d58504d0..c64237d4bf3f 100644 --- a/sycl/test/on-device/spec_const/spec_const_redefine.cpp +++ b/sycl/test/on-device/spec_const/spec_const_redefine.cpp @@ -1,7 +1,7 @@ // UNSUPPORTED: cuda // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %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 // diff --git a/sycl/test/on-device/sub_group/attributes.cpp b/sycl/test/on-device/sub_group/attributes.cpp index df39459e49d5..0261fe458f24 100644 --- a/sycl/test/on-device/sub_group/attributes.cpp +++ b/sycl/test/on-device/sub_group/attributes.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUNx: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/barrier.cpp b/sycl/test/on-device/sub_group/barrier.cpp index aca849411b12..30ddcf367371 100644 --- a/sycl/test/on-device/sub_group/barrier.cpp +++ b/sycl/test/on-device/sub_group/barrier.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/broadcast.cpp b/sycl/test/on-device/sub_group/broadcast.cpp index f49d35c531b6..0027b32c208b 100644 --- a/sycl/test/on-device/sub_group/broadcast.cpp +++ b/sycl/test/on-device/sub_group/broadcast.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/broadcast_fp64.cpp b/sycl/test/on-device/sub_group/broadcast_fp64.cpp index e4b3eb09cc7b..193553afdffa 100644 --- a/sycl/test/on-device/sub_group/broadcast_fp64.cpp +++ b/sycl/test/on-device/sub_group/broadcast_fp64.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/common.cpp b/sycl/test/on-device/sub_group/common.cpp index 3bbdc9832fe8..4d2c4ac0fc11 100644 --- a/sycl/test/on-device/sub_group/common.cpp +++ b/sycl/test/on-device/sub_group/common.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/generic-shuffle.cpp b/sycl/test/on-device/sub_group/generic-shuffle.cpp index c9ece6143be9..90a24d265cfe 100644 --- a/sycl/test/on-device/sub_group/generic-shuffle.cpp +++ b/sycl/test/on-device/sub_group/generic-shuffle.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/generic_reduce.cpp b/sycl/test/on-device/sub_group/generic_reduce.cpp index 40f2901ff3bf..979b7924eb7d 100644 --- a/sycl/test/on-device/sub_group/generic_reduce.cpp +++ b/sycl/test/on-device/sub_group/generic_reduce.cpp @@ -1,6 +1,6 @@ // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -std=c++14 %s -o %t.out // RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple -std=c++14 -D SG_GPU %s -o %t_gpu.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t_gpu.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/info.cpp b/sycl/test/on-device/sub_group/info.cpp index 83cd72e431ef..15be9c8392dc 100644 --- a/sycl/test/on-device/sub_group/info.cpp +++ b/sycl/test/on-device/sub_group/info.cpp @@ -1,7 +1,7 @@ // REQUIRES: opencl // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/load_store.cpp b/sycl/test/on-device/sub_group/load_store.cpp index 0a614db1849c..48096caddd43 100644 --- a/sycl/test/on-device/sub_group/load_store.cpp +++ b/sycl/test/on-device/sub_group/load_store.cpp @@ -6,7 +6,7 @@ // runtime for every supported ISA // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/reduce.cpp b/sycl/test/on-device/sub_group/reduce.cpp index af63417b7564..167803e7b31a 100644 --- a/sycl/test/on-device/sub_group/reduce.cpp +++ b/sycl/test/on-device/sub_group/reduce.cpp @@ -3,7 +3,7 @@ // runtime for every supported ISA // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/reduce_fp64.cpp b/sycl/test/on-device/sub_group/reduce_fp64.cpp index 98102bb0de0b..33448db127f0 100644 --- a/sycl/test/on-device/sub_group/reduce_fp64.cpp +++ b/sycl/test/on-device/sub_group/reduce_fp64.cpp @@ -3,7 +3,7 @@ // runtime for every supported ISA // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/scan.cpp b/sycl/test/on-device/sub_group/scan.cpp index 00520a7bb8c3..6af2cfdc175b 100644 --- a/sycl/test/on-device/sub_group/scan.cpp +++ b/sycl/test/on-device/sub_group/scan.cpp @@ -3,7 +3,7 @@ // runtime for every supported ISA // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/scan_fp64.cpp b/sycl/test/on-device/sub_group/scan_fp64.cpp index 0ba135c67e4a..31a41aa61856 100644 --- a/sycl/test/on-device/sub_group/scan_fp64.cpp +++ b/sycl/test/on-device/sub_group/scan_fp64.cpp @@ -3,7 +3,7 @@ // runtime for every supported ISA // // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/shuffle.cpp b/sycl/test/on-device/sub_group/shuffle.cpp index 6d551a92bde7..ac0a26034975 100644 --- a/sycl/test/on-device/sub_group/shuffle.cpp +++ b/sycl/test/on-device/sub_group/shuffle.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/shuffle_fp64.cpp b/sycl/test/on-device/sub_group/shuffle_fp64.cpp index a1b153b4b8e3..620858225a8f 100644 --- a/sycl/test/on-device/sub_group/shuffle_fp64.cpp +++ b/sycl/test/on-device/sub_group/shuffle_fp64.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/on-device/sub_group/vote.cpp b/sycl/test/on-device/sub_group/vote.cpp index 74ae90a0f471..f31aee1701cc 100644 --- a/sycl/test/on-device/sub_group/vote.cpp +++ b/sycl/test/on-device/sub_group/vote.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %CPU_RUN_PLACEHOLDER %t.out // RUN: %GPU_RUN_PLACEHOLDER %t.out // RUN: %ACC_RUN_PLACEHOLDER %t.out diff --git a/sycl/test/regression/atomic_load.cpp b/sycl/test/regression/atomic_load.cpp index bff99f2c49a6..31b9840616d8 100644 --- a/sycl/test/regression/atomic_load.cpp +++ b/sycl/test/regression/atomic_load.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include using namespace cl::sycl; diff --git a/sycl/test/regression/builtins_vector1.cpp b/sycl/test/regression/builtins_vector1.cpp index 8d3d869f5622..e951ce1c5a8c 100644 --- a/sycl/test/regression/builtins_vector1.cpp +++ b/sycl/test/regression/builtins_vector1.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include diff --git a/sycl/test/regression/complex_global_object.cpp b/sycl/test/regression/complex_global_object.cpp index f6a190658b71..30c0e9ba2375 100644 --- a/sycl/test/regression/complex_global_object.cpp +++ b/sycl/test/regression/complex_global_object.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=host %t.out +// RUN: %RUN_ON_HOST %t.out // SYCL runtime may construct global objects at function scope. The test ensures // such objects do not cause problems if the first call to SYCL is inside main diff --git a/sycl/test/regression/fp16-with-unnamed-lambda.cpp b/sycl/test/regression/fp16-with-unnamed-lambda.cpp index 861f5498c465..91f3f69bdc3b 100644 --- a/sycl/test/regression/fp16-with-unnamed-lambda.cpp +++ b/sycl/test/regression/fp16-with-unnamed-lambda.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-unnamed-lambda %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=host %t.out +// RUN: %RUN_ON_HOST %t.out #include #include diff --git a/sycl/test/regression/global_queue.cpp b/sycl/test/regression/global_queue.cpp index ce4a8102256e..46381afed5a1 100644 --- a/sycl/test/regression/global_queue.cpp +++ b/sycl/test/regression/global_queue.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // SYCL dependencies (i.e. low level runtimes) may have global objects of their // own. The test ensures, that those objects do not cause problems. When host diff --git a/sycl/test/regression/group.cpp b/sycl/test/regression/group.cpp index 9ac8f64c7bf4..d4729ee8cda1 100644 --- a/sycl/test/regression/group.cpp +++ b/sycl/test/regression/group.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==-- group.cpp - Regression tests for cl::sycl::group API bug fixes. -----==// // diff --git a/sycl/test/regression/implicit_atomic_conversion.cpp b/sycl/test/regression/implicit_atomic_conversion.cpp index dbe8210dffb7..341791368c42 100644 --- a/sycl/test/regression/implicit_atomic_conversion.cpp +++ b/sycl/test/regression/implicit_atomic_conversion.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include diff --git a/sycl/test/regression/kernel_name_class.cpp b/sycl/test/regression/kernel_name_class.cpp index dfa1572d39a2..65b3fcc3bc65 100644 --- a/sycl/test/regression/kernel_name_class.cpp +++ b/sycl/test/regression/kernel_name_class.cpp @@ -1,7 +1,7 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.ext.out -fsycl-unnamed-lambda -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out %t.ext.out +// RUN: %RUN_ON_HOST %t.out %t.ext.out //==-- kernel_name_class.cpp - SYCL kernel naming variants test ------------==// // diff --git a/sycl/test/regression/kernel_name_inside_sycl_namespace.cpp b/sycl/test/regression/kernel_name_inside_sycl_namespace.cpp index 4f46e3227077..1411d2041ca7 100644 --- a/sycl/test/regression/kernel_name_inside_sycl_namespace.cpp +++ b/sycl/test/regression/kernel_name_inside_sycl_namespace.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -D__SYCL_DISABLE_NAMESPACE_INLINE__ %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==------- kernel_name_inside_sycl_namespace.cpp - Regression test --------==// // diff --git a/sycl/test/regression/kernel_unnamed.cpp b/sycl/test/regression/kernel_unnamed.cpp index ee797e86ed42..ed6c2202e137 100644 --- a/sycl/test/regression/kernel_unnamed.cpp +++ b/sycl/test/regression/kernel_unnamed.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -fsycl-unnamed-lambda -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==-- kernel_unnamed.cpp - SYCL kernel naming variants test ------------==// // diff --git a/sycl/test/regression/msvc_crt.cpp b/sycl/test/regression/msvc_crt.cpp index 8b484f5f7941..1029be811116 100644 --- a/sycl/test/regression/msvc_crt.cpp +++ b/sycl/test/regression/msvc_crt.cpp @@ -1,7 +1,7 @@ // RUN: %clang_cl -fsycl /MD -o %t1.exe %s -// RUN: env SYCL_DEVICE_TYPE=HOST %t1.exe +// RUN: %RUN_ON_HOST %t1.exe // RUN: %clang_cl -fsycl /MDd -o %t2.exe %s -// RUN: env SYCL_DEVICE_TYPE=HOST %t2.exe +// RUN: %RUN_ON_HOST %t2.exe // REQUIRES: system-windows //==-------------- msvc_crt.cpp - SYCL MSVC CRT test -----------------------==// // diff --git a/sycl/test/regression/private_array_init_test.cpp b/sycl/test/regression/private_array_init_test.cpp index 82fc6bfe2a78..af4053bebc4c 100644 --- a/sycl/test/regression/private_array_init_test.cpp +++ b/sycl/test/regression/private_array_init_test.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==- private_array_init_test.cpp - Regression test for private array init -==// // diff --git a/sycl/test/regression/same_unnamed_kernels.cpp b/sycl/test/regression/same_unnamed_kernels.cpp index 6800dda0aabb..9a447b56611b 100644 --- a/sycl/test/regression/same_unnamed_kernels.cpp +++ b/sycl/test/regression/same_unnamed_kernels.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl %s -o %t.out -fsycl-unnamed-lambda -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==----- same_unnamed_kernels.cpp - SYCL kernel naming variants test ------==// // diff --git a/sycl/test/regression/static-buffer-dtor.cpp b/sycl/test/regression/static-buffer-dtor.cpp index 1f2a25ec9a26..9420f47141e7 100644 --- a/sycl/test/regression/static-buffer-dtor.cpp +++ b/sycl/test/regression/static-buffer-dtor.cpp @@ -10,7 +10,7 @@ // would start shutting down. //===----------------------------------------------------------------------===// // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out #include diff --git a/sycl/test/regression/sycl-include-gnu11.cpp b/sycl/test/regression/sycl-include-gnu11.cpp index 50e5eaefa50e..c265b0ff2524 100644 --- a/sycl/test/regression/sycl-include-gnu11.cpp +++ b/sycl/test/regression/sycl-include-gnu11.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -std=gnu++11 -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out // UNSUPPORTED: system-windows diff --git a/sycl/test/scheduler/BasicSchedulerTests.cpp b/sycl/test/scheduler/BasicSchedulerTests.cpp index 0943cb61e5db..8be4042d4a72 100644 --- a/sycl/test/scheduler/BasicSchedulerTests.cpp +++ b/sycl/test/scheduler/BasicSchedulerTests.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -I %sycl_source_dir %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==------------------- BasicSchedulerTests.cpp ----------------------------==// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. diff --git a/sycl/test/scheduler/ReleaseResourcesTest.cpp b/sycl/test/scheduler/ReleaseResourcesTest.cpp index 4824aaf8f985..e0651b201d00 100644 --- a/sycl/test/scheduler/ReleaseResourcesTest.cpp +++ b/sycl/test/scheduler/ReleaseResourcesTest.cpp @@ -1,5 +1,5 @@ // RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-dead-args-optimization -I %sycl_source_dir %s -o %t.out -// RUN: env SYCL_DEVICE_TYPE=HOST %t.out +// RUN: %RUN_ON_HOST %t.out //==------------------- ReleaseResourcesTests.cpp --------------------------==// //