Changeset 261444 in webkit
- Timestamp:
- May 9, 2020 4:35:11 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r260844 r261444 192 192 endif () 193 193 194 if ("${PORT}" STREQUAL "GTK" OR "${PORT}" STREQUAL "WPE") 195 if (DEVELOPER_MODE) 196 add_subdirectory(PerformanceTests) 197 endif () 198 else () 194 if (DEVELOPER_MODE) 199 195 add_subdirectory(PerformanceTests) 200 196 endif () -
trunk/ChangeLog
r261275 r261444 1 2020-05-09 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] Use WEBKIT_EXECUTABLE in MallocBench 4 https://bugs.webkit.org/show_bug.cgi?id=211665 5 6 Reviewed by Yusuke Suzuki. 7 8 Add the PerformanceTest subdirectory for all ports when in DEVELOPER_MODE. 9 10 * CMakeLists.txt: 11 1 12 2020-05-07 Philippe Normand <pnormand@igalia.com> 2 13 -
trunk/PerformanceTests/CMakeLists.txt
r235253 r261444 1 1 # MallocBench requires malloc_trim for non-Apple platforms 2 if (NOT USE_SYSTEM_MALLOC AND (APPLE OR HAVE_MALLOC_TRIM)) 3 add_subdirectory(MallocBench) 4 else () 5 message(WARNING "MallocBench is not available on this platform") 2 if (NOT USE_SYSTEM_MALLOC) 3 if (APPLE OR HAVE_MALLOC_TRIM) 4 add_subdirectory(MallocBench) 5 else () 6 message(WARNING "MallocBench is not available on this platform") 7 endif () 6 8 endif () 7 9 -
trunk/PerformanceTests/ChangeLog
r261417 r261444 1 2020-05-09 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] Use WEBKIT_EXECUTABLE in MallocBench 4 https://bugs.webkit.org/show_bug.cgi?id=211665 5 6 Reviewed by Yusuke Suzuki. 7 8 Cleanup MallocBench definitions using WEBKIT_EXECUTABLE. Notify developers 9 that MallocBench is unavailable only if bmalloc is being used but the platform 10 does not have the functionality required. 11 12 * CMakeLists.txt: 13 * MallocBench/MallocBench/CMakeLists.txt: 14 1 15 2020-05-08 Darin Adler <darin@apple.com> 2 16 -
trunk/PerformanceTests/MallocBench/MallocBench/CMakeLists.txt
r256731 r261444 1 add_library(sysmalloc SHARED mbmalloc.cpp) 2 set_target_properties(sysmalloc PROPERTIES OUTPUT_NAME "mbmalloc") 3 set_target_properties(sysmalloc PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib/system/) 4 5 set(MALLOC_BENCH_SOURCES 1 set(MallocBench_SOURCES 6 2 Benchmark.cpp 7 3 CPUCount.cpp … … 29 25 ) 30 26 31 set(MALLOC_BENCH_INCLUDE_DIRECTORIES 32 "${BMALLOC_DIR}" 33 "${CMAKE_BINARY_DIR}" 34 "${DERIVED_SOURCES_DIR}" 35 "${THIRDPARTY_DIR}" 27 set(MallocBench_PRIVATE_INCLUDE_DIRECTORIES 28 ${CMAKE_BINARY_DIR} 29 ${bmalloc_FRAMEWORK_HEADERS_DIR} 36 30 ) 37 31 38 set(M ALLOC_BENCH_LIBRARIES32 set(MallocBench_PRIVATE_LIBRARIES 39 33 ${CMAKE_DL_LIBS} 34 Threads::Threads 35 mbmalloc 40 36 ) 41 37 42 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()38 set(MallocBench_DEPENDENCIES sysmalloc) 43 39 44 WEBKIT_WRAP_SOURCELIST(${MALLOC_BENCH_SOURCES}) 45 46 47 include_directories(${MALLOC_BENCH_INCLUDE_DIRECTORIES}) 48 49 SET(CMAKE_SKIP_BUILD_RPATH TRUE) 50 if (DEVELOPER_MODE) 51 add_executable(MallocBench ${MALLOC_BENCH_SOURCES}) 52 target_link_libraries(MallocBench ${MALLOC_BENCH_LIBRARIES} Threads::Threads mbmalloc) 53 add_dependencies(MallocBench sysmalloc mbmalloc) 54 endif () 55 56 set(MALLOC_BENCH_OPS 40 set(MallocBench_OPS 57 41 facebook.ops 58 42 flickr.ops … … 65 49 ) 66 50 51 WEBKIT_EXECUTABLE_DECLARE(MallocBench) 52 WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() 53 54 set(CMAKE_SKIP_BUILD_RPATH ON) 55 add_library(sysmalloc SHARED mbmalloc.cpp) 56 set_target_properties(sysmalloc PROPERTIES OUTPUT_NAME "mbmalloc") 57 set_target_properties(sysmalloc PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib/system/) 58 67 59 file(COPY 68 ${M ALLOC_BENCH_OPS}60 ${MallocBench_OPS} 69 61 DESTINATION 70 62 ${PROJECT_BINARY_DIR} 71 63 ) 64 65 WEBKIT_WRAP_SOURCELIST(${MallocBench_SOURCES}) 66 WEBKIT_EXECUTABLE(MallocBench) -
trunk/Source/bmalloc/CMakeLists.txt
r256088 r261444 158 158 WEBKIT_FRAMEWORK_TARGET(bmalloc) 159 159 160 if (DEVELOPER_MODE) 160 # Only build mbmalloc on platforms that MallocBench supports 161 if (DEVELOPER_MODE AND (APPLE OR HAVE_MALLOC_TRIM)) 161 162 add_library(mbmalloc SHARED bmalloc/mbmalloc.cpp) 162 163 target_include_directories(mbmalloc PRIVATE ${bmalloc_PRIVATE_INCLUDE_DIRECTORIES}) -
trunk/Source/bmalloc/ChangeLog
r261428 r261444 1 2020-05-09 Don Olmstead <don.olmstead@sony.com> 2 3 [CMake] Use WEBKIT_EXECUTABLE in MallocBench 4 https://bugs.webkit.org/show_bug.cgi?id=211665 5 6 Reviewed by Yusuke Suzuki. 7 8 Only build mbmalloc if its possible to run MallocBench. 9 10 * CMakeLists.txt: 11 1 12 2020-05-08 Basuke Suzuki <basuke.suzuki@sony.com> 2 13
Note: See TracChangeset
for help on using the changeset viewer.