diff --git a/tests/kernel_bundle/use_kernel_bundle_first_queue_ctx_not_equal_to_kernel_bundle_ctx.cpp b/tests/kernel_bundle/use_kernel_bundle_first_queue_ctx_not_equal_to_kernel_bundle_ctx.cpp deleted file mode 100644 index d983415a4..000000000 --- a/tests/kernel_bundle/use_kernel_bundle_first_queue_ctx_not_equal_to_kernel_bundle_ctx.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* -// -// SYCL 2020 Conformance Test Suite -// -// The test checks that calling sycl::handler::use_kernel_bundle with a kernel -// bundle which is associated with a context different from one associated with -// a handler results in exception. This is done for kernel bundles that: -// 1) contain user kernels -// 2) contain builtin kernels -// 3) don't contain any kernel -// -// The test verifies that the exception with sycl::errc::invalid was thrown. -// -*******************************************************************************/ - -#include "../common/common.h" -#include "use_kernel_bundle.h" -#include "use_kernel_bundle_queue_ctx_not_equal_to_kernel_bundle_ctx.h" - -#define TEST_NAME \ - use_kernel_bundle_first_queue_ctx_not_equal_to_kernel_bundle_ctx - -namespace TEST_NAMESPACE { -using namespace sycl_cts; -using namespace sycl_cts::tests::use_kernel_bundle; -using namespace use_kernel_bundle_queue_ctx_not_equal_kb_ctx; - -class TEST_NAME : public sycl_cts::util::test_base { - public: - /** return information about this test - */ - void get_info(test_base::info &out) const override { - set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE); - } - - /** execute the test - */ - void run(util::logger &log) override { - const std::vector devices{sycl::device::get_devices()}; - if (devices.size() <= 1) { - SKIP("Requires at least two devices"); - } - sycl::context first_ctx(devices[0]); - sycl::context second_ctx(devices[1]); - - sycl::kernel_bundle empty_bundle = - get_empty_bundle(second_ctx); - run_verification(log, first_ctx, second_ctx, empty_bundle); - - sycl::kernel_bundle non_empty_bundle = - get_non_empty_bundle(second_ctx); - run_verification(log, first_ctx, second_ctx, non_empty_bundle); - - sycl::kernel_bundle - bundle_with_built_in_kernel = - get_bundle_with_built_in_kernels(second_ctx); - run_verification(log, first_ctx, second_ctx, bundle_with_built_in_kernel); - } -}; - -// construction of this proxy will register the above test -util::test_proxy proxy; - -} // namespace TEST_NAMESPACE diff --git a/tests/kernel_bundle/use_kernel_bundle_queue_ctx_not_equal_to_kernel_bundle_ctx.h b/tests/kernel_bundle/use_kernel_bundle_queue_ctx_not_equal_to_kernel_bundle_ctx.h deleted file mode 100644 index 12d765999..000000000 --- a/tests/kernel_bundle/use_kernel_bundle_queue_ctx_not_equal_to_kernel_bundle_ctx.h +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* -// -// SYCL 2020 Conformance Test Suite -// -// Provides verification function for the case when first/second sycl::queue -// context not equal to kernel bundle context. -// -*******************************************************************************/ - -#ifndef __SYCLCTS_TESTS_USE_KERNEL_BUNDLE_QUEUE_CTX_NOT_EQUAL_KB_CTX_H -#define __SYCLCTS_TESTS_USE_KERNEL_BUNDLE_QUEUE_CTX_NOT_EQUAL_KB_CTX_H - -#include "../common/assertions.h" -#include "../common/common.h" -#include "use_kernel_bundle.h" - -namespace use_kernel_bundle_queue_ctx_not_equal_kb_ctx { - -/** @brief Call sycl::handler::use_kernel_bundle with kernel bundle which - * context doesent associated with the sycl::handler context - * @param log sycl_cts::util::logger class object - * @param first_ctx Context that will used for sycl::queue - * @param second_ctx Context that will used for sycl::queue - * @param kernel_bundle which will be set using use_kernel_bundle - */ -inline void run_verification( - sycl_cts::util::logger &log, const sycl::context &first_ctx, - const sycl::context &second_ctx, - sycl::kernel_bundle &kernel_bundle) { - sycl::queue first_queue(first_ctx, first_ctx.get_devices()[0]); - sycl::queue second_queue(second_ctx, second_ctx.get_devices()[0]); - - expect_throws( - log, - sycl_cts::tests::use_kernel_bundle::TestCaseDescription< - sycl::bundle_state::executable>("(kernel_bundle<>)"), - [&] { - first_queue.submit( - [&](sycl::handler &cgh) { - cgh.use_kernel_bundle(kernel_bundle); - cgh.single_task< - sycl_cts::tests::use_kernel_bundle::kernel_for_kernel_bundle>( - [=]() {}); - }, - second_queue); - }); -} - -} // namespace use_kernel_bundle_queue_ctx_not_equal_kb_ctx - -#endif // __SYCLCTS_TESTS_USE_KERNEL_BUNDLE_QUEUE_CTX_NOT_EQUAL_KB_CTX_H diff --git a/tests/kernel_bundle/use_kernel_bundle_second_queue_ctx_not_equal_to_kernel_bundle_ctx.cpp b/tests/kernel_bundle/use_kernel_bundle_second_queue_ctx_not_equal_to_kernel_bundle_ctx.cpp deleted file mode 100644 index 5cb936a28..000000000 --- a/tests/kernel_bundle/use_kernel_bundle_second_queue_ctx_not_equal_to_kernel_bundle_ctx.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* -// -// SYCL 2020 Conformance Test Suite -// -// The test checks that calling sycl::handler::use_kernel_bundle with a kernel -// bundle which is associated with a context different from one associated with -// a handler results in exception. This is done for kernel bundles that: -// 1) contain user kernels -// 2) contain builtin kernels -// 3) don't contain any kernel -// -// The test verifies that the exception with sycl::errc::invalid was thrown. -// -*******************************************************************************/ - -#include "../common/common.h" -#include "use_kernel_bundle.h" -#include "use_kernel_bundle_queue_ctx_not_equal_to_kernel_bundle_ctx.h" - -#define TEST_NAME \ - use_kernel_bundle_second_queue_ctx_not_equal_to_kernel_bundle_ctx - -namespace TEST_NAMESPACE { -using namespace sycl_cts; -using namespace sycl_cts::tests::use_kernel_bundle; -using namespace use_kernel_bundle_queue_ctx_not_equal_kb_ctx; - -class TEST_NAME : public sycl_cts::util::test_base { - public: - /** return information about this test - */ - void get_info(test_base::info &out) const override { - set_test_info(out, TOSTRING(TEST_NAME), TEST_FILE); - } - - /** execute the test - */ - void run(util::logger &log) override { - auto platforms = sycl::platform::get_platforms(); - const std::vector devices{sycl::device::get_devices()}; - if (devices.size() <= 1) { - log.note("Test skipped due to only zero or one device was found"); - return; - } - sycl::context first_ctx(devices[0]); - sycl::context second_ctx(devices[1]); - - sycl::kernel_bundle empty_bundle = - get_empty_bundle(first_ctx); - run_verification(log, first_ctx, second_ctx, empty_bundle); - - sycl::kernel_bundle non_empty_bundle = - get_non_empty_bundle(first_ctx); - run_verification(log, first_ctx, second_ctx, non_empty_bundle); - - sycl::kernel_bundle - bundle_with_built_in_kernel = - get_bundle_with_built_in_kernels(first_ctx); - run_verification(log, first_ctx, second_ctx, bundle_with_built_in_kernel); - } -}; - -// construction of this proxy will register the above test -util::test_proxy proxy; - -} // namespace TEST_NAMESPACE