[tint] Remove TINT_EXTERNAL_BENCHMARK_CORPUS_DIR
This is no longer needed, as we will not be using external benchmarks
for the Chrome Perf waterfall.
Bug: 42251293
Change-Id: I666f691dfae759950c13d2dc080002ccb41d0b4b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/200518
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: James Price <jrprice@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74fd35f..f17d6d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,8 +208,6 @@
option(TINT_BUILD_TINTD "Build the WGSL language server" OFF)
-set_if_not_defined(TINT_EXTERNAL_BENCHMARK_CORPUS_DIR "" "Directory that holds a corpus of external shaders to benchmark.")
-
option(TINT_ENABLE_BREAK_IN_DEBUGGER "Enable tint::debugger::Break()" OFF)
option(TINT_CHECK_CHROMIUM_STYLE "Check for [chromium-style] issues during build" OFF)
option(TINT_RANDOMIZE_HASHES "Randomize the hash seed value to detect non-deterministic output" OFF)
@@ -334,7 +332,6 @@
message(STATUS "Tint build benchmarks: ${TINT_BUILD_BENCHMARKS}")
message(STATUS "Tint build tests: ${TINT_BUILD_TESTS}")
message(STATUS "Tint build checking [chromium-style]: ${TINT_CHECK_CHROMIUM_STYLE}")
-message(STATUS "Tint external benchmark corpus dir: ${TINT_EXTERNAL_BENCHMARK_CORPUS_DIR}")
endif()
set(IS_ASAN ${DAWN_ENABLE_ASAN})
diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt
index 93d2772..afb557f 100644
--- a/src/tint/CMakeLists.txt
+++ b/src/tint/CMakeLists.txt
@@ -334,47 +334,6 @@
)
add_custom_target(tint_generate_benchmark_inputs DEPENDS ${OUTPUT})
endif()
-if(TINT_BUILD_BENCHMARKS AND TINT_EXTERNAL_BENCHMARK_CORPUS_DIR)
- # Glob all the files at TINT_EXTERNAL_BENCHMARK_CORPUS_DIR, and create a header
- # that lists these with the macros:
- # TINT_BENCHMARK_EXTERNAL_WGSL_PROGRAMS()
- # TINT_BENCHMARK_EXTERNAL_SPV_PROGRAMS()
- set(TINT_BENCHMARK_GEN_DIR "${DAWN_BUILD_GEN_DIR}/src/tint/benchmark/")
- set(TINT_BENCHMARK_EXTERNAL_SHADERS_HEADER "${TINT_BENCHMARK_GEN_DIR}/external_wgsl_programs.h")
- message("Globbing ${TINT_EXTERNAL_BENCHMARK_CORPUS_DIR}...")
-
- file(GLOB_RECURSE
- TINT_EXTERNAL_WGSL_BENCHMARK_FILES
- RELATIVE "${TINT_EXTERNAL_BENCHMARK_CORPUS_DIR}"
- "${TINT_EXTERNAL_BENCHMARK_CORPUS_DIR}/**.wgsl"
- )
- list(TRANSFORM TINT_EXTERNAL_WGSL_BENCHMARK_FILES REPLACE
- "(.+)"
- " BENCHMARK_CAPTURE\(FUNC, \"\\1\", \"${TINT_EXTERNAL_BENCHMARK_CORPUS_DIR}/\\1\")"
- )
- list(JOIN TINT_EXTERNAL_WGSL_BENCHMARK_FILES "; \\\n" TINT_EXTERNAL_WGSL_BENCHMARK_FILES)
-
- file(GLOB_RECURSE
- TINT_EXTERNAL_SPV_BENCHMARK_FILES
- RELATIVE "${TINT_EXTERNAL_BENCHMARK_CORPUS_DIR}"
- "${TINT_EXTERNAL_BENCHMARK_CORPUS_DIR}/**.spv")
-
- list(TRANSFORM TINT_EXTERNAL_SPV_BENCHMARK_FILES REPLACE
- "(.+)"
- " BENCHMARK_CAPTURE\(FUNC, \"\\1\", \"${TINT_EXTERNAL_BENCHMARK_CORPUS_DIR}/\\1\")"
- )
- list(JOIN TINT_EXTERNAL_SPV_BENCHMARK_FILES "; \\\n" TINT_EXTERNAL_SPV_BENCHMARK_FILES)
-
- file(CONFIGURE
- OUTPUT "${TINT_BENCHMARK_EXTERNAL_SHADERS_HEADER}"
- CONTENT "
-#define TINT_BENCHMARK_EXTERNAL_WGSL_PROGRAMS(FUNC) \\
-${TINT_EXTERNAL_WGSL_BENCHMARK_FILES};
-
-#define TINT_BENCHMARK_EXTERNAL_SPV_PROGRAMS(FUNC) \\
-${TINT_EXTERNAL_SPV_BENCHMARK_FILES};"
- )
-endif(TINT_BUILD_BENCHMARKS AND TINT_EXTERNAL_BENCHMARK_CORPUS_DIR)
################################################################################
# Functions used by BUILD.cmake files
@@ -581,11 +540,6 @@
elseif(${DEPENDENCY} STREQUAL "google-benchmark")
set_target_properties(${TARGET} PROPERTIES FOLDER "Benchmarks")
target_link_libraries(${TARGET} PRIVATE benchmark::benchmark)
- if(TINT_BENCHMARK_EXTERNAL_SHADERS_HEADER)
- target_compile_definitions(${TARGET} PRIVATE
- "TINT_BENCHMARK_EXTERNAL_SHADERS_HEADER=\"${TINT_BENCHMARK_EXTERNAL_SHADERS_HEADER}\""
- )
- endif()
elseif(${DEPENDENCY} STREQUAL "gtest")
target_include_directories(${TARGET} PRIVATE ${gmock_SOURCE_DIR}/include)
target_link_libraries(${TARGET} PRIVATE gmock)
