Migrate pipes suite to the new test registration framework (#2302)

Contributes to #2181

Signed-off-by: Ahmed Hesham <ahmed.hesham@arm.com>
This commit is contained in:
Ahmed Hesham
2025-03-09 09:42:10 +00:00
committed by GitHub
parent 521d067083
commit 5b47d4b19f
8 changed files with 296 additions and 375 deletions

View File

@@ -16,7 +16,6 @@
#include "harness/compat.h"
#include "harness/testHarness.h"
#include "procs.h"
#include <stdio.h>
#include <string.h>
@@ -48,67 +47,9 @@ test_status InitCL(cl_device_id device) {
return TEST_PASS;
}
test_definition test_list[] = {
ADD_TEST(pipe_readwrite_int),
ADD_TEST(pipe_readwrite_uint),
ADD_TEST(pipe_readwrite_long),
ADD_TEST(pipe_readwrite_ulong),
ADD_TEST(pipe_readwrite_short),
ADD_TEST(pipe_readwrite_ushort),
ADD_TEST(pipe_readwrite_float),
ADD_TEST(pipe_readwrite_half),
ADD_TEST(pipe_readwrite_char),
ADD_TEST(pipe_readwrite_uchar),
ADD_TEST(pipe_readwrite_double),
ADD_TEST(pipe_readwrite_struct),
ADD_TEST(pipe_workgroup_readwrite_int),
ADD_TEST(pipe_workgroup_readwrite_uint),
ADD_TEST(pipe_workgroup_readwrite_long),
ADD_TEST(pipe_workgroup_readwrite_ulong),
ADD_TEST(pipe_workgroup_readwrite_short),
ADD_TEST(pipe_workgroup_readwrite_ushort),
ADD_TEST(pipe_workgroup_readwrite_float),
ADD_TEST(pipe_workgroup_readwrite_half),
ADD_TEST(pipe_workgroup_readwrite_char),
ADD_TEST(pipe_workgroup_readwrite_uchar),
ADD_TEST(pipe_workgroup_readwrite_double),
ADD_TEST(pipe_workgroup_readwrite_struct),
ADD_TEST(pipe_subgroup_readwrite_int),
ADD_TEST(pipe_subgroup_readwrite_uint),
ADD_TEST(pipe_subgroup_readwrite_long),
ADD_TEST(pipe_subgroup_readwrite_ulong),
ADD_TEST(pipe_subgroup_readwrite_short),
ADD_TEST(pipe_subgroup_readwrite_ushort),
ADD_TEST(pipe_subgroup_readwrite_float),
ADD_TEST(pipe_subgroup_readwrite_half),
ADD_TEST(pipe_subgroup_readwrite_char),
ADD_TEST(pipe_subgroup_readwrite_uchar),
ADD_TEST(pipe_subgroup_readwrite_double),
ADD_TEST(pipe_subgroup_readwrite_struct),
ADD_TEST(pipe_convenience_readwrite_int),
ADD_TEST(pipe_convenience_readwrite_uint),
ADD_TEST(pipe_convenience_readwrite_long),
ADD_TEST(pipe_convenience_readwrite_ulong),
ADD_TEST(pipe_convenience_readwrite_short),
ADD_TEST(pipe_convenience_readwrite_ushort),
ADD_TEST(pipe_convenience_readwrite_float),
ADD_TEST(pipe_convenience_readwrite_half),
ADD_TEST(pipe_convenience_readwrite_char),
ADD_TEST(pipe_convenience_readwrite_uchar),
ADD_TEST(pipe_convenience_readwrite_double),
ADD_TEST(pipe_convenience_readwrite_struct),
ADD_TEST(pipe_info),
ADD_TEST(pipe_max_args),
ADD_TEST(pipe_max_packet_size),
ADD_TEST(pipe_max_active_reservations),
ADD_TEST(pipe_query_functions),
ADD_TEST(pipe_readwrite_errors),
ADD_TEST(pipe_subgroups_divergence),
};
const int test_num = ARRAY_SIZE(test_list);
int main(int argc, const char *argv[]) {
return runTestHarnessWithCheck(argc, argv, test_num, test_list, false,
0, InitCL);
int main(int argc, const char *argv[])
{
return runTestHarnessWithCheck(
argc, argv, test_registry::getInstance().num_tests(),
test_registry::getInstance().definitions(), false, 0, InitCL);
}

View File

@@ -1,92 +0,0 @@
//
// 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.
//
#ifndef __PROCS_H__
#define __PROCS_H__
#include "harness/kernelHelpers.h"
#include "harness/testHarness.h"
#include "harness/errorHelpers.h"
#include "harness/typeWrappers.h"
#include "harness/mt19937.h"
#include "harness/conversions.h"
#ifndef __APPLE__
#include <CL/cl.h>
#endif
extern int test_pipe_readwrite_int( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_uint( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_long( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_ulong( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_short( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_ushort( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_float( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_half( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_char( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_uchar( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_double( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_readwrite_struct( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_int( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_uint( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_long( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_ulong( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_short( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_ushort( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_float( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_half( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_char( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_uchar( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_double( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_workgroup_readwrite_struct( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_int( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_uint( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_long( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_ulong( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_short( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_ushort( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_float( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_half( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_char( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_uchar( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_double( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_subgroup_readwrite_struct( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_int( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_uint( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_long( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_ulong( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_short( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_ushort( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_float( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_half( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_char( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_uchar( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_double( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_convenience_readwrite_struct( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_info( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements );
extern int test_pipe_max_args(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_pipe_max_packet_size(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_pipe_max_active_reservations(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_pipe_query_functions(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_pipe_readwrite_errors(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
extern int test_pipe_subgroups_divergence(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements);
#endif // #ifndef __PROCS_H__

View File

@@ -16,14 +16,15 @@
#include <cinttypes>
#include "procs.h"
#include "harness/testHarness.h"
#include "harness/typeWrappers.h"
#include "harness/parseParameters.h"
const char* pipe_kernel_code = {
"__kernel void pipe_kernel(__write_only pipe int out_pipe)\n"
"{}\n" };
int test_pipe_info( cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements )
REGISTER_TEST(pipe_info)
{
clMemWrapper pipe;
cl_int err;

View File

@@ -25,8 +25,9 @@
#include <sys/stat.h>
#include <sys/types.h>
#include "procs.h"
#include "harness/testHarness.h"
#include "harness/errorHelpers.h"
#include "harness/typeWrappers.h"
#define STRING_LENGTH 1024
@@ -150,7 +151,7 @@ static int verify_result_int(void *ptr1, void *ptr2, int n)
return 0;
}
int test_pipe_max_args(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
REGISTER_TEST(pipe_max_args)
{
clMemWrapper pipes[1024];
@@ -177,7 +178,7 @@ int test_pipe_max_args(cl_device_id deviceID, cl_context context, cl_command_que
size_t min_alignment = get_min_alignment(context);
err = clGetDeviceInfo(deviceID, CL_DEVICE_MAX_PIPE_ARGS,
err = clGetDeviceInfo(device, CL_DEVICE_MAX_PIPE_ARGS,
sizeof(max_pipe_args), (void *)&max_pipe_args, NULL);
if (err)
{
@@ -263,7 +264,7 @@ int test_pipe_max_args(cl_device_id deviceID, cl_context context, cl_command_que
}
int test_pipe_max_packet_size(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
REGISTER_TEST(pipe_max_packet_size)
{
clMemWrapper pipe;
clMemWrapper buffers[2];
@@ -290,7 +291,7 @@ int test_pipe_max_packet_size(cl_device_id deviceID, cl_context context, cl_comm
std::stringstream source;
err = clGetDeviceInfo(deviceID, CL_DEVICE_PIPE_MAX_PACKET_SIZE,
err = clGetDeviceInfo(device, CL_DEVICE_PIPE_MAX_PACKET_SIZE,
sizeof(max_pipe_packet_size),
(void *)&max_pipe_packet_size, NULL);
test_error_ret(err, " clCreatePipe failed", -1);
@@ -402,7 +403,7 @@ int test_pipe_max_packet_size(cl_device_id deviceID, cl_context context, cl_comm
return 0;
}
int test_pipe_max_active_reservations(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
REGISTER_TEST(pipe_max_active_reservations)
{
clMemWrapper pipe;
clMemWrapper buffers[2];
@@ -437,12 +438,12 @@ int test_pipe_max_active_reservations(cl_device_id deviceID, cl_context context,
global_work_size[0] = 1;
err = clGetDeviceInfo(deviceID, CL_DEVICE_PIPE_MAX_ACTIVE_RESERVATIONS,
err = clGetDeviceInfo(device, CL_DEVICE_PIPE_MAX_ACTIVE_RESERVATIONS,
sizeof(max_active_reservations),
(void *)&max_active_reservations, NULL);
test_error_ret(err, " clGetDeviceInfo failed", -1);
err = clGetDeviceInfo(deviceID, CL_DEVICE_GLOBAL_MEM_SIZE,
err = clGetDeviceInfo(device, CL_DEVICE_GLOBAL_MEM_SIZE,
sizeof(max_global_size), (void *)&max_global_size,
NULL);
test_error_ret(err, " clGetDeviceInfo failed", -1);

View File

@@ -20,8 +20,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "procs.h"
#include "harness/testHarness.h"
#include "harness/errorHelpers.h"
#include "harness/typeWrappers.h"
#define TEST_PRIME_INT ((1<<16)+1)
@@ -77,7 +78,7 @@ static int verify_result(void *ptr1, void *ptr2, int n)
return 0;
}
int test_pipe_query_functions(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
REGISTER_TEST(pipe_query_functions)
{
clMemWrapper pipe;
clMemWrapper buffers[4];
@@ -252,4 +253,3 @@ int test_pipe_query_functions(cl_device_id deviceID, cl_context context, cl_comm
}
return 0;
}

File diff suppressed because it is too large Load Diff

View File

@@ -20,8 +20,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "procs.h"
#include "harness/errorHelpers.h"
#include "harness/testHarness.h"
#include "harness/typeWrappers.h"
const char* pipe_readwrite_errors_kernel_code = {
"__kernel void test_pipe_write_error(__global int *src, __write_only pipe int out_pipe, __global int *status)\n"
@@ -62,7 +63,7 @@ const char* pipe_readwrite_errors_kernel_code = {
};
int test_pipe_readwrite_errors(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
REGISTER_TEST(pipe_readwrite_errors)
{
clMemWrapper pipe;
clMemWrapper buffers[3];

View File

@@ -21,8 +21,10 @@
#include <sys/types.h>
#include <sys/stat.h>
#include "procs.h"
#include "harness/testHarness.h"
#include "harness/errorHelpers.h"
#include "harness/typeWrappers.h"
#define TEST_INT_VALUE 100
const char* pipe_subgroups_kernel_code = {
@@ -86,7 +88,7 @@ static int verify_result(void *ptr1, void *ptr2, int n)
return 0;
}
int test_pipe_subgroups_divergence(cl_device_id deviceID, cl_context context, cl_command_queue queue, int num_elements)
REGISTER_TEST(pipe_subgroups_divergence)
{
clMemWrapper pipe;
clMemWrapper buffers[3];
@@ -112,7 +114,7 @@ int test_pipe_subgroups_divergence(cl_device_id deviceID, cl_context context, cl
global_work_size[0] = (cl_uint)num_elements;
if (!is_extension_available(deviceID, "cl_khr_subgroups"))
if (!is_extension_available(device, "cl_khr_subgroups"))
{
log_info("cl_khr_subgroups is not supported on this platform. Skipping "
"test.\n");
@@ -165,7 +167,7 @@ int test_pipe_subgroups_divergence(cl_device_id deviceID, cl_context context, cl
test_error_ret(err, " Unable to get work group size to use", -1);
cl_platform_id platform;
err = clGetDeviceInfo(deviceID, CL_DEVICE_PLATFORM, sizeof(platform),
err = clGetDeviceInfo(device, CL_DEVICE_PLATFORM, sizeof(platform),
&platform, NULL);
test_error_ret(err, " clGetDeviceInfo failed", -1);
@@ -173,7 +175,10 @@ int test_pipe_subgroups_divergence(cl_device_id deviceID, cl_context context, cl
(clGetKernelSubGroupInfoKHR_fn)clGetExtensionFunctionAddressForPlatform(
platform, "clGetKernelSubGroupInfoKHR");
err = clGetKernelSubGroupInfoKHR(kernel[0], deviceID, CL_KERNEL_SUB_GROUP_COUNT_FOR_NDRANGE_KHR, sizeof(local_work_size[0]), &local_work_size[0], sizeof(subgroup_count), &subgroup_count, NULL);
err = clGetKernelSubGroupInfoKHR(
kernel[0], device, CL_KERNEL_SUB_GROUP_COUNT_FOR_NDRANGE_KHR,
sizeof(local_work_size[0]), &local_work_size[0], sizeof(subgroup_count),
&subgroup_count, NULL);
test_error_ret(err, " clGetKernelSubGroupInfoKHR failed", -1);
if(subgroup_count <= 1)
{