Skip to content

Commit 8846b91

Browse files
author
Jeff Niu
authored
Revert "[CMake][LIT] Add option to run lit testsuites in parallel" (#84813)
Reverts #82899 Per the discussion on the PR, this needs more design and justification.
1 parent 5b4c350 commit 8846b91

File tree

3 files changed

+5
-20
lines changed

3 files changed

+5
-20
lines changed

llvm/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,8 +712,6 @@ if(LLVM_INDIVIDUAL_TEST_COVERAGE)
712712
endif()
713713
set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit")
714714

715-
option(LLVM_PARALLEL_LIT "Enable multiple lit suites to run in parallel" OFF)
716-
717715
# On Win32 hosts, provide an option to specify the path to the GnuWin32 tools.
718716
if( WIN32 AND NOT CYGWIN )
719717
set(LLVM_LIT_TOOLS_DIR "" CACHE PATH "Path to GnuWin32 tools")

llvm/cmake/modules/AddLLVM.cmake

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,18 +1947,11 @@ function(add_lit_target target comment)
19471947
list(APPEND LIT_COMMAND --param ${param})
19481948
endforeach()
19491949
if (ARG_UNPARSED_ARGUMENTS)
1950-
if (LLVM_PARALLEL_LIT)
1951-
add_custom_target(${target}
1952-
COMMAND ${LIT_COMMAND} ${ARG_UNPARSED_ARGUMENTS}
1953-
COMMENT "${comment}"
1954-
)
1955-
else()
1956-
add_custom_target(${target}
1957-
COMMAND ${LIT_COMMAND} ${ARG_UNPARSED_ARGUMENTS}
1958-
COMMENT "${comment}"
1959-
USES_TERMINAL
1960-
)
1961-
endif()
1950+
add_custom_target(${target}
1951+
COMMAND ${LIT_COMMAND} ${ARG_UNPARSED_ARGUMENTS}
1952+
COMMENT "${comment}"
1953+
USES_TERMINAL
1954+
)
19621955
else()
19631956
add_custom_target(${target}
19641957
COMMAND ${CMAKE_COMMAND} -E echo "${target} does nothing, no tools built.")

llvm/docs/CMake.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -762,12 +762,6 @@ enabled sub-projects. Nearly all of these variable names begin with
762762
**LLVM_PARALLEL_LINK_JOBS**:STRING
763763
Define the maximum number of concurrent link jobs.
764764

765-
**LLVM_PARALLEL_LIT**:BOOL
766-
Defaults to ``OFF``. If set to ``OFF``, lit testsuites will be configured
767-
with CMake's ``USES_TERMINAL`` flag to give direct access to the terminal. If
768-
set to ``ON``, that flag will be removed allowing Ninja to schedule multiple
769-
lit testsuites in parallel.
770-
771765
**LLVM_RAM_PER_COMPILE_JOB**:STRING
772766
Calculates the amount of Ninja compile jobs according to available resources.
773767
Value has to be in MB, overwrites LLVM_PARALLEL_COMPILE_JOBS. Compile jobs

0 commit comments

Comments
 (0)