This is an archive of the discontinued LLVM Phabricator instance.

[benchmark] Disable CMake get_git_version
ClosedPublic

Authored by andrewng on Jun 28 2019, 4:25 AM.

Download Raw Diff

Details

Reviewers

lebedev.ri
kbobyrev

Commits

rGd74f2d0a8609: [benchmark] Disable CMake get_git_version
rL364742: [benchmark] Disable CMake get_git_version

Summary

Disabled CMake get_git_version as it is meaningless for this in-tree
build, and hardcoded a null version.

Not using get_git_version avoids a refresh of the git index that is
executed by get_git_version. Refreshing the index can take a
considerable amount of time if the index needs to be refreshed
(particularly with the mono repo). This situation can arise when
building shared source on a host in VMs.

Diff Detail

Event Timeline

andrewng created this revision.Jun 28 2019, 4:25 AM

Herald added a project: Restricted Project. · View Herald TranscriptJun 28 2019, 4:25 AM

Herald added a subscriber: mgorny. · View Herald Transcript

andrewng mentioned this in D63657: [benchmark] Change GetGitVersion to only check "dirty" when a tag is found.Jun 28 2019, 4:27 AM

Sorry for the delay with the original patch!
I think this is fine.
@kbobyrev - any thoughts?

This revision is now accepted and ready to land.Jun 28 2019, 4:38 AM

The change looks good to me, thank you for the patch!

I think I missed the original discussion regarding some benchmark library changes due to a complete lack of time, apologies for that.

Closed by commit rGd74f2d0a8609: [benchmark] Disable CMake get_git_version (authored by andrewng). · Explain WhyJul 1 2019, 4:10 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents

Path

Size

llvm/

utils/

benchmark/

CMakeLists.txt

7 lines

README.LLVM

2 lines

Diff 207030

llvm/utils/benchmark/CMakeLists.txt

Show First 20 Lines • Show All 70 Lines • ▼ Show 20 Lines	option(BENCHMARK_ENABLE_ASSEMBLY_TESTS "Enable building and running the assembly tests"
${ENABLE_ASSEMBLY_TESTS_DEFAULT})		${ENABLE_ASSEMBLY_TESTS_DEFAULT})

# Make sure we can import out CMake functions		# Make sure we can import out CMake functions
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")		list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")		list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")


# Read the git tags to determine the project version		# Read the git tags to determine the project version
include(GetGitVersion)		# WARNING: This is meaningless for when the benchmark library is being built in-tree,
get_git_version(GIT_VERSION)		# so disable it and hardcode a null version.
		# include(GetGitVersion)
		# get_git_version(GIT_VERSION)
		set(GIT_VERSION "v0.0.0")

# Tell the user what versions we are using		# Tell the user what versions we are using
string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION})		string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" VERSION ${GIT_VERSION})
message("-- Version: ${VERSION}")		message("-- Version: ${VERSION}")

# The version of the libraries		# The version of the libraries
set(GENERIC_LIB_VERSION ${VERSION})		set(GENERIC_LIB_VERSION ${VERSION})
string(SUBSTRING ${VERSION} 0 1 GENERIC_LIB_SOVERSION)		string(SUBSTRING ${VERSION} 0 1 GENERIC_LIB_SOVERSION)
▲ Show 20 Lines • Show All 171 Lines • Show Last 20 Lines

llvm/utils/benchmark/README.LLVM

	Show All 15 Lines
	* https://github.com/google/benchmark/commit/f0901417c89d123474e6b91365029cfe32cf89dc			* https://github.com/google/benchmark/commit/f0901417c89d123474e6b91365029cfe32cf89dc
	is applied to fix 32-bit build failure on macOS			is applied to fix 32-bit build failure on macOS
	* https://github.com/google/benchmark/commit/52613079824ac58d06c070aa9fbbb186a5859e2c			* https://github.com/google/benchmark/commit/52613079824ac58d06c070aa9fbbb186a5859e2c
	is applied to fix cross compilation with MinGW headers			is applied to fix cross compilation with MinGW headers
	* https://github.com/google/benchmark/commit/439d6b1c2a6da5cb6adc4c4dfc555af235722396			* https://github.com/google/benchmark/commit/439d6b1c2a6da5cb6adc4c4dfc555af235722396
	is applied to fix building with MinGW headers for ARM			is applied to fix building with MinGW headers for ARM
	* https://github.com/google/benchmark/commit/a9b31c51b1ee7ec7b31438c647123c2cbac5d956			* https://github.com/google/benchmark/commit/a9b31c51b1ee7ec7b31438c647123c2cbac5d956
	is applied to disable exceptions in Microsoft STL when exceptions are disabled			is applied to disable exceptions in Microsoft STL when exceptions are disabled
				* Disabled CMake get_git_version as it is meaningless for this in-tree build,
				and hardcoded a null version