Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-24 06:10:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[OpenMP] Fix misleading warning for OMP_PLACES

Browse Source 
When OMP_PLACES contains an invalid value, the warning informs the user
that the fallback is OMP_PLACES=threads, but the actual internal setting
is OMP_PLACES=cores and is detected as such with KMP_SETTINGS=1.
This patch informs the user that OMP_PLACES=cores is being used instead
of OMP_PLACES=threads.

Differential Revision: https://reviews.llvm.org/D95170
This commit is contained in:
Peyton, Jonathan L 2021-01-21 13:38:35 -06:00
parent 598c590b3c
commit 8e67134364
2 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
openmp/runtime/src/kmp_settings.cpp
View File

@ -2576,6 +2576,11 @@ signed := + signed
signed := - signed
-----------------------------------------------------------------------------*/
// Warning to issue for syntax error during parsing of OMP_PLACES
static inline void __kmp_omp_places_syntax_warn(const char *var) {
KMP_WARNING(SyntaxErrorUsing, var, "\"cores\"");
}
static int __kmp_parse_subplace_list(const char *var, const char **scan) {
const char *next;
@ -2587,7 +2592,7 @@ static int __kmp_parse_subplace_list(const char *var, const char **scan) {
//
SKIP_WS(*scan);
if ((**scan < '0') || (**scan > '9')) {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
next = *scan;
@ -2606,7 +2611,7 @@ static int __kmp_parse_subplace_list(const char *var, const char **scan) {
continue;
}
if (**scan != ':') {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
(*scan)++; // skip ':'
@ -2614,7 +2619,7 @@ static int __kmp_parse_subplace_list(const char *var, const char **scan) {
// Read count parameter
SKIP_WS(*scan);
if ((**scan < '0') || (**scan > '9')) {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
next = *scan;
@ -2633,7 +2638,7 @@ static int __kmp_parse_subplace_list(const char *var, const char **scan) {
continue;
}
if (**scan != ':') {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
(*scan)++; // skip ':'
@ -2655,7 +2660,7 @@ static int __kmp_parse_subplace_list(const char *var, const char **scan) {
}
SKIP_WS(*scan);
if ((**scan < '0') || (**scan > '9')) {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
next = *scan;
@ -2675,7 +2680,7 @@ static int __kmp_parse_subplace_list(const char *var, const char **scan) {
continue;
}
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
return TRUE;
@ -2692,7 +2697,7 @@ static int __kmp_parse_place(const char *var, const char **scan) {
return FALSE;
}
if (**scan != '}') {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
(*scan)++; // skip '}'
@ -2706,7 +2711,7 @@ static int __kmp_parse_place(const char *var, const char **scan) {
KMP_ASSERT(proc >= 0);
*scan = next;
} else {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
return TRUE;
@ -2734,7 +2739,7 @@ static int __kmp_parse_place_list(const char *var, const char *env,
continue;
}
if (*scan != ':') {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
scan++; // skip ':'
@ -2742,7 +2747,7 @@ static int __kmp_parse_place_list(const char *var, const char *env,
// Read count parameter
SKIP_WS(scan);
if ((*scan < '0') || (*scan > '9')) {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
next = scan;
@ -2761,7 +2766,7 @@ static int __kmp_parse_place_list(const char *var, const char *env,
continue;
}
if (*scan != ':') {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
scan++; // skip ':'
@ -2783,7 +2788,7 @@ static int __kmp_parse_place_list(const char *var, const char *env,
}
SKIP_WS(scan);
if ((*scan < '0') || (*scan > '9')) {
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
next = scan;
@ -2803,7 +2808,7 @@ static int __kmp_parse_place_list(const char *var, const char *env,
continue;
}
KMP_WARNING(SyntaxErrorUsing, var, "\"threads\"");
__kmp_omp_places_syntax_warn(var);
return FALSE;
}
@ -2831,14 +2836,6 @@ static void __kmp_stg_parse_places(char const *name, char const *value,
return;
}
// If OMP_PROC_BIND is not specified but OMP_PLACES is,
// then let OMP_PROC_BIND default to true.
if (__kmp_nested_proc_bind.bind_types[0] == proc_bind_default) {
__kmp_nested_proc_bind.bind_types[0] = proc_bind_true;
}
//__kmp_affinity_num_places = 0;
if (__kmp_match_str("threads", scan, &next)) {
scan = next;
__kmp_affinity_type = affinity_compact;
@ -2881,9 +2878,14 @@ static void __kmp_stg_parse_places(char const *name, char const *value,
__kmp_affinity_type = affinity_explicit;
__kmp_affinity_gran = affinity_gran_fine;
__kmp_affinity_dups = FALSE;
if (__kmp_nested_proc_bind.bind_types[0] == proc_bind_default) {
__kmp_nested_proc_bind.bind_types[0] = proc_bind_true;
}
} else {
// Syntax error fallback
__kmp_affinity_type = affinity_compact;
__kmp_affinity_gran = affinity_gran_core;
__kmp_affinity_dups = FALSE;
}
if (__kmp_nested_proc_bind.bind_types[0] == proc_bind_default) {
__kmp_nested_proc_bind.bind_types[0] = proc_bind_true;
}
return;
}

11
openmp/runtime/test/affinity/omp-places-invalid-syntax.c Normal file
View File

@ -0,0 +1,11 @@
// RUN: %libomp-compile && env KMP_SETTINGS=1 OMP_PLACES=invalid %libomp-run 2>&1 | FileCheck %s
// CHECK-DAG: Effective settings
// CHECK: OMP_PLACES=
// CHECK-SAME: cores
// REQUIRES: affinity
int main() {
#pragma omp parallel
{}
return 0;
}