diff --git a/.github/intel-llvm-mirror-base-commit b/.github/intel-llvm-mirror-base-commit index eb32b8eefe..7a4a3ea40c 100644 --- a/.github/intel-llvm-mirror-base-commit +++ b/.github/intel-llvm-mirror-base-commit @@ -1 +1 @@ -06407ab5626faccc61fb8367ac1017667045f9e1 +edb24728920365ff7aab67922ef22b7ec323b834 diff --git a/cmake/FetchOpenCL.cmake b/cmake/FetchOpenCL.cmake index f1ad134901..df8ede5787 100644 --- a/cmake/FetchOpenCL.cmake +++ b/cmake/FetchOpenCL.cmake @@ -17,7 +17,10 @@ set(OCL_LOADER_REPO set(OCL_HEADERS_TAG 6eabe90aa7b6cff9c67800a2fe25a0cd88d8b749) set(OCL_LOADER_TAG ddf6c70230a79cdb8fcccfd3c775b09e6820f42e) -find_package(OpenCL 3.0 QUIET) +# Set NO_CMAKE_PACKAGE_REGISTRY so only system-wide installs are +# detected. +find_package(OpenCL 3.0 QUIET NO_CMAKE_PACKAGE_REGISTRY) + if(OpenCL_FOUND) # The OpenCL-Headers CMake files don't provide granular info # on what is and isn't supposed, just the overall OpenCL version. @@ -48,16 +51,16 @@ endif() # OpenCL Headers if(NOT OpenCL_FOUND) + FetchContent_Declare(ocl-headers + GIT_REPOSITORY ${OCL_HEADERS_REPO} + GIT_TAG ${OCL_HEADERS_TAG} + ) FetchContent_GetProperties(ocl-headers) if(NOT ocl-headers_POPULATED) message(STATUS "Will fetch OpenCL headers from ${OCL_HEADERS_REPO}") - FetchContent_Declare(ocl-headers - GIT_REPOSITORY ${OCL_HEADERS_REPO} - GIT_TAG ${OCL_HEADERS_TAG} - ) - FetchContent_MakeAvailable(ocl-headers) endif() + FetchContent_MakeAvailable(ocl-headers) set(OpenCL_INCLUDE_DIR ${ocl-headers_SOURCE_DIR} CACHE PATH "" FORCE) else() message(STATUS "Using OpenCL headers at ${OpenCL_INCLUDE_DIR}") @@ -68,17 +71,15 @@ endif() set(BUILD_SHARED_LIBS ON) if(NOT OpenCL_FOUND) - + FetchContent_Declare(ocl-icd + GIT_REPOSITORY ${OCL_LOADER_REPO} + GIT_TAG ${OCL_LOADER_TAG} + ) FetchContent_GetProperties(ocl-icd) if(NOT ocl-icd_POPULATED) message(STATUS "Will fetch OpenCL ICD Loader from ${OCL_LOADER_REPO}") - FetchContent_Declare(ocl-icd - GIT_REPOSITORY ${OCL_LOADER_REPO} - GIT_TAG ${OCL_LOADER_TAG} - ) - - FetchContent_MakeAvailable(ocl-icd) endif() + FetchContent_MakeAvailable(ocl-icd) set(OpenCL_LIBRARY OpenCL::OpenCL CACHE PATH "" FORCE) else() message(STATUS diff --git a/test/conformance/enqueue/urEnqueueEventsWaitWithBarrier.cpp b/test/conformance/enqueue/urEnqueueEventsWaitWithBarrier.cpp index 37486077d1..b22594d2a3 100644 --- a/test/conformance/enqueue/urEnqueueEventsWaitWithBarrier.cpp +++ b/test/conformance/enqueue/urEnqueueEventsWaitWithBarrier.cpp @@ -174,13 +174,13 @@ TEST_P(urEnqueueEventsWaitWithBarrierOrderingTest, uur::KernelLaunchHelper addHelper(platform, context, add_kernel, queue); uur::KernelLaunchHelper mulHelper(platform, context, mul_kernel, queue); - addHelper.SetBuffer1DArg(buffer, nullptr); - mulHelper.SetBuffer1DArg(buffer, nullptr); + UUR_RETURN_ON_FATAL_FAILURE(addHelper.SetBuffer1DArg(buffer, nullptr)); + UUR_RETURN_ON_FATAL_FAILURE(mulHelper.SetBuffer1DArg(buffer, nullptr)); for (size_t i = 0; i < 10; i++) { constexpr uint32_t ONE = 1; - urEnqueueMemBufferWrite(queue, buffer, true, 0, sizeof(uint32_t), &ONE, 0, - nullptr, &event); + ASSERT_SUCCESS(urEnqueueMemBufferWrite( + queue, buffer, true, 0, sizeof(uint32_t), &ONE, 0, nullptr, &event)); ASSERT_SUCCESS(urEnqueueEventsWaitWithBarrier(queue, 1, &event, nullptr)); ASSERT_SUCCESS(urEnqueueKernelLaunch(queue, add_kernel, 1, &offset, &count, nullptr, 0, nullptr, 0, nullptr, @@ -205,13 +205,13 @@ TEST_P(urEnqueueEventsWaitWithBarrierOrderingTest, uur::KernelLaunchHelper addHelper(platform, context, add_kernel, queue); uur::KernelLaunchHelper mulHelper(platform, context, mul_kernel, queue); - addHelper.SetBuffer1DArg(buffer, nullptr); - mulHelper.SetBuffer1DArg(buffer, nullptr); + UUR_RETURN_ON_FATAL_FAILURE(addHelper.SetBuffer1DArg(buffer, nullptr)); + UUR_RETURN_ON_FATAL_FAILURE(mulHelper.SetBuffer1DArg(buffer, nullptr)); for (size_t i = 0; i < 10; i++) { constexpr uint32_t ONE = 1; - urEnqueueMemBufferWrite(queue, buffer, true, 0, sizeof(uint32_t), &ONE, 0, - nullptr, nullptr); + ASSERT_SUCCESS(urEnqueueMemBufferWrite( + queue, buffer, true, 0, sizeof(uint32_t), &ONE, 0, nullptr, nullptr)); ASSERT_SUCCESS(urEnqueueEventsWaitWithBarrier(queue, 0, nullptr, &event)); ASSERT_SUCCESS(urEnqueueKernelLaunch(queue, add_kernel, 1, &offset, &count, nullptr, 0, nullptr, 1, &event, @@ -235,13 +235,13 @@ TEST_P(urEnqueueEventsWaitWithBarrierOrderingTest, SuccessEventDependencies) { uur::KernelLaunchHelper addHelper(platform, context, add_kernel, queue); uur::KernelLaunchHelper mulHelper(platform, context, mul_kernel, queue); - addHelper.SetBuffer1DArg(buffer, nullptr); - mulHelper.SetBuffer1DArg(buffer, nullptr); + UUR_RETURN_ON_FATAL_FAILURE(addHelper.SetBuffer1DArg(buffer, nullptr)); + UUR_RETURN_ON_FATAL_FAILURE(mulHelper.SetBuffer1DArg(buffer, nullptr)); for (size_t i = 0; i < 10; i++) { constexpr uint32_t ONE = 1; - urEnqueueMemBufferWrite(queue, buffer, true, 0, sizeof(uint32_t), &ONE, 0, - nullptr, &event[0]); + ASSERT_SUCCESS(urEnqueueMemBufferWrite( + queue, buffer, true, 0, sizeof(uint32_t), &ONE, 0, nullptr, &event[0])); ASSERT_SUCCESS( urEnqueueEventsWaitWithBarrier(queue, 1, &event[0], &event[1])); ASSERT_SUCCESS(urEnqueueKernelLaunch(queue, add_kernel, 1, &offset, &count, @@ -268,13 +268,13 @@ TEST_P(urEnqueueEventsWaitWithBarrierOrderingTest, uur::KernelLaunchHelper addHelper(platform, context, add_kernel, queue); uur::KernelLaunchHelper mulHelper(platform, context, mul_kernel, queue); - addHelper.SetBuffer1DArg(buffer, nullptr); - mulHelper.SetBuffer1DArg(buffer, nullptr); + UUR_RETURN_ON_FATAL_FAILURE(addHelper.SetBuffer1DArg(buffer, nullptr)); + UUR_RETURN_ON_FATAL_FAILURE(mulHelper.SetBuffer1DArg(buffer, nullptr)); for (size_t i = 0; i < 10; i++) { constexpr uint32_t ONE = 1; - urEnqueueMemBufferWrite(queue, buffer, true, 0, sizeof(uint32_t), &ONE, 0, - nullptr, nullptr); + ASSERT_SUCCESS(urEnqueueMemBufferWrite( + queue, buffer, true, 0, sizeof(uint32_t), &ONE, 0, nullptr, nullptr)); ASSERT_SUCCESS(urEnqueueEventsWaitWithBarrier(queue, 0, nullptr, nullptr)); ASSERT_SUCCESS(urEnqueueKernelLaunch(queue, add_kernel, 1, &offset, &count, nullptr, 0, nullptr, 0, nullptr, diff --git a/test/conformance/enqueue/urEnqueueKernelLaunch.cpp b/test/conformance/enqueue/urEnqueueKernelLaunch.cpp index c59134660d..aadb43cc39 100644 --- a/test/conformance/enqueue/urEnqueueKernelLaunch.cpp +++ b/test/conformance/enqueue/urEnqueueKernelLaunch.cpp @@ -88,8 +88,9 @@ TEST_P(urEnqueueKernelLaunchNoArgs3DTest, Success) { TEST_P(urEnqueueKernelLaunchTest, Success) { ur_mem_handle_t buffer = nullptr; - AddBuffer1DArg(sizeof(val) * global_size, &buffer); - AddPodArg(val); + UUR_RETURN_ON_FATAL_FAILURE( + AddBuffer1DArg(sizeof(val) * global_size, &buffer)); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg(val)); ASSERT_SUCCESS(urEnqueueKernelLaunch(queue, kernel, n_dimensions, &global_offset, &global_size, nullptr, 0, nullptr, 0, nullptr, nullptr)); @@ -134,8 +135,9 @@ TEST_P(urEnqueueKernelLaunchTest, SuccessWithLaunchProperties) { } ur_mem_handle_t buffer = nullptr; - AddBuffer1DArg(sizeof(val) * global_size, &buffer); - AddPodArg(val); + UUR_RETURN_ON_FATAL_FAILURE( + AddBuffer1DArg(sizeof(val) * global_size, &buffer)); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg(val)); ASSERT_SUCCESS(urEnqueueKernelLaunch(queue, kernel, n_dimensions, &global_offset, &global_size, nullptr, 1, @@ -147,8 +149,9 @@ TEST_P(urEnqueueKernelLaunchTest, SuccessWithLaunchProperties) { TEST_P(urEnqueueKernelLaunchTest, SuccessNoOffset) { ur_mem_handle_t buffer = nullptr; - AddBuffer1DArg(sizeof(val) * global_size, &buffer); - AddPodArg(val); + UUR_RETURN_ON_FATAL_FAILURE( + AddBuffer1DArg(sizeof(val) * global_size, &buffer)); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg(val)); ASSERT_SUCCESS(urEnqueueKernelLaunch(queue, kernel, n_dimensions, nullptr, &global_size, nullptr, 0, nullptr, 0, nullptr, nullptr)); @@ -218,8 +221,9 @@ TEST_P(urEnqueueKernelLaunchTest, InvalidWorkGroupSize) { // an error size_t local_size = 31; ur_mem_handle_t buffer = nullptr; - AddBuffer1DArg(sizeof(val) * global_size, &buffer); - AddPodArg(val); + UUR_RETURN_ON_FATAL_FAILURE( + AddBuffer1DArg(sizeof(val) * global_size, &buffer)); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg(val)); auto result = urEnqueueKernelLaunch(queue, kernel, n_dimensions, &global_offset, &global_size, &local_size, 0, nullptr, 0, nullptr, nullptr); @@ -258,7 +262,7 @@ TEST_P(urEnqueueKernelLaunchKernelSubGroupTest, Success) { UUR_KNOWN_FAILURE_ON(uur::CUDA{}); ur_mem_handle_t buffer = nullptr; - AddBuffer1DArg(sizeof(size_t), &buffer); + UUR_RETURN_ON_FATAL_FAILURE(AddBuffer1DArg(sizeof(size_t), &buffer)); ASSERT_SUCCESS(urEnqueueKernelLaunch( queue, kernel, n_dimensions, global_offset.data(), global_size.data(), nullptr, 0, nullptr, 0, nullptr, nullptr)); @@ -275,13 +279,13 @@ struct Pair { TEST_P(urEnqueueKernelLaunchKernelStandardTest, Success) { uint32_t expected_result = 2410; ur_mem_handle_t output = nullptr; - AddBuffer1DArg(sizeof(uint32_t), &output); - AddPodArg(true); - AddPodArg(2); - AddPodArg(3); - AddPodArg(5); - AddPodArg({7, 5}); - AddPodArg(11.0); + UUR_RETURN_ON_FATAL_FAILURE(AddBuffer1DArg(sizeof(uint32_t), &output)); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg(true)); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg(2)); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg(3)); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg(5)); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg({7, 5})); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg(11.0)); ASSERT_SUCCESS(urEnqueueKernelLaunch(queue, kernel, n_dimensions, &offset, &global_size, nullptr, 0, nullptr, 0, @@ -371,8 +375,8 @@ UUR_DEVICE_TEST_SUITE_WITH_PARAM( TEST_P(urEnqueueKernelLaunchTestWithParam, Success) { ur_mem_handle_t buffer = nullptr; - AddBuffer1DArg(buffer_size, &buffer); - AddPodArg(val); + UUR_RETURN_ON_FATAL_FAILURE(AddBuffer1DArg(buffer_size, &buffer)); + UUR_RETURN_ON_FATAL_FAILURE(AddPodArg(val)); ASSERT_SUCCESS(urEnqueueKernelLaunch(queue, kernel, n_dimensions, global_offset, global_range, nullptr, 0, nullptr, 0, nullptr, nullptr)); @@ -624,8 +628,9 @@ TEST_P(urEnqueueKernelLaunchMultiDeviceTest, KernelLaunchReadDifferentQueues) { uur::KernelLaunchHelper{platform, context, kernel, queues[0]}; ur_mem_handle_t buffer = nullptr; - helper.AddBuffer1DArg(sizeof(val) * global_size, &buffer, nullptr); - helper.AddPodArg(val); + UUR_RETURN_ON_FATAL_FAILURE( + helper.AddBuffer1DArg(sizeof(val) * global_size, &buffer, nullptr)); + UUR_RETURN_ON_FATAL_FAILURE(helper.AddPodArg(val)); ASSERT_SUCCESS(urEnqueueKernelLaunch(queues[0], kernel, n_dimensions, &global_offset, &global_size, nullptr, 0, nullptr, 0, nullptr, nullptr));