Format subgroups tests according to clang-format (#745)

* Format subgroups tests to clang-format

* Format issue - fix do/while issue
This commit is contained in:
Grzegorz Wawiorko
2020-05-19 11:16:06 +02:00
committed by GitHub
parent a6c3d921ae
commit ec32bd9b5e
7 changed files with 1260 additions and 821 deletions

View File

@@ -1,6 +1,6 @@
//
// 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
@@ -18,102 +18,113 @@
#include "harness/conversions.h"
#include "harness/typeWrappers.h"
static const char * lbar_source =
"__kernel void test_lbar(const __global Type *in, __global int2 *xy, __global Type *out)\n"
"{\n"
" __local int tmp[200];\n"
" int gid = get_global_id(0);\n"
" int nid = get_sub_group_size();\n"
" int lid = get_sub_group_local_id();\n"
" xy[gid].x = lid;\n"
" xy[gid].y = get_sub_group_id();\n"
" if (get_sub_group_id() == 0) {\n"
" tmp[lid] = in[gid];\n"
" sub_group_barrier(CLK_LOCAL_MEM_FENCE);\n"
" out[gid] = tmp[nid-1-lid];\n"
" } else {\n"
" out[gid] = -in[gid];\n"
" }\n"
"}\n";
static const char *lbar_source =
"__kernel void test_lbar(const __global Type *in, __global int2 *xy, "
"__global Type *out)\n"
"{\n"
" __local int tmp[200];\n"
" int gid = get_global_id(0);\n"
" int nid = get_sub_group_size();\n"
" int lid = get_sub_group_local_id();\n"
" xy[gid].x = lid;\n"
" xy[gid].y = get_sub_group_id();\n"
" if (get_sub_group_id() == 0) {\n"
" tmp[lid] = in[gid];\n"
" sub_group_barrier(CLK_LOCAL_MEM_FENCE);\n"
" out[gid] = tmp[nid-1-lid];\n"
" } else {\n"
" out[gid] = -in[gid];\n"
" }\n"
"}\n";
static const char * gbar_source =
"__kernel void test_gbar(const __global Type *in, __global int2 *xy, __global Type *out, __global Type *tmp)\n"
"{\n"
" int gid = get_global_id(0);\n"
" int nid = get_sub_group_size();\n"
" int lid = get_sub_group_local_id();\n"
" int tof = get_group_id(0)*get_max_sub_group_size();\n"
" xy[gid].x = lid;\n"
" xy[gid].y = get_sub_group_id();\n"
" if (get_sub_group_id() == 0) {\n"
" tmp[tof+lid] = in[gid];\n"
" sub_group_barrier(CLK_GLOBAL_MEM_FENCE);\n"
" out[gid] = tmp[tof+nid-1-lid];\n"
" } else {\n"
" out[gid] = -in[gid];\n"
" }\n"
"}\n";
static const char *gbar_source =
"__kernel void test_gbar(const __global Type *in, __global int2 *xy, "
"__global Type *out, __global Type *tmp)\n"
"{\n"
" int gid = get_global_id(0);\n"
" int nid = get_sub_group_size();\n"
" int lid = get_sub_group_local_id();\n"
" int tof = get_group_id(0)*get_max_sub_group_size();\n"
" xy[gid].x = lid;\n"
" xy[gid].y = get_sub_group_id();\n"
" if (get_sub_group_id() == 0) {\n"
" tmp[tof+lid] = in[gid];\n"
" sub_group_barrier(CLK_GLOBAL_MEM_FENCE);\n"
" out[gid] = tmp[tof+nid-1-lid];\n"
" } else {\n"
" out[gid] = -in[gid];\n"
" }\n"
"}\n";
// barrier test functions
template <int Which>
struct BAR {
template <int Which> struct BAR
{
static void gen(cl_int *x, cl_int *t, cl_int *m, int ns, int nw, int ng)
{
int i, ii, j, k, n;
int nj = (nw + ns - 1)/ns;
int nj = (nw + ns - 1) / ns;
int e;
ii = 0;
for (k=0; k<ng; ++k) {
for (j=0; j<nj; ++j) {
ii = j*ns;
for (k = 0; k < ng; ++k)
{
for (j = 0; j < nj; ++j)
{
ii = j * ns;
n = ii + ns > nw ? nw - ii : ns;
for (i=0;i<n;++i)
t[ii+i] = genrand_int32(gMTdata);
for (i = 0; i < n; ++i) t[ii + i] = genrand_int32(gMTdata);
}
// Now map into work group using map from device
for (j=0;j<nw;++j) {
i = m[2*j+1]*ns + m[2*j];
for (j = 0; j < nw; ++j)
{
i = m[2 * j + 1] * ns + m[2 * j];
x[j] = t[i];
}
x += nw;
m += 2*nw;
m += 2 * nw;
}
}
static int chk(cl_int *x, cl_int *y, cl_int *mx, cl_int *my, cl_int *m, int ns, int nw, int ng)
static int chk(cl_int *x, cl_int *y, cl_int *mx, cl_int *my, cl_int *m,
int ns, int nw, int ng)
{
int ii, i, j, k, n;
int nj = (nw + ns - 1)/ns;
int nj = (nw + ns - 1) / ns;
cl_int tr, rr;
if (Which == 0)
if (Which == 0)
log_info(" sub_group_barrier(CLK_LOCAL_MEM_FENCE)...\n");
else
else
log_info(" sub_group_barrier(CLK_GLOBAL_MEM_FENCE)...\n");
for (k=0; k<ng; ++k) {
for (k = 0; k < ng; ++k)
{
// Map to array indexed to array indexed by local ID and sub group
for (j=0; j<nw; ++j) {
i = m[2*j+1]*ns + m[2*j];
for (j = 0; j < nw; ++j)
{
i = m[2 * j + 1] * ns + m[2 * j];
mx[i] = x[j];
my[i] = y[j];
}
for (j=0; j<nj; ++j) {
ii = j*ns;
for (j = 0; j < nj; ++j)
{
ii = j * ns;
n = ii + ns > nw ? nw - ii : ns;
for (i=0; i<n; ++i) {
tr = j == 0 ? mx[ii + n - 1 - i] : -mx[ii + i];
for (i = 0; i < n; ++i)
{
tr = j == 0 ? mx[ii + n - 1 - i] : -mx[ii + i];
rr = my[ii + i];
if (tr != rr) {
log_error("ERROR: sub_group_barrier mismatch for local id %d in sub group %d in group %d\n",
i, j, k);
if (tr != rr)
{
log_error("ERROR: sub_group_barrier mismatch for local "
"id %d in sub group %d in group %d\n",
i, j, k);
return -1;
}
}
@@ -121,7 +132,7 @@ struct BAR {
x += nw;
y += nw;
m += 2*nw;
m += 2 * nw;
}
return 0;
@@ -130,8 +141,8 @@ struct BAR {
// Entry point from main
int
test_barrier_functions(cl_device_id device, cl_context context, cl_command_queue queue, int num_elements)
int test_barrier_functions(cl_device_id device, cl_context context,
cl_command_queue queue, int num_elements)
{
int error;
@@ -139,9 +150,10 @@ test_barrier_functions(cl_device_id device, cl_context context, cl_command_queue
#define G 2000
#define L 200
error = test<cl_int, BAR<0>, G, L>::run(device, context, queue, num_elements, "test_lbar", lbar_source);
error = test<cl_int, BAR<1>, G, L, G>::run(device, context, queue, num_elements, "test_gbar", gbar_source);
error = test<cl_int, BAR<0>, G, L>::run(
device, context, queue, num_elements, "test_lbar", lbar_source);
error = test<cl_int, BAR<1>, G, L, G>::run(
device, context, queue, num_elements, "test_gbar", gbar_source);
return error;
}