Skip to content

Commit

Permalink
Add new extensions to conformance csv
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_full.csv` file.
This means that they are missed from conformance runs by vendors
who use this file.
  • Loading branch information
EwanC committed Oct 1, 2024
1 parent cd74e02 commit d4917b3
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 1 deletion.
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
9 changes: 9 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,12 @@ 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
#Binary only created on Windows builds
#cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing
cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore
#Binary only created when Vulkan SDK is available
#cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_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
9 changes: 9 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,12 @@ 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 .
#Binary only created on Windows builds
#cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing --compilation-mode binary --compilation-cache-path .
cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore --compilation-mode binary --compilation-cache-path .
#Binary only created when Vulkan SDK is available
#cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_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,12 @@ 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
#Binary only created on Windows builds
#cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing
cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore
#Binary only created when Vulkan SDK is available
#cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_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
9 changes: 9 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,12 @@ 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 .
#Binary only created on Windows builds
#cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing --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 .
#Binary only created when Vulkan SDK is available
#cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_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 .
9 changes: 9 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,12 @@ 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
#Binary only created on Windows builds
#cl_khr_dx9_media_sharing, extensions/cl_khr_dx9_media_sharing/test_cl_khr_dx9_media_sharing
cl_khr_semaphore,extensions/cl_khr_semaphore/test_cl_khr_semaphore
#Binary only created when Vulkan SDK is available
#cl_khr_external_semaphore,extensions/cl_khr_external_semaphore/test_cl_khr_external_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

0 comments on commit d4917b3

Please sign in to comment.