This is an archive of the discontinued LLVM Phabricator instance.

Differential D15975

[CUDA] Rename check-prefixes in cuda-options.cu and cuda-unused-arg-warning.cu.
ClosedPublic

Authored by jlebar on Jan 7 2016, 3:26 PM.

Details

Reviewers
tra
Commits
rG388579fab76d: [CUDA] Rename check-prefixes in cuda-options.cu and cuda-unused-arg-warning.cu.
rC257557: [CUDA] Rename check-prefixes in cuda-options.cu and cuda-unused-arg-warning.cu.
rL257557: [CUDA] Rename check-prefixes in cuda-options.cu and cuda-unused-arg-warning.cu.
Summary

Rename the args to be more human-readable. Among other things, this
lets us get rid of a bunch of comments (e.g. "ensure we don't run the
linker"), greatly shortening these tests.

Also apply consistent formatting and fix some English nits while we're
at it.

Diff Detail

Repository
rL LLVM

Event Timeline

jlebar updated this revision to Diff 44271.Jan 7 2016, 3:26 PM
jlebar retitled this revision from to [CUDA] Rename check-prefixes in cuda-options.cu and cuda-unused-arg-warning.cu..
jlebar updated this object.
jlebar added a reviewer: tra.
tra accepted this revision.Jan 12 2016, 5:25 PM
tra edited edge metadata.

LGTM

This revision is now accepted and ready to land.Jan 12 2016, 5:25 PM
Closed by commit rL257557: [CUDA] Rename check-prefixes in cuda-options.cu and cuda-unused-arg-warning.cu. (authored by jlebar). · Explain WhyJan 12 2016, 5:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
test/
Driver/
255 lines
8 lines

Diff 44699

cfe/trunk/test/Driver/cuda-options.cu

// Tests CUDA compilation pipeline construction in Driver. // Tests CUDA compilation pipeline construction in Driver.
// REQUIRES: clang-driver // REQUIRES: clang-driver
// REQUIRES: x86-registered-target // REQUIRES: x86-registered-target
// REQUIRES: nvptx-registered-target // REQUIRES: nvptx-registered-target
// Simple compilation case: // Simple compilation case. Compile device-side to PTX assembly and make sure
// we use it on the host side.
// 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 DEVICE -check-prefix DEVICE-NOSAVE \
// RUN: | FileCheck -check-prefix CUDA-D1 -check-prefix CUDA-D1NS\ // RUN: -check-prefix HOST -check-prefix INCLUDES-DEVICE \
// Then compile host side and incorporate device code. // RUN: -check-prefix NOLINK %s
// RUN: -check-prefix CUDA-H -check-prefix CUDA-H-I1 \
// Make sure we don't link anything.
// RUN: -check-prefix CUDA-NL %s
// Typical compilation + link case: // 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 DEVICE -check-prefix DEVICE-NOSAVE \
// RUN: | FileCheck -check-prefix CUDA-D1 -check-prefix CUDA-D1NS\ // RUN: -check-prefix HOST -check-prefix INCLUDES-DEVICE \
// Then compile host side and incorporate device code. // RUN: -check-prefix LINK %s
// RUN: -check-prefix CUDA-H -check-prefix CUDA-H-I1 \
// Then link things.
// RUN: -check-prefix CUDA-L %s
// Verify that --cuda-host-only disables device-side compilation and linking // Verify that --cuda-host-only disables device-side compilation, but doesn't
// disable host-side compilation/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 NODEVICE -check-prefix HOST \
// RUN: | FileCheck -check-prefix CUDA-ND \ // RUN: -check-prefix NOINCLUDES-DEVICE -check-prefix LINK %s
// Then compile host side and make sure we don't attempt to incorporate GPU code.
// RUN: -check-prefix CUDA-H -check-prefix CUDA-H-NI \
// Linking is allowed to happen, even if we're missing GPU code.
// RUN: -check-prefix CUDA-L %s
// Same test as above, but with preceeding --cuda-device-only to make // Same test as above, but with preceeding --cuda-device-only to make sure only
// sure only last option has effect. // the last option has an effect.
// RUN: %clang -### -target x86_64-linux-gnu --cuda-device-only --cuda-host-only %s 2>&1 \ // RUN: %clang -### -target x86_64-linux-gnu --cuda-device-only --cuda-host-only %s 2>&1 \
// Make sure we didn't run device-side compilation. // RUN: | FileCheck -check-prefix NODEVICE -check-prefix HOST \
// RUN: | FileCheck -check-prefix CUDA-ND \ // RUN: -check-prefix NOINCLUDES-DEVICE -check-prefix LINK %s
// Then compile host side and make sure we don't attempt to incorporate GPU code.
// RUN: -check-prefix CUDA-H -check-prefix CUDA-H-NI \
// Linking is allowed to happen, even if we're missing GPU code.
// RUN: -check-prefix CUDA-L %s
// Verify that --cuda-device-only disables host-side compilation and linking // Verify that --cuda-device-only 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 DEVICE -check-prefix DEVICE-NOSAVE \
// RUN: | FileCheck -check-prefix CUDA-D1 -check-prefix CUDA-D1NS\ // RUN: -check-prefix NOHOST -check-prefix NOLINK %s
// Make sure there are no host cmpilation or linking.
// RUN: -check-prefix CUDA-NH -check-prefix CUDA-NL %s
// Same test as above, but with preceeding --cuda-host-only to make // Same test as above, but with preceeding --cuda-host-only to make sure only
// sure only last option has effect. // the last option has an effect.
// RUN: %clang -### -target x86_64-linux-gnu --cuda-host-only --cuda-device-only %s 2>&1 \ // RUN: %clang -### -target x86_64-linux-gnu --cuda-host-only --cuda-device-only %s 2>&1 \
// Compile device-side to PTX assembly // RUN: | FileCheck -check-prefix DEVICE -check-prefix DEVICE-NOSAVE \
// RUN: | FileCheck -check-prefix CUDA-D1 -check-prefix CUDA-D1NS\ // RUN: -check-prefix NOHOST -check-prefix NOLINK %s
// Make sure there are no host cmpilation or linking.
// RUN: -check-prefix CUDA-NH -check-prefix CUDA-NL %s
// Verify that with -S we compile host and device sides to assembly // Verify that with -S we compile host and device sides to assembly and
// and incorporate device code on the host side. // incorporate device code into 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 DEVICE -check-prefix DEVICE-NOSAVE \
// RUN: | FileCheck -check-prefix CUDA-D1 -check-prefix CUDA-D1NS\ // RUN: -check-prefix HOST -check-prefix INCLUDES-DEVICE \
// Then compile host side and incorporate GPU code. // RUN: -check-prefix NOLINK %s
// RUN: -check-prefix CUDA-H -check-prefix CUDA-H-I1 \
// Make sure we don't link anything.
// RUN: -check-prefix CUDA-NL %s
// Verify that --cuda-gpu-arch option passes correct GPU // Verify that --cuda-gpu-arch option passes the correct GPU archtecture to
// archtecture info to device compilation. // 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 DEVICE -check-prefix DEVICE-NOSAVE \
// RUN: | FileCheck -check-prefix CUDA-D1 -check-prefix CUDA-D1NS \ // RUN: -check-prefix DEVICE-SM35 -check-prefix HOST \
// RUN: -check-prefix CUDA-D1-SM35 \ // RUN: -check-prefix INCLUDES-DEVICE -check-prefix NOLINK %s
// Then compile host side and incorporate GPU code.
// RUN: -check-prefix CUDA-H -check-prefix CUDA-H-I1 \
// Make sure we don't link anything.
// RUN: -check-prefix CUDA-NL %s
// Verify that there is device-side compilation per --cuda-gpu-arch args // Verify that there is one device-side compilation per --cuda-gpu-arch args
// and that all results are included on the host side. // and that all results are included on the host side.
// RUN: %clang -### -target x86_64-linux-gnu \ // RUN: %clang -### -target x86_64-linux-gnu \
// RUN: --cuda-gpu-arch=sm_35 --cuda-gpu-arch=sm_30 -c %s 2>&1 \ // RUN: --cuda-gpu-arch=sm_35 --cuda-gpu-arch=sm_30 -c %s 2>&1 \
// Compile both device-sides to PTX assembly // RUN: | FileCheck -check-prefix DEVICE -check-prefix DEVICE-NOSAVE \
// RUN: | FileCheck \ // RUN: -check-prefix DEVICE2 -check-prefix DEVICE-SM35 \
// RUN: -check-prefix CUDA-D1 -check-prefix CUDA-D1NS -check-prefix CUDA-D1-SM35 \ // RUN: -check-prefix DEVICE2-SM30 -check-prefix HOST \
// RUN: -check-prefix CUDA-D2 -check-prefix CUDA-D2-SM30 \ // RUN: -check-prefix HOST-NOSAVE -check-prefix INCLUDES-DEVICE \
// Then compile host side and incorporate both device-side outputs // RUN: -check-prefix INCLUDES-DEVICE2 -check-prefix NOLINK %s
// RUN: -check-prefix CUDA-H -check-prefix CUDA-HNS \
// RUN: -check-prefix CUDA-H-I1 -check-prefix CUDA-H-I2 \
// Make sure we don't link anything.
// RUN: -check-prefix CUDA-NL %s
// Verify that device-side results are passed to correct tool when // Verify that device-side results are passed to the correct tool when
// -save-temps is used // -save-temps is used.
// RUN: %clang -### -target x86_64-linux-gnu -save-temps -c %s 2>&1 \ // RUN: %clang -### -target x86_64-linux-gnu -save-temps -c %s 2>&1 \
// Compile device-side to PTX assembly and make sure we use it on the host side. // RUN: | FileCheck -check-prefix DEVICE -check-prefix DEVICE-SAVE \
// RUN: | FileCheck -check-prefix CUDA-D1 -check-prefix CUDA-D1S \ // RUN: -check-prefix HOST -check-prefix HOST-SAVE -check-prefix NOLINK %s
// Then compile host side and incorporate device code.
// RUN: -check-prefix CUDA-H -check-prefix CUDA-HS -check-prefix CUDA-HS-I1 \
// Make sure we don't link anything.
// RUN: -check-prefix CUDA-NL %s
// Verify that device-side results are passed to correct tool when // Verify that device-side results are passed to the correct tool when
// -fno-integrated-as is used // -fno-integrated-as is used.
// RUN: %clang -### -target x86_64-linux-gnu -fno-integrated-as -c %s 2>&1 \ // RUN: %clang -### -target x86_64-linux-gnu -fno-integrated-as -c %s 2>&1 \
// Compile device-side to PTX assembly and make sure we use it on the host side. // RUN: | FileCheck -check-prefix DEVICE -check-prefix DEVICE-NOSAVE \
// RUN: | FileCheck -check-prefix CUDA-D1 -check-prefix CUDA-D1NS \ // RUN: -check-prefix HOST -check-prefix HOST-NOSAVE \
// Then compile host side and incorporate device code. // RUN: -check-prefix HOST-AS -check-prefix NOLINK %s
// RUN: -check-prefix CUDA-H -check-prefix CUDA-HNS -check-prefix CUDA-HS-I1 \
// RUN: -check-prefix CUDA-H-AS \ // Match device-side preprocessor and compiler phases with -save-temps.
// Make sure we don't link anything. // DEVICE-SAVE: "-cc1" "-triple" "nvptx64-nvidia-cuda"
// RUN: -check-prefix CUDA-NL %s // DEVICE-SAVE-SAME: "-aux-triple" "x86_64--linux-gnu"
// DEVICE-SAVE-SAME: "-fcuda-is-device"
// Match device-side preprocessor, and compiler phases with -save-temps // DEVICE-SAVE-SAME: "-x" "cuda"
// CUDA-D1S: "-cc1" "-triple" "nvptx64-nvidia-cuda"
// CUDA-D1S-SAME: "-aux-triple" "x86_64--linux-gnu" // DEVICE-SAVE: "-cc1" "-triple" "nvptx64-nvidia-cuda"
// CUDA-D1S-SAME: "-fcuda-is-device" // DEVICE-SAVE-SAME: "-aux-triple" "x86_64--linux-gnu"
// CUDA-D1S-SAME: "-x" "cuda" // DEVICE-SAVE-SAME: "-fcuda-is-device"
// DEVICE-SAVE-SAME: "-x" "cuda-cpp-output"
// CUDA-D1S: "-cc1" "-triple" "nvptx64-nvidia-cuda"
// CUDA-D1S-SAME: "-aux-triple" "x86_64--linux-gnu" // Match the job that produces PTX assembly.
// CUDA-D1S-SAME: "-fcuda-is-device" // DEVICE: "-cc1" "-triple" "nvptx64-nvidia-cuda"
// CUDA-D1S-SAME: "-x" "cuda-cpp-output" // DEVICE-NOSAVE-SAME: "-aux-triple" "x86_64--linux-gnu"
// DEVICE-SAME: "-fcuda-is-device"
// Match the job that produces PTX assembly // DEVICE-SM35-SAME: "-target-cpu" "sm_35"
// CUDA-D1: "-cc1" "-triple" "nvptx64-nvidia-cuda" // DEVICE-SAME: "-o" "[[GPUBINARY1:[^"]*]]"
// CUDA-D1NS-SAME: "-aux-triple" "x86_64--linux-gnu" // DEVICE-NOSAVE-SAME: "-x" "cuda"
// CUDA-D1-SAME: "-fcuda-is-device" // DEVICE-SAVE-SAME: "-x" "ir"
// CUDA-D1-SM35-SAME: "-target-cpu" "sm_35"
// CUDA-D1-SAME: "-o" "[[GPUBINARY1:[^"]*]]" // Match another device-side compilation.
// CUDA-D1NS-SAME: "-x" "cuda" // DEVICE2: "-cc1" "-triple" "nvptx64-nvidia-cuda"
// CUDA-D1S-SAME: "-x" "ir" // DEVICE2-SAME: "-aux-triple" "x86_64--linux-gnu"
// DEVICE2-SAME: "-fcuda-is-device"
// Match another device-side compilation // DEVICE2-SM30-SAME: "-target-cpu" "sm_30"
// CUDA-D2: "-cc1" "-triple" "nvptx64-nvidia-cuda" // DEVICE2-SAME: "-o" "[[GPUBINARY2:[^"]*]]"
// CUDA-D2-SAME: "-aux-triple" "x86_64--linux-gnu" // DEVICE2-SAME: "-x" "cuda"
// CUDA-D2-SAME: "-fcuda-is-device"
// CUDA-D2-SM30-SAME: "-target-cpu" "sm_30" // Match no device-side compilation.
// CUDA-D2-SAME: "-o" "[[GPUBINARY2:[^"]*]]" // NODEVICE-NOT: "-cc1" "-triple" "nvptx64-nvidia-cuda"
// CUDA-D2-SAME: "-x" "cuda" // NODEVICE-SAME-NOT: "-fcuda-is-device"
// Match no device-side compilation // Match host-side preprocessor job with -save-temps.
// CUDA-ND-NOT: "-cc1" "-triple" "nvptx64-nvidia-cuda" // HOST-SAVE: "-cc1" "-triple" "x86_64--linux-gnu"
// CUDA-ND-SAME-NOT: "-fcuda-is-device" // HOST-SAVE-SAME: "-aux-triple" "nvptx64-nvidia-cuda"
// HOST-SAVE-SAME-NOT: "-fcuda-is-device"
// Match host-side preprocessor job with -save-temps // HOST-SAVE-SAME: "-x" "cuda"
// CUDA-HS: "-cc1" "-triple" "x86_64--linux-gnu"
// CUDA-HS-SAME: "-aux-triple" "nvptx64-nvidia-cuda" // Match host-side compilation.
// CUDA-HS-SAME-NOT: "-fcuda-is-device" // HOST: "-cc1" "-triple" "x86_64--linux-gnu"
// CUDA-HS-SAME: "-x" "cuda" // HOST-SAME: "-aux-triple" "nvptx64-nvidia-cuda"
// HOST-SAME-NOT: "-fcuda-is-device"
// Match host-side compilation // HOST-SAME: "-o" "[[HOSTOUTPUT:[^"]*]]"
// CUDA-H: "-cc1" "-triple" "x86_64--linux-gnu" // HOST-NOSAVE-SAME: "-x" "cuda"
// CUDA-H-SAME: "-aux-triple" "nvptx64-nvidia-cuda" // HOST-SAVE-SAME: "-x" "cuda-cpp-output"
// CUDA-H-SAME-NOT: "-fcuda-is-device" // INCLUDES-DEVICE-SAME: "-fcuda-include-gpubinary" "[[GPUBINARY1]]"
// CUDA-H-SAME: "-o" "[[HOSTOUTPUT:[^"]*]]" // INCLUDES-DEVICE2-SAME: "-fcuda-include-gpubinary" "[[GPUBINARY2]]"
// CUDA-HNS-SAME: "-x" "cuda"
// CUDA-HS-SAME: "-x" "cuda-cpp-output"
// CUDA-H-I1-SAME: "-fcuda-include-gpubinary" "[[GPUBINARY1]]"
// CUDA-H-I2-SAME: "-fcuda-include-gpubinary" "[[GPUBINARY2]]"
// Match external assembler that uses compilation output // Match external assembler that uses compilation output.
// CUDA-H-AS: "-o" "{{.*}}.o" "[[HOSTOUTPUT]]" // HOST-AS: "-o" "{{.*}}.o" "[[HOSTOUTPUT]]"
// Match no GPU code inclusion. // Match no GPU code inclusion.
// CUDA-H-NI-NOT: "-fcuda-include-gpubinary" // NOINCLUDES-DEVICE-NOT: "-fcuda-include-gpubinary"
// Match no CUDA compilation // Match no host compilation.
// CUDA-NH-NOT: "-cc1" "-triple" // NOHOST-NOT: "-cc1" "-triple"
// CUDA-NH-SAME-NOT: "-x" "cuda" // NOHOST-SAME-NOT: "-x" "cuda"
// Match linker // Match linker.
// CUDA-L: "{{.*}}{{ld|link}}{{(.exe)?}}" // LINK: "{{.*}}{{ld|link}}{{(.exe)?}}"
// CUDA-L-SAME: "[[HOSTOUTPUT]]" // LINK-SAME: "[[HOSTOUTPUT]]"
// Match no linker // Match no linker.
// CUDA-NL-NOT: "{{.*}}{{ld|link}}{{(.exe)?}}" // NOLINK-NOT: "{{.*}}{{ld|link}}{{(.exe)?}}"

cfe/trunk/test/Driver/cuda-unused-arg-warning.cu

// Tests that we trigger unused-arg warnings on CUDA flags appropriately. // Tests that we trigger unused-arg warnings on CUDA flags appropriately.
// REQUIRES: clang-driver // REQUIRES: clang-driver
// REQUIRES: x86-registered-target // REQUIRES: x86-registered-target
// REQUIRES: nvptx-registered-target // REQUIRES: nvptx-registered-target
// --cuda-host-only should never trigger unused arg warning. // --cuda-host-only should never trigger unused arg warning.
// RUN: %clang -### -target x86_64-linux-gnu --cuda-host-only -c %s 2>&1 | \ // RUN: %clang -### -target x86_64-linux-gnu --cuda-host-only -c %s 2>&1 | \
// RUN: FileCheck %s // RUN: FileCheck %s
// RUN: %clang -### -target x86_64-linux-gnu --cuda-host-only -x c -c %s 2>&1 | \ // RUN: %clang -### -target x86_64-linux-gnu --cuda-host-only -x c -c %s 2>&1 | \
// RUN: FileCheck %s // RUN: FileCheck %s
// --cuda-device-only should warn during non-CUDA compilation. // --cuda-device-only should warn during non-CUDA compilation.
// RUN: %clang -### -target x86_64-linux-gnu --cuda-device-only -x c -c %s 2>&1 | \ // RUN: %clang -### -target x86_64-linux-gnu --cuda-device-only -x c -c %s 2>&1 | \
// RUN: FileCheck -check-prefix UNUSED-CDO %s // RUN: FileCheck -check-prefix UNUSED-WARNING %s
// --cuda-device-only should not produce warning compiling CUDA files // --cuda-device-only should not produce warning compiling CUDA files
// RUN: %clang -### -target x86_64-linux-gnu --cuda-device-only -c %s 2>&1 | \ // RUN: %clang -### -target x86_64-linux-gnu --cuda-device-only -c %s 2>&1 | \
// RUN: FileCheck -check-prefix NO-UNUSED-CDO %s // RUN: FileCheck -check-prefix NO-UNUSED-WARNING %s
// CHECK-NOT: warning: argument unused during compilation: '--cuda-host-only' // CHECK-NOT: warning: argument unused during compilation: '--cuda-host-only'
// UNUSED-CDO: warning: argument unused during compilation: '--cuda-device-only' // UNUSED-WARNING: warning: argument unused during compilation: '--cuda-device-only'
// NO-UNUSED-CDO-NOT: warning: argument unused during compilation: '--cuda-device-only' // NO-UNUSED-WARNING-NOT: warning: argument unused during compilation: '--cuda-device-only'