[benchmark] Remove spv_reader and wgsl_writer deps
This removes the dependencies from the BUILD.cfg files and regenerates
the BUILD files.
Bug: 42251293
Change-Id: Ib5c7c4629d6ca667609c977b7f5246ad1750854a
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/202357
Commit-Queue: James Price <jrprice@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
diff --git a/src/tint/cmd/bench/BUILD.bazel b/src/tint/cmd/bench/BUILD.bazel
index 8ea236b..94891b9 100644
--- a/src/tint/cmd/bench/BUILD.bazel
+++ b/src/tint/cmd/bench/BUILD.bazel
@@ -109,37 +109,33 @@
"//src/tint/utils/traits",
"@benchmark",
] + select({
- ":tint_build_glsl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
+ ":tint_build_glsl_writer_and_tint_build_wgsl_reader": [
"//src/tint/lang/glsl/writer:bench",
],
"//conditions:default": [],
}) + select({
- ":tint_build_hlsl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
+ ":tint_build_hlsl_writer_and_tint_build_wgsl_reader": [
"//src/tint/lang/hlsl/writer:bench",
],
"//conditions:default": [],
}) + select({
- ":tint_build_msl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
+ ":tint_build_msl_writer_and_tint_build_wgsl_reader": [
"//src/tint/lang/msl/writer:bench",
],
"//conditions:default": [],
}) + select({
- ":tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
- "//src/tint/cmd/bench:bench",
- ],
- "//conditions:default": [],
- }) + select({
- ":tint_build_spv_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
+ ":tint_build_spv_writer_and_tint_build_wgsl_reader": [
"//src/tint/lang/spirv/writer:bench",
],
"//conditions:default": [],
}) + select({
- ":tint_build_wgsl_reader_and_tint_build_spv_reader_and_tint_build_wgsl_writer": [
+ ":tint_build_wgsl_reader": [
+ "//src/tint/cmd/bench:bench",
"//src/tint/lang/wgsl/reader:bench",
],
"//conditions:default": [],
}) + select({
- ":tint_build_wgsl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader": [
+ ":tint_build_wgsl_writer_and_tint_build_wgsl_reader": [
"//src/tint/lang/wgsl/writer:bench",
],
"//conditions:default": [],
@@ -164,11 +160,6 @@
)
alias(
- name = "tint_build_spv_reader",
- actual = "//src/tint:tint_build_spv_reader_true",
-)
-
-alias(
name = "tint_build_spv_writer",
actual = "//src/tint:tint_build_spv_writer_true",
)
@@ -184,62 +175,37 @@
)
selects.config_setting_group(
- name = "tint_build_glsl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
+ name = "tint_build_glsl_writer_and_tint_build_wgsl_reader",
match_all = [
":tint_build_glsl_writer",
- ":tint_build_spv_reader",
":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
],
)
selects.config_setting_group(
- name = "tint_build_hlsl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
+ name = "tint_build_hlsl_writer_and_tint_build_wgsl_reader",
match_all = [
":tint_build_hlsl_writer",
- ":tint_build_spv_reader",
":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
],
)
selects.config_setting_group(
- name = "tint_build_msl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
+ name = "tint_build_msl_writer_and_tint_build_wgsl_reader",
match_all = [
":tint_build_msl_writer",
- ":tint_build_spv_reader",
":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
],
)
selects.config_setting_group(
- name = "tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
- match_all = [
- ":tint_build_spv_reader",
- ":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
- ],
-)
-selects.config_setting_group(
- name = "tint_build_spv_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
+ name = "tint_build_spv_writer_and_tint_build_wgsl_reader",
match_all = [
":tint_build_spv_writer",
- ":tint_build_spv_reader",
":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
],
)
selects.config_setting_group(
- name = "tint_build_wgsl_reader_and_tint_build_spv_reader_and_tint_build_wgsl_writer",
- match_all = [
- ":tint_build_wgsl_reader",
- ":tint_build_spv_reader",
- ":tint_build_wgsl_writer",
- ],
-)
-selects.config_setting_group(
- name = "tint_build_wgsl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader",
+ name = "tint_build_wgsl_writer_and_tint_build_wgsl_reader",
match_all = [
":tint_build_wgsl_writer",
- ":tint_build_spv_reader",
":tint_build_wgsl_reader",
],
)
diff --git a/src/tint/cmd/bench/BUILD.cfg b/src/tint/cmd/bench/BUILD.cfg
index a1d4182..65b9491 100644
--- a/src/tint/cmd/bench/BUILD.cfg
+++ b/src/tint/cmd/bench/BUILD.cfg
@@ -1,5 +1,5 @@
{
- "Condition": "tint_build_spv_reader && tint_build_wgsl_reader && tint_build_wgsl_writer",
+ "Condition": "tint_build_wgsl_reader",
"bench_cmd": {
/* The benchmarks executable target for Tint. */
"OutputName": "tint_benchmark",
diff --git a/src/tint/cmd/bench/BUILD.cmake b/src/tint/cmd/bench/BUILD.cmake
index 0f7533c..852eddc 100644
--- a/src/tint/cmd/bench/BUILD.cmake
+++ b/src/tint/cmd/bench/BUILD.cmake
@@ -34,11 +34,11 @@
# Do not modify this file directly
################################################################################
-if(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_WGSL_READER)
################################################################################
# Target: tint_cmd_bench_bench_cmd
# Kind: bench_cmd
-# Condition: TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER
+# Condition: TINT_BUILD_WGSL_READER
################################################################################
tint_add_target(tint_cmd_bench_bench_cmd bench_cmd
cmd/bench/main_bench.cc
@@ -74,56 +74,51 @@
"google-benchmark"
)
-if(TINT_BUILD_GLSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_GLSL_WRITER AND TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_cmd_bench_bench_cmd bench_cmd
tint_lang_glsl_writer_bench
)
-endif(TINT_BUILD_GLSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_GLSL_WRITER AND TINT_BUILD_WGSL_READER)
-if(TINT_BUILD_HLSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_HLSL_WRITER AND TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_cmd_bench_bench_cmd bench_cmd
tint_lang_hlsl_writer_bench
)
-endif(TINT_BUILD_HLSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_HLSL_WRITER AND TINT_BUILD_WGSL_READER)
-if(TINT_BUILD_MSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_MSL_WRITER AND TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_cmd_bench_bench_cmd bench_cmd
tint_lang_msl_writer_bench
)
-endif(TINT_BUILD_MSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_MSL_WRITER AND TINT_BUILD_WGSL_READER)
-if(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
- tint_target_add_dependencies(tint_cmd_bench_bench_cmd bench_cmd
- tint_cmd_bench_bench
- )
-endif(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
-
-if(TINT_BUILD_SPV_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_SPV_WRITER AND TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_cmd_bench_bench_cmd bench_cmd
tint_lang_spirv_writer_bench
)
-endif(TINT_BUILD_SPV_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_SPV_WRITER AND TINT_BUILD_WGSL_READER)
-if(TINT_BUILD_WGSL_READER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_cmd_bench_bench_cmd bench_cmd
+ tint_cmd_bench_bench
tint_lang_wgsl_reader_bench
)
-endif(TINT_BUILD_WGSL_READER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_WGSL_READER)
-if(TINT_BUILD_WGSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER)
+if(TINT_BUILD_WGSL_WRITER AND TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_cmd_bench_bench_cmd bench_cmd
tint_lang_wgsl_writer_bench
)
-endif(TINT_BUILD_WGSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER)
+endif(TINT_BUILD_WGSL_WRITER AND TINT_BUILD_WGSL_READER)
tint_target_set_output_name(tint_cmd_bench_bench_cmd bench_cmd "tint_benchmark")
-endif(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
-if(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_WGSL_READER)
+if(TINT_BUILD_WGSL_READER)
################################################################################
# Target: tint_cmd_bench_bench
# Kind: bench
-# Condition: TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER
+# Condition: TINT_BUILD_WGSL_READER
################################################################################
tint_add_target(tint_cmd_bench_bench bench
cmd/bench/bench.cc
@@ -167,4 +162,4 @@
)
endif(TINT_BUILD_WGSL_READER)
-endif(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
\ No newline at end of file
+endif(TINT_BUILD_WGSL_READER)
\ No newline at end of file
diff --git a/src/tint/cmd/bench/BUILD.gn b/src/tint/cmd/bench/BUILD.gn
index 1d01419..e979db0 100644
--- a/src/tint/cmd/bench/BUILD.gn
+++ b/src/tint/cmd/bench/BUILD.gn
@@ -42,8 +42,7 @@
import("//testing/test.gni")
}
if (tint_build_benchmarks) {
- if (tint_build_spv_reader && tint_build_wgsl_reader &&
- tint_build_wgsl_writer) {
+ if (tint_build_wgsl_reader) {
tint_benchmarks_source_set("bench") {
sources = [
"bench.cc",
@@ -84,8 +83,7 @@
}
}
if (tint_build_benchmarks) {
- if (tint_build_spv_reader && tint_build_wgsl_reader &&
- tint_build_wgsl_writer) {
+ if (tint_build_wgsl_reader) {
test("bench_cmd") {
testonly = true
output_name = "tint_benchmark"
@@ -117,38 +115,30 @@
"${tint_src_dir}/utils/traits",
]
- if (tint_build_glsl_writer && tint_build_spv_reader &&
- tint_build_wgsl_reader && tint_build_wgsl_writer) {
+ if (tint_build_glsl_writer && tint_build_wgsl_reader) {
deps += [ "${tint_src_dir}/lang/glsl/writer:bench" ]
}
- if (tint_build_hlsl_writer && tint_build_spv_reader &&
- tint_build_wgsl_reader && tint_build_wgsl_writer) {
+ if (tint_build_hlsl_writer && tint_build_wgsl_reader) {
deps += [ "${tint_src_dir}/lang/hlsl/writer:bench" ]
}
- if (tint_build_msl_writer && tint_build_spv_reader &&
- tint_build_wgsl_reader && tint_build_wgsl_writer) {
+ if (tint_build_msl_writer && tint_build_wgsl_reader) {
deps += [ "${tint_src_dir}/lang/msl/writer:bench" ]
}
- if (tint_build_spv_reader && tint_build_wgsl_reader &&
- tint_build_wgsl_writer) {
- deps += [ "${tint_src_dir}/cmd/bench:bench" ]
- }
-
- if (tint_build_spv_writer && tint_build_spv_reader &&
- tint_build_wgsl_reader && tint_build_wgsl_writer) {
+ if (tint_build_spv_writer && tint_build_wgsl_reader) {
deps += [ "${tint_src_dir}/lang/spirv/writer:bench" ]
}
- if (tint_build_wgsl_reader && tint_build_spv_reader &&
- tint_build_wgsl_writer) {
- deps += [ "${tint_src_dir}/lang/wgsl/reader:bench" ]
+ if (tint_build_wgsl_reader) {
+ deps += [
+ "${tint_src_dir}/cmd/bench:bench",
+ "${tint_src_dir}/lang/wgsl/reader:bench",
+ ]
}
- if (tint_build_wgsl_writer && tint_build_spv_reader &&
- tint_build_wgsl_reader) {
+ if (tint_build_wgsl_writer && tint_build_wgsl_reader) {
deps += [ "${tint_src_dir}/lang/wgsl/writer:bench" ]
}
}
diff --git a/src/tint/lang/glsl/writer/BUILD.bazel b/src/tint/lang/glsl/writer/BUILD.bazel
index 8294a43..f429197 100644
--- a/src/tint/lang/glsl/writer/BUILD.bazel
+++ b/src/tint/lang/glsl/writer/BUILD.bazel
@@ -178,7 +178,7 @@
],
"//conditions:default": [],
}) + select({
- ":tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
+ ":tint_build_wgsl_reader": [
"//src/tint/cmd/bench:bench",
],
"//conditions:default": [],
@@ -198,20 +198,10 @@
)
alias(
- name = "tint_build_spv_reader",
- actual = "//src/tint:tint_build_spv_reader_true",
-)
-
-alias(
name = "tint_build_wgsl_reader",
actual = "//src/tint:tint_build_wgsl_reader_true",
)
-alias(
- name = "tint_build_wgsl_writer",
- actual = "//src/tint:tint_build_wgsl_writer_true",
-)
-
selects.config_setting_group(
name = "tint_build_glsl_writer_and_tint_build_glsl_validator",
match_all = [
@@ -220,20 +210,10 @@
],
)
selects.config_setting_group(
- name = "tint_build_glsl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
+ name = "tint_build_glsl_writer_and_tint_build_wgsl_reader",
match_all = [
":tint_build_glsl_writer",
- ":tint_build_spv_reader",
":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
- ],
-)
-selects.config_setting_group(
- name = "tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
- match_all = [
- ":tint_build_spv_reader",
- ":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
],
)
diff --git a/src/tint/lang/glsl/writer/BUILD.cfg b/src/tint/lang/glsl/writer/BUILD.cfg
index f3986f8..77527f8 100644
--- a/src/tint/lang/glsl/writer/BUILD.cfg
+++ b/src/tint/lang/glsl/writer/BUILD.cfg
@@ -1,7 +1,7 @@
{
"condition": "tint_build_glsl_writer",
"bench": {
- "Condition": "tint_build_spv_reader && tint_build_wgsl_reader && tint_build_wgsl_writer",
+ "Condition": "tint_build_wgsl_reader",
},
"test": {
"condition": "tint_build_glsl_validator",
diff --git a/src/tint/lang/glsl/writer/BUILD.cmake b/src/tint/lang/glsl/writer/BUILD.cmake
index e5a40a3..3783e19 100644
--- a/src/tint/lang/glsl/writer/BUILD.cmake
+++ b/src/tint/lang/glsl/writer/BUILD.cmake
@@ -152,11 +152,11 @@
endif(TINT_BUILD_GLSL_WRITER)
endif(TINT_BUILD_GLSL_WRITER AND TINT_BUILD_GLSL_VALIDATOR)
-if(TINT_BUILD_GLSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_GLSL_WRITER AND TINT_BUILD_WGSL_READER)
################################################################################
# Target: tint_lang_glsl_writer_bench
# Kind: bench
-# Condition: TINT_BUILD_GLSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER
+# Condition: TINT_BUILD_GLSL_WRITER AND TINT_BUILD_WGSL_READER
################################################################################
tint_add_target(tint_lang_glsl_writer_bench bench
lang/glsl/writer/writer_bench.cc
@@ -199,13 +199,13 @@
)
endif(TINT_BUILD_GLSL_WRITER)
-if(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_lang_glsl_writer_bench bench
tint_cmd_bench_bench
)
-endif(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_WGSL_READER)
-endif(TINT_BUILD_GLSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_GLSL_WRITER AND TINT_BUILD_WGSL_READER)
if(TINT_BUILD_GLSL_WRITER)
################################################################################
# Target: tint_lang_glsl_writer_fuzz
diff --git a/src/tint/lang/glsl/writer/BUILD.gn b/src/tint/lang/glsl/writer/BUILD.gn
index 8b3b547..4f151c0 100644
--- a/src/tint/lang/glsl/writer/BUILD.gn
+++ b/src/tint/lang/glsl/writer/BUILD.gn
@@ -138,8 +138,7 @@
}
}
if (tint_build_benchmarks) {
- if (tint_build_glsl_writer && tint_build_spv_reader &&
- tint_build_wgsl_reader && tint_build_wgsl_writer) {
+ if (tint_build_glsl_writer && tint_build_wgsl_reader) {
tint_benchmarks_source_set("bench") {
sources = [ "writer_bench.cc" ]
deps = [
@@ -176,8 +175,7 @@
]
}
- if (tint_build_spv_reader && tint_build_wgsl_reader &&
- tint_build_wgsl_writer) {
+ if (tint_build_wgsl_reader) {
deps += [ "${tint_src_dir}/cmd/bench:bench" ]
}
}
diff --git a/src/tint/lang/hlsl/writer/BUILD.bazel b/src/tint/lang/hlsl/writer/BUILD.bazel
index 87bc86c..a9f4e35 100644
--- a/src/tint/lang/hlsl/writer/BUILD.bazel
+++ b/src/tint/lang/hlsl/writer/BUILD.bazel
@@ -175,7 +175,7 @@
],
"//conditions:default": [],
}) + select({
- ":tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
+ ":tint_build_wgsl_reader": [
"//src/tint/cmd/bench:bench",
],
"//conditions:default": [],
@@ -190,35 +190,15 @@
)
alias(
- name = "tint_build_spv_reader",
- actual = "//src/tint:tint_build_spv_reader_true",
-)
-
-alias(
name = "tint_build_wgsl_reader",
actual = "//src/tint:tint_build_wgsl_reader_true",
)
-alias(
- name = "tint_build_wgsl_writer",
- actual = "//src/tint:tint_build_wgsl_writer_true",
-)
-
selects.config_setting_group(
- name = "tint_build_hlsl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
+ name = "tint_build_hlsl_writer_and_tint_build_wgsl_reader",
match_all = [
":tint_build_hlsl_writer",
- ":tint_build_spv_reader",
":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
- ],
-)
-selects.config_setting_group(
- name = "tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
- match_all = [
- ":tint_build_spv_reader",
- ":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
],
)
diff --git a/src/tint/lang/hlsl/writer/BUILD.cfg b/src/tint/lang/hlsl/writer/BUILD.cfg
index 5d85a91..32b58a0 100644
--- a/src/tint/lang/hlsl/writer/BUILD.cfg
+++ b/src/tint/lang/hlsl/writer/BUILD.cfg
@@ -1,6 +1,6 @@
{
"condition": "tint_build_hlsl_writer",
"bench": {
- "Condition": "tint_build_spv_reader && tint_build_wgsl_reader && tint_build_wgsl_writer",
+ "Condition": "tint_build_wgsl_reader",
}
}
diff --git a/src/tint/lang/hlsl/writer/BUILD.cmake b/src/tint/lang/hlsl/writer/BUILD.cmake
index 04927f5..89411bb 100644
--- a/src/tint/lang/hlsl/writer/BUILD.cmake
+++ b/src/tint/lang/hlsl/writer/BUILD.cmake
@@ -154,11 +154,11 @@
endif(TINT_BUILD_HLSL_WRITER)
endif(TINT_BUILD_HLSL_WRITER)
-if(TINT_BUILD_HLSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_HLSL_WRITER AND TINT_BUILD_WGSL_READER)
################################################################################
# Target: tint_lang_hlsl_writer_bench
# Kind: bench
-# Condition: TINT_BUILD_HLSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER
+# Condition: TINT_BUILD_HLSL_WRITER AND TINT_BUILD_WGSL_READER
################################################################################
tint_add_target(tint_lang_hlsl_writer_bench bench
lang/hlsl/writer/writer_bench.cc
@@ -199,13 +199,13 @@
)
endif(TINT_BUILD_HLSL_WRITER)
-if(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_lang_hlsl_writer_bench bench
tint_cmd_bench_bench
)
-endif(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_WGSL_READER)
-endif(TINT_BUILD_HLSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_HLSL_WRITER AND TINT_BUILD_WGSL_READER)
if(TINT_BUILD_HLSL_WRITER)
################################################################################
# Target: tint_lang_hlsl_writer_fuzz
diff --git a/src/tint/lang/hlsl/writer/BUILD.gn b/src/tint/lang/hlsl/writer/BUILD.gn
index 8ed285d..4273743 100644
--- a/src/tint/lang/hlsl/writer/BUILD.gn
+++ b/src/tint/lang/hlsl/writer/BUILD.gn
@@ -144,8 +144,7 @@
}
}
if (tint_build_benchmarks) {
- if (tint_build_hlsl_writer && tint_build_spv_reader &&
- tint_build_wgsl_reader && tint_build_wgsl_writer) {
+ if (tint_build_hlsl_writer && tint_build_wgsl_reader) {
tint_benchmarks_source_set("bench") {
sources = [ "writer_bench.cc" ]
deps = [
@@ -178,8 +177,7 @@
deps += [ "${tint_src_dir}/lang/hlsl/writer" ]
}
- if (tint_build_spv_reader && tint_build_wgsl_reader &&
- tint_build_wgsl_writer) {
+ if (tint_build_wgsl_reader) {
deps += [ "${tint_src_dir}/cmd/bench:bench" ]
}
}
diff --git a/src/tint/lang/msl/writer/BUILD.bazel b/src/tint/lang/msl/writer/BUILD.bazel
index e2e42b1..b82349c 100644
--- a/src/tint/lang/msl/writer/BUILD.bazel
+++ b/src/tint/lang/msl/writer/BUILD.bazel
@@ -169,7 +169,7 @@
],
"//conditions:default": [],
}) + select({
- ":tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
+ ":tint_build_wgsl_reader": [
"//src/tint/cmd/bench:bench",
],
"//conditions:default": [],
@@ -184,35 +184,15 @@
)
alias(
- name = "tint_build_spv_reader",
- actual = "//src/tint:tint_build_spv_reader_true",
-)
-
-alias(
name = "tint_build_wgsl_reader",
actual = "//src/tint:tint_build_wgsl_reader_true",
)
-alias(
- name = "tint_build_wgsl_writer",
- actual = "//src/tint:tint_build_wgsl_writer_true",
-)
-
selects.config_setting_group(
- name = "tint_build_msl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
+ name = "tint_build_msl_writer_and_tint_build_wgsl_reader",
match_all = [
":tint_build_msl_writer",
- ":tint_build_spv_reader",
":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
- ],
-)
-selects.config_setting_group(
- name = "tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
- match_all = [
- ":tint_build_spv_reader",
- ":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
],
)
diff --git a/src/tint/lang/msl/writer/BUILD.cfg b/src/tint/lang/msl/writer/BUILD.cfg
index ef68502..52536a2 100644
--- a/src/tint/lang/msl/writer/BUILD.cfg
+++ b/src/tint/lang/msl/writer/BUILD.cfg
@@ -1,6 +1,6 @@
{
"condition": "tint_build_msl_writer",
"bench": {
- "Condition": "tint_build_spv_reader && tint_build_wgsl_reader && tint_build_wgsl_writer",
+ "Condition": "tint_build_wgsl_reader",
}
}
diff --git a/src/tint/lang/msl/writer/BUILD.cmake b/src/tint/lang/msl/writer/BUILD.cmake
index b6c00cb..119c977 100644
--- a/src/tint/lang/msl/writer/BUILD.cmake
+++ b/src/tint/lang/msl/writer/BUILD.cmake
@@ -146,11 +146,11 @@
endif(TINT_BUILD_MSL_WRITER)
endif(TINT_BUILD_MSL_WRITER)
-if(TINT_BUILD_MSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_MSL_WRITER AND TINT_BUILD_WGSL_READER)
################################################################################
# Target: tint_lang_msl_writer_bench
# Kind: bench
-# Condition: TINT_BUILD_MSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER
+# Condition: TINT_BUILD_MSL_WRITER AND TINT_BUILD_WGSL_READER
################################################################################
tint_add_target(tint_lang_msl_writer_bench bench
lang/msl/writer/writer_bench.cc
@@ -193,13 +193,13 @@
)
endif(TINT_BUILD_MSL_WRITER)
-if(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_lang_msl_writer_bench bench
tint_cmd_bench_bench
)
-endif(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_WGSL_READER)
-endif(TINT_BUILD_MSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_MSL_WRITER AND TINT_BUILD_WGSL_READER)
if(TINT_BUILD_MSL_WRITER)
################################################################################
# Target: tint_lang_msl_writer_fuzz
diff --git a/src/tint/lang/msl/writer/BUILD.gn b/src/tint/lang/msl/writer/BUILD.gn
index 20e0624..6e83c0e 100644
--- a/src/tint/lang/msl/writer/BUILD.gn
+++ b/src/tint/lang/msl/writer/BUILD.gn
@@ -136,8 +136,7 @@
}
}
if (tint_build_benchmarks) {
- if (tint_build_msl_writer && tint_build_spv_reader &&
- tint_build_wgsl_reader && tint_build_wgsl_writer) {
+ if (tint_build_msl_writer && tint_build_wgsl_reader) {
tint_benchmarks_source_set("bench") {
sources = [ "writer_bench.cc" ]
deps = [
@@ -174,8 +173,7 @@
]
}
- if (tint_build_spv_reader && tint_build_wgsl_reader &&
- tint_build_wgsl_writer) {
+ if (tint_build_wgsl_reader) {
deps += [ "${tint_src_dir}/cmd/bench:bench" ]
}
}
diff --git a/src/tint/lang/spirv/writer/BUILD.bazel b/src/tint/lang/spirv/writer/BUILD.bazel
index e16969c..9cc1e25 100644
--- a/src/tint/lang/spirv/writer/BUILD.bazel
+++ b/src/tint/lang/spirv/writer/BUILD.bazel
@@ -179,11 +179,6 @@
"//src/tint/utils/traits",
"@benchmark",
] + select({
- ":tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
- "//src/tint/cmd/bench:bench",
- ],
- "//conditions:default": [],
- }) + select({
":tint_build_spv_writer": [
"//src/tint/lang/spirv/writer",
"//src/tint/lang/spirv/writer/common",
@@ -191,6 +186,7 @@
"//conditions:default": [],
}) + select({
":tint_build_wgsl_reader": [
+ "//src/tint/cmd/bench:bench",
"//src/tint/lang/wgsl/reader",
],
"//conditions:default": [],
@@ -214,11 +210,6 @@
actual = "//src/tint:tint_build_wgsl_reader_true",
)
-alias(
- name = "tint_build_wgsl_writer",
- actual = "//src/tint:tint_build_wgsl_writer_true",
-)
-
selects.config_setting_group(
name = "tint_build_spv_reader_or_tint_build_spv_writer",
match_any = [
@@ -228,20 +219,10 @@
)
selects.config_setting_group(
- name = "tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
- match_all = [
- ":tint_build_spv_reader",
- ":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
- ],
-)
-selects.config_setting_group(
- name = "tint_build_spv_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
+ name = "tint_build_spv_writer_and_tint_build_wgsl_reader",
match_all = [
":tint_build_spv_writer",
- ":tint_build_spv_reader",
":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
],
)
diff --git a/src/tint/lang/spirv/writer/BUILD.cfg b/src/tint/lang/spirv/writer/BUILD.cfg
index 9f5ef38..d53bc34 100644
--- a/src/tint/lang/spirv/writer/BUILD.cfg
+++ b/src/tint/lang/spirv/writer/BUILD.cfg
@@ -1,6 +1,6 @@
{
"condition": "tint_build_spv_writer",
"bench": {
- "Condition": "tint_build_spv_reader && tint_build_wgsl_reader && tint_build_wgsl_writer",
+ "Condition": "tint_build_wgsl_reader",
}
}
diff --git a/src/tint/lang/spirv/writer/BUILD.cmake b/src/tint/lang/spirv/writer/BUILD.cmake
index efba0b1..fcddb03 100644
--- a/src/tint/lang/spirv/writer/BUILD.cmake
+++ b/src/tint/lang/spirv/writer/BUILD.cmake
@@ -161,11 +161,11 @@
endif(TINT_BUILD_SPV_WRITER)
endif(TINT_BUILD_SPV_WRITER)
-if(TINT_BUILD_SPV_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_SPV_WRITER AND TINT_BUILD_WGSL_READER)
################################################################################
# Target: tint_lang_spirv_writer_bench
# Kind: bench
-# Condition: TINT_BUILD_SPV_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER
+# Condition: TINT_BUILD_SPV_WRITER AND TINT_BUILD_WGSL_READER
################################################################################
tint_add_target(tint_lang_spirv_writer_bench bench
lang/spirv/writer/writer_bench.cc
@@ -202,12 +202,6 @@
"google-benchmark"
)
-if(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
- tint_target_add_dependencies(tint_lang_spirv_writer_bench bench
- tint_cmd_bench_bench
- )
-endif(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
-
if(TINT_BUILD_SPV_WRITER)
tint_target_add_dependencies(tint_lang_spirv_writer_bench bench
tint_lang_spirv_writer
@@ -217,11 +211,12 @@
if(TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_lang_spirv_writer_bench bench
+ tint_cmd_bench_bench
tint_lang_wgsl_reader
)
endif(TINT_BUILD_WGSL_READER)
-endif(TINT_BUILD_SPV_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_SPV_WRITER AND TINT_BUILD_WGSL_READER)
if(TINT_BUILD_SPV_WRITER)
################################################################################
# Target: tint_lang_spirv_writer_fuzz
diff --git a/src/tint/lang/spirv/writer/BUILD.gn b/src/tint/lang/spirv/writer/BUILD.gn
index 6829308..d727487 100644
--- a/src/tint/lang/spirv/writer/BUILD.gn
+++ b/src/tint/lang/spirv/writer/BUILD.gn
@@ -152,8 +152,7 @@
}
}
if (tint_build_benchmarks) {
- if (tint_build_spv_writer && tint_build_spv_reader &&
- tint_build_wgsl_reader && tint_build_wgsl_writer) {
+ if (tint_build_spv_writer && tint_build_wgsl_reader) {
tint_benchmarks_source_set("bench") {
sources = [ "writer_bench.cc" ]
deps = [
@@ -184,11 +183,6 @@
"${tint_src_dir}/utils/traits",
]
- if (tint_build_spv_reader && tint_build_wgsl_reader &&
- tint_build_wgsl_writer) {
- deps += [ "${tint_src_dir}/cmd/bench:bench" ]
- }
-
if (tint_build_spv_writer) {
deps += [
"${tint_src_dir}/lang/spirv/writer",
@@ -197,7 +191,10 @@
}
if (tint_build_wgsl_reader) {
- deps += [ "${tint_src_dir}/lang/wgsl/reader" ]
+ deps += [
+ "${tint_src_dir}/cmd/bench:bench",
+ "${tint_src_dir}/lang/wgsl/reader",
+ ]
}
}
}
diff --git a/src/tint/lang/wgsl/reader/BUILD.bazel b/src/tint/lang/wgsl/reader/BUILD.bazel
index 09d2e1a..8c52a2c 100644
--- a/src/tint/lang/wgsl/reader/BUILD.bazel
+++ b/src/tint/lang/wgsl/reader/BUILD.bazel
@@ -146,12 +146,8 @@
"//src/tint/utils/traits",
"@benchmark",
] + select({
- ":tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
- "//src/tint/cmd/bench:bench",
- ],
- "//conditions:default": [],
- }) + select({
":tint_build_wgsl_reader": [
+ "//src/tint/cmd/bench:bench",
"//src/tint/lang/wgsl/reader",
],
"//conditions:default": [],
@@ -161,34 +157,7 @@
)
alias(
- name = "tint_build_spv_reader",
- actual = "//src/tint:tint_build_spv_reader_true",
-)
-
-alias(
name = "tint_build_wgsl_reader",
actual = "//src/tint:tint_build_wgsl_reader_true",
)
-alias(
- name = "tint_build_wgsl_writer",
- actual = "//src/tint:tint_build_wgsl_writer_true",
-)
-
-selects.config_setting_group(
- name = "tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
- match_all = [
- ":tint_build_spv_reader",
- ":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
- ],
-)
-selects.config_setting_group(
- name = "tint_build_wgsl_reader_and_tint_build_spv_reader_and_tint_build_wgsl_writer",
- match_all = [
- ":tint_build_wgsl_reader",
- ":tint_build_spv_reader",
- ":tint_build_wgsl_writer",
- ],
-)
-
diff --git a/src/tint/lang/wgsl/reader/BUILD.cfg b/src/tint/lang/wgsl/reader/BUILD.cfg
index dbab76b..e85bddd 100644
--- a/src/tint/lang/wgsl/reader/BUILD.cfg
+++ b/src/tint/lang/wgsl/reader/BUILD.cfg
@@ -1,6 +1,3 @@
{
"condition": "tint_build_wgsl_reader",
- "bench": {
- "Condition": "tint_build_spv_reader && tint_build_wgsl_writer",
- }
}
diff --git a/src/tint/lang/wgsl/reader/BUILD.cmake b/src/tint/lang/wgsl/reader/BUILD.cmake
index 8228593..15421cd 100644
--- a/src/tint/lang/wgsl/reader/BUILD.cmake
+++ b/src/tint/lang/wgsl/reader/BUILD.cmake
@@ -125,11 +125,11 @@
endif(TINT_BUILD_WGSL_READER)
endif(TINT_BUILD_WGSL_READER)
-if(TINT_BUILD_WGSL_READER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_WGSL_READER)
################################################################################
# Target: tint_lang_wgsl_reader_bench
# Kind: bench
-# Condition: TINT_BUILD_WGSL_READER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_WRITER
+# Condition: TINT_BUILD_WGSL_READER
################################################################################
tint_add_target(tint_lang_wgsl_reader_bench bench
lang/wgsl/reader/reader_bench.cc
@@ -166,16 +166,11 @@
"google-benchmark"
)
-if(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
- tint_target_add_dependencies(tint_lang_wgsl_reader_bench bench
- tint_cmd_bench_bench
- )
-endif(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
-
if(TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_lang_wgsl_reader_bench bench
+ tint_cmd_bench_bench
tint_lang_wgsl_reader
)
endif(TINT_BUILD_WGSL_READER)
-endif(TINT_BUILD_WGSL_READER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_WRITER)
\ No newline at end of file
+endif(TINT_BUILD_WGSL_READER)
\ No newline at end of file
diff --git a/src/tint/lang/wgsl/reader/BUILD.gn b/src/tint/lang/wgsl/reader/BUILD.gn
index ebbbb6d..9cf37f2 100644
--- a/src/tint/lang/wgsl/reader/BUILD.gn
+++ b/src/tint/lang/wgsl/reader/BUILD.gn
@@ -114,8 +114,7 @@
}
}
if (tint_build_benchmarks) {
- if (tint_build_wgsl_reader && tint_build_spv_reader &&
- tint_build_wgsl_writer) {
+ if (tint_build_wgsl_reader) {
tint_benchmarks_source_set("bench") {
sources = [ "reader_bench.cc" ]
deps = [
@@ -146,13 +145,11 @@
"${tint_src_dir}/utils/traits",
]
- if (tint_build_spv_reader && tint_build_wgsl_reader &&
- tint_build_wgsl_writer) {
- deps += [ "${tint_src_dir}/cmd/bench:bench" ]
- }
-
if (tint_build_wgsl_reader) {
- deps += [ "${tint_src_dir}/lang/wgsl/reader" ]
+ deps += [
+ "${tint_src_dir}/cmd/bench:bench",
+ "${tint_src_dir}/lang/wgsl/reader",
+ ]
}
}
}
diff --git a/src/tint/lang/wgsl/writer/BUILD.bazel b/src/tint/lang/wgsl/writer/BUILD.bazel
index 284c182..441673d 100644
--- a/src/tint/lang/wgsl/writer/BUILD.bazel
+++ b/src/tint/lang/wgsl/writer/BUILD.bazel
@@ -164,7 +164,7 @@
"//src/tint/utils/traits",
"@benchmark",
] + select({
- ":tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer": [
+ ":tint_build_wgsl_reader": [
"//src/tint/cmd/bench:bench",
],
"//conditions:default": [],
@@ -179,11 +179,6 @@
)
alias(
- name = "tint_build_spv_reader",
- actual = "//src/tint:tint_build_spv_reader_true",
-)
-
-alias(
name = "tint_build_wgsl_reader",
actual = "//src/tint:tint_build_wgsl_reader_true",
)
@@ -194,18 +189,9 @@
)
selects.config_setting_group(
- name = "tint_build_spv_reader_and_tint_build_wgsl_reader_and_tint_build_wgsl_writer",
- match_all = [
- ":tint_build_spv_reader",
- ":tint_build_wgsl_reader",
- ":tint_build_wgsl_writer",
- ],
-)
-selects.config_setting_group(
- name = "tint_build_wgsl_writer_and_tint_build_spv_reader_and_tint_build_wgsl_reader",
+ name = "tint_build_wgsl_writer_and_tint_build_wgsl_reader",
match_all = [
":tint_build_wgsl_writer",
- ":tint_build_spv_reader",
":tint_build_wgsl_reader",
],
)
diff --git a/src/tint/lang/wgsl/writer/BUILD.cfg b/src/tint/lang/wgsl/writer/BUILD.cfg
index 5873f47..0b16c81 100644
--- a/src/tint/lang/wgsl/writer/BUILD.cfg
+++ b/src/tint/lang/wgsl/writer/BUILD.cfg
@@ -1,6 +1,6 @@
{
"condition": "tint_build_wgsl_writer",
"bench": {
- "Condition": "tint_build_spv_reader && tint_build_wgsl_reader",
+ "Condition": "tint_build_wgsl_reader",
}
}
diff --git a/src/tint/lang/wgsl/writer/BUILD.cmake b/src/tint/lang/wgsl/writer/BUILD.cmake
index a949100..24754a3 100644
--- a/src/tint/lang/wgsl/writer/BUILD.cmake
+++ b/src/tint/lang/wgsl/writer/BUILD.cmake
@@ -145,11 +145,11 @@
endif(TINT_BUILD_WGSL_WRITER)
endif(TINT_BUILD_WGSL_WRITER)
-if(TINT_BUILD_WGSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER)
+if(TINT_BUILD_WGSL_WRITER AND TINT_BUILD_WGSL_READER)
################################################################################
# Target: tint_lang_wgsl_writer_bench
# Kind: bench
-# Condition: TINT_BUILD_WGSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER
+# Condition: TINT_BUILD_WGSL_WRITER AND TINT_BUILD_WGSL_READER
################################################################################
tint_add_target(tint_lang_wgsl_writer_bench bench
lang/wgsl/writer/writer_bench.cc
@@ -185,11 +185,11 @@
"google-benchmark"
)
-if(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+if(TINT_BUILD_WGSL_READER)
tint_target_add_dependencies(tint_lang_wgsl_writer_bench bench
tint_cmd_bench_bench
)
-endif(TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER AND TINT_BUILD_WGSL_WRITER)
+endif(TINT_BUILD_WGSL_READER)
if(TINT_BUILD_WGSL_WRITER)
tint_target_add_dependencies(tint_lang_wgsl_writer_bench bench
@@ -197,7 +197,7 @@
)
endif(TINT_BUILD_WGSL_WRITER)
-endif(TINT_BUILD_WGSL_WRITER AND TINT_BUILD_SPV_READER AND TINT_BUILD_WGSL_READER)
+endif(TINT_BUILD_WGSL_WRITER AND TINT_BUILD_WGSL_READER)
if(TINT_BUILD_WGSL_WRITER)
################################################################################
# Target: tint_lang_wgsl_writer_fuzz
diff --git a/src/tint/lang/wgsl/writer/BUILD.gn b/src/tint/lang/wgsl/writer/BUILD.gn
index 4b7229d..fa18d45 100644
--- a/src/tint/lang/wgsl/writer/BUILD.gn
+++ b/src/tint/lang/wgsl/writer/BUILD.gn
@@ -133,8 +133,7 @@
}
}
if (tint_build_benchmarks) {
- if (tint_build_wgsl_writer && tint_build_spv_reader &&
- tint_build_wgsl_reader) {
+ if (tint_build_wgsl_writer && tint_build_wgsl_reader) {
tint_benchmarks_source_set("bench") {
sources = [ "writer_bench.cc" ]
deps = [
@@ -164,8 +163,7 @@
"${tint_src_dir}/utils/traits",
]
- if (tint_build_spv_reader && tint_build_wgsl_reader &&
- tint_build_wgsl_writer) {
+ if (tint_build_wgsl_reader) {
deps += [ "${tint_src_dir}/cmd/bench:bench" ]
}
