This is an archive of the discontinued LLVM Phabricator instance.

Differential D42920

[CUDA] Fix test cuda-external-tools.cu
ClosedPublic

Authored by Hahnfeld on Feb 5 2018, 11:20 AM.

Details

Reviewers
jlebar
tra
Commits
rG15dd8c6c32d8: [CUDA] Fix test cuda-external-tools.cu
rC324877: [CUDA] Fix test cuda-external-tools.cu
rL324877: [CUDA] Fix test cuda-external-tools.cu
Summary

This didn't verify the CHECK prefix before!

Diff Detail

Event Timeline

Hahnfeld created this revision.Feb 5 2018, 11:20 AM
Herald added a subscriber: cfe-commits. · View Herald TranscriptFeb 5 2018, 11:20 AM
Hahnfeld added a child revision: D42921: [CUDA] Add option to generate relocatable device code.Feb 5 2018, 11:22 AM
tra accepted this revision.Feb 9 2018, 5:30 PM
tra added inline comments.
test/Driver/cuda-external-tools.cu
11

Nit: I'd use --check-prefixes=CHECK,ARCH64,SM20,OPT0 . Up to you.

This revision is now accepted and ready to land.Feb 9 2018, 5:30 PM
Hahnfeld updated this revision to Diff 133816.Feb 12 2018, 2:43 AM
Hahnfeld marked an inline comment as done.

Use --check-prefixes instead of multiple --check-prefix.

test/Driver/cuda-external-tools.cu
11

Did some search-and-replace magic, don't know why this change didn't occur to me...

Closed by commit rL324877: [CUDA] Fix test cuda-external-tools.cu (authored by Hahnfeld). · Explain WhyFeb 12 2018, 2:50 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptFeb 12 2018, 2:50 AM

Revision Contents

PathSize
test/
Driver/
119 lines

Diff 132863

test/Driver/cuda-external-tools.cu

// Tests that ptxas and fatbinary are invoked correctly during CUDA // Tests that ptxas and fatbinary are invoked correctly during CUDA
// compilation. // compilation.
// //
// REQUIRES: clang-driver // REQUIRES: clang-driver
// REQUIRES: x86-registered-target // REQUIRES: x86-registered-target
// REQUIRES: nvptx-registered-target // REQUIRES: nvptx-registered-target
// Regular compiles with -O{0,1,2,3,4,fast}. -O4 and -Ofast map to ptxas O3. // 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: %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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT0 %s
traUnsubmitted
Done
ReplyInline Actions

Nit: I'd use --check-prefixes=CHECK,ARCH64,SM20,OPT0 . Up to you.

tra: Nit: I'd use --check-prefixes=CHECK,ARCH64,SM20,OPT0 . Up to you.
HahnfeldAuthorUnsubmitted
Not Done
ReplyInline Actions

Did some search-and-replace magic, don't know why this change didn't occur to me...

Hahnfeld: Did some search-and-replace magic, don't know why this change didn't occur to me...
// RUN: %clang -### -target x86_64-linux-gnu -O1 -c %s 2>&1 \ // 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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT1 %s
// RUN: %clang -### -target x86_64-linux-gnu -O2 -c %s 2>&1 \ // 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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT2 %s
// RUN: %clang -### -target x86_64-linux-gnu -O3 -c %s 2>&1 \ // 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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT3 %s
// RUN: %clang -### -target x86_64-linux-gnu -O4 -c %s 2>&1 \ // 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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT3 %s
// RUN: %clang -### -target x86_64-linux-gnu -Ofast -c %s 2>&1 \ // 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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT3 %s
// With debugging enabled, ptxas should be run with with no ptxas optimizations. // 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: %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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix DBG %s
// --no-cuda-noopt-device-debug overrides --cuda-noopt-device-debug. // --no-cuda-noopt-device-debug overrides --cuda-noopt-device-debug.
// RUN: %clang -### -target x86_64-linux-gnu --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: --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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT2 %s
// Regular compile without -O. This should result in us passing -O0 to ptxas. // 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: %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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT0 %s
// Regular compiles with -Os and -Oz. For lack of a better option, we map // Regular compiles with -Os and -Oz. For lack of a better option, we map
// these to ptxas -O3. // these to ptxas -O3.
// RUN: %clang -### -target x86_64-linux-gnu -Os -c %s 2>&1 \ // 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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT2 %s
// RUN: %clang -### -target x86_64-linux-gnu -Oz -c %s 2>&1 \ // 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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT2 %s
// Regular compile targeting sm_35. // Regular compile targeting sm_35.
// 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 \
// RUN: | FileCheck -check-prefix ARCH64 -check-prefix SM35 %s // RUN: | FileCheck -check-prefix CHECK -check-prefix ARCH64 -check-prefix SM35 %s
// 32-bit compile. // 32-bit compile.
// RUN: %clang -### -target x86_32-linux-gnu -c %s 2>&1 \ // RUN: %clang -### -target i386-linux-gnu -c %s 2>&1 \
// RUN: | FileCheck -check-prefix ARCH32 -check-prefix SM20 %s // RUN: | FileCheck -check-prefix CHECK -check-prefix ARCH32 -check-prefix SM20 %s
// Compile with -fintegrated-as. This should still cause us to invoke ptxas. // 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: %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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT0 %s
// Check -Xcuda-ptxas and -Xcuda-fatbinary // Check -Xcuda-ptxas and -Xcuda-fatbinary
// RUN: %clang -### -target x86_64-linux-gnu -c -Xcuda-ptxas -foo1 \ // 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: -Xcuda-fatbinary -bar1 -Xcuda-ptxas -foo2 -Xcuda-fatbinary -bar2 %s 2>&1 \
// RUN: | FileCheck -check-prefix SM20 -check-prefix PTXAS-EXTRA \ // RUN: | FileCheck -check-prefix CHECK -check-prefix SM20 \
// RUN: -check-prefix FATBINARY-EXTRA %s // RUN: -check-prefix PTXAS-EXTRA -check-prefix FATBINARY-EXTRA %s
// MacOS spot-checks // MacOS spot-checks
// RUN: %clang -### -target x86_64-apple-macosx -O0 -c %s 2>&1 \ // 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-prefix CHECK -check-prefix ARCH64 \
// RUN: -check-prefix SM20 -check-prefix OPT0 %s
// RUN: %clang -### -target x86_64-apple-macosx --cuda-gpu-arch=sm_35 -c %s 2>&1 \ // 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: | FileCheck -check-prefix CHECK -check-prefix ARCH64 -check-prefix SM35 %s
// RUN: %clang -### -target x86_32-apple-macosx -c %s 2>&1 \ // RUN: %clang -### -target i386-apple-macosx -c %s 2>&1 \
// RUN: | FileCheck -check-prefix ARCH32 -check-prefix SM20 %s // RUN: | FileCheck -check-prefix CHECK -check-prefix ARCH32 -check-prefix SM20 %s
// Check that CLANG forwards the -v flag to PTXAS. // Check that CLANG forwards the -v flag to PTXAS.
// RUN: %clang -### -save-temps -no-canonical-prefixes -v %s 2>&1 \ // RUN: %clang -### -save-temps -no-canonical-prefixes -v %s 2>&1 \
// RUN: | FileCheck -check-prefix=CHK-PTXAS-VERBOSE %s // RUN: | FileCheck -check-prefix=CHK-PTXAS-VERBOSE %s
// Match clang job that produces PTX assembly. // Match clang job that produces PTX assembly.
// CHECK: "-cc1" "-triple" "nvptx64-nvidia-cuda" // CHECK: "-cc1"
// SM20: "-target-cpu" "sm_20" // ARCH64-SAME: "-triple" "nvptx64-nvidia-cuda"
// SM35: "-target-cpu" "sm_35" // ARCH32-SAME: "-triple" "nvptx-nvidia-cuda"
// SM20: "-o" "[[PTXFILE:[^"]*]]" // SM20-SAME: "-target-cpu" "sm_20"
// SM35: "-o" "[[PTXFILE:[^"]*]]" // SM35-SAME: "-target-cpu" "sm_35"
// SM20-SAME: "-o" "[[PTXFILE:[^"]*]]"
// SM35-SAME: "-o" "[[PTXFILE:[^"]*]]"
// Match the call to ptxas (which assembles PTX to SASS). // Match the call to ptxas (which assembles PTX to SASS).
// CHECK:ptxas // CHECK: ptxas
// ARCH64: "-m64" // ARCH64-SAME: "-m64"
// ARCH32: "-m32" // ARCH32-SAME: "-m32"
// OPT0: "-O0" // OPT0-SAME: "-O0"
// OPT0-NOT: "-g" // OPT0-NOT: "-g"
// OPT1: "-O1" // OPT1-SAME: "-O1"
// OPT1-NOT: "-g" // OPT1-NOT: "-g"
// OPT2: "-O2" // OPT2-SAME: "-O2"
// OPT2-NOT: "-g" // OPT2-NOT: "-g"
// OPT3: "-O3" // OPT3-SAME: "-O3"
// OPT3-NOT: "-g" // OPT3-NOT: "-g"
// DBG: "-g" "--dont-merge-basicblocks" "--return-at-end" // DBG-SAME: "-g" "--dont-merge-basicblocks" "--return-at-end"
// SM20: "--gpu-name" "sm_20" // SM20-SAME: "--gpu-name" "sm_20"
// SM35: "--gpu-name" "sm_35" // SM35-SAME: "--gpu-name" "sm_35"
// SM20: "--output-file" "[[CUBINFILE:[^"]*]]" // SM20-SAME: "--output-file" "[[CUBINFILE:[^"]*]]"
// SM35: "--output-file" "[[CUBINFILE:[^"]*]]" // SM35-SAME: "--output-file" "[[CUBINFILE:[^"]*]]"
// PTXAS-EXTRA: "-foo1"
// PTXAS-EXTRA-SAME: "-foo2"
// CHECK-SAME: "[[PTXFILE]]" // 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 // Match the call to fatbinary (which combines all our PTX and SASS into one
// blob). // blob).
// CHECK:fatbinary // CHECK: fatbinary
// CHECK-DAG: "--cuda" // CHECK-SAME-DAG: "--cuda"
// ARCH64-DAG: "-64" // ARCH64-SAME-DAG: "-64"
// ARCH32-DAG: "-32" // ARCH32-SAME-DAG: "-32"
// CHECK-DAG: "--create" "[[FATBINARY:[^"]*]]" // CHECK-DAG: "--create" "[[FATBINARY:[^"]*]]"
// SM20-DAG: "--image=profile=compute_20,file=[[PTXFILE]]" // SM20-SAME-DAG: "--image=profile=compute_20,file=[[PTXFILE]]"
// SM35-DAG: "--image=profile=compute_35,file=[[PTXFILE]]" // SM35-SAME-DAG: "--image=profile=compute_35,file=[[PTXFILE]]"
// SM20-DAG: "--image=profile=sm_20,file=[[CUBINFILE]]" // SM20-SAME-DAG: "--image=profile=sm_20,file=[[CUBINFILE]]"
// SM35-DAG: "--image=profile=sm_35,file=[[CUBINFILE]]" // SM35-SAME-DAG: "--image=profile=sm_35,file=[[CUBINFILE]]"
// FATBINARY-EXTRA: "-bar1" // FATBINARY-EXTRA-SAME: "-bar1"
// FATBINARY-EXTRA-SAME: "-bar2" // FATBINARY-EXTRA-SAME: "-bar2"
// Match the clang job for host compilation. // 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]]" // CHECK-SAME: "-fcuda-include-gpubinary" "[[FATBINARY]]"
// CHK-PTXAS-VERBOSE: ptxas{{.*}}" "-v" // CHK-PTXAS-VERBOSE: ptxas{{.*}}" "-v"
No newline at end of file