This is an archive of the discontinued LLVM Phabricator instance.

Differential D56048

[openmp] [runtime] [test] Fix using %python path
ClosedPublic

Authored by mgorny on Dec 22 2018, 1:50 AM.

Details

Reviewers
jlpeyton
krytarowski
Commits
rGa70184ba92b8: [runtime] [test] Fix using %python path
rOMP350001: [runtime] [test] Fix using %python path
rL350001: [runtime] [test] Fix using %python path
Summary

Fix the newly-added tests to use %python substitution in order to use
the correct path to Python interpreter. Otherwise, they fail on NetBSD
where there is no 'python', just 'pythonX.Y'.

Diff Detail

Event Timeline

mgorny created this revision.Dec 22 2018, 1:50 AM
Herald added a subscriber: guansong. · View Herald TranscriptDec 22 2018, 1:50 AM
krytarowski accepted this revision.Dec 22 2018, 1:52 AM
This revision is now accepted and ready to land.Dec 22 2018, 1:52 AM
Closed by commit rL350001: [runtime] [test] Fix using %python path (authored by mgorny). · Explain WhyDec 22 2018, 2:55 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptDec 22 2018, 2:55 AM

Revision Contents

PathSize
runtime/
test/
affinity/
format/
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
2 lines
12 lines
2 lines
1 line

Diff 179416

runtime/test/affinity/format/affinity_display.1.c

// RUN: %libomp-compile // RUN: %libomp-compile
// RUN: env OMP_DISPLAY_AFFINITY=TRUE OMP_NUM_THREADS=4 OMP_PLACES='{0,1},{2,3},{4,5},{6,7}' %libomp-run | python %S/check.py -c 'CHECK' %s // RUN: env OMP_DISPLAY_AFFINITY=TRUE OMP_NUM_THREADS=4 OMP_PLACES='{0,1},{2,3},{4,5},{6,7}' %libomp-run | %python %S/check.py -c 'CHECK' %s
// Affinity Display examples // Affinity Display examples
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> // also null is in <stddef.h> #include <stdlib.h> // also null is in <stddef.h>
#include <stddef.h> #include <stddef.h>
#include <omp.h> #include <omp.h>
#include <string.h> #include <string.h>
▲ Show 20 Lines • Show All 82 Lines • Show Last 20 Lines

runtime/test/affinity/format/api.c

// RUN: %libomp-compile-and-run // RUN: %libomp-compile-and-run
// RUN: %libomp-run | python %S/check.py -c 'CHECK' %s // RUN: %libomp-run | %python %S/check.py -c 'CHECK' %s
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <omp.h> #include <omp.h>
#define XSTR(x) #x #define XSTR(x) #x
#define STR(x) XSTR(x) #define STR(x) XSTR(x)
▲ Show 20 Lines • Show All 46 Lines • Show Last 20 Lines

runtime/test/affinity/format/api2.c

// RUN: %libomp-compile-and-run // RUN: %libomp-compile-and-run
// RUN: %libomp-run | python %S/check.py -c 'CHECK' %s // RUN: %libomp-run | %python %S/check.py -c 'CHECK' %s
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <omp.h> #include <omp.h>
#define XSTR(x) #x #define XSTR(x) #x
#define STR(x) XSTR(x) #define STR(x) XSTR(x)
▲ Show 20 Lines • Show All 74 Lines • Show Last 20 Lines

runtime/test/affinity/format/increase.c

// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | python %S/check.py -c 'CHECK' %s // RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | %python %S/check.py -c 'CHECK' %s
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <omp.h> #include <omp.h>
int main(int argc, char** argv) { int main(int argc, char** argv) {
omp_set_affinity_format("TESTER: tl:%L tn:%n nt:%N"); omp_set_affinity_format("TESTER: tl:%L tn:%n nt:%N");
// should print all for first parallel // should print all for first parallel
Show All 27 Lines

runtime/test/affinity/format/nested.c

// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES=threads OMP_PROC_BIND=spread,close %libomp-run | python %S/check.py -c 'CHECK' %s // RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES=threads OMP_PROC_BIND=spread,close %libomp-run | %python %S/check.py -c 'CHECK' %s
// REQUIRES: affinity // REQUIRES: affinity
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <omp.h> #include <omp.h>
int main(int argc, char** argv) { int main(int argc, char** argv) {
omp_set_affinity_format("TESTER: tl:%L at:%a tn:%n nt:%N"); omp_set_affinity_format("TESTER: tl:%L at:%a tn:%n nt:%N");
Show All 14 Lines

runtime/test/affinity/format/nested2.c

// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES=threads OMP_PROC_BIND=spread,close KMP_HOT_TEAMS_MAX_LEVEL=2 %libomp-run | python %S/check.py -c 'CHECK' %s // RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES=threads OMP_PROC_BIND=spread,close KMP_HOT_TEAMS_MAX_LEVEL=2 %libomp-run | %python %S/check.py -c 'CHECK' %s
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <omp.h> #include <omp.h>
// Currently, KMP_HOT_TEAMS_MAX_LEVEL has to be equal to the // Currently, KMP_HOT_TEAMS_MAX_LEVEL has to be equal to the
// nest depth for intuitive behavior // nest depth for intuitive behavior
int main(int argc, char** argv) { int main(int argc, char** argv) {
Show All 20 Lines

runtime/test/affinity/format/nested_mixed.c

// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | python %S/check.py -c 'CHECK' %s // RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | %python %S/check.py -c 'CHECK' %s
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <omp.h> #include <omp.h>
int main(int argc, char** argv) { int main(int argc, char** argv) {
omp_set_affinity_format("TESTER: tl:%L at:%a tn:%n nt:%N"); omp_set_affinity_format("TESTER: tl:%L at:%a tn:%n nt:%N");
omp_set_nested(1); omp_set_nested(1);
Show All 37 Lines

runtime/test/affinity/format/nested_serial.c

// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | python %S/check.py -c 'CHECK' %s // RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true %libomp-run | %python %S/check.py -c 'CHECK' %s
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <omp.h> #include <omp.h>
int main(int argc, char** argv) { int main(int argc, char** argv) {
omp_set_affinity_format("TESTER: tl:%L at:%a tn:%n nt:%N"); omp_set_affinity_format("TESTER: tl:%L at:%a tn:%n nt:%N");
omp_set_nested(1); omp_set_nested(1);
Show All 26 Lines

runtime/test/affinity/format/proc_bind.c

// RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES='{0},{0,1},{0},{0,1},{0},{0,1},{0},{0,1},{0},{0,1},{0}' %libomp-run | python %S/check.py -c 'CHECK' %s // RUN: %libomp-compile && env OMP_DISPLAY_AFFINITY=true OMP_PLACES='{0},{0,1},{0},{0,1},{0},{0,1},{0},{0,1},{0},{0,1},{0}' %libomp-run | %python %S/check.py -c 'CHECK' %s
// REQUIRES: affinity // REQUIRES: affinity
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <omp.h> #include <omp.h>
int main(int argc, char** argv) { int main(int argc, char** argv) {
omp_set_affinity_format("TESTER: tl:%L tn:%n nt:%N aff:{%A}"); omp_set_affinity_format("TESTER: tl:%L tn:%n nt:%N aff:{%A}");
Show All 22 Lines

runtime/test/affinity/format/simple.c

// RUN: %libomp-compile // RUN: %libomp-compile
// RUN: env OMP_DISPLAY_AFFINITY=false %libomp-run | python %S/check.py -c 'NOTHING' %s // RUN: env OMP_DISPLAY_AFFINITY=false %libomp-run | %python %S/check.py -c 'NOTHING' %s
// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=1 %libomp-run | python %S/check.py -c 'CHECK' %s // RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=1 %libomp-run | %python %S/check.py -c 'CHECK' %s
// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=2 %libomp-run | python %S/check.py -c 'CHECK-2' %s // RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=2 %libomp-run | %python %S/check.py -c 'CHECK-2' %s
// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=3 %libomp-run | python %S/check.py -c 'CHECK-3' %s // RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=3 %libomp-run | %python %S/check.py -c 'CHECK-3' %s
// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=4 %libomp-run | python %S/check.py -c 'CHECK-4' %s // RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=4 %libomp-run | %python %S/check.py -c 'CHECK-4' %s
// RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=8 %libomp-run | python %S/check.py -c 'CHECK-8' %s // RUN: env OMP_DISPLAY_AFFINITY=true OMP_NUM_THREADS=8 %libomp-run | %python %S/check.py -c 'CHECK-8' %s
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <omp.h> #include <omp.h>
int main(int argc, char** argv) { int main(int argc, char** argv) {
omp_set_affinity_format("TESTER: tl:%L tn:%n nt:%N"); omp_set_affinity_format("TESTER: tl:%L tn:%n nt:%N");
#pragma omp parallel #pragma omp parallel
Show All 12 Lines

runtime/test/affinity/format/simple_env.c

// RUN: %libomp-compile // RUN: %libomp-compile
// RUN: env OMP_DISPLAY_AFFINITY=true OMP_AFFINITY_FORMAT='TESTER-ENV: tl:%L tn:%n nt:%N' OMP_NUM_THREADS=8 %libomp-run | python %S/check.py -c 'CHECK-8' %s // RUN: env OMP_DISPLAY_AFFINITY=true OMP_AFFINITY_FORMAT='TESTER-ENV: tl:%L tn:%n nt:%N' OMP_NUM_THREADS=8 %libomp-run | %python %S/check.py -c 'CHECK-8' %s
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <omp.h> #include <omp.h>
int main(int argc, char** argv) { int main(int argc, char** argv) {
#pragma omp parallel #pragma omp parallel
{ } { }
#pragma omp parallel #pragma omp parallel
{ } { }
return 0; return 0;
} }
// CHECK-8: num_threads=8 TESTER-ENV: tl:1 tn:[0-7] nt:8 // CHECK-8: num_threads=8 TESTER-ENV: tl:1 tn:[0-7] nt:8

runtime/test/lit.cfg

Show First 20 Lines • Show All 118 Lines • ▼ Show 20 Linesconfig.substitutions.append(("%libomp-cxx-compile", \
"%clangXX %openmp_flags %flags -std=c++11 %s -o %t" + libs)) "%clangXX %openmp_flags %flags -std=c++11 %s -o %t" + libs))
config.substitutions.append(("%libomp-compile", \ config.substitutions.append(("%libomp-compile", \
"%clang %openmp_flags %flags %s -o %t" + libs)) "%clang %openmp_flags %flags %s -o %t" + libs))
config.substitutions.append(("%libomp-run", "%t")) config.substitutions.append(("%libomp-run", "%t"))
config.substitutions.append(("%clangXX", config.test_cxx_compiler)) config.substitutions.append(("%clangXX", config.test_cxx_compiler))
config.substitutions.append(("%clang", config.test_c_compiler)) config.substitutions.append(("%clang", config.test_c_compiler))
config.substitutions.append(("%openmp_flags", config.test_openmp_flags)) config.substitutions.append(("%openmp_flags", config.test_openmp_flags))
config.substitutions.append(("%flags", config.test_flags)) config.substitutions.append(("%flags", config.test_flags))
config.substitutions.append(("%python", '"%s"' % (sys.executable)))
if config.has_ompt: if config.has_ompt:
config.substitutions.append(("FileCheck", config.test_filecheck)) config.substitutions.append(("FileCheck", config.test_filecheck))
config.substitutions.append(("%sort-threads", "sort -n -s")) config.substitutions.append(("%sort-threads", "sort -n -s"))
if config.operating_system == 'Windows': if config.operating_system == 'Windows':
# No such environment variable on Windows. # No such environment variable on Windows.
config.substitutions.append(("%preload-tool", "true ||")) config.substitutions.append(("%preload-tool", "true ||"))
config.substitutions.append(("%no-as-needed-flag", "-Wl,--no-as-needed")) config.substitutions.append(("%no-as-needed-flag", "-Wl,--no-as-needed"))
elif config.operating_system == 'Darwin': elif config.operating_system == 'Darwin':
config.substitutions.append(("%preload-tool", "env DYLD_INSERT_LIBRARIES=%T/tool.so")) config.substitutions.append(("%preload-tool", "env DYLD_INSERT_LIBRARIES=%T/tool.so"))
# No such linker flag on Darwin. # No such linker flag on Darwin.
config.substitutions.append(("%no-as-needed-flag", "")) config.substitutions.append(("%no-as-needed-flag", ""))
else: else:
config.substitutions.append(("%preload-tool", "env LD_PRELOAD=%T/tool.so")) config.substitutions.append(("%preload-tool", "env LD_PRELOAD=%T/tool.so"))
config.substitutions.append(("%no-as-needed-flag", "-Wl,--no-as-needed")) config.substitutions.append(("%no-as-needed-flag", "-Wl,--no-as-needed"))