diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 5ea7d9c08..8cd1a70f1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -5,6 +5,6 @@ # the corresponding owner only. /cmake/FindDPCPP.cmake @bader /cmake/AdaptDPCPP.cmake @bader -/cmake/FindhipSYCL.cmake @illuhad +/cmake/FindAdaptiveCpp.cmake @illuhad /test_plans @gmlueck @KhronosGroup/sycl-cts-reviewers diff --git a/.github/workflows/cts_ci.yml b/.github/workflows/cts_ci.yml index 8964ae5bf..642b3d6b3 100644 --- a/.github/workflows/cts_ci.yml +++ b/.github/workflows/cts_ci.yml @@ -57,8 +57,8 @@ jobs: include: - sycl-impl: dpcpp version: 6456fe89646deb8bf30c0eb32827a62ff6e58ffb - - sycl-impl: hipsycl - version: 3d8b1cd + - sycl-impl: adaptivecpp + version: 061e2d6ffe1084021d99f22ac1f16e28c6dab899 steps: - name: Checkout uses: actions/checkout@v3 @@ -115,8 +115,8 @@ jobs: include: - sycl-impl: dpcpp version: 6456fe89646deb8bf30c0eb32827a62ff6e58ffb - - sycl-impl: hipsycl - version: 3d8b1cd + - sycl-impl: adaptivecpp + version: 061e2d6ffe1084021d99f22ac1f16e28c6dab899 env: container-workspace: /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }} parallel-build-jobs: 2 diff --git a/README.md b/README.md index aaee0b465..a7f92a897 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ To compile the CTS, the following dependencies are required: - Python 3.7 or higher - CMake 3.15 or higher - A SYCL implementation - - The CTS currently supports DPC++ and hipSYCL + - The CTS currently supports DPC++ and AdaptiveCpp - See the [AddSYCLExecutable.cmake](cmake/AddSYCLExecutable.cmake) module on how to add support for additional SYCL implementations @@ -35,7 +35,7 @@ cloning this repository and its submodules: Then enter the `SYCL-CTS` folder and configure the build using CMake: -`cmake -S . -B build -DSYCL_IMPLEMENTATION=` +`cmake -S . -B build -DSYCL_IMPLEMENTATION=` See [CMake Configuration Options](#cmake-configuration-options) for additional configuration options that can be passed here. @@ -52,7 +52,7 @@ placed in the `build/bin` directory. The CTS can be configured using the following CMake configuration options: `SYCL_IMPLEMENTATION` (default: None) - `DPCPP` or `hipSYCL`. + `DPCPP` or `AdaptiveCpp`. `SYCL_CTS_EXCLUDE_TEST_CATEGORIES` (default: None) Optional file specifying a list of test categories to be excluded from the build. diff --git a/ci/hipsycl.filter b/ci/adaptivecpp.filter similarity index 59% rename from ci/hipsycl.filter rename to ci/adaptivecpp.filter index d4f9719d0..3f61c128e 100644 --- a/ci/hipsycl.filter +++ b/ci/adaptivecpp.filter @@ -1,44 +1,72 @@ +accessor_basic +accessor_generic accessor_legacy +accessor_placeholder +address_space atomic +atomic_fence +atomic_ref +atomic_ref_stress +bit_cast buffer context device +device_event device_selector +error event exception_handling exceptions +full_feature_set group +group_functions h_item handler +header hierarchical +host_accessor host_task +id image image_accessor +invoke +is_device_copyable item kernel kernel_args kernel_bundle +language +local_accessor +marray_arithmetic_assignment +marray_arithmetic_binary marray_basic marray_bitwise marray_pre_post marray_relational -marray_arithmetic_assignment -marray_arithmetic_binary math_builtin_api multi_ptr +namespace nd_item nd_range +opencl_interop +optional_kernel_features +platform +pointers property queue range +reduction sampler scalars spec_constants stream +sub_group +sycl_external usm vector_alias vector_api vector_constructors +vector_deduction_guides vector_load_store vector_operators vector_swizzle_assignment diff --git a/ci/generate_exclude_filter.py b/ci/generate_exclude_filter.py index dfd7e8b36..bfd578620 100755 --- a/ci/generate_exclude_filter.py +++ b/ci/generate_exclude_filter.py @@ -42,7 +42,7 @@ def parse_arguments(): configuration-time test category filters for all failing targets.""") parser.add_argument('sycl_implementation', metavar="SYCL-Implementation", - choices=['DPCPP', 'hipSYCL'], type=str, + choices=['DPCPP', 'AdaptiveCpp'], type=str, help="The SYCL implementation to use") parser.add_argument('--cmake-args', type=str, help="Arguments to pass on to CMake during configuration") diff --git a/cmake/AdapthipSYCL.cmake b/cmake/AdaptAdaptiveCpp.cmake similarity index 91% rename from cmake/AdapthipSYCL.cmake rename to cmake/AdaptAdaptiveCpp.cmake index ff1a72348..62a51cc2d 100644 --- a/cmake/AdapthipSYCL.cmake +++ b/cmake/AdaptAdaptiveCpp.cmake @@ -1,5 +1,5 @@ add_library(SYCL::SYCL INTERFACE IMPORTED GLOBAL) -target_link_libraries(SYCL::SYCL INTERFACE hipSYCL::hipSYCL-rt) +target_link_libraries(SYCL::SYCL INTERFACE AdaptiveCpp::acpp-rt) # add_sycl_executable_implementation function # Builds a SYCL program, compiling multiple SYCL test case source files into a # test executable, invoking a single-source/device compiler @@ -17,7 +17,7 @@ function(add_sycl_executable_implementation) add_library(${object_lib_name} OBJECT ${test_cases_list}) add_executable(${exe_name} $) - # hipSYCL needs the macro to be called on both the object library (to + # AdaptiveCpp needs the macro to be called on both the object library (to # override the compiler) and the executable (to override the linker). add_sycl_to_target(TARGET ${object_lib_name} SOURCES ${test_cases_list}) add_sycl_to_target(TARGET ${exe_name}) diff --git a/cmake/AddSYCLExecutable.cmake b/cmake/AddSYCLExecutable.cmake index 229bc7a69..8cda35248 100644 --- a/cmake/AddSYCLExecutable.cmake +++ b/cmake/AddSYCLExecutable.cmake @@ -1,8 +1,8 @@ -set (KNOWN_SYCL_IMPLEMENTATIONS "DPCPP;hipSYCL") +set (KNOWN_SYCL_IMPLEMENTATIONS "DPCPP;AdaptiveCpp") if ("${SYCL_IMPLEMENTATION}" STREQUAL "" OR NOT ${SYCL_IMPLEMENTATION} IN_LIST KNOWN_SYCL_IMPLEMENTATIONS) message(FATAL_ERROR "The SYCL CTS requires specifying a SYCL implementation with " - "-DSYCL_IMPLEMENTATION=[DPCPP;hipSYCL]") + "-DSYCL_IMPLEMENTATION=[DPCPP;AdaptiveCpp]") endif() if(NOT TARGET OpenCL_Proxy) diff --git a/docker/hipsycl/Dockerfile b/docker/adaptivecpp/Dockerfile similarity index 50% rename from docker/hipsycl/Dockerfile rename to docker/adaptivecpp/Dockerfile index 625787eb0..550c091be 100644 --- a/docker/hipsycl/Dockerfile +++ b/docker/adaptivecpp/Dockerfile @@ -1,4 +1,4 @@ -# hipSYCL version (git revision) to install +# AdaptiveCpp version (git revision) to install ARG IMPL_VERSION FROM khronosgroup/sycl-cts-ci:common @@ -14,15 +14,22 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get clean && \ rm -rf /var/lib/apt/lists* -RUN git clone https://github.com/illuhad/hipSYCL.git \ - --branch=develop --single-branch --shallow-since=2021-08-01 \ - --recurse-submodules /tmp/hipSYCL && \ - cd /tmp/hipSYCL && \ +RUN git clone https://github.com/AdaptiveCpp/AdaptiveCpp.git \ + --branch=develop --single-branch --shallow-since=2024-12-01 \ + --recurse-submodules /tmp/AdaptiveCpp && \ + cd /tmp/AdaptiveCpp && \ git checkout $IMPL_VERSION && \ - cmake /tmp/hipSYCL -G Ninja -B /tmp/build \ + cmake /tmp/AdaptiveCpp -G Ninja -B /tmp/build \ + -DWITH_SSCP_COMPILER=OFF \ + -DWITH_STDPAR_COMPILER=OFF \ + -DWITH_ACCELERATED_CPU=OFF \ + -DWITH_CUDA_BACKEND=OFF \ + -DWITH_ROCM_BACKEND=OFF \ + -DWITH_OPENCL_BACKEND=OFF \ + -DWITH_CPU_BACKEND=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/sycl && \ cmake --build /tmp/build --target install && \ - rm -rf /tmp/hipSYCL /tmp/build + rm -rf /tmp/AdaptiveCpp /tmp/build COPY configure.sh /scripts/ diff --git a/docker/hipsycl/configure.sh b/docker/adaptivecpp/configure.sh similarity index 89% rename from docker/hipsycl/configure.sh rename to docker/adaptivecpp/configure.sh index d6b2523e6..d6c841189 100644 --- a/docker/hipsycl/configure.sh +++ b/docker/adaptivecpp/configure.sh @@ -4,7 +4,7 @@ set -o errexit -o pipefail -o noclobber -o nounset cmake . -G Ninja -B build \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DSYCL_IMPLEMENTATION=hipSYCL \ + -DSYCL_IMPLEMENTATION=AdaptiveCpp \ -DCMAKE_PREFIX_PATH=/sycl \ -DCMAKE_BUILD_TYPE=Release \ -DSYCL_CTS_ENABLE_OPENCL_INTEROP_TESTS=0 \ diff --git a/docker/common/Dockerfile b/docker/common/Dockerfile index 20d29ba27..b70e1a325 100644 --- a/docker/common/Dockerfile +++ b/docker/common/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:24.04 # We install OpenCL to enable compilation of interop tests (for SYCL # implementations that support it). diff --git a/docs/README.adoc b/docs/README.adoc index 568246a11..02383ac1a 100644 --- a/docs/README.adoc +++ b/docs/README.adoc @@ -327,12 +327,12 @@ Their usage is best explained in an example: [source,c++] ---- -DISABLED_FOR_TEST_CASE(hipSYCL)("some feature works as expected", "[some-feature]")({ - CHECK(sycl::something_that_hipsycl_does_not_yet_support() == 123); +DISABLED_FOR_TEST_CASE(AdaptiveCpp)("some feature works as expected", "[some-feature]")({ + CHECK(sycl::something_that_adaptivecpp_does_not_yet_support() == 123); }); ---- -While for other SYCL implementations the test case will compile as if it were a normal `TEST_CASE`, for hipSYCL it will instead compile to a test case that fails at runtime with the message `"This test case has been compile-time disabled."`. +While for other SYCL implementations the test case will compile as if it were a normal `TEST_CASE`, for AdaptiveCpp it will instead compile to a test case that fails at runtime with the message `"This test case has been compile-time disabled."`. Note that unlike the normal `TEST_CASE` macro, `DISABLED_FOR_TEST_CASE` requires that the body of the test is wrapped in parentheses and followed by a semicolon. @@ -341,7 +341,7 @@ The CTS currently provides the following macros for compile-time disabling test * `DISABLED_FOR_TEST_CASE()(, )()` * `DISABLED_FOR_TEMPLATE_TEST_CASE_SIG()(, , , )()` -where `` is a comma-separated list of `hipSYCL` and/or `DPCPP`. +where `` is a comma-separated list of `AdaptiveCpp` and/or `DPCPP`. NOTE: #**TODO:** Custom matchers.# diff --git a/tests/accessor_basic/accessor_common.h b/tests/accessor_basic/accessor_common.h index 88cfa6403..085fc961b 100644 --- a/tests/accessor_basic/accessor_common.h +++ b/tests/accessor_basic/accessor_common.h @@ -30,8 +30,8 @@ #include "../common/type_list.h" #include "../common/value_operations.h" -// FIXME: re-enable when marrray is implemented in hipsycl -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when marrray is implemented in adaptivecpp +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../common/type_coverage.h" #endif @@ -140,9 +140,9 @@ inline std::string get_section_name(const std::string& type_name, .create(); } -// FIXME: re-enable when marrray is implemented in hipsycl and type_coverage is -// enabled -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when marrray is implemented in adaptivecpp and type_coverage +// is enabled +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Factory function for getting type_pack with fp16 type */ @@ -379,7 +379,7 @@ inline auto add_vectors_to_type_pack(StrNameType type_name) { "vec<" + type_name + ", 8>", "vec<" + type_name + ", 16>"); } -#endif // SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template struct tag_factory { @@ -476,8 +476,8 @@ void check_empty_accessor_constructor_post_conditions( } // FIXME: re-enable when handler.host_task and sycl::errc is implemented in -// hipsycl and computcpp -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// adaptivecpp and computcpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Common function that constructs accessor with default constructor @@ -619,7 +619,7 @@ void check_zero_length_buffer_constructor(GetAccFunctorT get_accessor_functor) { CHECK(conditions_check[i]); } } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace detail { /** @@ -668,8 +668,8 @@ void read_write_zero_dim_acc(AccT testing_acc, ResultAccT res_acc) { } } // FIXME: re-enable when handler.host_task and sycl::errc is implemented in -// hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Function helps to check zero dimension constructor of accessor @@ -756,7 +756,7 @@ void check_zero_dim_constructor(GetAccFunctorT get_accessor_functor, } } } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Function that tries to read or/and write depending on AccessMode @@ -785,8 +785,8 @@ void read_write_acc(AccT testing_acc, ResultAccT res_acc) { } // FIXME: re-enable when handler.host_task and sycl::errc is implemented in -// hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Function helps to check common constructor of accessor @@ -890,7 +890,7 @@ void check_common_constructor(GetAccFunctorT get_accessor_functor, } } } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Function mainly for testing no_init property. The function tries to @@ -920,7 +920,7 @@ void write_read_acc(AccT testing_acc, ResultAccT res_acc) { } } // FIXME: re-enable when handler.host_task and sycl::errc is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template @@ -1007,7 +1007,7 @@ void check_no_init_prop_exception(GetAccFunctorT construct_acc) { } } } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Function tests AccT::get_pointer() method @@ -1024,8 +1024,8 @@ void test_accessor_ptr(AccT& accessor, T expected_data) { } // FIXME: re-enable when sycl::access::decorated enumeration is implemented in -// hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template void test_accessor_ptr_device(AccT& accessor, T& expected_data, AccRes& res_acc, size_t& res_i) { @@ -1051,7 +1051,7 @@ void test_accessor_ptr_device(AccT& accessor, T& expected_data, AccRes& res_acc, sycl::global_ptr>; res_acc[res_i++] = value_operations::are_equal(*acc_pointer, expected_data); } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Function checks common buffer and local accessor member functions */ @@ -1205,8 +1205,8 @@ void check_get_property_member_func(GetAccFunctorT construct_acc) { } // FIXME: re-enable when handler.host_task and sycl::errc is implemented in -// hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Function invokes \c get_property() member function without \c PropT * property and verifies that false returns @@ -1241,7 +1241,7 @@ void check_get_property_member_without_no_init(GetAccFunctorT construct_acc) { sycl_cts::util::equals_exception(sycl::errc::invalid)); } } -#endif // SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Function checks common buffer and local accessor member types */ @@ -1283,8 +1283,8 @@ sycl::id next_id_linearly(sycl::id id, size_t size) { return id; } -// FIXME: re-enable when handler.host_task is implemented in hipsycl -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when handler.host_task is implemented in adaptivecpp +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template diff --git a/tests/accessor_basic/accessor_default_values.cpp.in b/tests/accessor_basic/accessor_default_values.cpp.in index 80441e823..61a6904d9 100644 --- a/tests/accessor_basic/accessor_default_values.cpp.in +++ b/tests/accessor_basic/accessor_default_values.cpp.in @@ -19,7 +19,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "accessor_default_values.h" @@ -30,7 +30,7 @@ using namespace accessor_tests_common; namespace accessor_default_values_test_core { using namespace sycl_cts; -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Accessors constructor default values test", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_basic/accessor_exceptions.cpp.in b/tests/accessor_basic/accessor_exceptions.cpp.in index d0f0dab08..af67f7c33 100644 --- a/tests/accessor_basic/accessor_exceptions.cpp.in +++ b/tests/accessor_basic/accessor_exceptions.cpp.in @@ -18,7 +18,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "accessor_exceptions.h" @@ -29,7 +29,7 @@ using namespace accessor_tests_common; namespace accessor_exceptions_test_core { using namespace sycl_cts; -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor constructor exceptions test.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -56,7 +56,7 @@ DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) #endif // SYCL_CTS_ENABLE_FULL_CONFORMANCE }); -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " sycl::local_accessor constructor exceptions test.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -83,7 +83,7 @@ DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) #endif // SYCL_CTS_ENABLE_FULL_CONFORMANCE }); -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " sycl::host_accessor constructor exceptions test.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_basic/accessor_implicit_conversions.cpp.in b/tests/accessor_basic/accessor_implicit_conversions.cpp.in index 2358bcb4e..a0a20119a 100644 --- a/tests/accessor_basic/accessor_implicit_conversions.cpp.in +++ b/tests/accessor_basic/accessor_implicit_conversions.cpp.in @@ -14,7 +14,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "accessor_common.h" #include "accessor_implicit_conversions.h" @@ -30,7 +30,7 @@ using namespace accessor_implicit_conversions; namespace accessor_implicit_conversions_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor implicit conversion.", "[accessor][generic_accessor][conversion][core]", generic_test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -56,7 +56,7 @@ DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) #endif // SYCL_CTS_ENABLE_FULL_CONFORMANCE }); -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " The sycl::local_accessor implicit conversion.", "[accessor][local_accessor][conversion][core]", host_local_test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -82,7 +82,7 @@ DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) #endif // SYCL_CTS_ENABLE_FULL_CONFORMANCE }); -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " The sycl::host_accessor implicit conversion.", "[accessor][host_accessor][conversion][core]", host_local_test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_basic/accessor_iterator_requirement.cpp b/tests/accessor_basic/accessor_iterator_requirement.cpp index 61fab7a44..f850c6c69 100644 --- a/tests/accessor_basic/accessor_iterator_requirement.cpp +++ b/tests/accessor_basic/accessor_iterator_requirement.cpp @@ -115,7 +115,7 @@ inline auto fill_errors(std::tuple ftuple) { return errors; } -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::accessor " "iterator", "[accessor]")({ @@ -131,7 +131,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::accessor " "const iterator", "[accessor]")({ @@ -147,7 +147,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::accessor " "reverse iterator", "[accessor]")({ @@ -163,7 +163,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::accessor " "const reverse iterator", "[accessor]")({ @@ -179,7 +179,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::local_accessor " "iterator", "[accessor]")({ @@ -196,7 +196,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::local_accessor " "const iterator", "[accessor]")({ @@ -213,7 +213,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::local_accessor " "reverse iterator", "[accessor]")({ @@ -230,7 +230,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::local_accessor " "const reverse iterator", "[accessor]")({ @@ -247,7 +247,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::host_accessor " "iterator", "[accessor]")({ @@ -264,7 +264,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::host_accessor " "const iterator", "[accessor]")({ @@ -281,7 +281,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::host_accessor " "reverse iterator", "[accessor]")({ @@ -298,7 +298,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) print_errors(errors); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("LegacyRandomAccessIterator requirement verification for sycl::host_accessor " "const reverse iterator", "[accessor]")({ diff --git a/tests/accessor_generic/generic_accessor_api.cpp.in b/tests/accessor_generic/generic_accessor_api.cpp.in index a9d521115..6cdf244f6 100644 --- a/tests/accessor_generic/generic_accessor_api.cpp.in +++ b/tests/accessor_generic/generic_accessor_api.cpp.in @@ -14,7 +14,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_api_common.h" @@ -24,7 +24,7 @@ using namespace generic_accessor_api_common; namespace generic_accessor_api_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor api.", "[accessor]", test_combinations)({ using namespace generic_accessor_api_common; auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_generic/generic_accessor_common_buffer_constructors.cpp.in b/tests/accessor_generic/generic_accessor_common_buffer_constructors.cpp.in index 2b37807c4..7f17cba9f 100644 --- a/tests/accessor_generic/generic_accessor_common_buffer_constructors.cpp.in +++ b/tests/accessor_generic/generic_accessor_common_buffer_constructors.cpp.in @@ -29,7 +29,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_common_buffer_constructors.h" @@ -40,7 +40,7 @@ using namespace generic_accessor_common_buffer_constructors; namespace generic_accessor_common_buffer_constructors_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor buffer constructors.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_generic/generic_accessor_common_buffer_tag_constructors.cpp.in b/tests/accessor_generic/generic_accessor_common_buffer_tag_constructors.cpp.in index e9a7437af..16b4e20b1 100644 --- a/tests/accessor_generic/generic_accessor_common_buffer_tag_constructors.cpp.in +++ b/tests/accessor_generic/generic_accessor_common_buffer_tag_constructors.cpp.in @@ -29,7 +29,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_common_buffer_tag_constructors.h" @@ -40,7 +40,7 @@ using namespace generic_accessor_common_buffer_tag_constructors; namespace generic_accessor_common_buffer_tag_constructors_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor buffer tag constructors.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_generic/generic_accessor_def_constructor.cpp.in b/tests/accessor_generic/generic_accessor_def_constructor.cpp.in index 7b528b4c5..90dd68312 100644 --- a/tests/accessor_generic/generic_accessor_def_constructor.cpp.in +++ b/tests/accessor_generic/generic_accessor_def_constructor.cpp.in @@ -28,7 +28,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_def_constructor.h" @@ -39,7 +39,7 @@ using namespace generic_accessor_def_constructor; namespace generic_accessor_def_constructor_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor def constructors.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_generic/generic_accessor_linearization.cpp.in b/tests/accessor_generic/generic_accessor_linearization.cpp.in index 5e56047cc..b72b077d4 100644 --- a/tests/accessor_generic/generic_accessor_linearization.cpp.in +++ b/tests/accessor_generic/generic_accessor_linearization.cpp.in @@ -28,7 +28,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_linearization.h" @@ -41,7 +41,7 @@ using namespace generic_accessor_linearization; namespace generic_accessor_linearization_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor linearization test.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_generic/generic_accessor_properties.cpp.in b/tests/accessor_generic/generic_accessor_properties.cpp.in index 61590a30c..8d6a354ff 100644 --- a/tests/accessor_generic/generic_accessor_properties.cpp.in +++ b/tests/accessor_generic/generic_accessor_properties.cpp.in @@ -14,7 +14,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_properties.h" @@ -27,7 +27,7 @@ using namespace generic_accessor_properties; namespace generic_accessor_properties_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor properties test.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_generic/generic_accessor_semantics.cpp b/tests/accessor_generic/generic_accessor_semantics.cpp index 19fa5e2ec..d6a23ac07 100644 --- a/tests/accessor_generic/generic_accessor_semantics.cpp +++ b/tests/accessor_generic/generic_accessor_semantics.cpp @@ -20,7 +20,7 @@ #include "../common/common.h" #include "../common/disabled_for_test_case.h" -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../common/semantics_reference.h" #endif @@ -57,7 +57,7 @@ struct storage { } }; -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("generic accessor common reference semantics (host)", "[accessor]")({ { // target::host_task int val_0; @@ -93,7 +93,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) } }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("generic accessor common reference semantics, mutation (host)", "[accessor]")({ sycl::queue queue = sycl_cts::util::get_cts_object::queue(); int result = 0; @@ -171,7 +171,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) } }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("generic accessor common reference semantics (kernel)", "[accessor]")({ sycl::buffer buffer{sycl::range<1>{1}}; using type = @@ -189,7 +189,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) template class kernel_name_generic; -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("generic accessor common reference semantics, mutation (kernel)", "[accessor]")({ sycl::queue queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_generic/generic_accessor_zero_dim_constructor.cpp.in b/tests/accessor_generic/generic_accessor_zero_dim_constructor.cpp.in index 9a062b453..79997b3e2 100644 --- a/tests/accessor_generic/generic_accessor_zero_dim_constructor.cpp.in +++ b/tests/accessor_generic/generic_accessor_zero_dim_constructor.cpp.in @@ -29,7 +29,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_zero_dim_constructor.h" @@ -41,7 +41,7 @@ using namespace generic_accessor_zero_dim_constructor; namespace generic_accessor_zero_dim_constructor_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor zero-dim constructors.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_placeholder/generic_accessor_placeholder_buffer_constructor.cpp.in b/tests/accessor_placeholder/generic_accessor_placeholder_buffer_constructor.cpp.in index 4a665236e..ad9089bce 100644 --- a/tests/accessor_placeholder/generic_accessor_placeholder_buffer_constructor.cpp.in +++ b/tests/accessor_placeholder/generic_accessor_placeholder_buffer_constructor.cpp.in @@ -29,7 +29,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_placeholder_buffer_constructor.h" @@ -41,7 +41,7 @@ using namespace generic_accessor_placeholder_buffer_constructor; namespace generic_accessor_placeholder_buffer_constructor_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor placeholder constructors.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_placeholder/generic_accessor_placeholder_buffer_range_constructor.cpp.in b/tests/accessor_placeholder/generic_accessor_placeholder_buffer_range_constructor.cpp.in index 584968e9c..32b3c797d 100644 --- a/tests/accessor_placeholder/generic_accessor_placeholder_buffer_range_constructor.cpp.in +++ b/tests/accessor_placeholder/generic_accessor_placeholder_buffer_range_constructor.cpp.in @@ -29,7 +29,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_placeholder_buffer_range_constructor.h" @@ -41,7 +41,7 @@ using namespace generic_accessor_placeholder_buffer_range_constructor; namespace generic_accessor_placeholder_buffer_range_constructor_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor placeholder buffer range constructor.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_placeholder/generic_accessor_placeholder_buffer_range_offset_constructor.cpp.in b/tests/accessor_placeholder/generic_accessor_placeholder_buffer_range_offset_constructor.cpp.in index e47ff1f64..b9dea6a57 100644 --- a/tests/accessor_placeholder/generic_accessor_placeholder_buffer_range_offset_constructor.cpp.in +++ b/tests/accessor_placeholder/generic_accessor_placeholder_buffer_range_offset_constructor.cpp.in @@ -29,7 +29,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_placeholder_buffer_range_offset_constructor.h" @@ -41,7 +41,7 @@ using namespace generic_accessor_placeholder_buffer_range_offset_constructor; namespace generic_accessor_placeholder_buffer_range_offset_constructor_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor placeholder buffer range offset constructor.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_constructor.cpp.in b/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_constructor.cpp.in index d6c46696c..c98b2aa88 100644 --- a/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_constructor.cpp.in +++ b/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_constructor.cpp.in @@ -29,7 +29,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_placeholder_zero_length_buffer_constructor.h" @@ -41,7 +41,7 @@ using namespace generic_accessor_placeholder_zero_length_buffer_constructor; namespace generic_accessor_placeholder_zero_length_buffer_constructor_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor placeholder zero-length buffer constructor.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_range_constructor.cpp.in b/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_range_constructor.cpp.in index e2ad4ad2f..82eca8f23 100644 --- a/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_range_constructor.cpp.in +++ b/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_range_constructor.cpp.in @@ -29,7 +29,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_placeholder_zero_length_buffer_range_constructor.h" @@ -41,7 +41,7 @@ using namespace generic_accessor_placeholder_zero_length_buffer_range_constructo namespace generic_accessor_placeholder_zero_length_buffer_range_constructor_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor placeholder zero-length buffer range constructor. ", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_range_offset_constructor.cpp.in b/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_range_offset_constructor.cpp.in index 36515912b..9b1e8fc1b 100644 --- a/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_range_offset_constructor.cpp.in +++ b/tests/accessor_placeholder/generic_accessor_placeholder_zero_length_buffer_range_offset_constructor.cpp.in @@ -29,7 +29,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "generic_accessor_placeholder_zero_length_buffer_range_offset_constructor.h" @@ -41,7 +41,7 @@ using namespace generic_accessor_placeholder_zero_length_buffer_range_offset_con namespace generic_accessor_placeholder_zero_length_buffer_range_offset_constructor_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " Generic sycl::accessor placeholder zero-length buffer range offset " "constructor.", "[accessor]", test_combinations)({ diff --git a/tests/address_space/address_space_common.h b/tests/address_space/address_space_common.h index 27f6953f0..70ffa4e4c 100644 --- a/tests/address_space/address_space_common.h +++ b/tests/address_space/address_space_common.h @@ -181,7 +181,7 @@ class check_types { localAcc[0] = initAcc[2]; T priv = initAcc[3]; // FIXME: re-enable when sycl::access::decorated is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP pass &= test_duplication( globalAcc .template get_multi_ptr(), diff --git a/tests/atomic_fence/atomic_fence.cpp b/tests/atomic_fence/atomic_fence.cpp index b13133723..61731f775 100644 --- a/tests/atomic_fence/atomic_fence.cpp +++ b/tests/atomic_fence/atomic_fence.cpp @@ -29,8 +29,8 @@ namespace atomic_fence_test { -// FIXME: re-enable when support for atomic_fence is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when support for atomic_fence is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP constexpr int expected_val = 42; @@ -321,10 +321,10 @@ class run_test { value_pack::generate_named()); } }; -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP -// FIXME: re-enable when support for atomic_fence is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when support for atomic_fence is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_fence function", "[atomic_fence]")({ atomic_fence_test::run_test{}(); }); diff --git a/tests/atomic_ref/atomic_ref_T_op_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_T_op_test_atomic64.cpp index eb28534be..fd7b5cc20 100644 --- a/tests/atomic_ref/atomic_ref_T_op_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_T_op_test_atomic64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_T_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::operator T() test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::atomic64)) { @@ -46,7 +46,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::operator T() test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64) or diff --git a/tests/atomic_ref/atomic_ref_T_op_test_core.cpp b/tests/atomic_ref/atomic_ref_T_op_test_core.cpp index 7531972cb..73cf4d551 100644 --- a/tests/atomic_ref/atomic_ref_T_op_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_T_op_test_core.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_T_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::operator T() test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); for_all_types(type_pack); diff --git a/tests/atomic_ref/atomic_ref_T_op_test_pointers.cpp b/tests/atomic_ref/atomic_ref_T_op_test_pointers.cpp index 4af4830cc..2db99a186 100644 --- a/tests/atomic_ref/atomic_ref_T_op_test_pointers.cpp +++ b/tests/atomic_ref/atomic_ref_T_op_test_pointers.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_T_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::operator T() test. pointers types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_pointers_type_pack(); diff --git a/tests/atomic_ref/atomic_ref_T_op_test_pointers_fp64.cpp b/tests/atomic_ref/atomic_ref_T_op_test_pointers_fp64.cpp index 1af1bddfc..8825316f0 100644 --- a/tests/atomic_ref/atomic_ref_T_op_test_pointers_fp64.cpp +++ b/tests/atomic_ref/atomic_ref_T_op_test_pointers_fp64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_T_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::operator T() test. double *", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64)) { diff --git a/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_atomic64.cpp index 132fa1f2a..223eb9c5d 100644 --- a/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_atomic64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_add_sub_op_all_types_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref operator+=()/operator-=() test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -48,7 +48,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref operator+=()/operator-=() test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_core.cpp b/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_core.cpp index 6c3f94030..c2cd39efc 100644 --- a/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_core.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_add_sub_op_all_types_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref operator+=()/operator-=() test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); diff --git a/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_pointers.cpp b/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_pointers.cpp index cbf9b0c00..f9ee2d2db 100644 --- a/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_pointers.cpp +++ b/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_pointers.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_add_sub_op_all_types_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref operator+=()/operator-=() test. pointers types", "[atomic_ref]")({ const auto type_pack = diff --git a/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_pointers_fp64.cpp b/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_pointers_fp64.cpp index 58e7d3481..7845c956e 100644 --- a/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_pointers_fp64.cpp +++ b/tests/atomic_ref/atomic_ref_add_sub_op_all_types_test_pointers_fp64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_add_sub_op_all_types_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref operator+=()/operator-=() test. double *", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64)) { diff --git a/tests/atomic_ref/atomic_ref_assign_op_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_assign_op_test_atomic64.cpp index 08bf60f8b..a58501ec4 100644 --- a/tests/atomic_ref/atomic_ref_assign_op_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_assign_op_test_atomic64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_assign_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::operator=() test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::atomic64)) { @@ -46,7 +46,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::operator=() test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64) or diff --git a/tests/atomic_ref/atomic_ref_assign_op_test_core.cpp b/tests/atomic_ref/atomic_ref_assign_op_test_core.cpp index 6e16723cb..f7dcf2d7c 100644 --- a/tests/atomic_ref/atomic_ref_assign_op_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_assign_op_test_core.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_assign_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::operator=() test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); for_all_types(type_pack); diff --git a/tests/atomic_ref/atomic_ref_assign_op_test_pointers.cpp b/tests/atomic_ref/atomic_ref_assign_op_test_pointers.cpp index 3ca0dc9bb..dd9f10a5c 100644 --- a/tests/atomic_ref/atomic_ref_assign_op_test_pointers.cpp +++ b/tests/atomic_ref/atomic_ref_assign_op_test_pointers.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_assign_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::operator=() test. pointers types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_pointers_type_pack(); diff --git a/tests/atomic_ref/atomic_ref_assign_op_test_pointers_fp64.cpp b/tests/atomic_ref/atomic_ref_assign_op_test_pointers_fp64.cpp index f8f143a97..c8c06f64e 100644 --- a/tests/atomic_ref/atomic_ref_assign_op_test_pointers_fp64.cpp +++ b/tests/atomic_ref/atomic_ref_assign_op_test_pointers_fp64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_assign_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::operator=() test. double *", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64)) { diff --git a/tests/atomic_ref/atomic_ref_bitwise_op_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_bitwise_op_test_atomic64.cpp index bc4304836..76fb8153c 100644 --- a/tests/atomic_ref/atomic_ref_bitwise_op_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_bitwise_op_test_atomic64.cpp @@ -23,19 +23,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_bitwise_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref operator^=()/operator|=()/operator&=() test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -48,7 +48,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref operator^=()/operator|=()/operator&=() test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/atomic_ref/atomic_ref_bitwise_op_test_core.cpp b/tests/atomic_ref/atomic_ref_bitwise_op_test_core.cpp index b0a50a502..7067649b5 100644 --- a/tests/atomic_ref/atomic_ref_bitwise_op_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_bitwise_op_test_core.cpp @@ -23,19 +23,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_bitwise_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref operator^=()/operator|=()/operator&=() test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); diff --git a/tests/atomic_ref/atomic_ref_common.h b/tests/atomic_ref/atomic_ref_common.h index 98475ef12..ead73255a 100644 --- a/tests/atomic_ref/atomic_ref_common.h +++ b/tests/atomic_ref/atomic_ref_common.h @@ -240,8 +240,8 @@ inline auto get_address_spaces() { // FIXME: re-enable when sycl::info::device::atomic_memory_order_capabilities // and sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP inline bool memory_order_is_supported(sycl::queue& q, sycl::memory_order order) { @@ -276,7 +276,7 @@ inline bool memory_order_and_scope_are_not_supported(sycl::queue& q, return !memory_order_and_scope_are_supported(q, order, scope); } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Function to compare two floating point values */ diff --git a/tests/atomic_ref/atomic_ref_compare_exchange_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_compare_exchange_test_atomic64.cpp index f84259663..0d62704c7 100644 --- a/tests/atomic_ref/atomic_ref_compare_exchange_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_compare_exchange_test_atomic64.cpp @@ -23,19 +23,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_compare_exchange_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref compare_exchange_strong()/compare_exchange_weak() test. " "atomic64 types", "[atomic_ref]")({ @@ -49,7 +49,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref compare_exchange_strong()/compare_exchange_weak() test. " "double type", "[atomic_ref]")({ diff --git a/tests/atomic_ref/atomic_ref_compare_exchange_test_core.cpp b/tests/atomic_ref/atomic_ref_compare_exchange_test_core.cpp index 44f1d893f..98fe1107b 100644 --- a/tests/atomic_ref/atomic_ref_compare_exchange_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_compare_exchange_test_core.cpp @@ -23,19 +23,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_compare_exchange_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref compare_exchange_strong()/compare_exchange_weak() test. " "core types", "[atomic_ref]")({ diff --git a/tests/atomic_ref/atomic_ref_compare_exchange_test_pointers.cpp b/tests/atomic_ref/atomic_ref_compare_exchange_test_pointers.cpp index 1db160f04..22a04b527 100644 --- a/tests/atomic_ref/atomic_ref_compare_exchange_test_pointers.cpp +++ b/tests/atomic_ref/atomic_ref_compare_exchange_test_pointers.cpp @@ -23,19 +23,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_compare_exchange_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref compare_exchange_strong()/compare_exchange_weak() test. " "pointers types", "[atomic_ref]")({ diff --git a/tests/atomic_ref/atomic_ref_compare_exchange_test_pointers_fp64.cpp b/tests/atomic_ref/atomic_ref_compare_exchange_test_pointers_fp64.cpp index f8d227931..869d8f20a 100644 --- a/tests/atomic_ref/atomic_ref_compare_exchange_test_pointers_fp64.cpp +++ b/tests/atomic_ref/atomic_ref_compare_exchange_test_pointers_fp64.cpp @@ -23,19 +23,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_compare_exchange_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref compare_exchange_strong()/compare_exchange_weak() test. " "double *", "[atomic_ref]")({ diff --git a/tests/atomic_ref/atomic_ref_constructors_atomic64.cpp b/tests/atomic_ref/atomic_ref_constructors_atomic64.cpp index 017750850..c33303495 100644 --- a/tests/atomic_ref/atomic_ref_constructors_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_constructors_atomic64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_constructors.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::constructors::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref constructors. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::atomic64)) { @@ -46,7 +46,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref constructors. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64) or diff --git a/tests/atomic_ref/atomic_ref_constructors_core.cpp b/tests/atomic_ref/atomic_ref_constructors_core.cpp index 7fcc8608a..5f0d777a9 100644 --- a/tests/atomic_ref/atomic_ref_constructors_core.cpp +++ b/tests/atomic_ref/atomic_ref_constructors_core.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_constructors.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::constructors::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref constructors. core types", "[atomic_ref]")({ const auto types = atomic_ref::tests::common::get_conformance_type_pack(); for_all_types(types); diff --git a/tests/atomic_ref/atomic_ref_constructors_pointers.cpp b/tests/atomic_ref/atomic_ref_constructors_pointers.cpp index dad357c7b..c3666ad38 100644 --- a/tests/atomic_ref/atomic_ref_constructors_pointers.cpp +++ b/tests/atomic_ref/atomic_ref_constructors_pointers.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_constructors.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::constructors::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref constructors. pointers types", "[atomic_ref]")({ const auto types = atomic_ref::tests::common::get_conformance_pointers_type_pack(); diff --git a/tests/atomic_ref/atomic_ref_constructors_pointers_fp64.cpp b/tests/atomic_ref/atomic_ref_constructors_pointers_fp64.cpp index 12e707d9f..2fac4fa85 100644 --- a/tests/atomic_ref/atomic_ref_constructors_pointers_fp64.cpp +++ b/tests/atomic_ref/atomic_ref_constructors_pointers_fp64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_constructors.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::constructors::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref constructors. double *", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64)) { diff --git a/tests/atomic_ref/atomic_ref_exchange_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_exchange_test_atomic64.cpp index 2b8c9c65e..56faf758f 100644 --- a/tests/atomic_ref/atomic_ref_exchange_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_exchange_test_atomic64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_exchange_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::exchange() test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::atomic64)) { @@ -46,7 +46,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::exchange() test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64) or diff --git a/tests/atomic_ref/atomic_ref_exchange_test_core.cpp b/tests/atomic_ref/atomic_ref_exchange_test_core.cpp index c0a0e2e47..273bfdca8 100644 --- a/tests/atomic_ref/atomic_ref_exchange_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_exchange_test_core.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_exchange_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::exchange() test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); for_all_types(type_pack); diff --git a/tests/atomic_ref/atomic_ref_exchange_test_pointers.cpp b/tests/atomic_ref/atomic_ref_exchange_test_pointers.cpp index de1a5b279..8da6ab4af 100644 --- a/tests/atomic_ref/atomic_ref_exchange_test_pointers.cpp +++ b/tests/atomic_ref/atomic_ref_exchange_test_pointers.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_exchange_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::exchange() test. pointers types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_pointers_type_pack(); diff --git a/tests/atomic_ref/atomic_ref_exchange_test_pointers_fp64.cpp b/tests/atomic_ref/atomic_ref_exchange_test_pointers_fp64.cpp index b87a0b5a8..0ec610dd2 100644 --- a/tests/atomic_ref/atomic_ref_exchange_test_pointers_fp64.cpp +++ b/tests/atomic_ref/atomic_ref_exchange_test_pointers_fp64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_exchange_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::exchange() test. double *", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64)) { diff --git a/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_atomic64.cpp index a1854b6cb..12824bd67 100644 --- a/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_atomic64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_fetch_add_sub_all_types_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_add()/fetch_sub() test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -48,7 +48,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_add()/fetch_sub() test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64) or diff --git a/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_core.cpp b/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_core.cpp index 85a6671b3..b42317e1c 100644 --- a/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_core.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_fetch_add_sub_all_types_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_add()/fetch_sub() test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); for_all_types( diff --git a/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_pointers.cpp b/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_pointers.cpp index 7ce3182b4..21cc99ebe 100644 --- a/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_pointers.cpp +++ b/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_pointers.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_fetch_add_sub_all_types_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_add()/fetch_sub() test. pointers types", "[atomic_ref]")({ const auto type_pack = diff --git a/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_pointers_fp64.cpp b/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_pointers_fp64.cpp index fcf14ba7c..25e668013 100644 --- a/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_pointers_fp64.cpp +++ b/tests/atomic_ref/atomic_ref_fetch_add_sub_all_types_test_pointers_fp64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_fetch_add_sub_all_types_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_add()/fetch_sub() test. double *", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64)) { diff --git a/tests/atomic_ref/atomic_ref_fetch_bitwise_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_fetch_bitwise_test_atomic64.cpp index 76ec22087..f8bc66935 100644 --- a/tests/atomic_ref/atomic_ref_fetch_bitwise_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_fetch_bitwise_test_atomic64.cpp @@ -23,19 +23,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_fetch_bitwise_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_xor()/fetch_or()/fetch_and() test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -48,7 +48,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_xor()/fetch_or()/fetch_and() test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/atomic_ref/atomic_ref_fetch_bitwise_test_core.cpp b/tests/atomic_ref/atomic_ref_fetch_bitwise_test_core.cpp index 5720093c9..85dd4c474 100644 --- a/tests/atomic_ref/atomic_ref_fetch_bitwise_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_fetch_bitwise_test_core.cpp @@ -23,19 +23,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_fetch_bitwise_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_xor()/fetch_or()/fetch_and() test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); diff --git a/tests/atomic_ref/atomic_ref_fetch_min_max_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_fetch_min_max_test_atomic64.cpp index dc6910b36..4dbf5dd95 100644 --- a/tests/atomic_ref/atomic_ref_fetch_min_max_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_fetch_min_max_test_atomic64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_fetch_min_max_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_min()/fetch_max() test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -47,7 +47,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_min()/fetch_max() test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64) or diff --git a/tests/atomic_ref/atomic_ref_fetch_min_max_test_core.cpp b/tests/atomic_ref/atomic_ref_fetch_min_max_test_core.cpp index af8af116b..9c017ff8b 100644 --- a/tests/atomic_ref/atomic_ref_fetch_min_max_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_fetch_min_max_test_core.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_fetch_min_max_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref fetch_min()/fetch_max() test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); for_all_types(type_pack); diff --git a/tests/atomic_ref/atomic_ref_incr_decr_op_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_incr_decr_op_test_atomic64.cpp index d66ac26a5..82b9efdd2 100644 --- a/tests/atomic_ref/atomic_ref_incr_decr_op_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_incr_decr_op_test_atomic64.cpp @@ -24,19 +24,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_incr_decr_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref increment/decrement operators test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -49,7 +49,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref increment/decrement operators test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/atomic_ref/atomic_ref_incr_decr_op_test_core.cpp b/tests/atomic_ref/atomic_ref_incr_decr_op_test_core.cpp index 54c77c7d7..572dca7ad 100644 --- a/tests/atomic_ref/atomic_ref_incr_decr_op_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_incr_decr_op_test_core.cpp @@ -24,19 +24,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_incr_decr_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref increment/decrement operators test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); diff --git a/tests/atomic_ref/atomic_ref_incr_decr_op_test_pointers.cpp b/tests/atomic_ref/atomic_ref_incr_decr_op_test_pointers.cpp index 320fb664c..e53b51e44 100644 --- a/tests/atomic_ref/atomic_ref_incr_decr_op_test_pointers.cpp +++ b/tests/atomic_ref/atomic_ref_incr_decr_op_test_pointers.cpp @@ -24,19 +24,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_incr_decr_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref increment/decrement operators test. pointers types", "[atomic_ref]")({ const auto type_pack = diff --git a/tests/atomic_ref/atomic_ref_incr_decr_op_test_pointers_fp64.cpp b/tests/atomic_ref/atomic_ref_incr_decr_op_test_pointers_fp64.cpp index f7a6039b2..d2519377a 100644 --- a/tests/atomic_ref/atomic_ref_incr_decr_op_test_pointers_fp64.cpp +++ b/tests/atomic_ref/atomic_ref_incr_decr_op_test_pointers_fp64.cpp @@ -24,19 +24,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_incr_decr_op_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref increment/decrement operators test. double *", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/atomic_ref/atomic_ref_is_lock_free_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_is_lock_free_test_atomic64.cpp index f348b5be8..81fe6e540 100644 --- a/tests/atomic_ref/atomic_ref_is_lock_free_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_is_lock_free_test_atomic64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_is_lock_free_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::is_lock_free() test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::atomic64)) { @@ -46,7 +46,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::is_lock_free() test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64) or diff --git a/tests/atomic_ref/atomic_ref_is_lock_free_test_core.cpp b/tests/atomic_ref/atomic_ref_is_lock_free_test_core.cpp index 9dd0c6249..53033f92a 100644 --- a/tests/atomic_ref/atomic_ref_is_lock_free_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_is_lock_free_test_core.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_is_lock_free_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::is_lock_free() test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); for_all_types(type_pack); diff --git a/tests/atomic_ref/atomic_ref_is_lock_free_test_pointers.cpp b/tests/atomic_ref/atomic_ref_is_lock_free_test_pointers.cpp index 6c694447f..1109fb923 100644 --- a/tests/atomic_ref/atomic_ref_is_lock_free_test_pointers.cpp +++ b/tests/atomic_ref/atomic_ref_is_lock_free_test_pointers.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_is_lock_free_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::is_lock_free() test. pointers types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_pointers_type_pack(); diff --git a/tests/atomic_ref/atomic_ref_is_lock_free_test_pointers_fp64.cpp b/tests/atomic_ref/atomic_ref_is_lock_free_test_pointers_fp64.cpp index 8012bfd19..488159a32 100644 --- a/tests/atomic_ref/atomic_ref_is_lock_free_test_pointers_fp64.cpp +++ b/tests/atomic_ref/atomic_ref_is_lock_free_test_pointers_fp64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_is_lock_free_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::is_lock_free() test. double *", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64)) { diff --git a/tests/atomic_ref/atomic_ref_store_test_atomic64.cpp b/tests/atomic_ref/atomic_ref_store_test_atomic64.cpp index f996d0cc6..2117f8928 100644 --- a/tests/atomic_ref/atomic_ref_store_test_atomic64.cpp +++ b/tests/atomic_ref/atomic_ref_store_test_atomic64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_store_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core::atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::store() test. atomic64 types", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::atomic64)) { @@ -46,7 +46,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::store() test. double type", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64) or diff --git a/tests/atomic_ref/atomic_ref_store_test_core.cpp b/tests/atomic_ref/atomic_ref_store_test_core.cpp index 3977f6ffd..c7c3ca37d 100644 --- a/tests/atomic_ref/atomic_ref_store_test_core.cpp +++ b/tests/atomic_ref/atomic_ref_store_test_core.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_store_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::store() test. core types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_type_pack(); for_all_types(type_pack); diff --git a/tests/atomic_ref/atomic_ref_store_test_pointers.cpp b/tests/atomic_ref/atomic_ref_store_test_pointers.cpp index 9eb9cdcce..e47ddaed1 100644 --- a/tests/atomic_ref/atomic_ref_store_test_pointers.cpp +++ b/tests/atomic_ref/atomic_ref_store_test_pointers.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_store_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::store() test. pointers types", "[atomic_ref]")({ const auto type_pack = atomic_ref::tests::common::get_conformance_pointers_type_pack(); diff --git a/tests/atomic_ref/atomic_ref_store_test_pointers_fp64.cpp b/tests/atomic_ref/atomic_ref_store_test_pointers_fp64.cpp index c15bc5e83..7c51084c4 100644 --- a/tests/atomic_ref/atomic_ref_store_test_pointers_fp64.cpp +++ b/tests/atomic_ref/atomic_ref_store_test_pointers_fp64.cpp @@ -22,19 +22,19 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_store_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace atomic_ref::tests::api::core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref::store() test. double *", "[atomic_ref]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64)) { diff --git a/tests/atomic_ref_stress/atomic_ref_stress_atomic64.cpp b/tests/atomic_ref_stress/atomic_ref_stress_atomic64.cpp index 8513bcf70..1cf3e49f2 100644 --- a/tests/atomic_ref_stress/atomic_ref_stress_atomic64.cpp +++ b/tests/atomic_ref_stress/atomic_ref_stress_atomic64.cpp @@ -19,18 +19,18 @@ *******************************************************************************/ #include "../common/disabled_for_test_case.h" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_stress_common.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include namespace atomic_ref_stress_test_atomic64 { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref atomicity for device scope test. long long type", "[atomic_ref_stress]")({ auto queue = once_per_unit::get_queue(); @@ -42,7 +42,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) atomic_ref_stress_test::run_atomicity_device_scope{}("long long"); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref atomicity for device scope test. double type", "[atomic_ref_stress]")({ auto queue = once_per_unit::get_queue(); @@ -58,7 +58,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) atomic_ref_stress_test::run_atomicity_device_scope{}("double"); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref atomicity for work_group scope test. long long type", "[atomic_ref_stress]")({ auto queue = once_per_unit::get_queue(); @@ -71,7 +71,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) "long long"); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref atomicity for work_group scope test. double type", "[atomic_ref_stress]")({ auto queue = once_per_unit::get_queue(); @@ -87,7 +87,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) atomic_ref_stress_test::run_atomicity_work_group_scope{}("double"); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref aquire and release. long long type", "[atomic_ref_stress]")({ auto queue = once_per_unit::get_queue(); if (!queue.get_device().has(sycl::aspect::atomic64)) @@ -98,7 +98,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) atomic_ref_stress_test::run_aquire_release{}("long long"); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref aquire and release. double types", "[atomic_ref_stress]")({ auto queue = once_per_unit::get_queue(); if (!queue.get_device().has(sycl::aspect::atomic64)) @@ -113,7 +113,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) atomic_ref_stress_test::run_aquire_release{}("double"); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref ordering. long long type", "[atomic_ref_stress]")({ auto queue = once_per_unit::get_queue(); if (!queue.get_device().has(sycl::aspect::atomic64)) @@ -124,7 +124,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) atomic_ref_stress_test::run_ordering{}("long long"); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref ordering. double type", "[atomic_ref_stress]")({ auto queue = once_per_unit::get_queue(); if (!queue.get_device().has(sycl::aspect::atomic64)) @@ -139,7 +139,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) atomic_ref_stress_test::run_ordering{}("double"); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref atomicity with respect to atomic operations in host code. " "long long type", "[atomic_ref_stress]")({ @@ -161,7 +161,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) #endif }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref atomicity with respect to atomic operations in host code. " "double type", "[atomic_ref_stress]")({ diff --git a/tests/atomic_ref_stress/atomic_ref_stress_core.cpp b/tests/atomic_ref_stress/atomic_ref_stress_core.cpp index 4f80ed51e..2a85669b1 100644 --- a/tests/atomic_ref_stress/atomic_ref_stress_core.cpp +++ b/tests/atomic_ref_stress/atomic_ref_stress_core.cpp @@ -19,25 +19,25 @@ *******************************************************************************/ #include "../common/disabled_for_test_case.h" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "atomic_ref_stress_common.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include namespace atomic_ref_stress_test_core { -// FIXME: re-enable for hipsycl +// FIXME: re-enable for adaptivecpp // when sycl::info::device::atomic_memory_order_capabilities and // sycl::info::device::atomic_memory_scope_capabilities are implemented in -// hipsycl -DISABLED_FOR_TEST_CASE(hipSYCL) +// adaptivecpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref atomicity for device scope. core types", "[atomic_ref_stress]")({ const auto type_pack = named_type_pack::generate("int", "float"); for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref atomicity for work_group scope. core types", "[atomic_ref_stress]")({ const auto type_pack = named_type_pack::generate("int", "float"); @@ -45,19 +45,19 @@ DISABLED_FOR_TEST_CASE(hipSYCL) type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref aquire and release. core types", "[atomic_ref_stress]")({ const auto type_pack = named_type_pack::generate("int", "float"); for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref ordering. core types", "[atomic_ref_stress]")({ const auto type_pack = named_type_pack::generate("int", "float"); for_all_types(type_pack); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sycl::atomic_ref atomicity with respect to atomic operations in host code. " "core types", "[atomic_ref_stress]")({ diff --git a/tests/bit_cast/bit_cast_test_core.cpp b/tests/bit_cast/bit_cast_test_core.cpp index 8ad1590de..24f4d886c 100644 --- a/tests/bit_cast/bit_cast_test_core.cpp +++ b/tests/bit_cast/bit_cast_test_core.cpp @@ -22,16 +22,16 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "bit_cast_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace bit_cast::tests::core { -// FIXME: re-enable when sycl::bit_cast() is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::bit_cast() is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("Test sycl::bit_cast, core types", "[bit_cast]")({ const auto primary_types = bit_cast::tests::helper_functions::get_primary_type_pack(); diff --git a/tests/bit_cast/bit_cast_test_core_fp64.cpp b/tests/bit_cast/bit_cast_test_core_fp64.cpp index 03ada5a39..286bc368d 100644 --- a/tests/bit_cast/bit_cast_test_core_fp64.cpp +++ b/tests/bit_cast/bit_cast_test_core_fp64.cpp @@ -22,16 +22,16 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "bit_cast_test.h" -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace bit_cast::tests::fp64 { -// FIXME: re-enable when sycl::bit_cast() is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::bit_cast() is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("Test sycl::bit_cast, fp64 type", "[bit_cast]")({ auto queue = sycl_cts::util::get_cts_object::queue(); if (!queue.get_device().has(sycl::aspect::fp64)) { diff --git a/tests/common/common.h b/tests/common/common.h index 4469681d1..1b46fe325 100644 --- a/tests/common/common.h +++ b/tests/common/common.h @@ -306,8 +306,8 @@ bool check_contains(const std::vector& vec, const T& elem) { return std::find(vec.begin(), vec.end(), elem) != vec.end(); } -// hipSYCL does not yet support sycl::marray -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// AdaptiveCpp does not yet support sycl::marray +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Instantiation for marray with the same API as for scalar values * Deprecated. Use \c value_operations::are_equal instead @@ -414,8 +414,8 @@ namespace pixel_tag { struct upper: generic {}; }; -// hipSYCL does not yet support images -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// AdaptiveCpp does not yet support images +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Helps with retrieving the right access type for reading/writing @@ -626,8 +626,8 @@ inline bool kernel_supports_wg_size(sycl_cts::util::logger& log, return false; } -// hipSYCL does not yet support sycl::get_kernel_bundle -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// AdaptiveCpp does not yet support sycl::get_kernel_bundle +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP auto kb = sycl::get_kernel_bundle(context); auto kernel = kb.get_kernel(sycl::get_kernel_id()); diff --git a/tests/common/disabled_for_test_case.h b/tests/common/disabled_for_test_case.h index b48046c20..ca22bc5c9 100644 --- a/tests/common/disabled_for_test_case.h +++ b/tests/common/disabled_for_test_case.h @@ -23,12 +23,12 @@ * currently does not compile for a given implementation, while other test cases * in the same translation unit would otherwise compile. * - * The following implementations can be specified: DPCPP, hipSYCL. + * The following implementations can be specified: DPCPP, AdaptiveCpp. * A disabled test case will fail automatically at runtime. * * Usage example: * ``` - * DISABLED_FOR_TEST_CASE(hipSYCL)("my test case", "[my-tag]")({ + * DISABLED_FOR_TEST_CASE(AdaptiveCpp)("my test case", "[my-tag]")({ * // ... * }); * ``` @@ -51,8 +51,8 @@ #if SYCL_CTS_COMPILING_WITH_DPCPP #define INTERNAL_CTS_SYCL_IMPL_DPCPP () -#elif SYCL_CTS_COMPILING_WITH_HIPSYCL -#define INTERNAL_CTS_SYCL_IMPL_hipSYCL () +#elif SYCL_CTS_COMPILING_WITH_ADAPTIVECPP +#define INTERNAL_CTS_SYCL_IMPL_AdaptiveCpp () #else #error Unknown SYCL implementation #endif diff --git a/tests/common/get_cts_object.h b/tests/common/get_cts_object.h index 768acdb98..7e5c4680b 100644 --- a/tests/common/get_cts_object.h +++ b/tests/common/get_cts_object.h @@ -77,7 +77,7 @@ struct get_cts_object { template static sycl::queue queue(DeviceSelector selector = cts_selector) { static cts_async_handler asyncHandler; -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP return sycl::queue(selector, asyncHandler, sycl::property_list{}); #else return sycl::queue(sycl::device(selector), asyncHandler, @@ -110,8 +110,8 @@ struct get_cts_object { */ template static sycl::kernel prebuilt(sycl::queue &queue) { -// hipSYCL does not yet support sycl::get_kernel_bundle -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// AdaptiveCpp does not yet support sycl::get_kernel_bundle +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP auto ctx = queue.get_context(); auto kb_exe = sycl::get_kernel_bundle( diff --git a/tests/common/get_group_range.h b/tests/common/get_group_range.h index c72a5b579..b9eb1223b 100644 --- a/tests/common/get_group_range.h +++ b/tests/common/get_group_range.h @@ -61,9 +61,9 @@ sycl::range work_group_range( // query device for work-group sizes size_t max_work_item_sizes[Dimensions]; { - // FIXME: hipSYCL does not implement + // FIXME: AdaptiveCpp does not implement // sycl::info::device::max_work_item_sizes<3> property -#if SYCL_CTS_COMPILING_WITH_HIPSYCL +#if SYCL_CTS_COMPILING_WITH_ADAPTIVECPP sycl::id<3> sizes = queue.get_device().get_info(); #else diff --git a/tests/common/range_index_space_id.h b/tests/common/range_index_space_id.h index 14203ee82..a41a0f7c0 100644 --- a/tests/common/range_index_space_id.h +++ b/tests/common/range_index_space_id.h @@ -19,7 +19,7 @@ // *******************************************************************************/ -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../common/type_coverage.h" #endif diff --git a/tests/common/string_makers.h b/tests/common/string_makers.h index 38e41d935..2b8d6034c 100644 --- a/tests/common/string_makers.h +++ b/tests/common/string_makers.h @@ -62,7 +62,7 @@ struct StringMaker { case type::device: return "target::device"; // FIXME: re-enable when target::host_task is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP case type::host_task: return "target::host_task"; #endif @@ -190,8 +190,8 @@ struct StringMaker { } }; -// FIXME: re-enable when sycl::access::decorated is implemented in hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::access::decorated is implemented in adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template <> struct StringMaker { using type = sycl::access::decorated; diff --git a/tests/common/type_coverage.h b/tests/common/type_coverage.h index bca4ca88f..85dc847cd 100644 --- a/tests/common/type_coverage.h +++ b/tests/common/type_coverage.h @@ -57,8 +57,8 @@ struct type_name_string> { } }; -// FIXME: re-enable when marray is implemented in hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when marray is implemented in adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Specialization of type name retrieve for sycl::marray class * @param T Type of the data stored in marray @@ -70,7 +70,7 @@ struct type_name_string> { return "sycl::marray<" + dataType + "," + std::to_string(nElements) + ">"; } }; -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Specialization of type name retrieve for std::array class @@ -457,8 +457,8 @@ void for_all_types_and_vectors(const named_type_pack &typeList, assert((typeNameIndex == sizeof...(types)) && "Pack expansion failed"); } -// FIXME: re-enable when marray is implemented in hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when marray is implemented in adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Run action for type, vectors and marrays of this type * @tparam action Functor template for action to run @@ -540,10 +540,10 @@ void for_type_vectors_marray_reduced(argsT&&... args) { std::forward(args)...); } } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP -// FIXME: re-enable when marray is implemented in hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when marray is implemented in adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Run action for each of types, vectors and marrays of types given by * named_type_pack instance @@ -571,10 +571,10 @@ void for_all_types_vectors_marray(const named_type_pack &typeList, // Ensure there is no silent miss for coverage assert((typeNameIndex == sizeof...(types)) && "Pack expansion failed"); } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP -// FIXME: re-enable when marray is implemented in hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when marray is implemented in adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Run action for type and marrays of this type * @tparam action Functor template for action to run @@ -592,10 +592,10 @@ void for_type_and_marrays(argsT &&...args) { typename sycl::template marray>{}, std::forward(args)...); } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP -// FIXME: re-enable when marray is implemented in hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when marray is implemented in adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Run action for marrays of type T * @tparam action Functor template for action to run @@ -613,10 +613,10 @@ void for_marrays_of_type(argsT&&... args) { typename sycl::template marray>{}, std::forward(args)...); } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP -// FIXME: re-enable when marray is implemented in hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when marray is implemented in adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Run action for each of types and marrays of types given by * named_type_pack instance @@ -641,10 +641,10 @@ void for_all_types_and_marrays(const named_type_pack &typeList, ++typeNameIndex), ...); } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP -// FIXME: re-enable when marray is implemented in hipsycl -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when marray is implemented in adaptivecpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * @brief Run action for marrays of each type of types given by * named_type_pack instance @@ -669,5 +669,5 @@ void for_marrays_of_all_types(const named_type_pack& typeList, ++typeNameIndex), ...); } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #endif // __SYCLCTS_TESTS_COMMON_TYPE_COVERAGE_H diff --git a/tests/common/type_list.h b/tests/common/type_list.h index 5042005a7..889d53f07 100644 --- a/tests/common/type_list.h +++ b/tests/common/type_list.h @@ -175,7 +175,7 @@ struct vec_marray_element_type> { using type = T; }; -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template struct vec_marray_element_type> { using type = T; diff --git a/tests/device/device_info.cpp b/tests/device/device_info.cpp index 9f3853d7b..06e1a5341 100644 --- a/tests/device/device_info.cpp +++ b/tests/device/device_info.cpp @@ -82,7 +82,7 @@ TEST_CASE("device info", "[device]") { /** check get_info parameters */ // FIXME: Reenable when struct information descriptors are implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP { auto dev = sycl_cts::util::get_cts_object::device(cts_selector); check_get_info_param ndItem) { // FIXME: re-enable when sycl::access::decorated and get_multi_ptr is // implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP // Run asynchronous copy for full buffer sycl::device_event deviceEvent = ndItem.async_work_group_copy( localAcc diff --git a/tests/extension/oneapi_non_uniform_groups/group_joint_scan.cpp.in b/tests/extension/oneapi_non_uniform_groups/group_joint_scan.cpp.in index 763840ecc..49db3aa19 100644 --- a/tests/extension/oneapi_non_uniform_groups/group_joint_scan.cpp.in +++ b/tests/extension/oneapi_non_uniform_groups/group_joint_scan.cpp.in @@ -23,14 +23,14 @@ #cmakedefine CTS_TYPE_NAME std::string("@CTS_TYPE_NAME@") // clang-format on -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "group_scan.h" namespace non_uniform_groups::tests { using CurrentType = unnamed_type_pack; using ScanTypes = Types; -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP TEMPLATE_LIST_TEST_CASE( CTS_TYPE_NAME + " non-uniform group joint scan functions", diff --git a/tests/extension/oneapi_non_uniform_groups/group_permute.cpp b/tests/extension/oneapi_non_uniform_groups/group_permute.cpp index edaeeddf8..8693dfba6 100644 --- a/tests/extension/oneapi_non_uniform_groups/group_permute.cpp +++ b/tests/extension/oneapi_non_uniform_groups/group_permute.cpp @@ -22,7 +22,7 @@ namespace non_uniform_groups::tests { -// hipSYCL does not permute right 8-bit types inside groups +// AdaptiveCpp does not permute right 8-bit types inside groups TEMPLATE_LIST_TEST_CASE("Non-uniform-group permute", "[oneapi_non_uniform_groups][group_func][type_list]", GroupPackTypes) { diff --git a/tests/extension/oneapi_non_uniform_groups/group_scan.h b/tests/extension/oneapi_non_uniform_groups/group_scan.h index cb7e92fed..01b2f87fe 100644 --- a/tests/extension/oneapi_non_uniform_groups/group_scan.h +++ b/tests/extension/oneapi_non_uniform_groups/group_scan.h @@ -552,7 +552,7 @@ class invoke_scan_over_group { template class init_scan_over_group_kernel; -// many errors with short types for hipSYCL +// many errors with short types for AdaptiveCpp // it means conversion and calculation patterns are not OK /** * @brief Provides test for scans over group with an init value diff --git a/tests/extension/oneapi_non_uniform_groups/group_shift.cpp b/tests/extension/oneapi_non_uniform_groups/group_shift.cpp index e90a674f4..493f18e51 100644 --- a/tests/extension/oneapi_non_uniform_groups/group_shift.cpp +++ b/tests/extension/oneapi_non_uniform_groups/group_shift.cpp @@ -22,7 +22,7 @@ namespace non_uniform_groups::tests { -// errors in hipSYCL with bool and 8-bit types - only in group shifts +// errors in AdaptiveCpp with bool and 8-bit types - only in group shifts TEMPLATE_LIST_TEST_CASE("Non-uniform-group shift", "[oneapi_non_uniform_groups][group_func][type_list]", GroupPackTypes) { diff --git a/tests/function_objects/function_objects_core.cpp b/tests/function_objects/function_objects_core.cpp index 2c305c52f..a86b9e433 100644 --- a/tests/function_objects/function_objects_core.cpp +++ b/tests/function_objects/function_objects_core.cpp @@ -22,18 +22,18 @@ #include "../common/disabled_for_test_case.h" #include "../common/type_coverage.h" -// fixme: re-enable when sycl::marray is implemented in hipSYCL -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// fixme: re-enable when sycl::marray is implemented in AdaptiveCpp +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "function_objects.h" #endif -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("function objects void specializations scalar core", "[function_objects]")({ const auto types = named_type_pack::generate(TYPE_NAMES); for_all_combinations(get_op_types(), types, types); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("function objects void specializations vector core", "[function_objects]")({ const auto types_vector = named_type_pack::generate(TYPE_NAMES_VECTOR); diff --git a/tests/function_objects/function_objects_fp64.cpp b/tests/function_objects/function_objects_fp64.cpp index 3144397c7..af0280639 100644 --- a/tests/function_objects/function_objects_fp64.cpp +++ b/tests/function_objects/function_objects_fp64.cpp @@ -23,12 +23,12 @@ #include "../common/disabled_for_test_case.h" #include "../common/type_coverage.h" -// fixme: re-enable when sycl::marray is implemented in hipSYCL -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// fixme: re-enable when sycl::marray is implemented in AdaptiveCpp +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "function_objects.h" #endif -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("function objects void specializations scalar fp64", "[function_objects][fp64]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -50,7 +50,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) get_op_types(), types_only_double, types_only_double); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("function objects void specializations vector fp64", "[function_objects][fp64]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/group_functions/group_barrier.cpp b/tests/group_functions/group_barrier.cpp index d9e444236..e142e695f 100644 --- a/tests/group_functions/group_barrier.cpp +++ b/tests/group_functions/group_barrier.cpp @@ -30,9 +30,9 @@ TEMPLATE_TEST_CASE_SIG("Group barriers", "[group_func][dim]", ((int D), D), 1, 2, 3) { auto queue = once_per_unit::get_queue(); - // FIXME: hipSYCL has not implemented + // FIXME: AdaptiveCpp has not implemented // atomic_fence_scope_capabilities query -#if !defined(SYCL_CTS_COMPILING_WITH_HIPSYCL) +#if !defined(SYCL_CTS_COMPILING_WITH_ADAPTIVECPP) std::vector supported_barriers = queue.get_context() .get_info(); @@ -42,7 +42,7 @@ TEMPLATE_TEST_CASE_SIG("Group barriers", "[group_func][dim]", ((int D), D), 1, sycl::memory_scope::sub_group, sycl::memory_scope::work_group, sycl::memory_scope::device, sycl::memory_scope::system}; WARN( - "hipSYCL has no implementation of " + "AdaptiveCpp has no implementation of " "atomic_fence_scope_capabilities query, suppose all barrier types as " "valid."); #endif diff --git a/tests/group_functions/group_functions_common.h b/tests/group_functions/group_functions_common.h index d91a98526..47f18019f 100644 --- a/tests/group_functions/group_functions_common.h +++ b/tests/group_functions/group_functions_common.h @@ -26,7 +26,7 @@ #include /* - * FIXME: hipSYCL does not implement size member function of sycl::vec + * FIXME: AdaptiveCpp does not implement size member function of sycl::vec * As a result the following implementation is not working * Workaround is presented below @@ -59,9 +59,9 @@ bool equal_impl(const sycl::vec& a, const U& b) { return res; } -// FIXME: hipSYCL has not implemented sycl::marray type yet +// FIXME: AdaptiveCpp has not implemented sycl::marray type yet // The warning is printed from group_shift.cpp and group_permute.cpp -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template bool equal_impl(const sycl::marray& a, const sycl::marray& b) { bool res = true; @@ -87,7 +87,7 @@ bool equal(const T& a, const U& b) { } /* - * FIXME: hipSYCL cannot construct vector from 1 value + * FIXME: AdaptiveCpp cannot construct vector from 1 value * As a result the helper below is needed */ template @@ -227,9 +227,9 @@ using Types = unnamed_type_pack; #endif -// FIXME: hipSYCL has not implemented sycl::marray type yet +// FIXME: AdaptiveCpp has not implemented sycl::marray type yet // The warning is printed from group_shift.cpp and group_permute.cpp -#ifdef SYCL_CTS_COMPILING_WITH_HIPSYCL +#ifdef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP using ExtendedTypes = concatenation, diff --git a/tests/group_functions/group_joint_scan.cpp.in b/tests/group_functions/group_joint_scan.cpp.in index 7fbee0ae6..6c311f66d 100644 --- a/tests/group_functions/group_joint_scan.cpp.in +++ b/tests/group_functions/group_joint_scan.cpp.in @@ -25,27 +25,27 @@ #cmakedefine CTS_TYPE_NAME std::string("@CTS_TYPE_NAME@") // clang-format on -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "group_scan.h" using TestType = unnamed_type_pack; using ScanTypes = Types; static const auto Dims = integer_pack<1, 2, 3>::generate_unnamed(); -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP -// FIXME: known_identity is not impemented yet for hipSYCL. -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: known_identity is not impemented yet for AdaptiveCpp. +DISABLED_FOR_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " group and sub-group joint scan functions", "[group_func][type_list][dim]")({ -#if defined(SYCL_CTS_COMPILING_WITH_HIPSYCL) +#if defined(SYCL_CTS_COMPILING_WITH_ADAPTIVECPP) WARN( - "hipSYCL cannot handle cases of different types for InPtr and OutPtr. " + "AdaptiveCpp cannot handle cases of different types for InPtr and OutPtr. " "Skipping such test cases."); WARN( - "hipSYCL joint_exclusive_scan and joint_inclusive_scan cannot process " + "AdaptiveCpp joint_exclusive_scan and joint_inclusive_scan cannot process " "over several sub-groups simultaneously. Using one sub-group only."); - WARN("hipSYCL does not support sycl::known_identity_v yet."); + WARN("AdaptiveCpp does not support sycl::known_identity_v yet."); #endif auto queue = once_per_unit::get_queue(); @@ -61,8 +61,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) "operations."); } - // FIXME: hipSYCL cannot handle cases of different types -#if defined(SYCL_CTS_COMPILING_WITH_HIPSYCL) + // FIXME: AdaptiveCpp cannot handle cases of different types +#if defined(SYCL_CTS_COMPILING_WITH_ADAPTIVECPP) for_all_combinations(Dims, TestType{}, queue); #else @@ -71,16 +71,16 @@ DISABLED_FOR_TEST_CASE(hipSYCL) #endif }); -// FIXME: known_identity is not impemented yet for hipSYCL. -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: known_identity is not impemented yet for AdaptiveCpp. +DISABLED_FOR_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " group and sub-group joint scan functions with init", "[group_func][type_list][dim]")({ -#if defined(SYCL_CTS_COMPILING_WITH_HIPSYCL) +#if defined(SYCL_CTS_COMPILING_WITH_ADAPTIVECPP) WARN( - "hipSYCL cannot handle cases of different types for T, *InPtr and " + "AdaptiveCpp cannot handle cases of different types for T, *InPtr and " "*OutPtr. Skipping such test cases."); WARN( - "hipSYCL joint_exclusive_scan and joint_inclusive_scan with init values " + "AdaptiveCpp joint_exclusive_scan and joint_inclusive_scan with init values " "cannot process over several sub-groups simultaneously. Using one " "sub-group only."); #endif @@ -98,8 +98,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) "operations."); } - // FIXME: hipSYCL cannot handle cases of different types -#if defined(SYCL_CTS_COMPILING_WITH_HIPSYCL) + // FIXME: AdaptiveCpp cannot handle cases of different types +#if defined(SYCL_CTS_COMPILING_WITH_ADAPTIVECPP) for_all_combinations(Dims, TestType{}, queue); #else diff --git a/tests/group_functions/group_permute.cpp b/tests/group_functions/group_permute.cpp index 58e5f46ea..b9066c50a 100644 --- a/tests/group_functions/group_permute.cpp +++ b/tests/group_functions/group_permute.cpp @@ -20,7 +20,7 @@ #include "group_permute.h" -// hipSYCL does not permute right 8-bit types inside groups +// AdaptiveCpp does not permute right 8-bit types inside groups TEMPLATE_LIST_TEST_CASE("Group and sub-group permute", "[group_func][type_list][dim]", CustomTypes) { auto queue = once_per_unit::get_queue(); diff --git a/tests/group_functions/group_reduce.h b/tests/group_functions/group_reduce.h index 5d150e76c..0a392a17c 100644 --- a/tests/group_functions/group_reduce.h +++ b/tests/group_functions/group_reduce.h @@ -151,8 +151,8 @@ void joint_reduce_group(sycl::queue& queue, const std::string& op_name) { "Return type of joint_reduce(sub_group g, Ptr first, Ptr " "last, BinaryOperation binary_op) is wrong\n"); - // FIXME: hipSYCL has no implementation over sub-groups -#ifdef SYCL_CTS_COMPILING_WITH_HIPSYCL + // FIXME: AdaptiveCpp has no implementation over sub-groups +#ifdef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP res_acc[1] = true; #else res_acc[1] = (reduced == sycl::joint_reduce(sub_group, v_begin, v_end, OpT())) @@ -260,8 +260,8 @@ void init_joint_reduce_group(sycl::queue& queue, const std::string& op_name) { "Return type of joint_reduce(sub_group g, Ptr first, Ptr " "last, T init, BinaryOperation binary_op) is wrong\n"); - // FIXME: hipSYCL has no implementation over sub-groups -#ifdef SYCL_CTS_COMPILING_WITH_HIPSYCL + // FIXME: AdaptiveCpp has no implementation over sub-groups +#ifdef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP res_acc[1] = true; #else res_acc[1] = (reduced == sycl::joint_reduce(sub_group, v_begin, v_end, T(init), OpT())) diff --git a/tests/group_functions/group_scan.h b/tests/group_functions/group_scan.h index 593ace793..083303b8e 100644 --- a/tests/group_functions/group_scan.h +++ b/tests/group_functions/group_scan.h @@ -546,7 +546,7 @@ class invoke_scan_over_group { template class init_scan_over_group_kernel; -// many errors with short types for hipSYCL +// many errors with short types for AdaptiveCpp // it means conversion and calculation patterns are not OK /** * @brief Provides test for scans over group with an init value diff --git a/tests/group_functions/group_scan_over_group.cpp.in b/tests/group_functions/group_scan_over_group.cpp.in index 39308d9e5..b44fb9cd1 100644 --- a/tests/group_functions/group_scan_over_group.cpp.in +++ b/tests/group_functions/group_scan_over_group.cpp.in @@ -25,17 +25,17 @@ #cmakedefine CTS_TYPE_NAME std::string("@CTS_TYPE_NAME@") // clang-format on -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "group_scan.h" using TestType = unnamed_type_pack; using ScanTypes = Types; static const auto Dims = integer_pack<1, 2, 3>::generate_unnamed(); -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP -// FIXME: known_identity is not impemented yet for hipSYCL. -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: known_identity is not impemented yet for AdaptiveCpp. +DISABLED_FOR_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " group and sub-group scan functions", "[group_func][type_list][dim]")({ auto queue = once_per_unit::get_queue(); @@ -53,9 +53,9 @@ DISABLED_FOR_TEST_CASE(hipSYCL) for_all_combinations(Dims, TestType{}, queue); }); -// FIXME: hipSYCL has wrong arguments order for inclusive_scan_over_group: init +// FIXME: AdaptiveCpp has wrong arguments order for inclusive_scan_over_group: init // and op are interchanged. known_identity is not implemented yet. -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " group and sub-group scan functions with init", "[group_func][type_list][dim]")({ auto queue = once_per_unit::get_queue(); diff --git a/tests/group_functions/group_shift.cpp b/tests/group_functions/group_shift.cpp index 07bf97234..3c3d9dea6 100644 --- a/tests/group_functions/group_shift.cpp +++ b/tests/group_functions/group_shift.cpp @@ -20,7 +20,7 @@ #include "group_shift.h" -// errors in hipSYCL with bool and 8-bit types - only in group shifts +// errors in AdaptiveCpp with bool and 8-bit types - only in group shifts TEMPLATE_LIST_TEST_CASE("Group and sub-group shift", "[group_func][type_list][dim]", CustomTypes) { auto queue = once_per_unit::get_queue(); diff --git a/tests/group_functions/type_coverage.h b/tests/group_functions/type_coverage.h index 12bde5a9b..1a7e4e730 100644 --- a/tests/group_functions/type_coverage.h +++ b/tests/group_functions/type_coverage.h @@ -8,7 +8,7 @@ /** * FIXME: this is an extended (and also partial) copy of type_coverage.h - * with marray parts removed for hipSYCL compilation + * with marray parts removed for AdaptiveCpp compilation * and with for_all_combinations_with/for_all_combinations_with_two added */ diff --git a/tests/host_accessor/host_accessor_api.cpp.in b/tests/host_accessor/host_accessor_api.cpp.in index ef6e41197..f16881222 100644 --- a/tests/host_accessor/host_accessor_api.cpp.in +++ b/tests/host_accessor/host_accessor_api.cpp.in @@ -14,7 +14,7 @@ // clang-format on // FIXME: re-enable when sycl::host_accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "host_accessor_api_common.h" @@ -23,7 +23,7 @@ using namespace host_accessor_api_common; namespace host_accessor_api_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " sycl::host_accessor api.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); if constexpr (std::is_same_v, sycl::half>) { diff --git a/tests/host_accessor/host_accessor_constructors.cpp.in b/tests/host_accessor/host_accessor_constructors.cpp.in index c1feb363e..d13f2c793 100644 --- a/tests/host_accessor/host_accessor_constructors.cpp.in +++ b/tests/host_accessor/host_accessor_constructors.cpp.in @@ -28,7 +28,7 @@ // clang-format on // FIXME: re-enable when sycl::host_accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "host_accessor_constructors.h" @@ -40,7 +40,7 @@ using namespace host_accessor_constructors; namespace host_accessor_constructors_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " sycl::host_accessor constructors.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/host_accessor/host_accessor_linearization.cpp.in b/tests/host_accessor/host_accessor_linearization.cpp.in index 1ae0bc474..9f81c20b5 100644 --- a/tests/host_accessor/host_accessor_linearization.cpp.in +++ b/tests/host_accessor/host_accessor_linearization.cpp.in @@ -28,7 +28,7 @@ // clang-format on // FIXME: re-enable when sycl::host_accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "host_accessor_linearization.h" @@ -38,7 +38,7 @@ using namespace host_accessor_linearization; namespace host_accessor_liniarization_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " sycl::host_accessor linearization.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/host_accessor/host_accessor_properties.cpp.in b/tests/host_accessor/host_accessor_properties.cpp.in index 1ca34f2c1..5db33949e 100644 --- a/tests/host_accessor/host_accessor_properties.cpp.in +++ b/tests/host_accessor/host_accessor_properties.cpp.in @@ -14,7 +14,7 @@ // clang-format on // FIXME: re-enable when sycl::host_accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "host_accessor_properties.h" @@ -26,7 +26,7 @@ using namespace host_accessor_properties; namespace host_accessor_properties_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " sycl::host_accessor properties.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); if constexpr (std::is_same_v, sycl::half>) { diff --git a/tests/host_accessor/host_accessor_semantics.cpp b/tests/host_accessor/host_accessor_semantics.cpp index 2634a0601..baf6b41aa 100644 --- a/tests/host_accessor/host_accessor_semantics.cpp +++ b/tests/host_accessor/host_accessor_semantics.cpp @@ -20,7 +20,7 @@ #include "../common/common.h" #include "../common/disabled_for_test_case.h" -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../common/semantics_reference.h" #endif @@ -56,7 +56,7 @@ struct storage { } }; -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("host_accessor common reference semantics", "[host_accessor]")({ sycl::buffer buffer_0{sycl::range<1>{1}}; sycl::host_accessor host_accessor_0{buffer_0}; @@ -67,7 +67,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) host_accessor_0, host_accessor_1, "host_accessor"); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("host_accessor common reference semantics, mutation", "[host_accessor]")({ constexpr int val = 1; constexpr int new_val = 2; diff --git a/tests/id/id.cpp b/tests/id/id.cpp index 13a46adf9..92a6f2f1f 100644 --- a/tests/id/id.cpp +++ b/tests/id/id.cpp @@ -285,7 +285,7 @@ TEMPLATE_TEST_CASE_SIG("id supports get() and operator[]", "[id]", ((int D), D), } } -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("id provides static constexpr member 'dimensions'", "[id]")({ // Dimension arguments in this test case are expanded to avoid conflicting // kernel names for different instantiations of sycl::id. @@ -356,7 +356,7 @@ TEMPLATE_TEST_CASE_SIG( KCHECK(EVAL_D(a >= b) == idh::get(1, 1, 1)); } -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("id supports various binary operators of the form `id OP size_t` and " "`size_t OP id`", "[id]", ((int D), D), 1, 2, 3)({ @@ -495,7 +495,7 @@ TEMPLATE_TEST_CASE_SIG( #undef COMPOUND_OP -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("id supports unary +/- operators", "[id]", ((int D), D), 1, 2, 3)({ const auto a = idh::get(5, 8, 3); const auto b = idh::get(-5, -8, -3); @@ -513,7 +513,7 @@ DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) #define INC_DEC_OP(operand_value, expr) \ ([=](auto x) { return std::pair{expr, x}; })(operand_value) -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("id supports pre- and postfix increment/decrement operators", "[id]", ((int D), D), 1, 2, 3)({ const auto a = idh::get(5, 8, 3); diff --git a/tests/image/default_image.h b/tests/image/default_image.h index ec41b9473..a3a4164b6 100644 --- a/tests/image/default_image.h +++ b/tests/image/default_image.h @@ -21,7 +21,7 @@ #ifndef SYCL_CTS_IMAGE_DEFAULT_IMAGE_H #define SYCL_CTS_IMAGE_DEFAULT_IMAGE_H -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** * Provides functionality to construct a default sampled_image and associated diff --git a/tests/image/image_semantics.cpp b/tests/image/image_semantics.cpp index 38b3fecc4..88d61ad4e 100644 --- a/tests/image/image_semantics.cpp +++ b/tests/image/image_semantics.cpp @@ -23,7 +23,7 @@ #include "../common/semantics_reference.h" #include "default_image.h" -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template struct storage_sampled { @@ -63,7 +63,7 @@ struct storage_unsampled { }; #endif -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("sampled_image common reference semantics", "[sampled_image]")({ auto sampled_image_0 = default_sampled_image::get(); auto sampled_image_1 = default_sampled_image::get(); @@ -75,7 +75,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) // sampled_image common reference semantics, mutation // Cannot be tested, since sampled_image is read-only. -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("unsampled_image common reference semantics", "[unsampled_image]")({ auto unsampled_image_0 = default_unsampled_image::get(); auto unsampled_image_1 = default_unsampled_image::get(); @@ -84,7 +84,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) unsampled_image_0, unsampled_image_1, "unsampled_image"); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("unsampled_image common reference semantics, mutation", "[unsampled_image]")({ using data_type = default_unsampled_image::data_type; constexpr data_type val{1}; diff --git a/tests/invoke/execution_and_memory_models.cpp b/tests/invoke/execution_and_memory_models.cpp index d605b0cdf..3f1fb2cd1 100644 --- a/tests/invoke/execution_and_memory_models.cpp +++ b/tests/invoke/execution_and_memory_models.cpp @@ -150,7 +150,7 @@ TEST_CASE( } } -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("Requirements on overlapping sub-buffers", "[invoke]")({ auto device = sycl_cts::util::get_cts_object::device(); auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/invoke/parallel_for_simplifications.cpp b/tests/invoke/parallel_for_simplifications.cpp index 3d2717e7d..4c35bb644 100644 --- a/tests/invoke/parallel_for_simplifications.cpp +++ b/tests/invoke/parallel_for_simplifications.cpp @@ -62,8 +62,8 @@ void check(ActionT action) { for (int i = 0; i < N; i++) CHECK(arr[i] == i); } -// FIXME: re-enable when parallel_for simplifications implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when parallel_for simplifications implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("Check parallel_for(N, some_kernel)", "[parallel_for_simplifications]")({ constexpr int N = 2; auto action = [=](auto& cgh, auto& acc) { @@ -72,8 +72,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) check(action); }); -// FIXME: re-enable when parallel_for simplifications implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when parallel_for simplifications implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("Check parallel_for({N}, some_kernel)", "[parallel_for_simplifications]")({ constexpr int N = 2; auto action = [=](auto& cgh, auto& acc) { @@ -82,8 +82,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) check(action); }); -// FIXME: re-enable when parallel_for simplifications implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when parallel_for simplifications implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("Check parallel_for({N1, N2}, some_kernel)", "[parallel_for_simplifications]")({ constexpr int N1 = 2; @@ -95,8 +95,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) check(action); }); -// FIXME: re-enable when parallel_for simplifications implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when parallel_for simplifications implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("Check parallel_for({N1, N2, N3}, some_kernel)", "[parallel_for_simplifications]")({ constexpr int N1 = 2; diff --git a/tests/kernel/kernel_attributes_vec_hint.cpp b/tests/kernel/kernel_attributes_vec_hint.cpp index fa3485617..c864ed572 100644 --- a/tests/kernel/kernel_attributes_vec_hint.cpp +++ b/tests/kernel/kernel_attributes_vec_hint.cpp @@ -192,7 +192,7 @@ void run_tests_for_type() { run_tests_for_size(); } -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("Behavior of kernel attribute vec_type_hint", "[kernel]")({ #if SYCL_CTS_ENABLE_DEPRECATED_FEATURES_TESTS run_tests_for_type(); diff --git a/tests/kernel/kernel_info.cpp b/tests/kernel/kernel_info.cpp index 2861c25e3..0fe29310a 100644 --- a/tests/kernel/kernel_info.cpp +++ b/tests/kernel/kernel_info.cpp @@ -105,7 +105,7 @@ TEST_CASE("Test kernel info", "[kernel]") { range3Ret, "sycl::kernel::get_info(dev) for built_in_kernel"); -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP check_get_info_param( built_in_kernel); #endif @@ -228,7 +228,7 @@ TEST_CASE("Test kernel info", "[kernel]") { } // FIXME: Reenable when struct information descriptors are implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP check_get_info_param(kernel); #endif diff --git a/tests/local_accessor/local_accessor_access_among_work_items.cpp.in b/tests/local_accessor/local_accessor_access_among_work_items.cpp.in index 4aabe3136..1a2a20f0c 100644 --- a/tests/local_accessor/local_accessor_access_among_work_items.cpp.in +++ b/tests/local_accessor/local_accessor_access_among_work_items.cpp.in @@ -18,7 +18,7 @@ // clang-format on // FIXME: re-enable when sycl::accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "local_accessor_access_among_work_items.h" @@ -28,7 +28,7 @@ using namespace accessor_tests_common; namespace local_accessor_access_among_work_items_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " sycl::local_accessor access among work items.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/local_accessor/local_accessor_api.cpp.in b/tests/local_accessor/local_accessor_api.cpp.in index 345b55673..5eae8be7e 100644 --- a/tests/local_accessor/local_accessor_api.cpp.in +++ b/tests/local_accessor/local_accessor_api.cpp.in @@ -14,7 +14,7 @@ // clang-format on // FIXME: re-enable when sycl::local_accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "local_accessor_api_common.h" @@ -23,7 +23,7 @@ using namespace local_accessor_api_common; namespace local_accessor_api_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " sycl::local_accessor api. core types", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/local_accessor/local_accessor_constructors.cpp.in b/tests/local_accessor/local_accessor_constructors.cpp.in index a2a928805..181419edf 100644 --- a/tests/local_accessor/local_accessor_constructors.cpp.in +++ b/tests/local_accessor/local_accessor_constructors.cpp.in @@ -28,7 +28,7 @@ // clang-format on // FIXME: re-enable when sycl::local_accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "local_accessor_constructors.h" @@ -41,7 +41,7 @@ using namespace local_accessor_constructors; namespace local_accessor_constructors_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " sycl::local_accessor constructors.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/local_accessor/local_accessor_linearization.cpp.in b/tests/local_accessor/local_accessor_linearization.cpp.in index d6bef620b..af767f2e3 100644 --- a/tests/local_accessor/local_accessor_linearization.cpp.in +++ b/tests/local_accessor/local_accessor_linearization.cpp.in @@ -28,7 +28,7 @@ // clang-format on // FIXME: re-enable when sycl::local_accessor is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../accessor_basic/accessor_common.h" #include "local_accessor_linearization.h" @@ -38,7 +38,7 @@ using namespace local_accessor_linearization; namespace local_accessor_liniarization_core { -DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(hipSYCL) +DISABLED_FOR_TEMPLATE_LIST_TEST_CASE(AdaptiveCpp) (CTS_TYPE_NAME + " sycl::local_accessor linearization.", "[accessor]", test_combinations)({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/local_accessor/local_accessor_semantics.cpp b/tests/local_accessor/local_accessor_semantics.cpp index f9f519c94..855e35893 100644 --- a/tests/local_accessor/local_accessor_semantics.cpp +++ b/tests/local_accessor/local_accessor_semantics.cpp @@ -20,7 +20,7 @@ #include "../common/common.h" #include "../common/disabled_for_test_case.h" -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../common/semantics_reference.h" #endif @@ -47,7 +47,7 @@ struct storage { } }; -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("local_accessor common reference semantics (host)", "[local_accessor]")({ sycl_cts::util::get_cts_object::queue().submit([&](sycl::handler& cgh) { sycl::local_accessor local_accessor_0{cgh}; @@ -57,7 +57,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) }); }); -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("local_accessor common reference semantics (kernel)", "[local_accessor]")({ using type = sycl::local_accessor; common_reference_semantics::check_kernel, type>( @@ -68,7 +68,7 @@ DISABLED_FOR_TEST_CASE(hipSYCL) template struct kernel_name_local; -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("local_accessor common reference semantics, mutation (kernel)", "[local_accessor]")({ sycl::queue queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/multi_ptr/multi_ptr_explicit_conversions.h b/tests/multi_ptr/multi_ptr_explicit_conversions.h index c034f8599..be1eb3bdb 100644 --- a/tests/multi_ptr/multi_ptr_explicit_conversions.h +++ b/tests/multi_ptr/multi_ptr_explicit_conversions.h @@ -215,7 +215,7 @@ void check_generic_pointer_aliases(const std::string& type_name) { .with("T", type_name) .create()) { // FIXME: Enable when aliases defined in implementations. -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP { INFO("decorated_generic_ptr"); STATIC_CHECK( @@ -232,7 +232,7 @@ void check_generic_pointer_aliases(const std::string& type_name) { sycl::multi_ptr>); } -#endif //! SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif //! SYCL_CTS_COMPILING_WITH_ADAPTIVECPP } } diff --git a/tests/multi_ptr/multi_ptr_explicit_conversions_core.cpp b/tests/multi_ptr/multi_ptr_explicit_conversions_core.cpp index b4334c7ad..158d13e55 100644 --- a/tests/multi_ptr/multi_ptr_explicit_conversions_core.cpp +++ b/tests/multi_ptr/multi_ptr_explicit_conversions_core.cpp @@ -37,7 +37,7 @@ TEST_CASE("multi_ptr explicit conversions. Core types", "[multi_ptr]") { for_all_types(composite_types); } -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("generic_ptr alias. Core types", "[multi_ptr]")({ using namespace multi_ptr_explicit_conversions; auto types = multi_ptr_common::get_types(); diff --git a/tests/multi_ptr/multi_ptr_explicit_conversions_fp16.cpp b/tests/multi_ptr/multi_ptr_explicit_conversions_fp16.cpp index 94172a0a0..ef45f8d1d 100644 --- a/tests/multi_ptr/multi_ptr_explicit_conversions_fp16.cpp +++ b/tests/multi_ptr/multi_ptr_explicit_conversions_fp16.cpp @@ -41,7 +41,7 @@ TEST_CASE("multi_ptr explicit conversions. fp16 type", "[multi_ptr]") { check_multi_ptr_explicit_convert_for_type{}("sycl::half"); } -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("generic_ptr alias. fp16 type", "[multi_ptr]")({ using namespace multi_ptr_explicit_conversions; check_generic_ptr_aliases_for_type{}("sycl::half"); diff --git a/tests/multi_ptr/multi_ptr_explicit_conversions_fp64.cpp b/tests/multi_ptr/multi_ptr_explicit_conversions_fp64.cpp index c86a19020..407d36386 100644 --- a/tests/multi_ptr/multi_ptr_explicit_conversions_fp64.cpp +++ b/tests/multi_ptr/multi_ptr_explicit_conversions_fp64.cpp @@ -41,7 +41,7 @@ TEST_CASE("multi_ptr explicit conversions. fp64 type", "[multi_ptr]") { check_multi_ptr_explicit_convert_for_type{}("double"); } -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("generic_ptr alias. fp64 type", "[multi_ptr]")({ using namespace multi_ptr_explicit_conversions; check_generic_ptr_aliases_for_type{}("double"); diff --git a/tests/optional_kernel_features/kernel_features_common.h b/tests/optional_kernel_features/kernel_features_common.h index 1877cfd4e..c3a06d630 100644 --- a/tests/optional_kernel_features/kernel_features_common.h +++ b/tests/optional_kernel_features/kernel_features_common.h @@ -26,8 +26,8 @@ #include "../common/common.h" #include "catch2/matchers/catch_matchers.hpp" namespace kernel_features_common { -// FIXME: re-enable compilation with hipSYCL when `sycl::errc` is supported -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable compilation with AdaptiveCpp when `sycl::errc` is supported +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP enum class call_attribute_type { external_decorated, @@ -992,7 +992,7 @@ class kernel_submission_call; parallel_for_wg_action); \ } -#endif // #if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // #if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP } // namespace kernel_features_common #endif // SYCL_CTS_TEST_KERNEL_FEATURES_COMMON_H diff --git a/tests/optional_kernel_features/kernel_features_device_has_exceptions.cpp b/tests/optional_kernel_features/kernel_features_device_has_exceptions.cpp index b74690f89..a320b0d33 100644 --- a/tests/optional_kernel_features/kernel_features_device_has_exceptions.cpp +++ b/tests/optional_kernel_features/kernel_features_device_has_exceptions.cpp @@ -36,7 +36,7 @@ using AtomicRefT = template class kernel_use_feature; -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("Kernel that uses the tested feature but does not have any attribute " "[[sycl::device_has()]]", "[kernel_features]", @@ -78,7 +78,7 @@ DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) template class kernel_use_feature_function_non_decorated; -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("Kernel that calls a function that uses the tested feature. Neither the " "kernel nor the function have an attribute ", "[kernel_features]", @@ -125,7 +125,7 @@ DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) template class kernel_use_feature_function_external_decorated; -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("Kernel does not have the attribute [[sycl::device_has()]] but it " "calls a SYCL_EXTERNAL function which uses the tested feature. The " "SYCL_EXTERNAL function is defined in another translation unit. The " @@ -176,7 +176,7 @@ DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) template class kernel_dummy_function_non_decorated; -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("Kernel does not use the tested feature but is decorated with the " "corresponding attribute [[sycl::device_has()]].", "[kernel_features]", @@ -220,7 +220,7 @@ DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) template class kernel_dummy_function_decorated; -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("Kernel that calls a function which is decorated with the feature's " "corresponding attribute [[sycl::device_has()]]. Neither the kernel " "nor the function use the feature.", @@ -264,7 +264,7 @@ DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) template class kernel_use_feature_function_decorated; -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("Kernel that calls a function which is decorated with the feature's " "corresponding attribute [[sycl::device_has()]]. Function uses the " "feature and kernel doesn't.", @@ -310,7 +310,7 @@ DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) template class kernel_use_another_feature; -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("Kernel with tested feature but with attribute [[sycl::device_has()]] " "for another feature.", "[kernel_features]", @@ -359,7 +359,7 @@ DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) template class kernel_use_feature_function_external_decorated_with_attr; -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("Kernel with attribute [[sycl::device_has()]] for not currently tested " "feature but with SYCL_EXTERNAL function with tested feature and " "attribute [[sycl::device_has()]] with tested feature that is defined in " diff --git a/tests/optional_kernel_features/kernel_features_mismatched_nd_range_exception.cpp b/tests/optional_kernel_features/kernel_features_mismatched_nd_range_exception.cpp index 3553b17a2..6810d9d66 100644 --- a/tests/optional_kernel_features/kernel_features_mismatched_nd_range_exception.cpp +++ b/tests/optional_kernel_features/kernel_features_mismatched_nd_range_exception.cpp @@ -28,7 +28,7 @@ class Functor { sycl::nd_item<1>) const {} }; -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("Submitting a kernel with an nd-range that does not match." "[[sycl::reqd_work_group_size]] throws an exception", "[kernel_features]")({ diff --git a/tests/optional_kernel_features/kernel_features_reqd_work_group_size.cpp b/tests/optional_kernel_features/kernel_features_reqd_work_group_size.cpp index e812412a8..5903a2333 100644 --- a/tests/optional_kernel_features/kernel_features_reqd_work_group_size.cpp +++ b/tests/optional_kernel_features/kernel_features_reqd_work_group_size.cpp @@ -50,9 +50,9 @@ class Functor { template class kernel_reqd_wg_size; -// FIXME: re-enable when max_work_item_sizes is implemented in hipsycl and +// FIXME: re-enable when max_work_item_sizes is implemented in adaptivecpp and // computcpp -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template void test_size() { INFO("N = " + std::to_string(N)); @@ -119,9 +119,9 @@ void test_size() { } } } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("Exceptions thrown by [[reqd_work_group_size(N)]] with unsupported size", "[kernel_features]", ((int Dimensions), Dimensions), 1, 2, 3)({ test_size<4, Dimensions>(); diff --git a/tests/optional_kernel_features/kernel_features_speculative_compilation.cpp b/tests/optional_kernel_features/kernel_features_speculative_compilation.cpp index ac4d271ff..3f7cd1279 100644 --- a/tests/optional_kernel_features/kernel_features_speculative_compilation.cpp +++ b/tests/optional_kernel_features/kernel_features_speculative_compilation.cpp @@ -42,7 +42,7 @@ using AtomicRefT = template class kernel_speculative; -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("Speculative compilation with supported feature", "[kernel_features]")({ auto queue = util::get_cts_object::queue(); const sycl::errc errc_expected = sycl::errc::success; diff --git a/tests/optional_kernel_features/kernel_features_sub_group_size_exceptions.cpp b/tests/optional_kernel_features/kernel_features_sub_group_size_exceptions.cpp index dc5a150bc..e82e0f54b 100644 --- a/tests/optional_kernel_features/kernel_features_sub_group_size_exceptions.cpp +++ b/tests/optional_kernel_features/kernel_features_sub_group_size_exceptions.cpp @@ -40,7 +40,7 @@ class functor_with_attribute { template class kernel_reqd_sg_size; -DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(hipSYCL) +DISABLED_FOR_TEMPLATE_TEST_CASE_SIG(AdaptiveCpp) ("Runtime exception if device doesn't support required sub-group size", "[kernel_features]", ((size_t N), N), 16, 4099)({ using kname = kernel_reqd_sg_size; diff --git a/tests/platform/platform_info.cpp b/tests/platform/platform_info.cpp index 115be8f2d..54102bf49 100644 --- a/tests/platform/platform_info.cpp +++ b/tests/platform/platform_info.cpp @@ -41,7 +41,7 @@ class TEST_NAME : public util::test_base { void run(util::logger &log) override { { // FIXME: Reenable when struct information descriptors are implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** check get_info parameters */ { diff --git a/tests/platform/platform_semantics.cpp b/tests/platform/platform_semantics.cpp index 3a304976b..55af350a1 100644 --- a/tests/platform/platform_semantics.cpp +++ b/tests/platform/platform_semantics.cpp @@ -20,7 +20,7 @@ #include "../common/common.h" #include "../common/disabled_for_test_case.h" -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "../common/semantics_reference.h" #endif @@ -52,7 +52,7 @@ struct storage { } }; -DISABLED_FOR_TEST_CASE(hipSYCL) +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("platform common reference semantics", "[platform]")({ sycl::platform platform = sycl_cts::util::get_cts_object::platform(); const std::vector platforms = sycl::platform::get_platforms(); diff --git a/tests/queue/queue_info.cpp b/tests/queue/queue_info.cpp index 3381e27cb..62ff74ff3 100644 --- a/tests/queue/queue_info.cpp +++ b/tests/queue/queue_info.cpp @@ -42,7 +42,7 @@ class TEST_NAME : public util::test_base { void run(util::logger &log) override { { // FIXME: Reenable when struct information descriptors are implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /** check get_info parameters */ { diff --git a/tests/reduction/reducer_api_core.cpp b/tests/reduction/reducer_api_core.cpp index ac8293a38..bdbf611a6 100644 --- a/tests/reduction/reducer_api_core.cpp +++ b/tests/reduction/reducer_api_core.cpp @@ -19,8 +19,8 @@ *******************************************************************************/ #include "../common/common.h" #include "../common/disabled_for_test_case.h" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reducer_api.h" #endif @@ -31,8 +31,8 @@ struct kernel_name; -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reducer class", "[reducer]")({ sycl::queue queue = sycl_cts::util::get_cts_object::queue(); @@ -66,8 +66,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) std::all_of(results.begin(), results.end(), [](int val) { return val; })); }); -// FIXME: re-enable when reducer is fully implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when reducer is fully implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reducer api core", "[reducer]")({ sycl::queue queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/reduction/reducer_api_fp16.cpp b/tests/reduction/reducer_api_fp16.cpp index b085a080a..0d9fcd7cb 100644 --- a/tests/reduction/reducer_api_fp16.cpp +++ b/tests/reduction/reducer_api_fp16.cpp @@ -20,14 +20,14 @@ #include "../../util/extensions.h" #include "../common/common.h" #include "../common/disabled_for_test_case.h" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reducer_api.h" #endif #include -// FIXME: re-enable when reducer is fully implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when reducer is fully implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reducer api fp16", "[reducer][fp16]")({ sycl::queue queue = sycl_cts::util::get_cts_object::queue(); using avaliability = sycl_cts::util::extensions::availability< diff --git a/tests/reduction/reducer_api_fp64.cpp b/tests/reduction/reducer_api_fp64.cpp index b183424b3..80d491e6c 100644 --- a/tests/reduction/reducer_api_fp64.cpp +++ b/tests/reduction/reducer_api_fp64.cpp @@ -20,14 +20,14 @@ #include "../../util/extensions.h" #include "../common/common.h" #include "../common/disabled_for_test_case.h" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reducer_api.h" #endif #include -// FIXME: re-enable when reducer is fully implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when reducer is fully implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reducer api fp64", "[reducer][fp64]")({ sycl::queue queue = sycl_cts::util::get_cts_object::queue(); using avaliability = sycl_cts::util::extensions::availability< diff --git a/tests/reduction/reduction_with_identity_param_core.cpp b/tests/reduction/reduction_with_identity_param_core.cpp index 48a0d1fe1..29c1f509d 100644 --- a/tests/reduction/reduction_with_identity_param_core.cpp +++ b/tests/reduction/reduction_with_identity_param_core.cpp @@ -24,15 +24,15 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_with_identity_param.h" #endif namespace reduction_with_identity_param_core { -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_core", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/reduction/reduction_with_identity_param_even_item_core.cpp b/tests/reduction/reduction_with_identity_param_even_item_core.cpp index 90d0a7954..8f4656cba 100644 --- a/tests/reduction/reduction_with_identity_param_even_item_core.cpp +++ b/tests/reduction/reduction_with_identity_param_even_item_core.cpp @@ -24,15 +24,15 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_with_identity_param.h" #endif namespace reduction_with_identity_param_even_item_core { -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_even_item_core", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/reduction/reduction_with_identity_param_fp16.cpp b/tests/reduction/reduction_with_identity_param_fp16.cpp index 140c6cfbf..9dd99770b 100644 --- a/tests/reduction/reduction_with_identity_param_fp16.cpp +++ b/tests/reduction/reduction_with_identity_param_fp16.cpp @@ -22,15 +22,15 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_with_identity_param.h" #endif namespace reduction_with_identity_param_fp16 { -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_fp16", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -42,8 +42,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) "sycl::half"); }); -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_item_twice_fp16", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -55,8 +55,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) queue, "sycl::half"); }); -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_even_item_fp16", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -68,8 +68,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) queue, "sycl::half"); }); -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_no_one_item_fp16", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/reduction/reduction_with_identity_param_fp64.cpp b/tests/reduction/reduction_with_identity_param_fp64.cpp index 350040f49..bd48bf601 100644 --- a/tests/reduction/reduction_with_identity_param_fp64.cpp +++ b/tests/reduction/reduction_with_identity_param_fp64.cpp @@ -22,15 +22,15 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_with_identity_param.h" #endif namespace reduction_with_identity_param_fp64 { -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_fp64", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -40,8 +40,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) reduction_with_identity_param::run_test_for_type()(queue, "double"); }); -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_item_twice_fp64", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -52,8 +52,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) queue, "double"); }); -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_even_item_fp64", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); @@ -64,8 +64,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) queue, "double"); }); -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_no_one_fp64", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/reduction/reduction_with_identity_param_item_twice_core.cpp b/tests/reduction/reduction_with_identity_param_item_twice_core.cpp index b02927715..779e3ee5c 100644 --- a/tests/reduction/reduction_with_identity_param_item_twice_core.cpp +++ b/tests/reduction/reduction_with_identity_param_item_twice_core.cpp @@ -24,15 +24,15 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_with_identity_param.h" #endif namespace reduction_with_identity_param_item_twice_core { -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_even_item_twice_core", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/reduction/reduction_with_identity_param_no_one_item_core.cpp b/tests/reduction/reduction_with_identity_param_no_one_item_core.cpp index 89df1b877..13380f054 100644 --- a/tests/reduction/reduction_with_identity_param_no_one_item_core.cpp +++ b/tests/reduction/reduction_with_identity_param_no_one_item_core.cpp @@ -24,15 +24,15 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_with_identity_param.h" #endif namespace reduction_with_identity_param_no_one_item_core { -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_identity_param_even_no_one_item_core", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/reduction/reduction_with_several_reductions_in_kernel.cpp b/tests/reduction/reduction_with_several_reductions_in_kernel.cpp index 582a1675c..396196941 100644 --- a/tests/reduction/reduction_with_several_reductions_in_kernel.cpp +++ b/tests/reduction/reduction_with_several_reductions_in_kernel.cpp @@ -8,15 +8,15 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_with_several_reductions_in_kernel.h" #endif namespace reduction_with_several_reductions_in_kernel { -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_with_several_reductions_in_kernel", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); reduction_with_several_reductions_in_kernel_h::run_all_tests(queue); diff --git a/tests/reduction/reduction_without_identity_param_core.cpp b/tests/reduction/reduction_without_identity_param_core.cpp index 9761e1c68..076bc122e 100644 --- a/tests/reduction/reduction_without_identity_param_core.cpp +++ b/tests/reduction/reduction_without_identity_param_core.cpp @@ -24,8 +24,8 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_without_identity_param_common.h" namespace reduction_without_identity_param_core { @@ -110,13 +110,13 @@ void run_tests_for_identity_type(sycl::queue& queue) { } } // namespace reduction_without_identity_param_core -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace reduction_without_identity_param_core { // FIXME: re-enable when compilation failure for reduction with custom type is -// fixed and sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// fixed and sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_core", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/reduction/reduction_without_identity_param_even_item_core.cpp b/tests/reduction/reduction_without_identity_param_even_item_core.cpp index a0913d311..45bd6b710 100644 --- a/tests/reduction/reduction_without_identity_param_even_item_core.cpp +++ b/tests/reduction/reduction_without_identity_param_even_item_core.cpp @@ -24,8 +24,8 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_without_identity_param_common.h" namespace reduction_without_identity_param_even_item_core { @@ -110,13 +110,13 @@ void run_tests_for_identity_type(sycl::queue& queue) { } } // namespace reduction_without_identity_param_even_item_core -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace reduction_without_identity_param_even_item_core { // FIXME: re-enable when compilation failure for reduction with custom type is -// fixed and sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// fixed and sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_even_item_core", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/reduction/reduction_without_identity_param_fp16.cpp b/tests/reduction/reduction_without_identity_param_fp16.cpp index 32ed952cc..94835be0a 100644 --- a/tests/reduction/reduction_without_identity_param_fp16.cpp +++ b/tests/reduction/reduction_without_identity_param_fp16.cpp @@ -23,15 +23,15 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_without_identity_param_common.h" #endif namespace reduction_without_identity_param_fp16 { -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_fp16", "[reduction]")({ using namespace reduction_without_identity_param_common; @@ -51,8 +51,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) reduction_common::nd_range, queue, "sycl::half"); }); -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_item_twice_fp16", "[reduction]")({ using namespace reduction_without_identity_param_common; @@ -74,8 +74,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) reduction_common::nd_range, queue, "sycl::half"); }); -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_even_item_fp16", "[reduction]")({ using namespace reduction_without_identity_param_common; @@ -95,8 +95,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) reduction_common::nd_range, queue, "sycl::half"); }); -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_no_one_item_fp16", "[reduction]")({ using namespace reduction_without_identity_param_common; diff --git a/tests/reduction/reduction_without_identity_param_fp64.cpp b/tests/reduction/reduction_without_identity_param_fp64.cpp index 96f0a52ef..89fcc8b5e 100644 --- a/tests/reduction/reduction_without_identity_param_fp64.cpp +++ b/tests/reduction/reduction_without_identity_param_fp64.cpp @@ -23,16 +23,16 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_without_identity_param_common.h" #endif namespace reduction_without_identity_param_fp64 { // FIXME: re-enable when compilation failure for reduction with custom type is -// fixed and sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// fixed and sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_fp64", "[reduction]")({ using namespace reduction_without_identity_param_common; @@ -53,8 +53,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) }); // FIXME: re-enable when compilation failure for reduction with custom type is -// fixed and sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// fixed and sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_item_twice_fp64", "[reduction]")({ using namespace reduction_without_identity_param_common; @@ -75,8 +75,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) }); // FIXME: re-enable when compilation failure for reduction with custom type is -// fixed and sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// fixed and sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_even_item_fp64", "[reduction]")({ using namespace reduction_without_identity_param_common; @@ -97,8 +97,8 @@ DISABLED_FOR_TEST_CASE(hipSYCL) }); // FIXME: re-enable when compilation failure for reduction with custom type is -// fixed and sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// fixed and sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_no_one_item_fp64", "[reduction]")({ using namespace reduction_without_identity_param_common; diff --git a/tests/reduction/reduction_without_identity_param_item_twice_core.cpp b/tests/reduction/reduction_without_identity_param_item_twice_core.cpp index c5b529105..c2c05f4f4 100644 --- a/tests/reduction/reduction_without_identity_param_item_twice_core.cpp +++ b/tests/reduction/reduction_without_identity_param_item_twice_core.cpp @@ -24,8 +24,8 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_without_identity_param_common.h" namespace reduction_without_identity_param_item_twice_core { @@ -110,13 +110,13 @@ void run_tests_for_identity_type(sycl::queue& queue) { } } // namespace reduction_without_identity_param_item_twice_core -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace reduction_without_identity_param_item_twice_core { // FIXME: re-enable when compilation failure for reduction with custom type is -// fixed and sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// fixed and sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_item_twice_core", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/reduction/reduction_without_identity_param_no_one_item_core.cpp b/tests/reduction/reduction_without_identity_param_no_one_item_core.cpp index cc118ff5a..7833eb470 100644 --- a/tests/reduction/reduction_without_identity_param_no_one_item_core.cpp +++ b/tests/reduction/reduction_without_identity_param_no_one_item_core.cpp @@ -24,8 +24,8 @@ #include "../common/disabled_for_test_case.h" #include "catch2/catch_test_macros.hpp" -// FIXME: re-enable when sycl::reduction is implemented in hipSYCL -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: re-enable when sycl::reduction is implemented in AdaptiveCpp +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP #include "reduction_without_identity_param_common.h" namespace reduction_without_identity_param_no_one_item_core { @@ -110,13 +110,13 @@ void run_tests_for_identity_type(sycl::queue& queue) { } } // namespace reduction_without_identity_param_no_one_item_core -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP namespace reduction_without_identity_param_no_one_item_core { // FIXME: re-enable when compilation failure for reduction with custom type is -// fixed and sycl::reduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// fixed and sycl::reduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("reduction_without_identity_param_no_one_item_core", "[reduction]")({ auto queue = sycl_cts::util::get_cts_object::queue(); diff --git a/tests/sub_group/sub_group_api.cpp b/tests/sub_group/sub_group_api.cpp index 27795991e..b0aff832b 100644 --- a/tests/sub_group/sub_group_api.cpp +++ b/tests/sub_group/sub_group_api.cpp @@ -63,7 +63,7 @@ static size_t get_idx(size_t id, member_function member_func) { * work-group may have such that it is a power of two and * smaller or equal to 1024. */ static std::vector get_3d_work_group_sizes(const sycl::device& device) { -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP const sycl::id<3> max_work_item_sizes = device.get_info>(); #else diff --git a/tests/sub_group/sub_group_semantics.cpp b/tests/sub_group/sub_group_semantics.cpp index 0ba9be5ac..0823412f6 100644 --- a/tests/sub_group/sub_group_semantics.cpp +++ b/tests/sub_group/sub_group_semantics.cpp @@ -116,7 +116,7 @@ TEST_CASE("sub_group by-value semantics", "[sub_group]") { } // FIXME: re-enable when == and != operators is implemented -#if !SYCL_CTS_COMPILING_WITH_HIPSYCL +#if !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP TEST_CASE("Check sycl::sub_group equality", "[sub_group]") { size_t code_count = to_integral(common_by_value_semantics::current_check::size); @@ -155,5 +155,5 @@ TEST_CASE("Check sycl::sub_group equality", "[sub_group]") { CHECK(result[i]); } } -#endif // !SYCL_CTS_COMPILING_WITH_HIPSYCL +#endif // !SYCL_CTS_COMPILING_WITH_ADAPTIVECPP } // namespace sub_group_semantics diff --git a/tests/vector_deduction_guides/vec_deduction_guides.cpp b/tests/vector_deduction_guides/vec_deduction_guides.cpp index 02ea5a074..c73bd4c3f 100644 --- a/tests/vector_deduction_guides/vec_deduction_guides.cpp +++ b/tests/vector_deduction_guides/vec_deduction_guides.cpp @@ -84,8 +84,8 @@ class check_vec_deduction { } }; -// FIXME: re-enable when vec deduction is implemented in hipSYCL -DISABLED_FOR_TEST_CASE(hipSYCL) +// FIXME: re-enable when vec deduction is implemented in AdaptiveCpp +DISABLED_FOR_TEST_CASE(AdaptiveCpp) ("vec deduction guides", "[vec_deduction]")({ for_all_types(deduction::vector_types); }); diff --git a/util/math_helper.h b/util/math_helper.h index 9c4dbbeb4..83559a523 100644 --- a/util/math_helper.h +++ b/util/math_helper.h @@ -72,8 +72,8 @@ int numElements(const sycl::vec &) { /* Generic function for both scalar and marray types to * return the number of elements in a type. */ -// FIXME: hipSYCL does not support marray -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: AdaptiveCpp does not support marray +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template int numElements(const sycl::marray &) { return numElems; @@ -94,8 +94,8 @@ T getElement(sycl::vec &f, int ix) { return f[ix]; } -// FIXME: hipSYCL does not support marray -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: AdaptiveCpp does not support marray +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP /* Generic function for both scalar and vector types to * extract an individual element. */ template @@ -118,8 +118,8 @@ sycl::vec run_func_on_vector(funT fun, Args... args) { return res; } -// FIXME: hipSYCL does not support marray -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: AdaptiveCpp does not support marray +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template sycl::marray run_func_on_marray(funT fun, Args... args) { sycl::marray res; @@ -144,8 +144,8 @@ sycl::vec run_rel_func_on_vector(funT fun, Args... args) { return res; } -// FIXME: hipSYCL does not support marray -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: AdaptiveCpp does not support marray +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template sycl::marray run_rel_func_on_marray(funT fun, Args... args) { sycl::marray res; @@ -172,8 +172,8 @@ run_func_on_vector_result_ref(funT fun, Args... args) { return sycl_cts::resultRef>(res, undefined); } -// FIXME: hipSYCL does not support marray -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: AdaptiveCpp does not support marray +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template sycl_cts::resultRef> run_func_on_marray_result_ref( funT fun, Args... args) { @@ -217,8 +217,8 @@ rel_func_dispatcher(sycl::vec a, Args... args) { funT{}, a, args...); } -// FIXME: hipSYCL does not support marray -#ifndef SYCL_CTS_COMPILING_WITH_HIPSYCL +// FIXME: AdaptiveCpp does not support marray +#ifndef SYCL_CTS_COMPILING_WITH_ADAPTIVECPP template