ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-25 16:29:03 +00:00
Code Packages Projects Releases Wiki Activity

Move semaphore tests from api to extensions (#1646)

Browse Source 
* Move semaphore tests from api to extensions

Moved cl_khr_semaphore tests from core api tests to a separate
extension test as suggested in
https://github.com/KhronosGroup/OpenCL-CTS/issues/1588 .

Signed-off-by: Paweł Jastrzębski <p.k.jastrzebski@gmail.com>

* Fix clang-format

Signed-off-by: Paweł Jastrzębski <p.k.jastrzebski@gmail.com>

* Remove unneeded comment.

Signed-off-by: Paweł Jastrzębski <p.k.jastrzebski@gmail.com>

---------

Signed-off-by: Paweł Jastrzębski <p.k.jastrzebski@gmail.com>
This commit is contained in:
Paweł Jastrzębski
2023-03-07 18:00:16 +01:00
committed by GitHub
parent 0b44338eda
commit e882a3dc5e
8 changed files with 115 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test_conformance/api/CMakeLists.txt
View File

@@ -35,7 +35,6 @@ set(${MODULE_NAME}_SOURCES
test_mem_object_properties_queries.cpp test_mem_object_properties_queries.cpp
test_queue_properties_queries.cpp test_queue_properties_queries.cpp
test_pipe_properties_queries.cpp test_pipe_properties_queries.cpp
test_semaphores.cpp
) )
include(../CMakeCommon.txt) include(../CMakeCommon.txt)

14
test_conformance/api/main.cpp
View File

@@ -148,20 +148,6 @@ test_definition test_list[] = {
ADD_TEST(min_image_formats), ADD_TEST(min_image_formats),
ADD_TEST(negative_get_platform_info), ADD_TEST(negative_get_platform_info),
ADD_TEST(negative_get_platform_ids), ADD_TEST(negative_get_platform_ids),
ADD_TEST_VERSION(semaphores_simple_1, Version(1, 2)),
ADD_TEST_VERSION(semaphores_simple_2, Version(1, 2)),
ADD_TEST_VERSION(semaphores_reuse, Version(1, 2)),
ADD_TEST_VERSION(semaphores_cross_queues_ooo, Version(1, 2)),
ADD_TEST_VERSION(semaphores_cross_queues_io, Version(1, 2)),
ADD_TEST_VERSION(semaphores_multi_signal, Version(1, 2)),
ADD_TEST_VERSION(semaphores_multi_wait, Version(1, 2)),
ADD_TEST_VERSION(semaphores_queries, Version(1, 2)),
ADD_TEST_VERSION(semaphores_order_1, Version(1, 2)),
ADD_TEST_VERSION(semaphores_order_2, Version(1, 2)),
ADD_TEST_VERSION(semaphores_order_3, Version(1, 2)),
ADD_TEST_VERSION(semaphores_import_export_fd, Version(1, 2)),
ADD_TEST_VERSION(semaphores_invalid_command, Version(1, 2)),
}; };
const int test_num = ARRAY_SIZE(test_list); const int test_num = ARRAY_SIZE(test_list);

37
test_conformance/api/procs.h
View File

@@ -204,40 +204,3 @@ extern int test_negative_get_platform_ids(cl_device_id deviceID,
int num_elements); int num_elements);
extern int test_kernel_attributes(cl_device_id deviceID, cl_context context, extern int test_kernel_attributes(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements); cl_command_queue queue, int num_elements);
extern int test_semaphores_simple_1(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_simple_2(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_reuse(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_cross_queues_ooo(cl_device_id deviceID,
cl_context context,
cl_command_queue queue,
int num_elements);
extern int test_semaphores_cross_queues_io(cl_device_id deviceID,
cl_context context,
cl_command_queue queue,
int num_elements);
extern int test_semaphores_multi_signal(cl_device_id deviceID,
cl_context context,
cl_command_queue queue,
int num_elements);
extern int test_semaphores_multi_wait(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_queries(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_order_1(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_order_2(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_order_3(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_import_export_fd(cl_device_id deviceID,
cl_context context,
cl_command_queue queue,
int num_elements);
extern int test_semaphores_invalid_command(cl_device_id deviceID,
cl_context context,
cl_command_queue queue,
int num_elements);

1
test_conformance/extensions/CMakeLists.txt
View File

@@ -1,3 +1,4 @@
add_subdirectory( cl_ext_cxx_for_opencl ) add_subdirectory( cl_ext_cxx_for_opencl )
add_subdirectory( cl_khr_command_buffer ) add_subdirectory( cl_khr_command_buffer )
add_subdirectory( cl_khr_dx9_media_sharing ) add_subdirectory( cl_khr_dx9_media_sharing )
add_subdirectory( cl_khr_semaphore )

8
test_conformance/extensions/cl_khr_semaphore/CMakeLists.txt Normal file
View File

@@ -0,0 +1,8 @@
set(MODULE_NAME CL_KHR_SEMAPHORE)
set(${MODULE_NAME}_SOURCES
main.cpp
test_semaphores.cpp
)
include(../../CMakeCommon.txt)

49
test_conformance/extensions/cl_khr_semaphore/main.cpp Normal file
View File

@@ -0,0 +1,49 @@
//
// Copyright (c) 2017 The Khronos Group Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#include "harness/compat.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "procs.h"
#include "harness/testHarness.h"
#if !defined(_WIN32)
#include <unistd.h>
#endif
test_definition test_list[] = {
ADD_TEST_VERSION(semaphores_simple_1, Version(1, 2)),
ADD_TEST_VERSION(semaphores_simple_2, Version(1, 2)),
ADD_TEST_VERSION(semaphores_reuse, Version(1, 2)),
ADD_TEST_VERSION(semaphores_cross_queues_ooo, Version(1, 2)),
ADD_TEST_VERSION(semaphores_cross_queues_io, Version(1, 2)),
ADD_TEST_VERSION(semaphores_multi_signal, Version(1, 2)),
ADD_TEST_VERSION(semaphores_multi_wait, Version(1, 2)),
ADD_TEST_VERSION(semaphores_queries, Version(1, 2)),
ADD_TEST_VERSION(semaphores_order_1, Version(1, 2)),
ADD_TEST_VERSION(semaphores_order_2, Version(1, 2)),
ADD_TEST_VERSION(semaphores_order_3, Version(1, 2)),
ADD_TEST_VERSION(semaphores_import_export_fd, Version(1, 2)),
ADD_TEST_VERSION(semaphores_invalid_command, Version(1, 2)),
};
const int test_num = ARRAY_SIZE(test_list);
int main(int argc, const char *argv[])
{
return runTestHarness(argc, argv, test_num, test_list, false, 0);
}

57
test_conformance/extensions/cl_khr_semaphore/procs.h Normal file
View File

@@ -0,0 +1,57 @@
//
// Copyright (c) 2017 The Khronos Group Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#include "harness/errorHelpers.h"
#include "harness/kernelHelpers.h"
#include "harness/typeWrappers.h"
#include "harness/clImageHelper.h"
#include "harness/imageHelpers.h"
extern int test_semaphores_simple_1(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_simple_2(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_reuse(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_cross_queues_ooo(cl_device_id deviceID,
cl_context context,
cl_command_queue queue,
int num_elements);
extern int test_semaphores_cross_queues_io(cl_device_id deviceID,
cl_context context,
cl_command_queue queue,
int num_elements);
extern int test_semaphores_multi_signal(cl_device_id deviceID,
cl_context context,
cl_command_queue queue,
int num_elements);
extern int test_semaphores_multi_wait(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_queries(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_order_1(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_order_2(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_order_3(cl_device_id deviceID, cl_context context,
cl_command_queue queue, int num_elements);
extern int test_semaphores_import_export_fd(cl_device_id deviceID,
cl_context context,
cl_command_queue queue,
int num_elements);
extern int test_semaphores_invalid_command(cl_device_id deviceID,
cl_context context,
cl_command_queue queue,
int num_elements);

1
test_conformance/api/test_semaphores.cpp → test_conformance/extensions/cl_khr_semaphore/test_semaphores.cpp
View File

@@ -15,7 +15,6 @@
// //
#include "testBase.h"
#include "harness/typeWrappers.h" #include "harness/typeWrappers.h"
#include "harness/extensionHelpers.h" #include "harness/extensionHelpers.h"
#include "harness/errorHelpers.h" #include "harness/errorHelpers.h"