From 39066f21f0102a53206598d87e83b6acfdf9bee4 Mon Sep 17 00:00:00 2001 From: Jonas Hahnfeld Date: Mon, 12 Feb 2018 10:46:34 +0000 Subject: [PATCH] [CUDA] Fix test cuda-external-tools.cu This didn't verify the CHECK prefix before! Differential Revision: https://reviews.llvm.org/D42920 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@324877 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Driver/cuda-external-tools.cu | 105 +++++++++++++++-------------- 1 file changed, 54 insertions(+), 51 deletions(-) diff --git a/test/Driver/cuda-external-tools.cu b/test/Driver/cuda-external-tools.cu index 63b74fc06b..99efb64492 100644 --- a/test/Driver/cuda-external-tools.cu +++ b/test/Driver/cuda-external-tools.cu @@ -7,112 +7,115 @@ // Regular compiles with -O{0,1,2,3,4,fast}. -O4 and -Ofast map to ptxas O3. // RUN: %clang -### -target x86_64-linux-gnu -O0 -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT0 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT0 %s // RUN: %clang -### -target x86_64-linux-gnu -O1 -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT1 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT1 %s // RUN: %clang -### -target x86_64-linux-gnu -O2 -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT2 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT2 %s // RUN: %clang -### -target x86_64-linux-gnu -O3 -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT3 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT3 %s // RUN: %clang -### -target x86_64-linux-gnu -O4 -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT3 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT3 %s // RUN: %clang -### -target x86_64-linux-gnu -Ofast -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT3 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT3 %s // With debugging enabled, ptxas should be run with with no ptxas optimizations. // RUN: %clang -### -target x86_64-linux-gnu --cuda-noopt-device-debug -O2 -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix DBG %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,DBG %s // --no-cuda-noopt-device-debug overrides --cuda-noopt-device-debug. // RUN: %clang -### -target x86_64-linux-gnu --cuda-noopt-device-debug \ // RUN: --no-cuda-noopt-device-debug -O2 -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT2 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT2 %s // Regular compile without -O. This should result in us passing -O0 to ptxas. // RUN: %clang -### -target x86_64-linux-gnu -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT0 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT0 %s // Regular compiles with -Os and -Oz. For lack of a better option, we map // these to ptxas -O3. // RUN: %clang -### -target x86_64-linux-gnu -Os -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT2 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT2 %s // RUN: %clang -### -target x86_64-linux-gnu -Oz -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT2 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT2 %s // Regular compile targeting sm_35. // RUN: %clang -### -target x86_64-linux-gnu --cuda-gpu-arch=sm_35 -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM35 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM35 %s // 32-bit compile. -// RUN: %clang -### -target x86_32-linux-gnu -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH32 -check-prefix SM20 %s +// RUN: %clang -### -target i386-linux-gnu -c %s 2>&1 \ +// RUN: | FileCheck -check-prefixes=CHECK,ARCH32,SM20 %s // Compile with -fintegrated-as. This should still cause us to invoke ptxas. // RUN: %clang -### -target x86_64-linux-gnu -fintegrated-as -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT0 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT0 %s // Check -Xcuda-ptxas and -Xcuda-fatbinary // RUN: %clang -### -target x86_64-linux-gnu -c -Xcuda-ptxas -foo1 \ // RUN: -Xcuda-fatbinary -bar1 -Xcuda-ptxas -foo2 -Xcuda-fatbinary -bar2 %s 2>&1 \ -// RUN: | FileCheck -check-prefix SM20 -check-prefix PTXAS-EXTRA \ -// RUN: -check-prefix FATBINARY-EXTRA %s +// RUN: | FileCheck -check-prefixes=CHECK,SM20,PTXAS-EXTRA,FATBINARY-EXTRA %s // MacOS spot-checks // RUN: %clang -### -target x86_64-apple-macosx -O0 -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM20 -check-prefix OPT0 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM20,OPT0 %s // RUN: %clang -### -target x86_64-apple-macosx --cuda-gpu-arch=sm_35 -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM35 %s -// RUN: %clang -### -target x86_32-apple-macosx -c %s 2>&1 \ -// RUN: | FileCheck -check-prefix ARCH32 -check-prefix SM20 %s +// RUN: | FileCheck -check-prefixes=CHECK,ARCH64,SM35 %s +// RUN: %clang -### -target i386-apple-macosx -c %s 2>&1 \ +// RUN: | FileCheck -check-prefixes=CHECK,ARCH32,SM20 %s // Check that CLANG forwards the -v flag to PTXAS. // RUN: %clang -### -save-temps -no-canonical-prefixes -v %s 2>&1 \ // RUN: | FileCheck -check-prefix=CHK-PTXAS-VERBOSE %s // Match clang job that produces PTX assembly. -// CHECK: "-cc1" "-triple" "nvptx64-nvidia-cuda" -// SM20: "-target-cpu" "sm_20" -// SM35: "-target-cpu" "sm_35" -// SM20: "-o" "[[PTXFILE:[^"]*]]" -// SM35: "-o" "[[PTXFILE:[^"]*]]" +// CHECK: "-cc1" +// ARCH64-SAME: "-triple" "nvptx64-nvidia-cuda" +// ARCH32-SAME: "-triple" "nvptx-nvidia-cuda" +// SM20-SAME: "-target-cpu" "sm_20" +// SM35-SAME: "-target-cpu" "sm_35" +// SM20-SAME: "-o" "[[PTXFILE:[^"]*]]" +// SM35-SAME: "-o" "[[PTXFILE:[^"]*]]" // Match the call to ptxas (which assembles PTX to SASS). -// CHECK:ptxas -// ARCH64: "-m64" -// ARCH32: "-m32" -// OPT0: "-O0" +// CHECK: ptxas +// ARCH64-SAME: "-m64" +// ARCH32-SAME: "-m32" +// OPT0-SAME: "-O0" // OPT0-NOT: "-g" -// OPT1: "-O1" +// OPT1-SAME: "-O1" // OPT1-NOT: "-g" -// OPT2: "-O2" +// OPT2-SAME: "-O2" // OPT2-NOT: "-g" -// OPT3: "-O3" +// OPT3-SAME: "-O3" // OPT3-NOT: "-g" -// DBG: "-g" "--dont-merge-basicblocks" "--return-at-end" -// SM20: "--gpu-name" "sm_20" -// SM35: "--gpu-name" "sm_35" -// SM20: "--output-file" "[[CUBINFILE:[^"]*]]" -// SM35: "--output-file" "[[CUBINFILE:[^"]*]]" -// PTXAS-EXTRA: "-foo1" -// PTXAS-EXTRA-SAME: "-foo2" +// DBG-SAME: "-g" "--dont-merge-basicblocks" "--return-at-end" +// SM20-SAME: "--gpu-name" "sm_20" +// SM35-SAME: "--gpu-name" "sm_35" +// SM20-SAME: "--output-file" "[[CUBINFILE:[^"]*]]" +// SM35-SAME: "--output-file" "[[CUBINFILE:[^"]*]]" // CHECK-SAME: "[[PTXFILE]]" +// PTXAS-EXTRA-SAME: "-foo1" +// PTXAS-EXTRA-SAME: "-foo2" // Match the call to fatbinary (which combines all our PTX and SASS into one // blob). -// CHECK:fatbinary -// CHECK-DAG: "--cuda" -// ARCH64-DAG: "-64" -// ARCH32-DAG: "-32" +// CHECK: fatbinary +// CHECK-SAME-DAG: "--cuda" +// ARCH64-SAME-DAG: "-64" +// ARCH32-SAME-DAG: "-32" // CHECK-DAG: "--create" "[[FATBINARY:[^"]*]]" -// SM20-DAG: "--image=profile=compute_20,file=[[PTXFILE]]" -// SM35-DAG: "--image=profile=compute_35,file=[[PTXFILE]]" -// SM20-DAG: "--image=profile=sm_20,file=[[CUBINFILE]]" -// SM35-DAG: "--image=profile=sm_35,file=[[CUBINFILE]]" -// FATBINARY-EXTRA: "-bar1" +// SM20-SAME-DAG: "--image=profile=compute_20,file=[[PTXFILE]]" +// SM35-SAME-DAG: "--image=profile=compute_35,file=[[PTXFILE]]" +// SM20-SAME-DAG: "--image=profile=sm_20,file=[[CUBINFILE]]" +// SM35-SAME-DAG: "--image=profile=sm_35,file=[[CUBINFILE]]" +// FATBINARY-EXTRA-SAME: "-bar1" // FATBINARY-EXTRA-SAME: "-bar2" // Match the clang job for host compilation. -// CHECK: "-cc1" "-triple" "x86_64--linux-gnu" +// CHECK: "-cc1" +// ARCH64-SAME: "-triple" "x86_64- +// ARCH32-SAME: "-triple" "i386- // CHECK-SAME: "-fcuda-include-gpubinary" "[[FATBINARY]]" -// CHK-PTXAS-VERBOSE: ptxas{{.*}}" "-v" \ No newline at end of file +// CHK-PTXAS-VERBOSE: ptxas{{.*}}" "-v" -- 2.40.0