Merged in r242526. Thanks, Hans
On Fri, Jul 17, 2015 at 3:17 AM, Daniel Sanders <daniel.sand...@imgtec.com> wrote: > Thanks for fixing this. > > Hans: This fixes the cuda-options.cu failure on my trial mips release > package. Ok to merge to the 3.7 branch? > >> -----Original Message----- >> From: cfe-commits-boun...@cs.uiuc.edu [mailto:cfe-commits- >> boun...@cs.uiuc.edu] On Behalf Of Artem Belevich >> Sent: 16 July 2015 18:24 >> To: cfe-commits@cs.uiuc.edu >> Subject: r242422 - Fixed an error in cuda-options.cu test: >> >> Author: tra >> Date: Thu Jul 16 12:24:18 2015 >> New Revision: 242422 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=242422&view=rev >> Log: >> Fixed an error in cuda-options.cu test: >> -target option must be used without '='. >> >> Modified: >> cfe/trunk/test/Driver/cuda-options.cu >> >> Modified: cfe/trunk/test/Driver/cuda-options.cu >> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cuda- >> options.cu?rev=242422&r1=242421&r2=242422&view=diff >> ========================================================== >> ==================== >> --- cfe/trunk/test/Driver/cuda-options.cu (original) >> +++ cfe/trunk/test/Driver/cuda-options.cu Thu Jul 16 12:24:18 2015 >> @@ -4,7 +4,7 @@ >> // REQUIRES: nvptx-registered-target >> >> // Simple compilation case: >> -// RUN: %clang -### -target=x86_64-linux-gnu -c %s 2>&1 \ >> +// RUN: %clang -### -target x86_64-linux-gnu -c %s 2>&1 \ >> // Compile device-side to PTX assembly and make sure we use it on the host >> side. >> // RUN: | FileCheck -check-prefix CUDA-D1 \ >> // Then compile host side and incorporate device code. >> @@ -13,7 +13,7 @@ >> // RUN: -check-prefix CUDA-NL %s >> >> // Typical compilation + link case: >> -// RUN: %clang -### -target=x86_64-linux-gnu %s 2>&1 \ >> +// RUN: %clang -### -target x86_64-linux-gnu %s 2>&1 \ >> // Compile device-side to PTX assembly and make sure we use it on the host >> side >> // RUN: | FileCheck -check-prefix CUDA-D1 \ >> // Then compile host side and incorporate device code. >> @@ -22,7 +22,7 @@ >> // RUN: -check-prefix CUDA-L %s >> >> // Verify that -cuda-no-device disables device-side compilation and linking >> -// RUN: %clang -### -target=x86_64-linux-gnu --cuda-host-only %s 2>&1 \ >> +// RUN: %clang -### -target x86_64-linux-gnu --cuda-host-only %s 2>&1 \ >> // Make sure we didn't run device-side compilation. >> // RUN: | FileCheck -check-prefix CUDA-ND \ >> // Then compile host side and make sure we don't attempt to incorporate >> GPU code. >> @@ -31,7 +31,7 @@ >> // RUN: -check-prefix CUDA-NL %s >> >> // Verify that -cuda-no-host disables host-side compilation and linking >> -// RUN: %clang -### -target=x86_64-linux-gnu --cuda-device-only %s 2>&1 \ >> +// RUN: %clang -### -target x86_64-linux-gnu --cuda-device-only %s 2>&1 \ >> // Compile device-side to PTX assembly >> // RUN: | FileCheck -check-prefix CUDA-D1 \ >> // Make sure there are no host cmpilation or linking. >> @@ -39,7 +39,7 @@ >> >> // Verify that with -S we compile host and device sides to assembly >> // and incorporate device code on the host side. >> -// RUN: %clang -### -target=x86_64-linux-gnu -S -c %s 2>&1 \ >> +// RUN: %clang -### -target x86_64-linux-gnu -S -c %s 2>&1 \ >> // Compile device-side to PTX assembly >> // RUN: | FileCheck -check-prefix CUDA-D1 \ >> // Then compile host side and incorporate GPU code. >> @@ -49,7 +49,7 @@ >> >> // Verify that --cuda-gpu-arch option passes correct GPU >> // archtecture info to device compilation. >> -// RUN: %clang -### -target=x86_64-linux-gnu --cuda-gpu-arch=sm_35 -c %s >> 2>&1 \ >> +// RUN: %clang -### -target x86_64-linux-gnu --cuda-gpu-arch=sm_35 -c %s >> 2>&1 \ >> // Compile device-side to PTX assembly. >> // RUN: | FileCheck -check-prefix CUDA-D1 -check-prefix CUDA-D1-SM35 \ >> // Then compile host side and incorporate GPU code. >> @@ -59,7 +59,7 @@ >> >> // Verify that there is device-side compilation per --cuda-gpu-arch args >> // and that all results are included on the host side. >> -// RUN: %clang -### -target=x86_64-linux-gnu --cuda-gpu-arch=sm_35 -- >> cuda-gpu-arch=sm_30 -c %s 2>&1 \ >> +// RUN: %clang -### -target x86_64-linux-gnu --cuda-gpu-arch=sm_35 -- >> cuda-gpu-arch=sm_30 -c %s 2>&1 \ >> // Compile both device-sides to PTX assembly >> // RUN: | FileCheck \ >> // RUN: -check-prefix CUDA-D1 -check-prefix CUDA-D1-SM35 \ >> >> >> _______________________________________________ >> cfe-commits mailing list >> cfe-commits@cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list cfe-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits