Skip to content

Commit

Permalink
Add new extensions to conformance csv files (#2096)
Browse files Browse the repository at this point in the history
The extension tests in `test_conformance/extensions` have not matching
entries in the `opencl_conformance_tests_*.csv` files. This means that
they are missed from conformance runs by vendors who use these files.

I've included the new extensions in the full and quick CSV files as they
don't have vast combinations of tests to run like bruteforce or
conversions.

I've put `cl_khr_dx9_media_sharing` in the
`test_conformance/opencl_conformance_tests_d3d.csv` CSV as like the
other tests there the test binary is conditional built only on a Windows
platform.

I've created a new `opencl_conformance_tests_vulkan.csv ` file for
testing the `cl_khr_external_semaphore` extension, as creation of the
binary is conditional on the Vulkan SDK being enabled environment. Any
other tests that require the Vulkan SDK in future can also be added
there.
  • Loading branch information
EwanC authored Oct 8, 2024
1 parent c40c8d5 commit b64f429
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ require compilation, these are:

The Khronos [Conformance Process Document](https://members.khronos.org/document/dl/911)
details the steps required for a conformance submission.
In this repository [opencl_conformance_tests_full.csv](test_conformance/submission_details_template.txt)
In this repository [opencl_conformance_tests_full.csv](test_conformance/opencl_conformance_tests_full.csv)
defines the full list of tests which must be run for conformance. The output log
of which must be included alongside a filled in
[submission details template](test_conformance/submission_details_template.txt).
Expand Down
4 changes: 4 additions & 0 deletions test_conformance/extensions/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Note: Each extension adds its own test executable to the build. When
# creating tests for a new extension ensure to update the
# `opencl_conformance_tests_*.csv` files with the path to the new binary so
# that the extension tests are included in conformance test runs.
add_subdirectory( cl_ext_cxx_for_opencl )
add_subdirectory( cl_khr_command_buffer )
add_subdirectory( cl_khr_dx9_media_sharing )
Expand Down
4 changes: 3 additions & 1 deletion test_conformance/opencl_conformance_tests_d3d.csv
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@

DX9 media sharing,media_sharing\test_media_surface_sharing
D3D10,d3d10\test_d3d10
D3D11,d3d11\test_d3d11
D3D11,d3d11\test_d3d11

cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing
5 changes: 5 additions & 0 deletions test_conformance/opencl_conformance_tests_full.csv
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,8 @@ Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FIL
Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps
Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps
Subgroups,subgroups/test_subgroups
cl_ext_cxx_for_opencl,extensions/cl_ext_cxx_for_opencl/test_cl_ext_cxx_for_opencl
cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore
cl_khr_command_buffer,extensions/cl_khr_command_buffer/test_cl_khr_command_buffer
cl_khr_command_buffer_mutable_dispatch,extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/test_cl_khr_mutable_dispatch
cl_khr_kernel_clock,extensions/cl_khr_kernel_clock/test_cl_khr_kernel_clock
5 changes: 5 additions & 0 deletions test_conformance/opencl_conformance_tests_full_binary.csv
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,8 @@ Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FIL
Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps --compilation-mode binary --compilation-cache-path .
Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps --compilation-mode binary --compilation-cache-path .
Subgroups,subgroups/test_subgroups --compilation-mode binary --compilation-cache-path .
cl_ext_cxx_for_opencl,extensions/cl_ext_cxx_for_opencl/test_cl_ext_cxx_for_opencl --compilation-mode binary --compilation-cache-path .
cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore --compilation-mode binary --compilation-cache-path .
cl_khr_command_buffer,extensions/cl_khr_command_buffer/test_cl_khr_command_buffer --compilation-mode binary --compilation-cache-path .
cl_khr_command_buffer_mutable_dispatch,extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/test_cl_khr_mutable_dispatch --compilation-mode binary --compilation-cache-path .
cl_khr_kernel_clock,extensions/cl_khr_kernel_clock/test_cl_khr_kernel_clock --compilation-mode binary --compilation-cache-path .
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,8 @@ Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FIL
Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps
Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps
Subgroups,subgroups/test_subgroups
cl_ext_cxx_for_opencl,extensions/cl_ext_cxx_for_opencl/test_cl_ext_cxx_for_opencl
cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore
cl_khr_command_buffer,extensions/cl_khr_command_buffer/test_cl_khr_command_buffer
cl_khr_command_buffer_mutable_dispatch,extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/test_cl_khr_mutable_dispatch
cl_khr_kernel_clock,extensions/cl_khr_kernel_clock/test_cl_khr_kernel_clock
5 changes: 5 additions & 0 deletions test_conformance/opencl_conformance_tests_full_spirv.csv
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,8 @@ Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FIL
Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps --compilation-mode spir-v --compilation-cache-path .
Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps --compilation-mode spir-v --compilation-cache-path .
Subgroups,subgroups/test_subgroups --compilation-mode spir-v --compilation-cache-path .
cl_ext_cxx_for_opencl,extensions/cl_ext_cxx_for_opencl/test_cl_ext_cxx_for_opencl --compilation-mode spir-v --compilation-cache-path .
cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore --compilation-mode spir-v --compilation-cache-path .
cl_khr_command_buffer,extensions/cl_khr_command_buffer/test_cl_khr_command_buffer --compilation-mode spir-v --compilation-cache-path .
cl_khr_command_buffer_mutable_dispatch,extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/test_cl_khr_mutable_dispatch --compilation-mode spir-v --compilation-cache-path .
cl_khr_kernel_clock,extensions/cl_khr_kernel_clock/test_cl_khr_kernel_clock --compilation-mode spir-v --compilation-cache-path .
5 changes: 5 additions & 0 deletions test_conformance/opencl_conformance_tests_quick.csv
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,8 @@ Mipmaps (Kernel),images/kernel_read_write/test_image_streams test_mipmaps CL_FIL
Mipmaps (clCopyImage),images/clCopyImage/test_cl_copy_images test_mipmaps
Mipmaps (clReadWriteImage),images/clReadWriteImage/test_cl_read_write_images test_mipmaps
Subgroups,subgroups/test_subgroups
cl_ext_cxx_for_opencl,extensions/cl_ext_cxx_for_opencl/test_cl_ext_cxx_for_opencl
cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore
cl_khr_command_buffer,extensions/cl_khr_command_buffer/test_cl_khr_command_buffer
cl_khr_command_buffer_mutable_dispatch,extensions/cl_khr_command_buffer/cl_khr_command_buffer_mutable_dispatch/test_cl_khr_mutable_dispatch
cl_khr_kernel_clock,extensions/cl_khr_kernel_clock/test_cl_khr_kernel_clock
5 changes: 5 additions & 0 deletions test_conformance/opencl_conformance_tests_vulkan.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#
# OpenCL Conformance Tests requiring Vulkan SDK
#

cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_semaphore

0 comments on commit b64f429

Please sign in to comment.