[test-suite][cmake] sort unit test targets

[gracejennings]

Summary

This patch sorts unit test targets into directories corresponding to the test source file directories to improve target navigation.

[smeenai]

IIUC this only affects IDE project generation. This makes sense to me, though I'll give others a few days to take a look as well in case they have any thoughts on the organization.

[smeenai]

LGTM

[gracejennings]

In D124810#3498019, @smeenai wrote:

LGTM

Thank you for the review! I don't yet have commit access. Would you commit the change on my behalf?

[smeenai]

In D124810#3501235, @gracejennings wrote:

In D124810#3498019, @smeenai wrote:

LGTM

Thank you for the review! I don't yet have commit access. Would you commit the change on my behalf?

Sorry, I was out last week; I'll do so now. What name and email address would you like the commit to use?

[gracejennings]

In D124810#3517473, @smeenai wrote:

In D124810#3501235, @gracejennings wrote:

In D124810#3498019, @smeenai wrote:

LGTM

Thank you for the review! I don't yet have commit access. Would you commit the change on my behalf?

Sorry, I was out last week; I'll do so now. What name and email address would you like the commit to use?

No worries, thanks! Grace Jennings [e-mail]

llvm/unittests/CMakeLists.txt

 add_custom_target(UnitTests)
-set_target_properties(UnitTests PROPERTIES FOLDER "Tests")
+set_target_properties(UnitTests PROPERTIES FOLDER "Tests/UnitTests")
 
 function(add_llvm_unittest test_dirname)
   add_unittest(UnitTests ${test_dirname} ${ARGN})
 endfunction()
 function(add_llvm_unittest_with_input_files test_dirname)
   add_unittest_with_input_files(UnitTests ${test_dirname} ${ARGN})
 endfunction()
 

llvm/unittests/DebugInfo/CodeView/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   DebugInfoCodeView
   )
 
 add_llvm_unittest(DebugInfoCodeViewTests
   GUIDFormatTest.cpp
   RandomAccessVisitorTest.cpp
   TypeHashingTest.cpp
   TypeIndexDiscoveryTest.cpp
   )
 
 target_link_libraries(DebugInfoCodeViewTests PRIVATE LLVMTestingSupport)
+
+set_property(TARGET DebugInfoCodeViewTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests")

llvm/unittests/DebugInfo/DWARF/CMakeLists.txt

add_llvm_unittest(DebugInfoDWARFTests
   DWARFExpressionCopyBytesTest.cpp
   DWARFExpressionCompactPrinterTest.cpp
   DWARFFormValueTest.cpp
   DWARFListTableTest.cpp
   DWARFLocationExpressionTest.cpp
   )
 
 target_link_libraries(DebugInfoDWARFTests PRIVATE LLVMTestingSupport)
+
+set_property(TARGET DebugInfoDWARFTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests")

llvm/unittests/DebugInfo/GSYM/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   DebugInfoDWARF
   DebugInfoGSYM
   MC
   Support
   ObjectYAML
   )
 
 add_llvm_unittest(DebugInfoGSYMTests
   GSYMTest.cpp
   )
 
 target_link_libraries(DebugInfoGSYMTests PRIVATE LLVMTestingSupport)
+
+set_property(TARGET DebugInfoGSYMTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests")

llvm/unittests/DebugInfo/MSF/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   DebugInfoMSF
   )
 
 add_llvm_unittest(DebugInfoMSFTests
   MappedBlockStreamTest.cpp
   MSFBuilderTest.cpp
   MSFCommonTest.cpp
   )
 
 target_link_libraries(DebugInfoMSFTests PRIVATE LLVMTestingSupport)
+
+set_property(TARGET DebugInfoMSFTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests")

llvm/unittests/DebugInfo/PDB/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   DebugInfoCodeView
   DebugInfoMSF
   DebugInfoPDB
   )
 
 add_llvm_unittest_with_input_files(DebugInfoPDBTests
   HashTableTest.cpp
   NativeSessionTest.cpp
   NativeSymbolReuseTest.cpp
   StringTableBuilderTest.cpp
   PDBApiTest.cpp
   )
 
 target_link_libraries(DebugInfoPDBTests PRIVATE LLVMTestingSupport)
+
+set_property(TARGET DebugInfoPDBTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests")

llvm/unittests/ExecutionEngine/CMakeLists.txt

 add_subdirectory(Orc)
 
 # Include MCJIT tests only if native arch is a built JIT target.
 list(FIND LLVM_TARGETS_TO_BUILD "${LLVM_NATIVE_ARCH}" build_idx)
 list(FIND LLVM_TARGETS_WITH_JIT "${LLVM_NATIVE_ARCH}" jit_idx)
 if (NOT build_idx LESS 0 AND NOT jit_idx LESS 0)
   add_subdirectory(MCJIT)
 endif()
+
+set_property(TARGET ExecutionEngineTests PROPERTY FOLDER "Tests/UnitTests/ExecutionTests")

llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
   JITLink
   Object
   OrcShared
   OrcTargetProcess
   RuntimeDyld
   Support
   )
 
 add_llvm_unittest(JITLinkTests
     LinkGraphTests.cpp
   )
 
 target_link_libraries(JITLinkTests PRIVATE LLVMTestingSupport)
+
+set_property(TARGET JITLinkTests PROPERTY FOLDER "Tests/UnitTests/ExecutionTests")

llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt

 
 add_llvm_unittest(MCJITTests
   ${MCJITTestsSources}
   )
 
 if(MINGW OR CYGWIN)
   set_property(TARGET MCJITTests PROPERTY LINK_FLAGS -Wl,--export-all-symbols)
 endif()
+
+set_property(TARGET MCJITTests PROPERTY FOLDER "Tests/UnitTests/ExecutionTests")

llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt

add_llvm_unittest(OrcJITTests
   TaskDispatchTest.cpp
   ThreadSafeModuleTest.cpp
   WrapperFunctionUtilsTest.cpp
   )
 
 target_link_libraries(OrcJITTests PRIVATE
                         LLVMTestingSupport
                         ${ORC_JIT_TEST_LIBS})
+
+set_property(TARGET OrcJITTests PROPERTY FOLDER "Tests/UnitTests/ExecutionTests")

llvm/unittests/Target/AArch64/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
   Target
   )
 
 add_llvm_target_unittest(AArch64Tests
   InstSizes.cpp
   DecomposeStackOffsetTest.cpp
   MatrixRegisterAliasing.cpp
   )
+
+set_property(TARGET AArch64Tests PROPERTY FOLDER "Tests/UnitTests/TargetTests")

llvm/unittests/Target/AMDGPU/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
   MC
   Support
   )
 
 add_llvm_target_unittest(AMDGPUTests
   DwarfRegMappings.cpp
   ExecMayBeModifiedBeforeAnyUse.cpp
   )
+
+set_property(TARGET AMDGPUTests PROPERTY FOLDER "Tests/UnitTests/TargetTests")

llvm/unittests/Target/ARM/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
   Support
   Target
 )
 
 add_llvm_target_unittest(ARMTests
   MachineInstrTest.cpp
   InstSizes.cpp
   )
+
+set_property(TARGET ARMTests PROPERTY FOLDER "Tests/UnitTests/TargetTests")

llvm/unittests/Target/PowerPC/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
   PowerPCCodeGen
   PowerPCDesc
   PowerPCInfo
   )
 
 add_llvm_unittest(PowerPCTests
   AIXRelocModelTest.cpp
   )
+
+set_property(TARGET PowerPCTests PROPERTY FOLDER "Tests/UnitTests/TargetTests")

llvm/unittests/Target/WebAssembly/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
   WebAssemblyCodeGen
   WebAssemblyDesc
   WebAssemblyInfo
   )
 
 add_llvm_target_unittest(WebAssemblyTests
   WebAssemblyExceptionInfoTest.cpp
   )
+
+set_property(TARGET WebAssemblyTests PROPERTY FOLDER "Tests/UnitTests/TargetTests")

llvm/unittests/Target/X86/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
   X86CodeGen
   X86Desc
   X86Info
   )
 
 add_llvm_unittest(X86Tests
   MachineSizeOptsTest.cpp
   )
+
+set_property(TARGET X86Tests PROPERTY FOLDER "Tests/UnitTests/TargetTests")

llvm/unittests/Transforms/IPO/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Analysis
   AsmParser
   Core
   IPO
   Support
   TransformUtils
   )
 
 add_llvm_unittest(IPOTests
   LowerTypeTests.cpp
   WholeProgramDevirt.cpp
   AttributorTest.cpp
   )
+
+set_property(TARGET IPOTests PROPERTY FOLDER "Tests/UnitTests/TransformsTests")

llvm/unittests/Transforms/Scalar/CMakeLists.txt

add_llvm_unittest(ScalarTests
   )
 
 target_link_libraries(ScalarTests PRIVATE LLVMTestingSupport)
 
 # Workaround for the gcc 6.1 bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80916.
 if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
   set_source_files_properties(LoopPassManagerTest.cpp PROPERTIES COMPILE_FLAGS -Wno-unused-function)
 endif()
+
+set_property(TARGET ScalarTests PROPERTY FOLDER "Tests/UnitTests/TransformsTests")

llvm/unittests/Transforms/Utils/CMakeLists.txt

add_llvm_unittest(UtilsTests
   ModuleUtilsTest.cpp
   ScalarEvolutionExpanderTest.cpp
   SizeOptsTest.cpp
   SSAUpdaterBulkTest.cpp
   UnrollLoopTest.cpp
   ValueMapperTest.cpp
   VFABIUtils.cpp
   )
+
+set_property(TARGET UtilsTests PROPERTY FOLDER "Tests/UnitTests/TransformsTests")

llvm/unittests/Transforms/Vectorize/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Analysis
   Core
   Vectorize
   AsmParser
   )
 
 add_llvm_unittest(VectorizeTests
   VPlanDominatorTreeTest.cpp
   VPlanLoopInfoTest.cpp
   VPlanPredicatorTest.cpp
   VPlanTest.cpp
   VPlanHCFGTest.cpp
   VPlanSlpTest.cpp
   )
+
+set_property(TARGET VectorizeTests PROPERTY FOLDER "Tests/UnitTests/TransformsTests")

llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt

set(LLVM_LINK_COMPONENTS
   Symbolize
   )
 
 add_llvm_unittest(CFIVerifyTests
   FileAnalysis.cpp
   GraphBuilder.cpp
   )
 target_link_libraries(CFIVerifyTests PRIVATE LLVMCFIVerify)
+
+set_property(TARGET CFIVerifyTests PROPERTY FOLDER "Tests/UnitTests/ToolTests")

llvm/unittests/tools/llvm-exegesis/CMakeLists.txt

 include_directories(${exegesis_includes})
 
 list(REMOVE_DUPLICATES LLVM_LINK_COMPONENTS)
 
 add_llvm_target_unittest(LLVMExegesisTests
   ${exegesis_sources}
   )
 target_link_libraries(LLVMExegesisTests PRIVATE ${exegesis_link_libraries})
+
+set_property(TARGET LLVMExegesisTests PROPERTY FOLDER "Tests/UnitTests/ToolTests")

llvm/unittests/tools/llvm-profgen/CMakeLists.txt

 set(LLVM_LINK_COMPONENTS
   Support
   )
 
 add_llvm_unittest(LLVMProfgenTests
     ContextCompressionTest.cpp
   )
 
 target_link_libraries(LLVMProfgenTests PRIVATE LLVMTestingSupport)
 
 add_dependencies(LLVMProfgenTests intrinsics_gen)
+
+set_property(TARGET LLVMProfgenTests PROPERTY FOLDER "Tests/UnitTests/ToolTests")