[benchmark] Don't hard code directory structure

Author: lplarson

benchmark/CMakeLists.txt

@@ -15,84 +15,84 @@ list(APPEND CMAKE_MODULE_PATH
 include(AddSwiftBenchmarkSuite)
 
 set(SWIFT_BENCH_MODULES
-    Ackermann
-    AngryPhonebook
-    Array2D
-    ArrayAppend
-    ArrayInClass
-    ArrayLiteral
-    ArrayOfGenericPOD
-    ArrayOfGenericRef
-    ArrayOfPOD
-    ArrayOfRef
-    ArraySubscript
-    BitCount
-    ByteSwap
-    Calculator
-    CaptureProp
-    Chars
-    ClassArrayGetter
-    DeadArray
-    DictionaryBridge
-    DictionaryLiteral
-    DictionaryRemove
-    DictionarySwap
-    DictTest
-    DictTest2
-    DictTest3
-    ErrorHandling
-    Fibonacci
-    GlobalClass
-    Hanoi
-    Hash
-    Histogram
-    Join
-    LinkedList
-    MapReduce
-    Memset
-    MonteCarloE
-    MonteCarloPi
-    NopDeinit
-    NSDictionaryCastToSwift
-    NSError
-    NSStringConversion
-    ObjectAllocation
-    OpenClose
-    Phonebook
-    PolymorphicCalls
-    PopFront
-    PopFrontGeneric
-    Prims
-    ProtocolDispatch
-    RangeAssignment
-    RC4
-    RecursiveOwnedParameter
-    RGBHistogram
-    SetTests
-    SevenBoom
-    Sim2DArray
-    SortLettersInPlace
-    SortStrings
-    StrComplexWalk
-    StringBuilder
-    StringInterpolation
-    StringTests
-    StringWalk
-    StrToInt
-    SuperChars
-    TypeFlood
-    TwoSum
-    Walsh
-    XorLoop
+    single-source/Ackermann
+    single-source/AngryPhonebook
+    single-source/Array2D
+    single-source/ArrayAppend
+    single-source/ArrayInClass
+    single-source/ArrayLiteral
+    single-source/ArrayOfGenericPOD
+    single-source/ArrayOfGenericRef
+    single-source/ArrayOfPOD
+    single-source/ArrayOfRef
+    single-source/ArraySubscript
+    single-source/BitCount
+    single-source/ByteSwap
+    single-source/Calculator
+    single-source/CaptureProp
+    single-source/Chars
+    single-source/ClassArrayGetter
+    single-source/DeadArray
+    single-source/DictionaryBridge
+    single-source/DictionaryLiteral
+    single-source/DictionaryRemove
+    single-source/DictionarySwap
+    single-source/DictTest
+    single-source/DictTest2
+    single-source/DictTest3
+    single-source/ErrorHandling
+    single-source/Fibonacci
+    single-source/GlobalClass
+    single-source/Hanoi
+    single-source/Hash
+    single-source/Histogram
+    single-source/Join
+    single-source/LinkedList
+    single-source/MapReduce
+    single-source/Memset
+    single-source/MonteCarloE
+    single-source/MonteCarloPi
+    single-source/NopDeinit
+    single-source/NSDictionaryCastToSwift
+    single-source/NSError
+    single-source/NSStringConversion
+    single-source/ObjectAllocation
+    single-source/OpenClose
+    single-source/Phonebook
+    single-source/PolymorphicCalls
+    single-source/PopFront
+    single-source/PopFrontGeneric
+    single-source/Prims
+    single-source/ProtocolDispatch
+    single-source/RangeAssignment
+    single-source/RC4
+    single-source/RecursiveOwnedParameter
+    single-source/RGBHistogram
+    single-source/SetTests
+    single-source/SevenBoom
+    single-source/Sim2DArray
+    single-source/SortLettersInPlace
+    single-source/SortStrings
+    single-source/StrComplexWalk
+    single-source/StringBuilder
+    single-source/StringInterpolation
+    single-source/StringTests
+    single-source/StringWalk
+    single-source/StrToInt
+    single-source/SuperChars
+    single-source/TwoSum
+    single-source/TypeFlood
+    single-source/Walsh
+    single-source/XorLoop
 )
 
 set(SWIFT_MULTISOURCE_BENCHES
 )
 
 
 set(BENCH_DRIVER_LIBRARY_MODULES
-    DriverUtils
-    TestsUtils
+    utils/DriverUtils
+    utils/TestsUtils
 )
 
 set(BENCH_DRIVER_LIBRARY_FLAGS)

benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

@@ -68,15 +68,17 @@ function (swift_benchmark_compile_archopts)
 
   set(bench_library_objects)
   set(bench_library_sibfiles)
-  foreach(module_name ${BENCH_DRIVER_LIBRARY_MODULES})
+  foreach(module_name_path ${BENCH_DRIVER_LIBRARY_MODULES})
+    get_filename_component(module_name "${module_name_path}" NAME)
+
     if("${module_name}" STREQUAL "DriverUtils")
       set(extra_sources "${srcdir}/utils/ArgParse.swift")
     endif()
 
     set(objfile "${objdir}/${module_name}.o")
     set(swiftmodule "${objdir}/${module_name}.swiftmodule")
     list(APPEND bench_library_objects "${objfile}")
-    set(source "${srcdir}/utils/${module_name}.swift")
+    set(source "${srcdir}/${module_name_path}.swift")
     add_custom_command(
         OUTPUT "${objfile}"
         DEPENDS ${stdlib_dependencies} "${source}" ${extra_sources}
@@ -95,7 +97,7 @@ function (swift_benchmark_compile_archopts)
       add_custom_command(
           OUTPUT "${sibfile}"
           DEPENDS
-            ${stdlib_dependencies} "${srcdir}/utils/${module_name}.swift"
+            ${stdlib_dependencies} "${srcdir}/${module_name_path}.swift"
             ${extra_sources}
           COMMAND "${SWIFT_EXEC}"
           ${common_options_driver}
@@ -105,18 +107,20 @@ function (swift_benchmark_compile_archopts)
           "-module-name" "${module_name}"
           "-emit-sib"
           "-o" "${sibfile}"
-          "${srcdir}/utils/${module_name}.swift" ${extra_sources})
+          "${srcdir}/${module_name_path}.swift" ${extra_sources})
     endif()
   endforeach()
 
-  foreach(module_name ${BENCH_LIBRARY_MODULES})
+  foreach(module_name_path ${BENCH_LIBRARY_MODULES})
+    get_filename_component(module_name "${module_name_path}" NAME)
+
     set(objfile "${objdir}/${module_name}.o")
     set(swiftmodule "${objdir}/${module_name}.swiftmodule")
     list(APPEND bench_library_objects "${objfile}")
     add_custom_command(
         OUTPUT "${objfile}"
         DEPENDS
-          ${stdlib_dependencies} "${srcdir}/utils/${module_name}.swift"
+          ${stdlib_dependencies} "${srcdir}/${module_name_path}.swift"
           ${extra_sources}
         COMMAND "${SWIFT_EXEC}"
         ${common_options}
@@ -125,14 +129,14 @@ function (swift_benchmark_compile_archopts)
         "-module-name" "${module_name}"
         "-emit-module" "-emit-module-path" "${swiftmodule}"
         "-o" "${objfile}"
-        "${srcdir}/utils/${module_name}.swift" ${extra_sources})
+        "${srcdir}/${module_name_path}.swift" ${extra_sources})
     if (SWIFT_BENCHMARK_EMIT_SIB)
       set(sibfile "${objdir}/${module_name}.sib")
       list(APPEND bench_library_sibfiles "${sibfile}")
       add_custom_command(
           OUTPUT "${sibfile}"
           DEPENDS
-            ${stdlib_dependencies} "${srcdir}/utils/${module_name}.swift"
+            ${stdlib_dependencies} "${srcdir}/${module_name_path}.swift"
             ${extra_sources}
           COMMAND "${SWIFT_EXEC}"
           ${common_options}
@@ -141,13 +145,15 @@ function (swift_benchmark_compile_archopts)
           "-module-name" "${module_name}"
           "-emit-sib"
           "-o" "${sibfile}"
-          "${srcdir}/utils/${module_name}.swift" ${extra_sources})
+          "${srcdir}/${module_name_path}.swift" ${extra_sources})
     endif()
   endforeach()
 
   set(SWIFT_BENCH_OBJFILES)
   set(SWIFT_BENCH_SIBFILES)
-  foreach(module_name ${SWIFT_BENCH_MODULES})
+  foreach(module_name_path ${SWIFT_BENCH_MODULES})
+    get_filename_component(module_name "${module_name_path}" NAME)
+
     if(module_name)
       set(objfile "${objdir}/${module_name}.o")
       set(swiftmodule "${objdir}/${module_name}.swiftmodule")
@@ -156,7 +162,7 @@ function (swift_benchmark_compile_archopts)
           OUTPUT "${objfile}"
           DEPENDS
             ${stdlib_dependencies} ${bench_library_objects}
-            "${srcdir}/single-source/${module_name}.swift"
+            "${srcdir}/${module_name_path}.swift"
           COMMAND "${SWIFT_EXEC}"
           ${common_options}
           "-parse-as-library"
@@ -165,15 +171,15 @@ function (swift_benchmark_compile_archopts)
           "-emit-module" "-emit-module-path" "${swiftmodule}"
           "-I" "${objdir}"
           "-o" "${objfile}"
-          "${srcdir}/single-source/${module_name}.swift")
+          "${srcdir}/${module_name_path}.swift")
       if (SWIFT_BENCHMARK_EMIT_SIB)
         set(sibfile "${objdir}/${module_name}.sib")
         list(APPEND SWIFT_BENCH_SIBFILES "${sibfile}")
         add_custom_command(
             OUTPUT "${sibfile}"
             DEPENDS
               ${stdlib_dependencies} ${bench_library_sibfiles}
-              "${srcdir}/single-source/${module_name}.swift"
+              "${srcdir}/${module_name_path}.swift"
             COMMAND "${SWIFT_EXEC}"
             ${common_options}
             "-parse-as-library"
@@ -182,12 +188,14 @@ function (swift_benchmark_compile_archopts)
             "-I" "${objdir}"
             "-emit-sib"
             "-o" "${sibfile}"
-            "${srcdir}/single-source/${module_name}.swift")
+            "${srcdir}/${module_name_path}.swift")
       endif()
     endif()
   endforeach()
 
-  foreach(module_name ${SWIFT_MULTISOURCE_BENCHES})
+  foreach(module_name_path ${SWIFT_MULTISOURCE_BENCHES})
+    get_filename_component(module_name "${module_name_path}" NAME)
+
     if ("${bench_flags}" MATCHES "-whole-module.*" AND
         NOT "${bench_flags}" MATCHES "-num-threads.*")
       # Regular whole-module-compilation: only a single object file is
@@ -196,7 +204,7 @@ function (swift_benchmark_compile_archopts)
       list(APPEND SWIFT_BENCH_OBJFILES "${objfile}")
       set(sources)
       foreach(source ${${module_name}_sources})
-        list(APPEND sources "${srcdir}/multi-source/${source}")
+        list(APPEND sources "${srcdir}/${source}")
       endforeach()
       add_custom_command(
           OUTPUT "${objfile}"
@@ -219,13 +227,13 @@ function (swift_benchmark_compile_archopts)
       set(objfiles)
       set(json "{\n")
       foreach(source ${${module_name}_sources})
-          list(APPEND sources "${srcdir}/multi-source/${source}")
+          list(APPEND sources "${srcdir}/${source}")
 
           get_filename_component(basename "${source}" NAME_WE)
           set(objfile "${objdir}/${module_name}/${basename}.o")
 
               string(CONCAT json "${json}"
-    "  \"${srcdir}/multi-source/${source}\": { \"object\": \"${objfile}\" },\n")
+    "  \"${srcdir}/${source}\": { \"object\": \"${objfile}\" },\n")
 
           list(APPEND objfiles "${objfile}")
           list(APPEND SWIFT_BENCH_OBJFILES "${objfile}")

benchmark/scripts/generate_harness/CMakeLists.txt_template

@@ -12,32 +12,32 @@ cmake_minimum_required(VERSION 2.8.12)
 list(APPEND CMAKE_MODULE_PATH
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
-include(add-swift-benchmark-suite)
+include(AddSwiftBenchmarkSuite)
 
 set(SWIFT_BENCH_MODULES
 {% for test in tests %}
-    {{ test }}
+    single-source/{{ test }}
 {% endfor %}
 )
 
 set(SWIFT_MULTISOURCE_BENCHES
 {% for multisource_bench in multisource_benches %}
-    {{ multisource_bench.name }}
+    multi-source/{{ multisource_bench.name }}
 {% endfor %}
 )
 
 {% for multisource_bench in multisource_benches %}
 set({{ multisource_bench.name }}_sources
     {% for file in multisource_bench.files %}
-    {{ multisource_bench.name }}/{{ file }}
+    multi-source/{{ multisource_bench.name }}/{{ file }}
     {% endfor %}
 )
 
 {% endfor %}
 
 set(BENCH_DRIVER_LIBRARY_MODULES
-    DriverUtils
-    TestsUtils
+    utils/DriverUtils
+    utils/TestsUtils
 )
 
 set(BENCH_DRIVER_LIBRARY_FLAGS)
@@ -155,3 +155,4 @@ foreach(platform ${platforms})
 endforeach()
 
 add_subdirectory(scripts)
+

benchmark/utils/main.swift

@@ -85,8 +85,8 @@ import StringInterpolation
 import StringTests
 import StringWalk
 import SuperChars
-import TypeFlood
 import TwoSum
+import TypeFlood
 import Walsh
 import XorLoop
 
@@ -163,8 +163,8 @@ precommitTests = [
   "StringWalk": run_StringWalk,
   "StringWithCString": run_StringWithCString,
   "SuperChars": run_SuperChars,
-  "TypeFlood": run_TypeFlood,
   "TwoSum": run_TwoSum,
+  "TypeFlood": run_TypeFlood,
   "Walsh": run_Walsh,
   "XorLoop": run_XorLoop,
 ]