cmake: Make benchmark name an argument of llvm_multisource()

llvm-svn: 338787

Author: MatzeB

Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt

@@ -2,12 +2,11 @@ file(GLOB bcsources ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86_halide_runtime.bc
 SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
-set(PROG halide_bilateral_grid)
 
 test_img_input(rgb 0.1 10)
 test_img_input(rgba 0.1 10)
 
-llvm_multisource()
+llvm_multisource(halide_bilateral_grid)
 
 
 

Bitcode/Benchmarks/Halide/blur/CMakeLists.txt

@@ -2,7 +2,6 @@ file(GLOB bcsources ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86_halide_runtime.bc
 SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
-set(PROG halide_blur)
 
-llvm_multisource()
+llvm_multisource(halide_blur)
 

Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt

@@ -2,12 +2,11 @@ file(GLOB bcsources ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86_halide_runtime.bc
 SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
-set(PROG halide_local_laplacian)
 
 test_img_input(rgb 8 1 1 10)
 test_img_input(rgba 8 1 1 10)
 
-llvm_multisource()
+llvm_multisource(halide_local_laplacian)
 
 
 

Bitcode/Regression/fft/CMakeLists.txt

@@ -10,7 +10,6 @@ foreach(lib ${CMAKE_DL_LIBS})
 endforeach()
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc ${uosources})
-set(PROG fft)
-llvm_multisource()
+llvm_multisource(fft)
 
 

Bitcode/Regression/vector_widen/CMakeLists.txt

@@ -8,7 +8,6 @@ foreach(lib ${CMAKE_DL_LIBS})
 endforeach()
 
 set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc)
-set(PROG widen_bug)
-llvm_multisource()
+llvm_multisource(widen_bug)
 
 

Bitcode/simd_ops/CMakeLists.txt

@@ -20,7 +20,6 @@ foreach(sourcebc ${uosources})
   string(REGEX REPLACE ".*/" "" namebc ${pathbc})
   string(REPLACE "." "" namebc ${namebc})
   set(Source ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_tests/${namebc}.bc ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_scalar_tests/scalar_${namebc}.bc)
-  set(PROG simd_ops_${namebc})
-  llvm_multisource()
+  llvm_multisource(simd_ops_${namebc})
   target_link_libraries(${PROG} simd_ops)
 endforeach()

MultiSource/Applications/ALAC/decode/CMakeLists.txt

@@ -6,7 +6,6 @@ else()
   list(APPEND CXXFLAGS -DTARGET_RT_BIG_ENDIAN=1)
 endif()
 list(APPEND LDFLAGS -lstdc++)
-set(PROG alacconvert-decode)
 set(Sources EndianPortable.c ALACBitUtilities.c ALACDecoder.cpp ALACEncoder.cpp ag_dec.c ag_enc.c dp_dec.c dp_enc.c matrix_dec.c matrix_enc.c main.cpp CAFFileALAC.cpp)
 set(RUN_OPTIONS - - < ${CMAKE_CURRENT_SOURCE_DIR}/tune.caf)
-llvm_multisource()
+llvm_multisource(alacconvert-decode)

MultiSource/Applications/ALAC/encode/CMakeLists.txt

@@ -6,7 +6,6 @@ else()
   list(APPEND CXXFLAGS -DTARGET_RT_BIG_ENDIAN=1)
 endif()
 list(APPEND LDFLAGS -lstdc++)
-set(PROG alacconvert-encode)
 set(Sources EndianPortable.c ALACBitUtilities.c ALACDecoder.cpp ALACEncoder.cpp ag_dec.c ag_enc.c dp_dec.c dp_enc.c matrix_dec.c matrix_enc.c main.cpp CAFFileALAC.cpp)
 set(RUN_OPTIONS - - < ${CMAKE_CURRENT_SOURCE_DIR}/tune.wav)
-llvm_multisource()
+llvm_multisource(alacconvert-encode)

MultiSource/Applications/Burg/CMakeLists.txt

@@ -1,8 +1,7 @@
-set(PROG burg)
 list(APPEND CPPFLAGS -DDEBUG)
 list(APPEND CFLAGS -std=gnu89)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/sample.gr)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-llvm_multisource()
+llvm_multisource(burg)

MultiSource/Applications/ClamAV/CMakeLists.txt

@@ -99,7 +99,6 @@ set(Source
   zlib_uncompr.c
   zlib_zutil.c
 )
-set(PROG clamscan)
 list(APPEND CPPFLAGS -DHAVE_CONFIG_H -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/zlib -DDONT_LOCK_DBDIRS)
 
 set(INPUT
@@ -172,4 +171,4 @@ if(ENDIAN STREQUAL "big")
   list(APPEND CPPFLAGS -DWORDS_BIGENDIAN=1)
 endif()
 set(DIFFPROG ${PROGDIR}/DiffOutput.sh "diff ")
-llvm_multisource()
+llvm_multisource(clamscan)

MultiSource/Applications/JM/ldecod/CMakeLists.txt

@@ -1,9 +1,8 @@
-set(PROG ldecod)
 list(APPEND CPPFLAGS -D__USE_LARGEFILE64 -D_FILE_OFFSET_BITS=64)
 list(APPEND LDFLAGS -lm ${TOOLLINKOPTS})
 set(RUN_OPTIONS -i ${CMAKE_CURRENT_SOURCE_DIR}/data/test.264 -o Output/test_dec.yuv -r ${CMAKE_CURRENT_SOURCE_DIR}/data/test_rec.yuv)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 if(ARCH STREQUAL "XCore")
   set(XCORE_TARGET_NEEDS_MEMORY 64)
 endif()
-llvm_multisource()
+llvm_multisource(ldecod)

MultiSource/Applications/JM/lencod/CMakeLists.txt

@@ -1,4 +1,3 @@
-set(PROG lencod)
 list(APPEND CPPFLAGS -D__USE_LARGEFILE64 -D_FILE_OFFSET_BITS=64)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.025)
@@ -8,4 +7,4 @@ else()
   set(RUN_OPTIONS -d ${CMAKE_CURRENT_SOURCE_DIR}/data/encoder.cfg -p InputFile=${CMAKE_CURRENT_SOURCE_DIR}/data/foreman_part_qcif_444.yuv -p LeakyBucketRateFile=${CMAKE_CURRENT_SOURCE_DIR}/data/leakybucketrate.cfg -p QmatrixFile=${CMAKE_CURRENT_SOURCE_DIR}/data/q_matrix.cfg)
 endif()
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
-llvm_multisource()
+llvm_multisource(lencod)

MultiSource/Applications/SIBsim4/CMakeLists.txt

@@ -1,7 +1,6 @@
-set(PROG SIBsim4)
 if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -A4 ${CMAKE_CURRENT_SOURCE_DIR}/x-small.fa ${CMAKE_CURRENT_SOURCE_DIR}/y-small.fa)
 else()
   set(RUN_OPTIONS -A4 ${CMAKE_CURRENT_SOURCE_DIR}/x.fa ${CMAKE_CURRENT_SOURCE_DIR}/y.fa)
 endif()
-llvm_multisource()
+llvm_multisource(SIBsim4)

MultiSource/Applications/SPASS/CMakeLists.txt

@@ -1,4 +1,3 @@
-set(PROG SPASS)
 list(APPEND CPPFLAGS -DCLOCK_NO_TIMING)
 list(APPEND CFLAGS -fno-strict-aliasing)
 list(APPEND LDFLAGS -lm)
@@ -8,4 +7,4 @@ else()
   set(RUN_OPTIONS "${CMAKE_CURRENT_SOURCE_DIR}/problem.dfg")
 endif()
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(SPASS)

MultiSource/Applications/aha/CMakeLists.txt

@@ -1,2 +1 @@
-set(PROG aha)
-llvm_multisource()
+llvm_multisource(aha)

MultiSource/Applications/d/CMakeLists.txt

@@ -1,6 +1,5 @@
-set(PROG make_dparser)
 set(Source make_dparser.c write_ctables.c gram.c lex.c lr.c arg.c parse.c scan.c symtab.c util.c version.c grammar.g.c)
 list(APPEND CPPFLAGS -DD_BUILD_VERSION=5725)
 set(RUN_OPTIONS -v ${CMAKE_CURRENT_SOURCE_DIR}/grammar.g)
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(make_dparser)

MultiSource/Applications/hbd/CMakeLists.txt

@@ -1,6 +1,5 @@
-set(PROG hbd)
 list(APPEND CPPFLAGS -DHAVE_CONFIG_H)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/Sort.class)
 set(REQUIRES_EH_SUPPORT 1)
-llvm_multisource()
+llvm_multisource(hbd)

MultiSource/Applications/hexxagon/CMakeLists.txt

@@ -1,6 +1,5 @@
-set(PROG hexxagon)
 set(REQUIRES_EH_SUPPORT 1)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
-llvm_multisource()
+llvm_multisource(hexxagon)
 target_include_directories(hexxagon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

MultiSource/Applications/kimwitu++/CMakeLists.txt

@@ -1,7 +1,6 @@
-set(PROG kc)
 list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DYYDEBUG=1)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS -f test  -o -v -s kcc ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f3.k ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f2.k ${CMAKE_CURRENT_SOURCE_DIR}/inputs/f1.k)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 set(HASH_PROGRAM_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(kc)

MultiSource/Applications/lambda-0.1.3/CMakeLists.txt

@@ -1,6 +1,5 @@
-set(PROG lambda)
 list(APPEND LDFLAGS -lstdc++)
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
-llvm_multisource()
+llvm_multisource(lambda)
 target_include_directories(lambda PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

MultiSource/Applications/lemon/CMakeLists.txt

@@ -1,8 +1,7 @@
 if(NOT TEST_SUITE_BENCHMARKING_ONLY)
   set(Source lemon.c)
-  set(PROG lemon)
   set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/parse.y ${CMAKE_CURRENT_SOURCE_DIR}/example1.y ${CMAKE_CURRENT_SOURCE_DIR}/example2.y ${CMAKE_CURRENT_SOURCE_DIR}/example3.y ${CMAKE_CURRENT_SOURCE_DIR}/example4.y ${CMAKE_CURRENT_SOURCE_DIR}/example5.y ${CMAKE_CURRENT_SOURCE_DIR}/lighttpd_configparser.y ${CMAKE_CURRENT_SOURCE_DIR}/lighttpd_mod_ssi_exprparser.y ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_dtd_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/wireshark_mate_grammar.lemon ${CMAKE_CURRENT_SOURCE_DIR}/xapian_queryparser.lemony ${CMAKE_CURRENT_SOURCE_DIR}/ecmascript.y)
   set(HASH_PROGRAM_OUTPUT 1)
   set(DIFFPROG ${PROGDIR}/DiffOutput.sh "diff ")
-  llvm_multisource()
+  llvm_multisource(lemon)
 endif()

MultiSource/Applications/lua/CMakeLists.txt

@@ -5,7 +5,6 @@ if(ARCH STREQUAL "XCore")
 else()
   list(APPEND CPPFLAGS -DLUA_USE_POSIX)
 endif()
-set(PROG lua)
 set(RUN_OPTIONS alltests.lua "")
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 set(HASH_PROGRAM_OUTPUT 1)
@@ -21,5 +20,5 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generate_inputs.sh
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Generating lua test inputs")
 add_custom_target(lua_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/generate_inputs.sh)
-    llvm_multisource()
+    llvm_multisource(lua)
 add_dependencies(lua lua_input)

MultiSource/Applications/minisat/CMakeLists.txt

@@ -1,4 +1,3 @@
-set(PROG minisat)
 list(APPEND LDFLAGS -lstdc++ -lm)
 if(SMALL_PROBLEM_SIZE)
   set(RUN_OPTIONS -verbosity=0 ${CMAKE_CURRENT_SOURCE_DIR}/small.cnf)
@@ -17,4 +16,4 @@ if(TARGET_OS STREQUAL "Darwin")
   set(SHLIBEXT .dylib)
 endif()
 list(APPEND JIT_OPTS -load libz${SHLIBEXT})
-llvm_multisource()
+llvm_multisource(minisat)

MultiSource/Applications/obsequi/CMakeLists.txt

@@ -1,4 +1,3 @@
-set(PROG Obsequi)
 list(APPEND CPPFLAGS -DCOUNTBITS16 -DLASTBIT16 -DCOUNTMOVES_TABLE)
 list(APPEND CPPFLAGS -DTWO_STAGE_GENERATION)
 if(SMALL_PROBLEM_SIZE)
@@ -10,4 +9,4 @@ if(NOT "${ARCH}" STREQUAL "PowerPC")
   list(APPEND LDFLAGS -lsupc++)
 endif()
 set(RUN_OPTIONS < ${CMAKE_CURRENT_SOURCE_DIR}/input)
-llvm_multisource()
+llvm_multisource(Obsequi)

MultiSource/Applications/oggenc/CMakeLists.txt

@@ -1,5 +1,4 @@
-set(PROG oggenc)
 list(APPEND CFLAGS -fno-strict-aliasing)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -Q -s 901820 - < ${CMAKE_CURRENT_SOURCE_DIR}/tune)
-llvm_multisource()
+llvm_multisource(oggenc)

MultiSource/Applications/sgefa/CMakeLists.txt

@@ -1,9 +1,8 @@
-set(PROG sgefa)
 list(APPEND LDFLAGS -lm)
 set(FP_TOLERANCE 0.0001)
 if(LARGE_PROBLEM_SIZE)
   list(APPEND CPPFLAGS -DSCALE=50)
 else()
   list(APPEND CPPFLAGS -DSCALE=40)
 endif()
-llvm_multisource()
+llvm_multisource(sgefa)

MultiSource/Applications/siod/CMakeLists.txt

@@ -1,5 +1,4 @@
-set(PROG siod)
 list(APPEND CPPFLAGS -D__USE_MISC -D__USE_GNU -D__USE_SVID -D__USE_XOPEN_EXTENDED -D__USE_XOPEN -Dunix)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS -v1 ${CMAKE_CURRENT_SOURCE_DIR}/test.scm)
-llvm_multisource()
+llvm_multisource(siod)

MultiSource/Applications/spiff/CMakeLists.txt

@@ -1,8 +1,7 @@
-set(PROG spiff)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/Sample.3 ${CMAKE_CURRENT_SOURCE_DIR}/Sample.4)
 if(ARCH STREQUAL "XCore")
   if(NOT DEFINED SMALL_PROBLEM_SIZE)
     set(XCORE_TARGET_NEEDS_MEMORY 1024)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(spiff)

MultiSource/Applications/sqlite3/CMakeLists.txt

@@ -1,5 +1,4 @@
 set(Source sqlite3.c shell.c)
-set(PROG sqlite3)
 list(APPEND CPPFLAGS -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -I.)
 set(RUN_OPTIONS -init ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3rc :memory: < ${CMAKE_CURRENT_SOURCE_DIR}/commands)
 set(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
@@ -16,5 +15,5 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test15.sql
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Generating sqlite test inputs")
 add_custom_target(sqlite_input SOURCES ${CMAKE_CURRENT_BINARY_DIR}/test15.sql)
-    llvm_multisource()
+    llvm_multisource(sqlite3)
 add_dependencies(sqlite3 sqlite_input)

MultiSource/Applications/treecc/CMakeLists.txt

@@ -1,3 +1,2 @@
-set(PROG treecc)
 set(RUN_OPTIONS -n ${CMAKE_CURRENT_SOURCE_DIR}/examples/expr_cpp.tc)
-llvm_multisource()
+llvm_multisource(treecc)

MultiSource/Applications/viterbi/CMakeLists.txt

@@ -1,3 +1,2 @@
-set(PROG viterbi)
 list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR} -DPROJ_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
-llvm_multisource()
+llvm_multisource(viterbi)

MultiSource/Benchmarks/7zip/CMakeLists.txt

@@ -1,8 +1,7 @@
-set(PROG 7zip-benchmark)
 set(RUN_OPTIONS b)
 list(APPEND CFLAGS -DBREAK_HANDLER -DUNICODE -D_UNICODE -I${CMAKE_CURRENT_SOURCE_DIR}/C -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/myWindows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/include_windows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP -I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DNDEBUG -D_REENTRANT -DENV_UNIX -D_7ZIP_LARGE_PAGES -pthread)
 list(APPEND CXXFLAGS -Wno-error=c++11-narrowing -DBREAK_HANDLER -DUNICODE -D_UNICODE -I${CMAKE_CURRENT_SOURCE_DIR}/C -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/myWindows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP/include_windows -I${CMAKE_CURRENT_SOURCE_DIR}/CPP -I. -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DNDEBUG -D_REENTRANT -DENV_UNIX -D_7ZIP_LARGE_PAGES -pthread)
 list(APPEND LDFLAGS -lstdc++ -pthread)
 set(Source CPP/myWindows/myGetTickCount.cpp CPP/myWindows/wine_date_and_time.cpp CPP/myWindows/myAddExeFlag.cpp CPP/myWindows/mySplitCommandLine.cpp CPP/7zip/UI/Console/BenchCon.cpp CPP/7zip/UI/Console/ConsoleClose.cpp CPP/7zip/UI/Console/ExtractCallbackConsole.cpp CPP/7zip/UI/Console/List.cpp CPP/7zip/UI/Console/Main.cpp CPP/7zip/UI/Console/MainAr.cpp CPP/7zip/UI/Console/OpenCallbackConsole.cpp CPP/7zip/UI/Console/PercentPrinter.cpp CPP/7zip/UI/Console/UpdateCallbackConsole.cpp CPP/7zip/UI/Console/UserInputUtils.cpp CPP/Common/CommandLineParser.cpp CPP/Common/CRC.cpp CPP/Common/IntToString.cpp CPP/Common/ListFileUtils.cpp CPP/Common/StdInStream.cpp CPP/Common/StdOutStream.cpp CPP/Common/MyString.cpp CPP/Common/StringConvert.cpp CPP/Common/StringToInt.cpp CPP/Common/UTFConvert.cpp CPP/Common/MyWindows.cpp CPP/Common/MyVector.cpp CPP/Common/Wildcard.cpp CPP/Windows/Error.cpp CPP/Windows/FileDir.cpp CPP/Windows/FileFind.cpp CPP/Windows/FileIO.cpp CPP/Windows/FileName.cpp CPP/Windows/PropVariant.cpp CPP/Windows/PropVariantConversions.cpp CPP/Windows/Synchronization.cpp CPP/Windows/System.cpp CPP/Windows/Time.cpp CPP/7zip/Common/CreateCoder.cpp CPP/7zip/Common/CWrappers.cpp CPP/7zip/Common/FilePathAutoRename.cpp CPP/7zip/Common/FileStreams.cpp CPP/7zip/Common/FilterCoder.cpp CPP/7zip/Common/InBuffer.cpp CPP/7zip/Common/InOutTempBuffer.cpp CPP/7zip/Common/LimitedStreams.cpp CPP/7zip/Common/LockedStream.cpp CPP/7zip/Common/MemBlocks.cpp CPP/7zip/Common/MethodId.cpp CPP/7zip/Common/MethodProps.cpp CPP/7zip/Common/OffsetStream.cpp CPP/7zip/Common/OutBuffer.cpp CPP/7zip/Common/OutMemStream.cpp CPP/7zip/Common/ProgressMt.cpp CPP/7zip/Common/ProgressUtils.cpp CPP/7zip/Common/StreamBinder.cpp CPP/7zip/Common/StreamObjects.cpp CPP/7zip/Common/StreamUtils.cpp CPP/7zip/Common/VirtThread.cpp CPP/7zip/UI/Common/ArchiveCommandLine.cpp CPP/7zip/UI/Common/ArchiveExtractCallback.cpp CPP/7zip/UI/Common/ArchiveOpenCallback.cpp CPP/7zip/UI/Common/Bench.cpp CPP/7zip/UI/Common/DefaultName.cpp CPP/7zip/UI/Common/EnumDirItems.cpp CPP/7zip/UI/Common/Extract.cpp CPP/7zip/UI/Common/ExtractingFilePath.cpp CPP/7zip/UI/Common/LoadCodecs.cpp CPP/7zip/UI/Common/OpenArchive.cpp CPP/7zip/UI/Common/PropIDUtils.cpp CPP/7zip/UI/Common/SetProperties.cpp CPP/7zip/UI/Common/SortUtils.cpp CPP/7zip/UI/Common/TempFiles.cpp CPP/7zip/UI/Common/Update.cpp CPP/7zip/UI/Common/UpdateAction.cpp CPP/7zip/UI/Common/UpdateCallback.cpp CPP/7zip/UI/Common/UpdatePair.cpp CPP/7zip/UI/Common/UpdateProduce.cpp CPP/7zip/Archive/Bz2Handler.cpp CPP/7zip/Archive/DeflateProps.cpp CPP/7zip/Archive/GzHandler.cpp CPP/7zip/Archive/LzmaHandler.cpp CPP/7zip/Archive/PpmdHandler.cpp CPP/7zip/Archive/SplitHandler.cpp CPP/7zip/Archive/XzHandler.cpp CPP/7zip/Archive/ZHandler.cpp CPP/7zip/Archive/Common/CoderMixer2.cpp CPP/7zip/Archive/Common/CoderMixer2MT.cpp CPP/7zip/Archive/Common/CrossThreadProgress.cpp CPP/7zip/Archive/Common/DummyOutStream.cpp CPP/7zip/Archive/Common/FindSignature.cpp CPP/7zip/Archive/Common/HandlerOut.cpp CPP/7zip/Archive/Common/InStreamWithCRC.cpp CPP/7zip/Archive/Common/ItemNameUtils.cpp CPP/7zip/Archive/Common/MultiStream.cpp CPP/7zip/Archive/Common/OutStreamWithCRC.cpp CPP/7zip/Archive/Common/ParseProperties.cpp CPP/7zip/Archive/7z/7zCompressionMode.cpp CPP/7zip/Archive/7z/7zDecode.cpp CPP/7zip/Archive/7z/7zEncode.cpp CPP/7zip/Archive/7z/7zExtract.cpp CPP/7zip/Archive/7z/7zFolderInStream.cpp CPP/7zip/Archive/7z/7zFolderOutStream.cpp CPP/7zip/Archive/7z/7zHandler.cpp CPP/7zip/Archive/7z/7zHandlerOut.cpp CPP/7zip/Archive/7z/7zHeader.cpp CPP/7zip/Archive/7z/7zIn.cpp CPP/7zip/Archive/7z/7zOut.cpp CPP/7zip/Archive/7z/7zProperties.cpp CPP/7zip/Archive/7z/7zSpecStream.cpp CPP/7zip/Archive/7z/7zUpdate.cpp CPP/7zip/Archive/7z/7zRegister.cpp CPP/7zip/Archive/Cab/CabBlockInStream.cpp CPP/7zip/Archive/Cab/CabHandler.cpp CPP/7zip/Archive/Cab/CabHeader.cpp CPP/7zip/Archive/Cab/CabIn.cpp CPP/7zip/Archive/Cab/CabRegister.cpp CPP/7zip/Archive/Tar/TarHandler.cpp CPP/7zip/Archive/Tar/TarHandlerOut.cpp CPP/7zip/Archive/Tar/TarHeader.cpp CPP/7zip/Archive/Tar/TarIn.cpp CPP/7zip/Archive/Tar/TarOut.cpp CPP/7zip/Archive/Tar/TarUpdate.cpp CPP/7zip/Archive/Tar/TarRegister.cpp CPP/7zip/Archive/Zip/ZipAddCommon.cpp CPP/7zip/Archive/Zip/ZipHandler.cpp CPP/7zip/Archive/Zip/ZipHandlerOut.cpp CPP/7zip/Archive/Zip/ZipHeader.cpp CPP/7zip/Archive/Zip/ZipIn.cpp CPP/7zip/Archive/Zip/ZipItem.cpp CPP/7zip/Archive/Zip/ZipOut.cpp CPP/7zip/Archive/Zip/ZipUpdate.cpp CPP/7zip/Archive/Zip/ZipRegister.cpp CPP/7zip/Compress/Bcj2Coder.cpp CPP/7zip/Compress/Bcj2Register.cpp CPP/7zip/Compress/BcjCoder.cpp CPP/7zip/Compress/BcjRegister.cpp CPP/7zip/Compress/BitlDecoder.cpp CPP/7zip/Compress/BranchCoder.cpp CPP/7zip/Compress/BranchMisc.cpp CPP/7zip/Compress/BranchRegister.cpp CPP/7zip/Compress/ByteSwap.cpp CPP/7zip/Compress/BZip2Crc.cpp CPP/7zip/Compress/BZip2Decoder.cpp CPP/7zip/Compress/BZip2Encoder.cpp CPP/7zip/Compress/BZip2Register.cpp CPP/7zip/Compress/CopyCoder.cpp CPP/7zip/Compress/CopyRegister.cpp CPP/7zip/Compress/Deflate64Register.cpp CPP/7zip/Compress/DeflateDecoder.cpp CPP/7zip/Compress/DeflateEncoder.cpp CPP/7zip/Compress/DeflateRegister.cpp CPP/7zip/Compress/DeltaFilter.cpp CPP/7zip/Compress/ImplodeDecoder.cpp CPP/7zip/Compress/ImplodeHuffmanDecoder.cpp CPP/7zip/Compress/Lzma2Decoder.cpp CPP/7zip/Compress/Lzma2Encoder.cpp CPP/7zip/Compress/Lzma2Register.cpp CPP/7zip/Compress/LzmaDecoder.cpp CPP/7zip/Compress/LzmaEncoder.cpp CPP/7zip/Compress/LzmaRegister.cpp CPP/7zip/Compress/LzOutWindow.cpp CPP/7zip/Compress/Lzx86Converter.cpp CPP/7zip/Compress/LzxDecoder.cpp CPP/7zip/Compress/PpmdDecoder.cpp CPP/7zip/Compress/PpmdEncoder.cpp CPP/7zip/Compress/PpmdRegister.cpp CPP/7zip/Compress/PpmdZip.cpp CPP/7zip/Compress/QuantumDecoder.cpp CPP/7zip/Compress/ShrinkDecoder.cpp CPP/7zip/Compress/ZDecoder.cpp CPP/7zip/Crypto/7zAes.cpp CPP/7zip/Crypto/7zAesRegister.cpp CPP/7zip/Crypto/HmacSha1.cpp CPP/7zip/Crypto/MyAes.cpp CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp CPP/7zip/Crypto/RandGen.cpp CPP/7zip/Crypto/Sha1.cpp CPP/7zip/Crypto/WzAes.cpp CPP/7zip/Crypto/ZipCrypto.cpp CPP/7zip/Crypto/ZipStrong.cpp C/7zStream.c C/Aes.c C/Alloc.c C/Bra.c C/Bra86.c C/BraIA64.c C/BwtSort.c C/Delta.c C/HuffEnc.c C/LzFind.c C/LzFindMt.c C/Lzma2Dec.c C/Lzma2Enc.c C/LzmaDec.c C/LzmaEnc.c C/MtCoder.c C/Ppmd7.c C/Ppmd7Dec.c C/Ppmd7Enc.c C/Ppmd8.c C/Ppmd8Dec.c C/Ppmd8Enc.c C/Sha256.c C/Sort.c C/Threads.c C/Xz.c C/XzCrc64.c C/XzDec.c C/XzEnc.c C/XzIn.c C/7zCrc.c C/7zCrcOpt.c)
 set(NO_REFERENCE_OUTPUT 1)
-llvm_multisource()
+llvm_multisource(7zip-benchmark)

MultiSource/Benchmarks/ASCI_Purple/SMG2000/CMakeLists.txt

@@ -1,4 +1,3 @@
-set(PROG smg2000)
 list(APPEND CPPFLAGS -D_POSIX_SOURCE -DHYPRE_TIMING -DHYPRE_SEQUENTIAL )
 list(APPEND CPPFLAGS -I. )
 list(APPEND LDFLAGS -lm)
@@ -10,5 +9,5 @@ else()
     set(XCORE_TARGET_NEEDS_MEMORY 256)
   endif()
 endif()
-llvm_multisource()
+llvm_multisource(smg2000)
 target_include_directories(smg2000 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

MultiSource/Benchmarks/ASC_Sequoia/AMGmk/CMakeLists.txt

@@ -1,3 +1,2 @@
-set(PROG AMGmk)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(AMGmk)

MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/CMakeLists.txt

@@ -1,3 +1,2 @@
-set(PROG CrystalMk)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
+llvm_multisource(CrystalMk)

MultiSource/Benchmarks/ASC_Sequoia/IRSmk/CMakeLists.txt

@@ -1,4 +1,3 @@
-set(PROG IRSmk)
 list(APPEND LDFLAGS -lm)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/irsmk_input)
-llvm_multisource()
+llvm_multisource(IRSmk)

MultiSource/Benchmarks/BitBench/drop3/CMakeLists.txt

@@ -1,3 +1,2 @@
-set(PROG drop3)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file)
-llvm_multisource()
+llvm_multisource(drop3)

MultiSource/Benchmarks/BitBench/five11/CMakeLists.txt

@@ -1,3 +1,2 @@
-set(PROG five11)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file)
-llvm_multisource()
+llvm_multisource(five11)

MultiSource/Benchmarks/BitBench/uudecode/CMakeLists.txt

@@ -1,3 +1,2 @@
-set(PROG uudecode)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input-file)
-llvm_multisource()
+llvm_multisource(uudecode)

MultiSource/Benchmarks/BitBench/uuencode/CMakeLists.txt

@@ -1,3 +1,2 @@
-set(PROG uuencode)
 set(RUN_OPTIONS ${CMAKE_CURRENT_SOURCE_DIR}/input.txt)
-llvm_multisource()
+llvm_multisource(uuencode)

MultiSource/Benchmarks/Bullet/CMakeLists.txt

@@ -1,7 +1,6 @@
-set(PROG bullet)
 list(APPEND CPPFLAGS -I${CMAKE_CURRENT_SOURCE_DIR}/include -std=gnu++98 -DNO_TIME)
 list(APPEND LDFLAGS -lstdc++ -lm)
 if(ARCH STREQUAL "XCore")
   set(XCORE_TARGET_NEEDS_MEMORY 64)
 endif()
-llvm_multisource()
+llvm_multisource(bullet)

MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/CMakeLists.txt

@@ -1,3 +1,2 @@
-set(PROG CLAMR)
 set(RUN_OPTIONS -n 64 -t 1000)
-llvm_multisource()
+llvm_multisource(CLAMR)

MultiSource/Benchmarks/DOE-ProxyApps-C++/HACCKernels/CMakeLists.txt

@@ -1,5 +1,4 @@
-set(PROG HACCKernels)
 set(FP_TOLERANCE 0.00001)
 list(APPEND CPPFLAGS -ffast-math -DVERIFICATION_OUTPUT_ONLY=ON)
 set(RUN_OPTIONS 450)
-llvm_multisource()
+llvm_multisource(HACCKernels)