This is an archive of the discontinued LLVM Phabricator instance.

Silence unused argument warning for --cuda-host-only.
ClosedPublic

Authored by tra on Jul 28 2015, 1:33 PM.

Download Raw Diff

Details

Reviewers

samsonov
echristo

Commits

rGbaae093e49ae: Silence unused argument warning for --cuda-host-only.
rC243479: Silence unused argument warning for --cuda-host-only.
rL243479: Silence unused argument warning for --cuda-host-only.

Diff Detail

Event Timeline

tra updated this revision to Diff 30850.Jul 28 2015, 1:33 PM

tra retitled this revision from to Silence unused argument warning for --cuda-host-only..

tra updated this object.

tra added reviewers: echristo, samsonov.

tra added a subscriber: cfe-commits.

LGTM

test/Driver/cuda-options.cu
78	s/warnging/warning

This revision is now accepted and ready to land.Jul 28 2015, 1:47 PM

Sure. It's probably not ideal, but seems to work. Couple of silly nits inline.

-eric

test/Driver/cuda-options.cu
72	"not ever" -> never
78	"warning"

Fixed spelling/phrasing errors.

Closed by commit rL243479: Silence unused argument warning for --cuda-host-only. (authored by tra). · Explain WhyJul 28 2015, 2:02 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

lib/

Driver/

Driver.cpp

4 lines

test/

Driver/

cuda-options.cu

18 lines

Diff 30852

lib/Driver/Driver.cpp

Show First 20 Lines • Show All 1,484 Lines • ▼ Show 20 Lines	void Driver::BuildActions(const ToolChain &TC, DerivedArgList &Args,
// compilation.		// compilation.
if (FinalPhase == phases::Link && PL.size() == 1) {		if (FinalPhase == phases::Link && PL.size() == 1) {
Args.ClaimAllArgs(options::OPT_CompileOnly_Group);		Args.ClaimAllArgs(options::OPT_CompileOnly_Group);
Args.ClaimAllArgs(options::OPT_cl_compile_Group);		Args.ClaimAllArgs(options::OPT_cl_compile_Group);
}		}

// Claim ignored clang-cl options.		// Claim ignored clang-cl options.
Args.ClaimAllArgs(options::OPT_cl_ignored_Group);		Args.ClaimAllArgs(options::OPT_cl_ignored_Group);

		// Claim --cuda-host-only arg which may be passed to non-CUDA
		// compilations and should not trigger warnings there.
		Args.ClaimAllArgs(options::OPT_cuda_host_only);
}		}

std::unique_ptr<Action>		std::unique_ptr<Action>
Driver::ConstructPhaseAction(const ToolChain &TC, const ArgList &Args,		Driver::ConstructPhaseAction(const ToolChain &TC, const ArgList &Args,
phases::ID Phase,		phases::ID Phase,
std::unique_ptr<Action> Input) const {		std::unique_ptr<Action> Input) const {
llvm::PrettyStackTraceString CrashInfo("Constructing phase actions");		llvm::PrettyStackTraceString CrashInfo("Constructing phase actions");
// Build the appropriate action.		// Build the appropriate action.
▲ Show 20 Lines • Show All 816 Lines • Show Last 20 Lines

test/Driver/cuda-options.cu

	Show First 20 Lines • Show All 63 Lines • ▼ Show 20 Lines
	// RUN: \| FileCheck \			// RUN: \| FileCheck \
	// RUN: -check-prefix CUDA-D1 -check-prefix CUDA-D1-SM35 \			// RUN: -check-prefix CUDA-D1 -check-prefix CUDA-D1-SM35 \
	// RUN: -check-prefix CUDA-D2 -check-prefix CUDA-D2-SM30 \			// RUN: -check-prefix CUDA-D2 -check-prefix CUDA-D2-SM30 \
	// Then compile host side and incorporate both device-side outputs			// Then compile host side and incorporate both device-side outputs
	// RUN: -check-prefix CUDA-H -check-prefix CUDA-H-I1 -check-prefix CUDA-H-I2 \			// RUN: -check-prefix CUDA-H -check-prefix CUDA-H-I1 -check-prefix CUDA-H-I2 \
	// Make sure we don't link anything.			// Make sure we don't link anything.
	// RUN: -check-prefix CUDA-NL %s			// RUN: -check-prefix CUDA-NL %s

				// --cuda-host-only should never trigger unused arg warning.
				echristoUnsubmitted Done Reply Inline Actions "not ever" -> never echristo: "not ever" -> never
				// RUN: %clang -### -target x86_64-linux-gnu --cuda-host-only -c %s 2>&1 \| \
				// RUN: FileCheck -check-prefix CUDA-NO-UNUSED-CHO %s
				// RUN: %clang -### -target x86_64-linux-gnu --cuda-host-only -x c -c %s 2>&1 \| \
				// RUN: FileCheck -check-prefix CUDA-NO-UNUSED-CHO %s

				// --cuda-device-only should not produce warning compiling CUDA files
				samsonovUnsubmitted Done Reply Inline Actions s/warnging/warning samsonov: s/warnging/warning
				echristoUnsubmitted Done Reply Inline Actions "warning" echristo: "warning"
				// RUN: %clang -### -target x86_64-linux-gnu --cuda-device-only -c %s 2>&1 \| \
				// RUN: FileCheck -check-prefix CUDA-NO-UNUSED-CDO %s

				// --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: FileCheck -check-prefix CUDA-UNUSED-CDO %s

	// Match device-side compilation			// Match device-side compilation
	// CUDA-D1: "-cc1" "-triple" "nvptx{{(64)?}}-nvidia-cuda"			// CUDA-D1: "-cc1" "-triple" "nvptx{{(64)?}}-nvidia-cuda"
	// CUDA-D1-SAME: "-fcuda-is-device"			// CUDA-D1-SAME: "-fcuda-is-device"
	// CUDA-D1-SM35-SAME: "-target-cpu" "sm_35"			// CUDA-D1-SM35-SAME: "-target-cpu" "sm_35"
	// CUDA-D1-SAME: "-o" "[[GPUBINARY1:[^"]*]]"			// CUDA-D1-SAME: "-o" "[[GPUBINARY1:[^"]*]]"
	// CUDA-D1-SAME: "-x" "cuda"			// CUDA-D1-SAME: "-x" "cuda"

	// Match anothe device-side compilation			// Match anothe device-side compilation
	Show All 24 Lines
	// CUDA-NH-SAME-NOT: "-x" "cuda"			// CUDA-NH-SAME-NOT: "-x" "cuda"

	// Match linker			// Match linker
	// CUDA-L: "{{.*}}{{ld\|link}}{{(.exe)?}}"			// CUDA-L: "{{.*}}{{ld\|link}}{{(.exe)?}}"
	// CUDA-L-SAME: "[[HOSTOBJ]]"			// CUDA-L-SAME: "[[HOSTOBJ]]"

	// Match no linker			// Match no linker
	// CUDA-NL-NOT: "{{.*}}{{ld\|link}}{{(.exe)?}}"			// CUDA-NL-NOT: "{{.*}}{{ld\|link}}{{(.exe)?}}"

				// CUDA-NO-UNUSED-CHO-NOT: warning: argument unused during compilation: '--cuda-host-only'
				// CUDA-UNUSED-CDO: warning: argument unused during compilation: '--cuda-device-only'
				// CUDA-NO-UNUSED-CDO-NOT: warning: argument unused during compilation: '--cuda-device-only'