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

Reindent parameter parsing code

Browse Source
This commit is contained in:
Stuart Brady
2019-07-03 19:32:47 +01:00
committed by Kévin Petit
parent 90b0c52584
commit 74f82665d0
1 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
test_common/harness/parseParameters.cpp
View File

@@ -35,91 +35,91 @@ OfflineCompilerOutputType gOfflineCompilerOutputType;
void helpInfo () void helpInfo ()
{ {
log_info(" '-offlineCompiler <output_type:binary|spir_v>': use offline compiler\n"); log_info(" '-offlineCompiler <output_type:binary|spir_v>': use offline compiler\n");
log_info(" ' output_type binary - \"../build_script_binary.py\" is invoked\n"); log_info(" ' output_type binary - \"../build_script_binary.py\" is invoked\n");
log_info(" ' output_type spir_v <mode:generate|cache> - \"../cl_build_script_spir_v.py\" is invoked, optional modes: generate, cache\n"); log_info(" ' output_type spir_v <mode:generate|cache> - \"../cl_build_script_spir_v.py\" is invoked, optional modes: generate, cache\n");
log_info(" ' mode generate <path> - force binary generation\n"); log_info(" ' mode generate <path> - force binary generation\n");
log_info(" ' mode cache <path> - force reading binary files from cache\n"); log_info(" ' mode cache <path> - force reading binary files from cache\n");
log_info("\n"); log_info("\n");
} }
int parseCustomParam (int argc, const char *argv[], const char *ignore) int parseCustomParam (int argc, const char *argv[], const char *ignore)
{ {
int delArg = 0; int delArg = 0;
for (int i=1; i<argc; i++) for (int i=1; i<argc; i++)
{
if(ignore != 0)
{ {
// skip parameters that require special/different treatment in application if(ignore != 0)
// (generic interpretation and parameter removal will not be performed)
const char * ptr = strstr(ignore, argv[i]);
if(ptr != 0 &&
(ptr == ignore || ptr[-1] == ' ') && //first on list or ' ' before
(ptr[strlen(argv[i])] == 0 || ptr[strlen(argv[i])] == ' ')) // last on list or ' ' after
continue;
}
if (i < 0) i = 0;
delArg = 0;
if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0)
helpInfo ();
else if (!strcmp(argv[i], "-offlineCompiler"))
{
log_info(" Offline Compiler enabled\n");
delArg = 1;
if ((i + 1) < argc)
{ {
gOfflineCompiler = true; // skip parameters that require special/different treatment in application
// (generic interpretation and parameter removal will not be performed)
const char * ptr = strstr(ignore, argv[i]);
if(ptr != 0 &&
(ptr == ignore || ptr[-1] == ' ') && //first on list or ' ' before
(ptr[strlen(argv[i])] == 0 || ptr[strlen(argv[i])] == ' ')) // last on list or ' ' after
continue;
}
if (i < 0) i = 0;
delArg = 0;
if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--help") == 0)
helpInfo ();
if (!strcmp(argv[i + 1], "binary")) else if (!strcmp(argv[i], "-offlineCompiler"))
{
log_info(" Offline Compiler enabled\n");
delArg = 1;
if ((i + 1) < argc)
{ {
gOfflineCompilerOutputType = kBinary; gOfflineCompiler = true;
delArg++;
} if (!strcmp(argv[i + 1], "binary"))
else if (!strcmp(argv[i + 1], "spir_v"))
{
gOfflineCompilerOutputType = kSpir_v;
delArg++;
if ((i + 3) < argc)
{ {
if (!strcmp(argv[i + 2], "cache")) gOfflineCompilerOutputType = kBinary;
delArg++;
}
else if (!strcmp(argv[i + 1], "spir_v"))
{
gOfflineCompilerOutputType = kSpir_v;
delArg++;
if ((i + 3) < argc)
{ {
gForceSpirVCache = true; if (!strcmp(argv[i + 2], "cache"))
gSpirVPath = argv[i + 3]; {
log_info(" SpirV reading from cache enabled.\n"); gForceSpirVCache = true;
delArg += 2; gSpirVPath = argv[i + 3];
} log_info(" SpirV reading from cache enabled.\n");
else if (!strcmp(argv[i + 2], "generate")) delArg += 2;
{ }
gForceSpirVGenerate = true; else if (!strcmp(argv[i + 2], "generate"))
gSpirVPath = argv[i + 3]; {
log_info(" SpirV force generate binaries enabled.\n"); gForceSpirVGenerate = true;
delArg += 2; gSpirVPath = argv[i + 3];
log_info(" SpirV force generate binaries enabled.\n");
delArg += 2;
}
} }
} }
else
{
log_error(" Offline Compiler output type not supported: %s\n", argv[i + 1]);
return -1;
}
} }
else else
{ {
log_error(" Offline Compiler output type not supported: %s\n", argv[i + 1]); log_error(" Offline Compiler parameters are incorrect. Usage:\n");
log_error(" -offlineCompiler <input> <output> <output_type:binary|spir_v>\n");
return -1; return -1;
} }
} }
else
{
log_error(" Offline Compiler parameters are incorrect. Usage:\n");
log_error(" -offlineCompiler <input> <output> <output_type:binary|spir_v>\n");
return -1;
}
}
//cleaning parameters from argv tab //cleaning parameters from argv tab
for (int j=i; j<argc-delArg; j++) for (int j=i; j<argc-delArg; j++)
argv[j] = argv[j+delArg]; argv[j] = argv[j+delArg];
argc -= delArg ; argc -= delArg ;
i -= delArg; i -= delArg;
} }
return argc; return argc;
} }
bool is_power_of_two(int number) bool is_power_of_two(int number)
@@ -135,13 +135,13 @@ extern void parseWimpyReductionFactor(const char *&arg, int &wimpyReductionFacto
int new_factor = atoi(&arg[1]); int new_factor = atoi(&arg[1]);
arg = arg_temp; // Advance until ']' arg = arg_temp; // Advance until ']'
if (is_power_of_two(new_factor)) if (is_power_of_two(new_factor))
{ {
log_info("\n Wimpy reduction factor changed from %d to %d \n", wimpyReductionFactor, new_factor); log_info("\n Wimpy reduction factor changed from %d to %d \n", wimpyReductionFactor, new_factor);
wimpyReductionFactor = new_factor; wimpyReductionFactor = new_factor;
} }
else else
{ {
log_info("\n WARNING: Incorrect wimpy reduction factor %d, must be power of 2. The default value will be used.\n", new_factor); log_info("\n WARNING: Incorrect wimpy reduction factor %d, must be power of 2. The default value will be used.\n", new_factor);
} }
} }
} }