Author: sfantao
Date: Thu Oct 27 13:29:57 2016
New Revision: 285327
URL: http://llvm.org/viewvc/llvm-project?rev=285327&view=rev
Log:
Use -fopenmp=libomp in all OpenMP offloading tests.
This will make sure the right features are being tested even for machines that
default to libgomp.
Modified:
cfe/trunk/test/Driver/openmp-offload.c
Modified: cfe/trunk/test/Driver/openmp-offload.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/openmp-offload.c?rev=285327&r1=285326&r2=285327&view=diff
==============================================================================
--- cfe/trunk/test/Driver/openmp-offload.c (original)
+++ cfe/trunk/test/Driver/openmp-offload.c Thu Oct 27 13:29:57 2016
@@ -12,8 +12,6 @@
/// Check whether an invalid OpenMP target is specified:
// RUN: %clang -### -fopenmp=libomp -fopenmp-targets=aaa-bbb-ccc-ddd %s 2>&1
\
// RUN: | FileCheck -check-prefix=CHK-INVALID-TARGET %s
-// RUN: %clang -### -fopenmp -fopenmp-targets=aaa-bbb-ccc-ddd %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHK-INVALID-TARGET %s
// CHK-INVALID-TARGET: error: OpenMP target is invalid: 'aaa-bbb-ccc-ddd'
/// ###########################################################################
@@ -21,8 +19,6 @@
/// Check warning for empty -fopenmp-targets
// RUN: %clang -### -fopenmp=libomp -fopenmp-targets= %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-EMPTY-OMPTARGETS %s
-// RUN: %clang -### -fopenmp -fopenmp-targets= %s 2>&1 \
-// RUN: | FileCheck -check-prefix=CHK-EMPTY-OMPTARGETS %s
// CHK-EMPTY-OMPTARGETS: warning: joined argument expects additional value:
'-fopenmp-targets='
/// ###########################################################################
@@ -37,7 +33,7 @@
/// ###########################################################################
/// Check warning for duplicate offloading targets.
-// RUN: %clang -### -ccc-print-phases -fopenmp
-fopenmp-targets=powerpc64le-ibm-linux-gnu,powerpc64le-ibm-linux-gnu %s 2>&1 \
+// RUN: %clang -### -ccc-print-phases -fopenmp=libomp
-fopenmp-targets=powerpc64le-ibm-linux-gnu,powerpc64le-ibm-linux-gnu %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-DUPLICATES %s
// CHK-DUPLICATES: warning: The OpenMP offloading target
'powerpc64le-ibm-linux-gnu' is similar to target 'powerpc64le-ibm-linux-gnu'
already specified - will be ignored.
@@ -47,7 +43,7 @@
/// We should have an offload action joining the host compile and device
/// preprocessor and another one joining the device linking outputs to the host
/// action.
-// RUN: %clang -ccc-print-phases -fopenmp -target powerpc64le-ibm-linux-gnu
-fopenmp-targets=x86_64-pc-linux-gnu %s 2>&1 \
+// RUN: %clang -ccc-print-phases -fopenmp=libomp -target
powerpc64le-ibm-linux-gnu -fopenmp-targets=x86_64-pc-linux-gnu %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-PHASES %s
// CHK-PHASES: 0: input, "[[INPUT:.+\.c]]", c, (host-openmp)
// CHK-PHASES: 1: preprocessor, {0}, cpp-output, (host-openmp)
@@ -68,7 +64,7 @@
/// Check the phases when using multiple targets. Here we also add a library to
/// make sure it is treated as input by the device.
-// RUN: %clang -ccc-print-phases -lsomelib -fopenmp -target
powerpc64-ibm-linux-gnu
-fopenmp-targets=x86_64-pc-linux-gnu,powerpc64-ibm-linux-gnu %s 2>&1 \
+// RUN: %clang -ccc-print-phases -lsomelib -fopenmp=libomp -target
powerpc64-ibm-linux-gnu
-fopenmp-targets=x86_64-pc-linux-gnu,powerpc64-ibm-linux-gnu %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-PHASES-LIB %s
// CHK-PHASES-LIB: 0: input, "somelib", object, (host-openmp)
// CHK-PHASES-LIB: 1: input, "[[INPUT:.+\.c]]", c, (host-openmp)
@@ -100,7 +96,7 @@
/// Check the phases when using multiple targets and multiple source files
// RUN: echo " " > %t.c
-// RUN: %clang -ccc-print-phases -lsomelib -fopenmp -target
powerpc64-ibm-linux-gnu
-fopenmp-targets=x86_64-pc-linux-gnu,powerpc64-ibm-linux-gnu %s %t.c 2>&1 \
+// RUN: %clang -ccc-print-phases -lsomelib -fopenmp=libomp -target
powerpc64-ibm-linux-gnu
-fopenmp-targets=x86_64-pc-linux-gnu,powerpc64-ibm-linux-gnu %s %t.c 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-PHASES-FILES %s
// CHK-PHASES-FILES: 0: input, "somelib", object, (host-openmp)
// CHK-PHASES-FILES: 1: input, "[[INPUT1:.+\.c]]", c, (host-openmp)
@@ -148,7 +144,7 @@
/// Check the phases graph when using a single GPU target, and check the OpenMP
/// and CUDA phases are articulated correctly.
-// RUN: %clang -ccc-print-phases -fopenmp -target powerpc64le-ibm-linux-gnu
-fopenmp-targets=nvptx64-nvidia-cuda -x cuda %s 2>&1 \
+// RUN: %clang -ccc-print-phases -fopenmp=libomp -target
powerpc64le-ibm-linux-gnu -fopenmp-targets=nvptx64-nvidia-cuda -x cuda %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-PHASES-WITH-CUDA %s
// CHK-PHASES-WITH-CUDA: 0: input, "[[INPUT:.+\.c]]", cuda, (host-cuda-openmp)
// CHK-PHASES-WITH-CUDA: 1: preprocessor, {0}, cuda-cpp-output,
(host-cuda-openmp)
@@ -188,15 +184,15 @@
/// We use -fopenmp-dump-offload-linker-script to dump the linker script and
/// check its contents.
///
-// RUN: %clang -### -fopenmp -o %t.out -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s
-fopenmp-dump-offload-linker-script 2>&1 \
+// RUN: %clang -### -fopenmp=libomp -o %t.out -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s
-fopenmp-dump-offload-linker-script 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-COMMANDS -check-prefix=CHK-LKS
-check-prefix=CHK-LKS-REG %s
-// RUN: %clang -### -fopenmp -o %t.out -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s -save-temps
-fopenmp-dump-offload-linker-script 2>&1 \
+// RUN: %clang -### -fopenmp=libomp -o %t.out -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s -save-temps
-fopenmp-dump-offload-linker-script 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-COMMANDS-ST -check-prefix=CHK-LKS
-check-prefix=CHK-LKS-ST %s
// Make sure we are not dumping the script unless the user requested it.
-// RUN: %clang -### -fopenmp -o %t.out -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s 2>&1 \
+// RUN: %clang -### -fopenmp=libomp -o %t.out -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-LKS-NODUMP %s
-// RUN: %clang -### -fopenmp -o %t.out -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s -save-temps
2>&1 \
+// RUN: %clang -### -fopenmp=libomp -o %t.out -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s -save-temps
2>&1 \
// RUN: | FileCheck -check-prefix=CHK-LKS-NODUMP %s
//
@@ -279,7 +275,7 @@
/// ###########################################################################
/// Check separate compilation with offloading - bundling actions
-// RUN: %clang -### -ccc-print-phases -fopenmp -c -o %t.o -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s 2>&1 \
+// RUN: %clang -### -ccc-print-phases -fopenmp=libomp -c -o %t.o -lsomelib
-target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-BUACTIONS %s
// CHK-BUACTIONS: 0: input, "[[INPUT:.+\.c]]", c, (host-openmp)
@@ -307,7 +303,7 @@
/// Check separate compilation with offloading - unbundling actions
// RUN: touch %t.i
-// RUN: %clang -### -ccc-print-phases -fopenmp -o %t.out -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i 2>&1 \
+// RUN: %clang -### -ccc-print-phases -fopenmp=libomp -o %t.out -lsomelib
-target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-UBACTIONS %s
// CHK-UBACTIONS: 0: input, "somelib", object, (host-openmp)
@@ -335,7 +331,7 @@
/// Check separate compilation with offloading - unbundling/bundling actions
// RUN: touch %t.i
-// RUN: %clang -### -ccc-print-phases -fopenmp -c -o %t.o -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i 2>&1 \
+// RUN: %clang -### -ccc-print-phases -fopenmp=libomp -c -o %t.o -lsomelib
-target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-UBUACTIONS %s
// CHK-UBUACTIONS: 0: input, "[[INPUT:.+\.i]]", cpp-output, (host-openmp)
@@ -358,9 +354,9 @@
/// ###########################################################################
/// Check separate compilation with offloading - bundling jobs construct
-// RUN: %clang -### -fopenmp -c -o %t.o -lsomelib -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s 2>&1 \
+// RUN: %clang -### -fopenmp=libomp -c -o %t.o -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-BUJOBS %s
-// RUN: %clang -### -fopenmp -c -o %t.o -lsomelib -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s -save-temps
2>&1 \
+// RUN: %clang -### -fopenmp=libomp -c -o %t.o -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %s -save-temps
2>&1 \
// RUN: | FileCheck -check-prefix=CHK-BUJOBS-ST %s
// Create host BC.
@@ -394,14 +390,14 @@
/// Check separate compilation with offloading - unbundling jobs construct
// RUN: touch %t.i
-// RUN: %clang -### -fopenmp -o %t.out -lsomelib -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i 2>&1 \
+// RUN: %clang -### -fopenmp=libomp -o %t.out -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-UBJOBS %s
-// RUN: %clang -### -fopenmp -o %t.out -lsomelib -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i -save-temps
2>&1 \
+// RUN: %clang -### -fopenmp=libomp -o %t.out -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i -save-temps
2>&1 \
// RUN: | FileCheck -check-prefix=CHK-UBJOBS-ST %s
// RUN: touch %t.o
-// RUN: %clang -### -fopenmp -o %t.out -lsomelib -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.o 2>&1 \
+// RUN: %clang -### -fopenmp=libomp -o %t.out -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.o 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-UBJOBS2 %s
-// RUN: %clang -### -fopenmp -o %t.out -lsomelib -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.o -save-temps
2>&1 \
+// RUN: %clang -### -fopenmp=libomp -o %t.out -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.o -save-temps
2>&1 \
// RUN: | FileCheck -check-prefix=CHK-UBJOBS2-ST %s
// Unbundle and create host BC.
@@ -448,9 +444,9 @@
/// Check separate compilation with offloading - unbundling/bundling jobs
/// construct
// RUN: touch %t.i
-// RUN: %clang -### -fopenmp -c %t.o -lsomelib -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i 2>&1 \
+// RUN: %clang -### -fopenmp=libomp -c %t.o -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-UBUJOBS %s
-// RUN: %clang -### -fopenmp -c %t.o -lsomelib -target powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i -save-temps
2>&1 \
+// RUN: %clang -### -fopenmp=libomp -c %t.o -lsomelib -target
powerpc64le-linux
-fopenmp-targets=powerpc64le-ibm-linux-gnu,x86_64-pc-linux-gnu %t.i -save-temps
2>&1 \
// RUN: | FileCheck -check-prefix=CHK-UBUJOBS-ST %s
// Unbundle and create host BC.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
