Merge KhronoGroup/OpenCL-CTS: main into nikhiljnv/OpenCL-CTS:KhronosGroup-master #43
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fix enqueue_flags test to use correct barrier type. Currently, enqueue_flags test uses CLK_LOCAL_MEM_FENCE. Use CLK_GLOBAL_MEM_FENCE instead as all threads across work-groups need to wait here. * Add check for support for Read-Wrie images Read-Write images have required OpenCL 2.x. Read-Write image tests are already being skipped for 1.x devices. With OpenCL 3.0, read-write images being optional, the tests should be run or skipped depending on the implementation support. Add a check to decide if Read-Write images are supported or required to be supported depending on OpenCL version and decide if the tests should be run on skipped. Fixes issue #894 * Fix formatting in case of Read-Write image checks. Fix formatting in case of Read-write image checks. Also, combine two ifs into one in case of kerne_read_write tests * Fix some more formatting for RW-image checks Remove unnecessary spaces at various places. Also, fix lengthy lines. * Fix malloc-size calculation in test imagedim unsigned char size is silently assumed to be 1 in imagedim test of test_basic. Pass sizeof(type) in malloc size calculation. Also, change loop variable from signed to unsigned. Add checks for null pointer for malloced memory. * Initial CTS for external sharing extensions Initial set of tests for below extensions with Vulkan as producer 1. cl_khr_external_memory 2. cl_khr_external_memory_win32 3. cl_khr_external_memory_opaque_fd 4. cl_khr_external_semaphore 5. cl_khr_external_semaphore_win32 6. cl_khr_external_semaphore_opaque_fd * Updates to external sharing CTS Updates to external sharing CTS 1. Fix some build issues to remove unnecessary, non-existent files 2. Add new tests for platform and device queries. 3. Some added checks for VK Support. * Update CTS build script for Vulkan Headers Update CTS build to clone Vulkan Headers repo and pass it to CTS build in preparation for external memory and semaphore tests * Fix Vulkan header path Fix Vulkan header include path. * Add Vulkan loader dependency Vulkan loader is required to build test_vulkan of OpenCL-CTS. Clone and build Vulkan loader as prerequisite to OpenCL-CTS. * Fix Vulkan loader path in test_vulkan Remove arch/os suffix in Vulkan loader path to match vulkan loader repo build. * Fix warnings around getHandle API. Return type of getHandle is defined differently based on win or linux builds. Use appropriate guards when using API at other places. While at it remove duplicate definition of ARRAY_SIZE. * Use ARRAY_SIZE in harness. Use already defined ARRAY_SIZE macro from test_harness. * Fix build issues for test_vulkan Fix build issues for test_vulkan 1. Add cl_ext.h in common files 2. Replace cl_mem_properties_khr with cl_mem_properties 3. Replace cl_external_mem_handle_type_khr with cl_external_memory_handle_type_khr 4. Type-cast malloc as required. * Fix code formatting. Fix code formatting to get CTS CI builds clean. * Fix formatting fixes part-2 Another set of formatting fixes. * Fix code formatting part-3 Some more code formatting fixes. * Fix code formatting issues part-4 More code formatting fixes. * Formatting fixes part-5 Some more formatting fixes * Fix formatting part-6 More formatting fixes continued. * Code formatting fixes part-7 Code formatting fixes for image * Code formatting fixes part-8 Fixes for platform and device query tests. * Code formatting fixes part-9 More formatting fixes for vulkan_wrapper * Code formatting fixes part-10 More fixes to wrapper header * Code formatting fixes part-11 Formatting fixes for api_list * Code formatting fixes part-12 Formatting fixes for api_list_map. * Code formatting changes part-13 Code formatting changes for utility. * Code formatting fixes part-15 Formatting fixes for wrapper. * Misc Code formatting fixes Some more misc code formatting fixes. * Fix build breaks due to code formatting Fix build issues arised with recent code formatting issues. * Fix presubmit script after merge Fix presubmit script after merge conflicts. * Fix Vulkan loader build in presubmit script. Use cmake ninja and appropriate toolchain for Vulkan loader dependency to fix linking issue on arm/aarch64. * Use static array sizes Use static array sizes to fix windows builds. * Some left-out formatting fixes. Fix remaining formatting issues. * Fix harness header path Fix harness header path While at it, remove Misc and test pragma. * Add/Fix license information Add Khronos License info for test_vulkan. Replace Apple license with Khronos as applicable. * Fix headers for Mac OSX builds. Use appropriate headers for Mac OSX builds * Fix Mac OSX builds. Use appropriate headers for Mac OSX builds. Also, fix some build issues due to type-casting. * Fix new code formatting issues Fix new code formatting issues with recent MacOS fixes. * Add back missing case statement Add back missing case statement that was accidentally removed. * Disable USE_GAS for Vulkan Loader build. Disable USE_GAS for Vulkan Loader build to fix aarch64 build. * Fixes to OpenCL external sharing tests Fix clReleaseSemaphore() API. Fix copyright year. Some other minor fixes. * Improvements to OpenCL external sharing CTS Use SPIR-V shaders instead of NV extension path from GLSL to Vulkan shaders. Fixes for lower end GPUs to use limited memory. Update copy-right year at some more places. * Fix new code formatting issues. Fix code formatting issues with recent changes for external sharing tests. * More formatting fixes. More formatting fixes for recent updates to external sharing tests. * Final code formatting fixes. Minor formatting fixes to get format checks clean. * Update extension list of test_compiler Upate extension list of test_compiler with missing external memory and semaphore extensions * Add ffp-contract=off Compilation flag for CTS build. GCC defaults to using ffp-contract=fast even when fast math is disabled in the case of GNU C This creates precision issues when comparing the results with that of x86_64. GNU options reference: https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html# This fix is to disable floating-point expression contractions with flag ffp-contract=off for math_brute_force tests Fixes #1794 * Make fp-contract flag arch-independent, but compiler dependent Use existing CMake constructs to add fp-contract flag so that it automatically checks for compiler support. Also, make this change arch-independent. Fixes #1794 * Fix typo in earlier commit Fix typo in earlier commit Fixes #1794 * Remove duplicate addition of ffp-contract flag ffp-contract flag is currently added via two macros Retain add_cxx_flag_if_supported macro and remove set_gnulike_module_compile_flags. Fixes #1794 * Fix typo in earlier commit Add closing " that was unintentionally removed in previous commit.
* add tests for clCommandSVMMemcpyKHR & clCommandSVMMemfillKHR * Fix typo SVMMemfill -> SVMMemFill * fix clCommandSVMMemFillKHR calls to match extension * add Khronos license + minor fixes * review fixes
The spec requires implementations return NULL for CL_MEM_HOST_PTR when the flags passed at memory object creation time do not contain CL_MEM_USE_HOST_PTR CTS was not checking this. Add the same check. Fixes #1752
…1713) * Added cl_khr_fp16 support for test_explicit_s2v from basic (issue #142, basic) * Cosmetic corrections * cosmetic fix * Added correction to distinguish signed and unsigned char types for ARM architecture tests * Added missing pieces of convertion procedure to support half * Corrected condition to verify if additional pragma is necessary (issue #142, basic) * Add NaN check for half to float conversion * check-format fixes * Add NaN check for all float types Use std::isnan for float/double types. Change-Id: I005bddccaa3f8490ac59b2aa431ed315733ad143 * Fix Ubuntu build error with isnan macro definition Change-Id: I671ed826a9631fbbc66d0aa9b674ab00124c7967 * Check format fixes * NAN define not needed anymore --------- Co-authored-by: Vasu Penugonda <vpenugon@qti.qualcomm.com> Co-authored-by: Sreelakshmi Haridas <sharidas@quicinc.com>
This is helpful for testing progvars on implementations not implementing all the optional atomic features.
Remove left over file from (#1537) #1537 (comment) Signed-off-by: John Kesapides <john.kesapides@arm.com>
Only check against 2D image types as per the spec. Move some device checks out of the loop. Only perform the checks when element_size is a power of two. Signed-off-by: John Kesapides <john.kesapides@arm.com>
Initialize the `_memoryOrder` and `_memoryScope` members to avoid `CBasicTestMemOrderScope::MaxHostThreads()` accessing uninitialized data. Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
Some `HOST_` types were declared with signedness different from the `HOST_ATOMIC_` counterparts, leading to sign-compare warnings when comparing between types. Fix by aligning the signedness. Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
Using `local_size_x = 512` in the shader used in the Vulkan interop tests fails on older hardware because this exceeds the maximum barrier size limit. Changed to 256, which is still a multiple of 32 and 64, and is below the hardware limitations. The tests are not performance tests anyways, so the performance penalty, if any, is acceptable. Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
…1814) * switch to the new memory and semaphore specific device handle lists * remove support for older headers * dummy commit
Vulkan guarantees 128 is always supported. Relates to #1828 Signed-off-by: Kevin Petit <kevin.petit@arm.com>
* Added support for SYNC_FD and other handle types * Fix consistency test Deleted test cases that are no longer testable according to the spec. * Fix multi-import tests -Delete obsolete code relating to offsets -Propagate dedicated memory change * Fix error handling Some subtests did not fail on incorrect result. Changes to macros to fail, so this does not occur again. * Delete invalid test cases Test cases are not related to this extension. * External memory test Add support for any handle type supported by the platform. Change-Id: I6765fde5e7929988f49bfbf2df2f41d5263b6abc * Update multi-import tests to use new semaphore types * Fix formatting * Addressed review comments. Deleted VULKAN_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_NT_KMT as it appears to be redundant.
* Increase the number of work items used by the allocations test The test uses a fixed number of work items to process very large buffers and images. As devices support more and more memory, this leads to an ever-increasing amount of work done in each work item. This results in some implementations and devices hitting timeout issues. Furthermore, a greater number of work items can provide performance benefits on some devices. Long term, this test should be redesigned to scale the number of threads dynamically as a function of the max allocation size. Signed-off-by: Kevin Petit <kevin.petit@arm.com> * formatting and add parentheses --------- Signed-off-by: Kevin Petit <kevin.petit@arm.com>
* allocations: Fix stack overflow * check format fixes
…e GWS (#1856) Modify the existing condition to include extremely small LWS like 1x1 on large GWS values
…1853) Reduce the loop from 1000000 to 500000 since the former value makes the test run too long and cause system issues on certain platforms
Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
The main sources of warnings were: * Printing of a `size_t` which requires the `%zu` specifier. * Printing of `cl_long`/`cl_ulong` which is now done using the `PRI*64` macros to ensure portability across 32 and 64-bit builds. Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
* Replace OBSOLETE_FORAMT with OBSOLETE_FORMAT In imageHelpers.cpp and few other places in image tests, OBSOLETE_FORMAT is misspelled as OBSOLETE_FORAMT. Fix misspelling by replcaing it with OBSOLETE_FORMAT. Fixes #1769 * Remove code guarded by OBSOLETE_FORMAT Remove code guarded by OBSOLETE_FORMAT as suggested by review comments Fixes #1769 * Fix formating issues for OBSOLETE_FORMAT changes Fix formatting issues observed in files while removing code guarded by OBSOLETE_FORMAT Fixes #1769 * Some more formatting fixes Some more formatting fixes to get CI clean Fixes #1769 * Final Formating fixes Final formatting fixes for #1769
* Fix format in the test scope * Add user params to limit testing Add parameters to reduce amount of testing. Helpful for debugging or for machines with lower performance. * Restore default value * Print info only if testing params bigger than 0.
Remove an assigned-to but unused variable. Reenable the Wunused-but-set-variable warning for the conversions suite, as it now compiles cleanly with this warning enabled. Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
* Fix bug of conversion from long to double It the input is long type, it should be load as long type, not ulong. * update long2float
Fix the ULP error calculation for the `exp` and `exp2` builtins in relaxed math mode for the full profile. Previously, the `ulps` value kept being added to while verifying the result buffer in a loop. `ulps` could even become a `NaN` when the input argument being tested was a `NaN`. Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This PR adds targeted testing for the SPIR-V 1.4 instructions OpPtrEqual, OpPtrNotEqual, and OpPtrDiff.
Call `getAllowedUlpError` to obtain the allowed ULP error for all of the half type (fp16) tests. The aim is to standardise obtaining the desired ULP requirement and pave the way for adding the Embedded Profile ULP errors. Contributes to #867 Contributes to #1685 Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
Rounding up the clusters_results size to avoid out of bounds access when subgroup_size is not a multiple of cluster_size.
When cl_khr_fp16 is not supported, this property is not available.
Note that the spec is different for
CL_DEVICE_{PREFERRED,NATIVE}_VECTOR_WIDTH_HALF: those properties are
always available and return 0 if cl_khr_fp16 is not supported, so those
checks are left as is.
Add a `format` parameter to the macro, to be able to specify how to print the expected and actual parameter values. Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
Removes `using namespace std` and adds `std::` explicitly instead, which is usually on calls to `min`. This is generally best practice, and it also might be helpful when there are the same function names in the std namespace and in the global namespace (e.g. #1833).
This PR adds targeted testing for more SPIR-V 1.4 features. Specifically, this PR adds testing for OpDecorateString, OpMemberDecorateString, and the UserSemantic decoration.
Fixes #1366 according to task description.
…ws (#2088) Currently Intel® C++ Compiler Classic (ICC) is supported to build OpenCL-CTS on Windows. This compiler has been discontinued since the second half of 2023. Instead, Intel recommends that users transition to use the LLVM-based Intel® oneAPI DPC++/C++ Compiler (ICX). This change is to enable users to build OpenCL-CTS with ICX on Windows.
Image height is initialized to 0. But the size calculation should assume a height of 1.
Current class wrapper of the CTS test framework allows getting the pointer of the private member object. This puts the object at risk of losing its original value if the pointer gets reassigned, causing a memory leak and potentially other problems. This happens to the "clMemWrapper kernel" used by mutable_command_work_groups tests, where the "clMemWrapper kernel" gets initialised by the default basic setup function and then it gets reassigned by the build_program_create_kernel_helper() helper function through pointer. This patch fixes this issue by updating mutable_command_work_groups tests: instead of calling basic setup function and then initialise the "clMemWrapper kernel" object again in the helper function, it now overrides the basic setup function to make sure the "clMemWrapper kernel" will be assigned only once. Signed-off-by: Xin Jin <xin.jin@arm.com>
Add coverage to import Vulkan resources (memory and semaphore) in Windows via named NT handles. If no name is given during resource creation, then use NT handles for import. If a name is given, have an option to either use that name or get the NT handle and use that for import. Resolves KhronosGroup/OpenCL-Docs#943
- negative testing for semaphore functions is accomplished in semaphore tests, as well as create image in the api test Co-authored-by: dcrawley <dcrawley@qti.qualcomm.com>
When creating a CL semaphore object from a Vulkan semaphore one, we explicitly pass `-1` as the file descriptor value in the case of `VULKAN_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD`. According to the CL specification: > The special value -1 for fd is treated like a valid sync file > descriptor referring to an object that has already signaled. The > import operation will succeed and the semaphore will have a > temporarily imported payload as if a valid file descriptor had > been provided. The test currently checks that the semaphore payload is unsignalled, unconditionally, which is incorrect. Changed the test to check for the correct expected payload value. Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
This PR adds targeted testing for a few remaining miscellaneous SPIR-V 1.4 features: * Variables in the Function storage class can have a NonWriteable decoration. * OpCopyMemorySized can have two optional memory operands. * OpSelect can have composite operands that are not vectors.
Re-enable a disabled external semaphore test. Delete obsolete subtests that remain in comments.
This change refactors the following files: 1. test_imagearraycopy.cpp 2. test_arrayimagecopy.cpp The purpose of refactoring is to allow passing different buffer and image flags to the test function as well as passing customisable test functions. Signed-off-by: Michael Rizkalla <michael.rizkalla@arm.com>
None of these are referenced anywhere in the code, so remove them. Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This PR adds targeted testing for the SPIR-V 1.4 instruction OpCopyLogical.
When comparing scanlines for SNORM images, take into account that -1.0 can be exactly represented in two different ways. --------- Co-authored-by: Ben Ashbaugh <ben.ashbaugh@intel.com>
Some platforms (Windows in our case) seem to need this.
test_copy_1D.cpp: num_mip_levels is a cl_uint, so don't cast and just print using `%u`. test_pipe_info.cpp: arg_type_qualifier is a 64-bit wide bitfield, so print in hexadecimal format using the correct length modifier. test_device_partition.cpp: it is not clear what the bit width of `cl_device_partition_property` should be, so cast the operands to align with the format specifiers. Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
Signed-off-by: Gorazd Sumkovski <gorazd.sumkovski@arm.com> Co-authored-by: Ewan Crawford <ewan.cr@gmail.com>
The following tests under `spirv_new`:
* `op_branch_conditional`
* `op_phi`
* `op_selection_merge`
were using randomly generated `cl_int` values, and storing the
difference between them as a `cl_int`. If one of the generated values is
negative and large enough, while the other is positive and large enough,
the difference then becomes a larger value that cannot be represented
using `cl_int`.
Switch the tests to use `cl_uint` instead, and update the relevant
spvasm{32,64} files to use `OpULessThan` instead of `OpSLessThan`.
Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
On Ubuntu, use the system's package manager, `apt`, to download and install the cross-compilers for Arm and AArch64. This replaces downloading the compilers as tarballs. To ensure that the correct version of the compiler is used when calling one without the version suffix, e.g. `aarch64-linux-gnu-gcc`, use `update-alternatives`. On Linux, the compilers for `x86_64`, `arm`, and `aarch64` will now correctly use the filesystem root as their sysroots, i.e. `/usr/include` will be used when searching for headers, instead of each compiler providing its own.
And use in device_timer suite. Signed-off-by: Kévin Petit <kpet@free.fr>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge KhronoGroup/OpenCL-CTS: main as of Jan 20, 2023 into nikhiljnv/OpenCL-CTS:KhronosGroup-master.