This is an archive of the discontinued LLVM Phabricator instance.

[CUDA] Fix CUDA install version parsing.
ClosedPublic

Authored by jlebar on Aug 9 2016, 5:26 PM.

Reviewers

Commits

Summary

getAsInteger returns true on error. Oops.

No test because the behavior at the moment is identical with or without
this change.

jlebar retitled this revision from to [CUDA] Fix CUDA install version parsing..

jlebar updated this object.

jlebar added a reviewer: tra.

tra accepted this revision.Aug 10 2016, 9:54 AM

tra edited edge metadata.

This revision is now accepted and ready to land.Aug 10 2016, 9:54 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

cfe/

trunk/

lib/

Driver/

4 lines

	Show First 20 Lines • Show All 1,724 Lines • ▼ Show 20 Lines
	// contain one line of the from e.g. "CUDA Version 7.5.2".			// contain one line of the from e.g. "CUDA Version 7.5.2".
	static CudaVersion ParseCudaVersionFile(llvm::StringRef V) {			static CudaVersion ParseCudaVersionFile(llvm::StringRef V) {
	if (!V.startswith("CUDA Version "))			if (!V.startswith("CUDA Version "))
	return CudaVersion::UNKNOWN;			return CudaVersion::UNKNOWN;
	V = V.substr(strlen("CUDA Version "));			V = V.substr(strlen("CUDA Version "));
	int Major = -1, Minor = -1;			int Major = -1, Minor = -1;
	auto First = V.split('.');			auto First = V.split('.');
	auto Second = First.second.split('.');			auto Second = First.second.split('.');
	if (!First.first.getAsInteger(10, Major) \|\|			if (First.first.getAsInteger(10, Major) \|\|
	!Second.first.getAsInteger(10, Minor))			Second.first.getAsInteger(10, Minor))
	return CudaVersion::UNKNOWN;			return CudaVersion::UNKNOWN;

	if (Major == 7 && Minor == 0) {			if (Major == 7 && Minor == 0) {
	// This doesn't appear to ever happen -- version.txt doesn't exist in the			// This doesn't appear to ever happen -- version.txt doesn't exist in the
	// CUDA 7 installs I've seen. But no harm in checking.			// CUDA 7 installs I've seen. But no harm in checking.
	return CudaVersion::CUDA_70;			return CudaVersion::CUDA_70;
	}			}
	if (Major == 7 && Minor == 5)			if (Major == 7 && Minor == 5)
	▲ Show 20 Lines • Show All 3,428 Lines • Show Last 20 Lines