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

Fix test skipping in math_brute_force (#1475)

Browse Source 
Commit 9666ca3c ("[NFC] Fix sign-compare warnings in math_brute_force
(#1467)", 2022-08-23) inadvertently changed the semantics of the if
condition.  The `i > gEndTestNumber` comparison was relying on
`gEndTestNumber` being promoted to unsigned.  When casting `i` to
`int32_t`, this promotion no longer happens and as a result any tests
given on the command line were being skipped.

Use an unsigned type for `gStartTestNumber` and `gEndTestNumber` to
eliminate the casts and any implicit conversions between signed and
unsigned types.

Signed-off-by: Sven van Haastregt <sven.vanhaastregt@arm.com>
This commit is contained in:
Sven van Haastregt
2022-08-24 12:05:01 +01:00
committed by GitHub
parent c82dabd4bb
commit afe4ef8b8f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test_conformance/math_brute_force/main.cpp
View File

@@ -58,8 +58,8 @@ static char appName[MAXPATHLEN] = "";
cl_device_id gDevice = NULL; cl_device_id gDevice = NULL;
cl_context gContext = NULL; cl_context gContext = NULL;
cl_command_queue gQueue = NULL; cl_command_queue gQueue = NULL;
static int32_t gStartTestNumber = -1; static size_t gStartTestNumber = ~0u;
static int32_t gEndTestNumber = -1; static size_t gEndTestNumber = ~0u;
int gSkipCorrectnessTesting = 0; int gSkipCorrectnessTesting = 0;
static int gStopOnError = 0; static int gStopOnError = 0;
static bool gSkipRestOfTests; static bool gSkipRestOfTests;
@@ -129,9 +129,8 @@ static int doTest(const char *name)
const Func *const temp_func = functionList + i; const Func *const temp_func = functionList + i;
if (strcmp(temp_func->name, name) == 0) if (strcmp(temp_func->name, name) == 0)
{ {
if ((gStartTestNumber != -1 if ((gStartTestNumber != ~0u && i < gStartTestNumber)
&& static_cast<int32_t>(i) < gStartTestNumber) || i > gEndTestNumber)
|| static_cast<int32_t>(i) > gEndTestNumber)
{ {
vlog("Skipping function #%d\n", i); vlog("Skipping function #%d\n", i);
return 0; return 0;
@@ -468,7 +467,7 @@ static int ParseArgs(int argc, const char **argv)
long number = strtol(arg, &t, 0); long number = strtol(arg, &t, 0);
if (t != arg) if (t != arg)
{ {
if (-1 == gStartTestNumber) if (~0u == gStartTestNumber)
gStartTestNumber = (int32_t)number; gStartTestNumber = (int32_t)number;
else else
gEndTestNumber = gStartTestNumber + (int32_t)number; gEndTestNumber = gStartTestNumber + (int32_t)number;