From d3ef553d242917145d4f216049f8bdcd4728d2f6 Mon Sep 17 00:00:00 2001 From: Elie Michel Date: Fri, 30 May 2025 11:13:42 +0200 Subject: [PATCH 1/9] Update dawn-ci.cmake to install tint --- .github/workflows/dawn-ci.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/dawn-ci.cmake b/.github/workflows/dawn-ci.cmake index 90c36d751fd..7bb4df2da91 100644 --- a/.github/workflows/dawn-ci.cmake +++ b/.github/workflows/dawn-ci.cmake @@ -8,6 +8,9 @@ endif () set(DAWN_FETCH_DEPENDENCIES ON CACHE BOOL "") set(DAWN_ENABLE_INSTALL ON CACHE BOOL "") +set(TINT_ENABLE_INSTALL ON CACHE BOOL "") +set(TINT_BUILD_TINTD ON CACHE BOOL "") + if (CMAKE_SYTEM_NAME STREQUAL "Linux") # `sccache` seems effective only on linux. # for windows, we could look into `buildcache` From 97747f26eff8fede07a5e105a5d5237cc4f0f383 Mon Sep 17 00:00:00 2001 From: Elie Michel Date: Fri, 30 May 2025 12:06:16 +0200 Subject: [PATCH 2/9] Update dawn-ci.cmake --- .github/workflows/dawn-ci.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/dawn-ci.cmake b/.github/workflows/dawn-ci.cmake index 7bb4df2da91..514be5a3888 100644 --- a/.github/workflows/dawn-ci.cmake +++ b/.github/workflows/dawn-ci.cmake @@ -7,9 +7,7 @@ if (WIN32) endif () set(DAWN_FETCH_DEPENDENCIES ON CACHE BOOL "") set(DAWN_ENABLE_INSTALL ON CACHE BOOL "") - set(TINT_ENABLE_INSTALL ON CACHE BOOL "") -set(TINT_BUILD_TINTD ON CACHE BOOL "") if (CMAKE_SYTEM_NAME STREQUAL "Linux") # `sccache` seems effective only on linux. From 27d7c822acc2d265309ae2fa59f2a1b87feb0cca Mon Sep 17 00:00:00 2001 From: Elie Michel Date: Sat, 31 May 2025 15:15:47 +0200 Subject: [PATCH 3/9] Add install rules for tint commands --- src/tint/CMakeLists.txt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/tint/CMakeLists.txt b/src/tint/CMakeLists.txt index 0d5f52a3589..125c9aad09c 100644 --- a/src/tint/CMakeLists.txt +++ b/src/tint/CMakeLists.txt @@ -262,6 +262,15 @@ function(tint_fuzz_compile_options TARGET) set_target_properties(${TARGET} PROPERTIES FOLDER "Fuzzers") endfunction() +function(tint_cmd_compile_options TARGET) + if (TINT_ENABLE_INSTALL) + install(TARGETS ${TARGET} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + ) + endif() + tint_default_compile_options(${TARGET}) +endfunction() + function(tint_test_cmd_compile_options TARGET) tint_test_compile_options(${TARGET}) @@ -408,7 +417,7 @@ function(tint_add_target TARGET KIND) tint_proto_compile_options(${TARGET}) elseif(${KIND} STREQUAL cmd) add_executable(${TARGET}) - tint_default_compile_options(${TARGET}) + tint_cmd_compile_options(${TARGET}) elseif(${KIND} STREQUAL test_cmd) add_executable(${TARGET}) tint_test_cmd_compile_options(${TARGET}) From 8d0722d81a0adfe6b0dd130dbab25656137b1ffd Mon Sep 17 00:00:00 2001 From: Elie Michel Date: Sat, 31 May 2025 15:16:19 +0200 Subject: [PATCH 4/9] Update dawn-ci.cmake to build tint commands --- .github/workflows/dawn-ci.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dawn-ci.cmake b/.github/workflows/dawn-ci.cmake index 514be5a3888..85255b16861 100644 --- a/.github/workflows/dawn-ci.cmake +++ b/.github/workflows/dawn-ci.cmake @@ -7,6 +7,7 @@ if (WIN32) endif () set(DAWN_FETCH_DEPENDENCIES ON CACHE BOOL "") set(DAWN_ENABLE_INSTALL ON CACHE BOOL "") +set(TINT_BUILD_CMD_TOOLS ON CACHE BOOL "") set(TINT_ENABLE_INSTALL ON CACHE BOOL "") if (CMAKE_SYTEM_NAME STREQUAL "Linux") From e44d20d4ffbd457353e0e88759fc99db03796862 Mon Sep 17 00:00:00 2001 From: Elie Michel Date: Sat, 31 May 2025 17:14:50 +0200 Subject: [PATCH 5/9] Add files via upload --- src/tint/lang/hlsl/writer/common/BUILD.cfg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/tint/lang/hlsl/writer/common/BUILD.cfg diff --git a/src/tint/lang/hlsl/writer/common/BUILD.cfg b/src/tint/lang/hlsl/writer/common/BUILD.cfg new file mode 100644 index 00000000000..b6a2e0df061 --- /dev/null +++ b/src/tint/lang/hlsl/writer/common/BUILD.cfg @@ -0,0 +1,3 @@ +{ + "condition": "tint_build_hlsl_writer", +} From b5eb3f2a69a5ff5066854994fbc6d0db1fee2b4a Mon Sep 17 00:00:00 2001 From: Elie Michel Date: Sat, 31 May 2025 17:15:30 +0200 Subject: [PATCH 6/9] Add files via upload --- src/tint/lang/hlsl/writer/helpers/BUILD.cfg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/tint/lang/hlsl/writer/helpers/BUILD.cfg diff --git a/src/tint/lang/hlsl/writer/helpers/BUILD.cfg b/src/tint/lang/hlsl/writer/helpers/BUILD.cfg new file mode 100644 index 00000000000..b6a2e0df061 --- /dev/null +++ b/src/tint/lang/hlsl/writer/helpers/BUILD.cfg @@ -0,0 +1,3 @@ +{ + "condition": "tint_build_hlsl_writer", +} From 6b98c5738d08345210e2dea14ae6cebc208febb1 Mon Sep 17 00:00:00 2001 From: Elie Michel Date: Sat, 31 May 2025 17:15:51 +0200 Subject: [PATCH 7/9] Add files via upload --- src/tint/lang/hlsl/writer/printer/BUILD.cfg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/tint/lang/hlsl/writer/printer/BUILD.cfg diff --git a/src/tint/lang/hlsl/writer/printer/BUILD.cfg b/src/tint/lang/hlsl/writer/printer/BUILD.cfg new file mode 100644 index 00000000000..b6a2e0df061 --- /dev/null +++ b/src/tint/lang/hlsl/writer/printer/BUILD.cfg @@ -0,0 +1,3 @@ +{ + "condition": "tint_build_hlsl_writer", +} From 136ccd58d4a4cee836b83a94259f2f40661b7e31 Mon Sep 17 00:00:00 2001 From: Elie Michel Date: Sat, 31 May 2025 17:16:25 +0200 Subject: [PATCH 8/9] Add files via upload --- src/tint/lang/hlsl/writer/raise/BUILD.cfg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/tint/lang/hlsl/writer/raise/BUILD.cfg diff --git a/src/tint/lang/hlsl/writer/raise/BUILD.cfg b/src/tint/lang/hlsl/writer/raise/BUILD.cfg new file mode 100644 index 00000000000..b6a2e0df061 --- /dev/null +++ b/src/tint/lang/hlsl/writer/raise/BUILD.cfg @@ -0,0 +1,3 @@ +{ + "condition": "tint_build_hlsl_writer", +} From 7a6ea2c58d08e08ac2ad142b3565355bd48a7e76 Mon Sep 17 00:00:00 2001 From: Elie Michel Date: Sat, 31 May 2025 17:41:24 +0200 Subject: [PATCH 9/9] Run gen build --- src/tint/api/BUILD.bazel | 2 +- src/tint/api/BUILD.cmake | 2 +- src/tint/cmd/bench/hlsl/BUILD.bazel | 4 +-- src/tint/cmd/bench/hlsl/BUILD.cmake | 4 +-- src/tint/cmd/fuzz/ir/BUILD.cmake | 2 +- src/tint/cmd/fuzz/wgsl/BUILD.cmake | 2 +- src/tint/cmd/test/BUILD.bazel | 4 +-- src/tint/cmd/test/BUILD.cmake | 4 +-- src/tint/cmd/tint/BUILD.bazel | 4 +-- src/tint/cmd/tint/BUILD.cmake | 4 +-- src/tint/lang/hlsl/writer/BUILD.bazel | 8 ++--- src/tint/lang/hlsl/writer/BUILD.cmake | 12 +++---- .../lang/hlsl/writer/ast_printer/BUILD.bazel | 4 +-- .../lang/hlsl/writer/ast_printer/BUILD.cmake | 4 +-- src/tint/lang/hlsl/writer/common/BUILD.bazel | 13 ++++++-- src/tint/lang/hlsl/writer/common/BUILD.cmake | 14 +++++++- src/tint/lang/hlsl/writer/helpers/BUILD.bazel | 13 ++++++-- src/tint/lang/hlsl/writer/helpers/BUILD.cmake | 11 ++++++- src/tint/lang/hlsl/writer/printer/BUILD.bazel | 13 ++++++-- src/tint/lang/hlsl/writer/printer/BUILD.cmake | 11 ++++++- src/tint/lang/hlsl/writer/raise/BUILD.bazel | 23 ++++++++++--- src/tint/lang/hlsl/writer/raise/BUILD.cmake | 33 ++++++++++++++++--- 22 files changed, 143 insertions(+), 48 deletions(-) diff --git a/src/tint/api/BUILD.bazel b/src/tint/api/BUILD.bazel index 2f4267171f9..45558b00fe9 100644 --- a/src/tint/api/BUILD.bazel +++ b/src/tint/api/BUILD.bazel @@ -50,7 +50,6 @@ cc_library( "//src/tint/lang/core/constant", "//src/tint/lang/core/ir", "//src/tint/lang/core/type", - "//src/tint/lang/hlsl/writer/common", "//src/tint/lang/wgsl", "//src/tint/lang/wgsl/ast", "//src/tint/lang/wgsl/inspector", @@ -77,6 +76,7 @@ cc_library( }) + select({ ":tint_build_hlsl_writer": [ "//src/tint/lang/hlsl/writer", + "//src/tint/lang/hlsl/writer/common", ], "//conditions:default": [], }) + select({ diff --git a/src/tint/api/BUILD.cmake b/src/tint/api/BUILD.cmake index 8ea3f94b980..363282833a8 100644 --- a/src/tint/api/BUILD.cmake +++ b/src/tint/api/BUILD.cmake @@ -51,7 +51,6 @@ tint_target_add_dependencies(tint_api lib tint_lang_core_constant tint_lang_core_ir tint_lang_core_type - tint_lang_hlsl_writer_common tint_lang_wgsl tint_lang_wgsl_ast tint_lang_wgsl_inspector @@ -84,6 +83,7 @@ endif(TINT_BUILD_GLSL_WRITER) if(TINT_BUILD_HLSL_WRITER) tint_target_add_dependencies(tint_api lib tint_lang_hlsl_writer + tint_lang_hlsl_writer_common ) endif(TINT_BUILD_HLSL_WRITER) diff --git a/src/tint/cmd/bench/hlsl/BUILD.bazel b/src/tint/cmd/bench/hlsl/BUILD.bazel index 80250e68c12..ac063d7961b 100644 --- a/src/tint/cmd/bench/hlsl/BUILD.bazel +++ b/src/tint/cmd/bench/hlsl/BUILD.bazel @@ -48,8 +48,6 @@ cc_library( "//src/tint/lang/core/constant", "//src/tint/lang/core/ir", "//src/tint/lang/core/type", - "//src/tint/lang/hlsl/writer/common", - "//src/tint/lang/hlsl/writer/helpers", "//src/tint/lang/wgsl", "//src/tint/lang/wgsl/ast", "//src/tint/lang/wgsl/program", @@ -69,6 +67,8 @@ cc_library( ] + select({ ":tint_build_hlsl_writer": [ "//src/tint/lang/hlsl/writer", + "//src/tint/lang/hlsl/writer/common", + "//src/tint/lang/hlsl/writer/helpers", ], "//conditions:default": [], }) + select({ diff --git a/src/tint/cmd/bench/hlsl/BUILD.cmake b/src/tint/cmd/bench/hlsl/BUILD.cmake index 155227faad7..fa72c4eee2b 100644 --- a/src/tint/cmd/bench/hlsl/BUILD.cmake +++ b/src/tint/cmd/bench/hlsl/BUILD.cmake @@ -50,8 +50,6 @@ tint_target_add_dependencies(tint_cmd_bench_hlsl_bench bench tint_lang_core_constant tint_lang_core_ir tint_lang_core_type - tint_lang_hlsl_writer_common - tint_lang_hlsl_writer_helpers tint_lang_wgsl tint_lang_wgsl_ast tint_lang_wgsl_program @@ -76,6 +74,8 @@ tint_target_add_external_dependencies(tint_cmd_bench_hlsl_bench bench if(TINT_BUILD_HLSL_WRITER) tint_target_add_dependencies(tint_cmd_bench_hlsl_bench bench tint_lang_hlsl_writer + tint_lang_hlsl_writer_common + tint_lang_hlsl_writer_helpers ) endif(TINT_BUILD_HLSL_WRITER) diff --git a/src/tint/cmd/fuzz/ir/BUILD.cmake b/src/tint/cmd/fuzz/ir/BUILD.cmake index acfa4b0e741..a7def6d08c1 100644 --- a/src/tint/cmd/fuzz/ir/BUILD.cmake +++ b/src/tint/cmd/fuzz/ir/BUILD.cmake @@ -57,7 +57,6 @@ tint_target_add_dependencies(tint_cmd_fuzz_ir_fuzz_cmd fuzz_cmd tint_lang_core_ir tint_lang_core_ir_transform_fuzz tint_lang_core_type - tint_lang_hlsl_writer_raise_fuzz tint_lang_wgsl_program_fuzz tint_lang_wgsl_writer_raise_fuzz tint_utils @@ -88,6 +87,7 @@ endif(TINT_BUILD_GLSL_WRITER) if(TINT_BUILD_HLSL_WRITER) tint_target_add_dependencies(tint_cmd_fuzz_ir_fuzz_cmd fuzz_cmd + tint_lang_hlsl_writer_raise_fuzz tint_lang_hlsl_writer_fuzz ) endif(TINT_BUILD_HLSL_WRITER) diff --git a/src/tint/cmd/fuzz/wgsl/BUILD.cmake b/src/tint/cmd/fuzz/wgsl/BUILD.cmake index 68e09613f9c..8fcc828b181 100644 --- a/src/tint/cmd/fuzz/wgsl/BUILD.cmake +++ b/src/tint/cmd/fuzz/wgsl/BUILD.cmake @@ -51,7 +51,6 @@ tint_target_add_dependencies(tint_cmd_fuzz_wgsl_fuzz_cmd fuzz_cmd tint_lang_core_constant tint_lang_core_ir_transform_fuzz tint_lang_core_type - tint_lang_hlsl_writer_raise_fuzz tint_lang_wgsl tint_lang_wgsl_ast tint_lang_wgsl_program @@ -86,6 +85,7 @@ endif(TINT_BUILD_GLSL_WRITER) if(TINT_BUILD_HLSL_WRITER) tint_target_add_dependencies(tint_cmd_fuzz_wgsl_fuzz_cmd fuzz_cmd tint_lang_hlsl_validate + tint_lang_hlsl_writer_raise_fuzz tint_lang_hlsl_writer_fuzz ) tint_target_add_external_dependencies(tint_cmd_fuzz_wgsl_fuzz_cmd fuzz_cmd diff --git a/src/tint/cmd/test/BUILD.bazel b/src/tint/cmd/test/BUILD.bazel index facb4fe9ec5..e6b650d8442 100644 --- a/src/tint/cmd/test/BUILD.bazel +++ b/src/tint/cmd/test/BUILD.bazel @@ -55,8 +55,6 @@ cc_binary( "//src/tint/lang/glsl/ir:test", "//src/tint/lang/hlsl/ir:test", "//src/tint/lang/hlsl/type:test", - "//src/tint/lang/hlsl/writer/common:test", - "//src/tint/lang/hlsl/writer/raise:test", "//src/tint/lang/msl/ir/transform:test", "//src/tint/lang/msl/ir:test", "//src/tint/lang/msl/type:test", @@ -103,6 +101,8 @@ cc_binary( }) + select({ ":tint_build_hlsl_writer": [ "//src/tint/lang/hlsl/writer/ast_printer:test", + "//src/tint/lang/hlsl/writer/common:test", + "//src/tint/lang/hlsl/writer/raise:test", "//src/tint/lang/hlsl/writer:test", ], "//conditions:default": [], diff --git a/src/tint/cmd/test/BUILD.cmake b/src/tint/cmd/test/BUILD.cmake index 13652822f4d..a5bc2ff90ca 100644 --- a/src/tint/cmd/test/BUILD.cmake +++ b/src/tint/cmd/test/BUILD.cmake @@ -56,8 +56,6 @@ tint_target_add_dependencies(tint_cmd_test_test_cmd test_cmd tint_lang_glsl_ir_test tint_lang_hlsl_ir_test tint_lang_hlsl_type_test - tint_lang_hlsl_writer_common_test - tint_lang_hlsl_writer_raise_test tint_lang_msl_ir_transform_test tint_lang_msl_ir_test tint_lang_msl_type_test @@ -111,6 +109,8 @@ endif(TINT_BUILD_GLSL_WRITER AND TINT_BUILD_GLSL_VALIDATOR) if(TINT_BUILD_HLSL_WRITER) tint_target_add_dependencies(tint_cmd_test_test_cmd test_cmd tint_lang_hlsl_writer_ast_printer_test + tint_lang_hlsl_writer_common_test + tint_lang_hlsl_writer_raise_test tint_lang_hlsl_writer_test ) endif(TINT_BUILD_HLSL_WRITER) diff --git a/src/tint/cmd/tint/BUILD.bazel b/src/tint/cmd/tint/BUILD.bazel index 4fca497af53..3768f802578 100644 --- a/src/tint/cmd/tint/BUILD.bazel +++ b/src/tint/cmd/tint/BUILD.bazel @@ -50,8 +50,6 @@ cc_binary( "//src/tint/lang/core/ir", "//src/tint/lang/core/ir/transform", "//src/tint/lang/core/type", - "//src/tint/lang/hlsl/writer/common", - "//src/tint/lang/hlsl/writer/helpers", "//src/tint/lang/msl/ir/transform", "//src/tint/lang/wgsl", "//src/tint/lang/wgsl/ast", @@ -89,6 +87,8 @@ cc_binary( ":tint_build_hlsl_writer": [ "//src/tint/lang/hlsl/validate", "//src/tint/lang/hlsl/writer", + "//src/tint/lang/hlsl/writer/common", + "//src/tint/lang/hlsl/writer/helpers", ], "//conditions:default": [], }) + select({ diff --git a/src/tint/cmd/tint/BUILD.cmake b/src/tint/cmd/tint/BUILD.cmake index 5a035d95ac9..26964261fb3 100644 --- a/src/tint/cmd/tint/BUILD.cmake +++ b/src/tint/cmd/tint/BUILD.cmake @@ -51,8 +51,6 @@ tint_target_add_dependencies(tint_cmd_tint_cmd cmd tint_lang_core_ir tint_lang_core_ir_transform tint_lang_core_type - tint_lang_hlsl_writer_common - tint_lang_hlsl_writer_helpers tint_lang_msl_ir_transform tint_lang_wgsl tint_lang_wgsl_ast @@ -97,6 +95,8 @@ if(TINT_BUILD_HLSL_WRITER) tint_target_add_dependencies(tint_cmd_tint_cmd cmd tint_lang_hlsl_validate tint_lang_hlsl_writer + tint_lang_hlsl_writer_common + tint_lang_hlsl_writer_helpers ) endif(TINT_BUILD_HLSL_WRITER) diff --git a/src/tint/lang/hlsl/writer/BUILD.bazel b/src/tint/lang/hlsl/writer/BUILD.bazel index 0e84209c158..242463297b7 100644 --- a/src/tint/lang/hlsl/writer/BUILD.bazel +++ b/src/tint/lang/hlsl/writer/BUILD.bazel @@ -50,9 +50,6 @@ cc_library( "//src/tint/lang/core/constant", "//src/tint/lang/core/ir", "//src/tint/lang/core/type", - "//src/tint/lang/hlsl/writer/common", - "//src/tint/lang/hlsl/writer/printer", - "//src/tint/lang/hlsl/writer/raise", "//src/tint/lang/wgsl", "//src/tint/lang/wgsl/ast", "//src/tint/lang/wgsl/ast/transform", @@ -74,6 +71,9 @@ cc_library( ":tint_build_hlsl_writer": [ "//src/tint/lang/hlsl/writer/ast_printer", "//src/tint/lang/hlsl/writer/ast_raise", + "//src/tint/lang/hlsl/writer/common", + "//src/tint/lang/hlsl/writer/printer", + "//src/tint/lang/hlsl/writer/raise", ], "//conditions:default": [], }), @@ -108,7 +108,6 @@ cc_library( "//src/tint/lang/core/intrinsic", "//src/tint/lang/core/ir", "//src/tint/lang/core/type", - "//src/tint/lang/hlsl/writer/common", "//src/tint/lang/wgsl/ast", "//src/tint/utils", "//src/tint/utils/command", @@ -127,6 +126,7 @@ cc_library( ":tint_build_hlsl_writer": [ "//src/tint/lang/hlsl/validate", "//src/tint/lang/hlsl/writer", + "//src/tint/lang/hlsl/writer/common", ], "//conditions:default": [], }), diff --git a/src/tint/lang/hlsl/writer/BUILD.cmake b/src/tint/lang/hlsl/writer/BUILD.cmake index 6ee58caa779..821f169a13c 100644 --- a/src/tint/lang/hlsl/writer/BUILD.cmake +++ b/src/tint/lang/hlsl/writer/BUILD.cmake @@ -58,9 +58,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer lib tint_lang_core_constant tint_lang_core_ir tint_lang_core_type - tint_lang_hlsl_writer_common - tint_lang_hlsl_writer_printer - tint_lang_hlsl_writer_raise tint_lang_wgsl tint_lang_wgsl_ast tint_lang_wgsl_ast_transform @@ -87,6 +84,9 @@ if(TINT_BUILD_HLSL_WRITER) tint_target_add_dependencies(tint_lang_hlsl_writer lib tint_lang_hlsl_writer_ast_printer tint_lang_hlsl_writer_ast_raise + tint_lang_hlsl_writer_common + tint_lang_hlsl_writer_printer + tint_lang_hlsl_writer_raise ) endif(TINT_BUILD_HLSL_WRITER) @@ -123,7 +123,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_test test tint_lang_core_intrinsic tint_lang_core_ir tint_lang_core_type - tint_lang_hlsl_writer_common tint_lang_wgsl_ast tint_utils tint_utils_command @@ -147,6 +146,7 @@ if(TINT_BUILD_HLSL_WRITER) tint_target_add_dependencies(tint_lang_hlsl_writer_test test tint_lang_hlsl_validate tint_lang_hlsl_writer + tint_lang_hlsl_writer_common ) endif(TINT_BUILD_HLSL_WRITER) @@ -168,8 +168,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_fuzz fuzz tint_lang_core_constant tint_lang_core_ir tint_lang_core_type - tint_lang_hlsl_writer_common - tint_lang_hlsl_writer_helpers tint_lang_wgsl tint_lang_wgsl_ast tint_lang_wgsl_ast_transform @@ -197,6 +195,8 @@ if(TINT_BUILD_HLSL_WRITER) tint_target_add_dependencies(tint_lang_hlsl_writer_fuzz fuzz tint_lang_hlsl_validate tint_lang_hlsl_writer + tint_lang_hlsl_writer_common + tint_lang_hlsl_writer_helpers ) endif(TINT_BUILD_HLSL_WRITER) diff --git a/src/tint/lang/hlsl/writer/ast_printer/BUILD.bazel b/src/tint/lang/hlsl/writer/ast_printer/BUILD.bazel index 7da657b9466..ec937e89af2 100644 --- a/src/tint/lang/hlsl/writer/ast_printer/BUILD.bazel +++ b/src/tint/lang/hlsl/writer/ast_printer/BUILD.bazel @@ -50,7 +50,6 @@ cc_library( "//src/tint/lang/core/constant", "//src/tint/lang/core/ir/transform", "//src/tint/lang/core/type", - "//src/tint/lang/hlsl/writer/common", "//src/tint/lang/wgsl", "//src/tint/lang/wgsl/ast", "//src/tint/lang/wgsl/ast/transform", @@ -72,6 +71,7 @@ cc_library( ] + select({ ":tint_build_hlsl_writer": [ "//src/tint/lang/hlsl/writer/ast_raise", + "//src/tint/lang/hlsl/writer/common", ], "//conditions:default": [], }), @@ -119,7 +119,6 @@ cc_library( "//src/tint/lang/core", "//src/tint/lang/core/constant", "//src/tint/lang/core/type", - "//src/tint/lang/hlsl/writer/common", "//src/tint/lang/wgsl", "//src/tint/lang/wgsl/ast", "//src/tint/lang/wgsl/ast/transform", @@ -145,6 +144,7 @@ cc_library( "//src/tint/lang/hlsl/writer", "//src/tint/lang/hlsl/writer/ast_printer", "//src/tint/lang/hlsl/writer/ast_raise", + "//src/tint/lang/hlsl/writer/common", ], "//conditions:default": [], }), diff --git a/src/tint/lang/hlsl/writer/ast_printer/BUILD.cmake b/src/tint/lang/hlsl/writer/ast_printer/BUILD.cmake index 4b09f81e25b..352d3c73690 100644 --- a/src/tint/lang/hlsl/writer/ast_printer/BUILD.cmake +++ b/src/tint/lang/hlsl/writer/ast_printer/BUILD.cmake @@ -51,7 +51,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_ast_printer lib tint_lang_core_constant tint_lang_core_ir_transform tint_lang_core_type - tint_lang_hlsl_writer_common tint_lang_wgsl tint_lang_wgsl_ast tint_lang_wgsl_ast_transform @@ -78,6 +77,7 @@ tint_target_add_external_dependencies(tint_lang_hlsl_writer_ast_printer lib if(TINT_BUILD_HLSL_WRITER) tint_target_add_dependencies(tint_lang_hlsl_writer_ast_printer lib tint_lang_hlsl_writer_ast_raise + tint_lang_hlsl_writer_common ) endif(TINT_BUILD_HLSL_WRITER) @@ -127,7 +127,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_ast_printer_test test tint_lang_core tint_lang_core_constant tint_lang_core_type - tint_lang_hlsl_writer_common tint_lang_wgsl tint_lang_wgsl_ast tint_lang_wgsl_ast_transform @@ -158,6 +157,7 @@ if(TINT_BUILD_HLSL_WRITER) tint_lang_hlsl_writer tint_lang_hlsl_writer_ast_printer tint_lang_hlsl_writer_ast_raise + tint_lang_hlsl_writer_common ) endif(TINT_BUILD_HLSL_WRITER) diff --git a/src/tint/lang/hlsl/writer/common/BUILD.bazel b/src/tint/lang/hlsl/writer/common/BUILD.bazel index b8a4e919dd3..936a6a4fdeb 100644 --- a/src/tint/lang/hlsl/writer/common/BUILD.bazel +++ b/src/tint/lang/hlsl/writer/common/BUILD.bazel @@ -76,7 +76,6 @@ cc_library( deps = [ "//src/tint/api/common", "//src/tint/lang/core", - "//src/tint/lang/hlsl/writer/common", "//src/tint/utils", "//src/tint/utils/containers", "//src/tint/utils/ice", @@ -86,8 +85,18 @@ cc_library( "//src/tint/utils/rtti", "@gtest", "//src/utils", - ], + ] + select({ + ":tint_build_hlsl_writer": [ + "//src/tint/lang/hlsl/writer/common", + ], + "//conditions:default": [], + }), copts = COPTS, visibility = ["//visibility:public"], ) +alias( + name = "tint_build_hlsl_writer", + actual = "//src/tint:tint_build_hlsl_writer_true", +) + diff --git a/src/tint/lang/hlsl/writer/common/BUILD.cmake b/src/tint/lang/hlsl/writer/common/BUILD.cmake index ec496462305..1b30b6c0c31 100644 --- a/src/tint/lang/hlsl/writer/common/BUILD.cmake +++ b/src/tint/lang/hlsl/writer/common/BUILD.cmake @@ -34,9 +34,11 @@ # Do not modify this file directly ################################################################################ +if(TINT_BUILD_HLSL_WRITER) ################################################################################ # Target: tint_lang_hlsl_writer_common # Kind: lib +# Condition: TINT_BUILD_HLSL_WRITER ################################################################################ tint_add_target(tint_lang_hlsl_writer_common lib lang/hlsl/writer/common/option_helpers.cc @@ -67,9 +69,12 @@ tint_target_add_external_dependencies(tint_lang_hlsl_writer_common lib "src_utils" ) +endif(TINT_BUILD_HLSL_WRITER) +if(TINT_BUILD_HLSL_WRITER) ################################################################################ # Target: tint_lang_hlsl_writer_common_test # Kind: test +# Condition: TINT_BUILD_HLSL_WRITER ################################################################################ tint_add_target(tint_lang_hlsl_writer_common_test test lang/hlsl/writer/common/options_test.cc @@ -78,7 +83,6 @@ tint_add_target(tint_lang_hlsl_writer_common_test test tint_target_add_dependencies(tint_lang_hlsl_writer_common_test test tint_api_common tint_lang_core - tint_lang_hlsl_writer_common tint_utils tint_utils_containers tint_utils_ice @@ -92,3 +96,11 @@ tint_target_add_external_dependencies(tint_lang_hlsl_writer_common_test test "gtest" "src_utils" ) + +if(TINT_BUILD_HLSL_WRITER) + tint_target_add_dependencies(tint_lang_hlsl_writer_common_test test + tint_lang_hlsl_writer_common + ) +endif(TINT_BUILD_HLSL_WRITER) + +endif(TINT_BUILD_HLSL_WRITER) \ No newline at end of file diff --git a/src/tint/lang/hlsl/writer/helpers/BUILD.bazel b/src/tint/lang/hlsl/writer/helpers/BUILD.bazel index b51b642e94d..f990d41ca92 100644 --- a/src/tint/lang/hlsl/writer/helpers/BUILD.bazel +++ b/src/tint/lang/hlsl/writer/helpers/BUILD.bazel @@ -50,7 +50,6 @@ cc_library( "//src/tint/lang/core/constant", "//src/tint/lang/core/ir", "//src/tint/lang/core/type", - "//src/tint/lang/hlsl/writer/common", "//src/tint/lang/wgsl", "//src/tint/lang/wgsl/ast", "//src/tint/lang/wgsl/program", @@ -66,8 +65,18 @@ cc_library( "//src/tint/utils/symbol", "//src/tint/utils/text", "//src/utils", - ], + ] + select({ + ":tint_build_hlsl_writer": [ + "//src/tint/lang/hlsl/writer/common", + ], + "//conditions:default": [], + }), copts = COPTS, visibility = ["//visibility:public"], ) +alias( + name = "tint_build_hlsl_writer", + actual = "//src/tint:tint_build_hlsl_writer_true", +) + diff --git a/src/tint/lang/hlsl/writer/helpers/BUILD.cmake b/src/tint/lang/hlsl/writer/helpers/BUILD.cmake index 77785f6ca1f..b1f7c35a97d 100644 --- a/src/tint/lang/hlsl/writer/helpers/BUILD.cmake +++ b/src/tint/lang/hlsl/writer/helpers/BUILD.cmake @@ -34,9 +34,11 @@ # Do not modify this file directly ################################################################################ +if(TINT_BUILD_HLSL_WRITER) ################################################################################ # Target: tint_lang_hlsl_writer_helpers # Kind: lib +# Condition: TINT_BUILD_HLSL_WRITER ################################################################################ tint_add_target(tint_lang_hlsl_writer_helpers lib lang/hlsl/writer/helpers/generate_bindings.cc @@ -49,7 +51,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_helpers lib tint_lang_core_constant tint_lang_core_ir tint_lang_core_type - tint_lang_hlsl_writer_common tint_lang_wgsl tint_lang_wgsl_ast tint_lang_wgsl_program @@ -69,3 +70,11 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_helpers lib tint_target_add_external_dependencies(tint_lang_hlsl_writer_helpers lib "src_utils" ) + +if(TINT_BUILD_HLSL_WRITER) + tint_target_add_dependencies(tint_lang_hlsl_writer_helpers lib + tint_lang_hlsl_writer_common + ) +endif(TINT_BUILD_HLSL_WRITER) + +endif(TINT_BUILD_HLSL_WRITER) \ No newline at end of file diff --git a/src/tint/lang/hlsl/writer/printer/BUILD.bazel b/src/tint/lang/hlsl/writer/printer/BUILD.bazel index dec47e28260..d6a6a05328d 100644 --- a/src/tint/lang/hlsl/writer/printer/BUILD.bazel +++ b/src/tint/lang/hlsl/writer/printer/BUILD.bazel @@ -55,7 +55,6 @@ cc_library( "//src/tint/lang/hlsl/intrinsic", "//src/tint/lang/hlsl/ir", "//src/tint/lang/hlsl/type", - "//src/tint/lang/hlsl/writer/common", "//src/tint/lang/wgsl/ast", "//src/tint/utils", "//src/tint/utils/containers", @@ -70,8 +69,18 @@ cc_library( "//src/tint/utils/text", "//src/tint/utils/text_generator", "//src/utils", - ], + ] + select({ + ":tint_build_hlsl_writer": [ + "//src/tint/lang/hlsl/writer/common", + ], + "//conditions:default": [], + }), copts = COPTS, visibility = ["//visibility:public"], ) +alias( + name = "tint_build_hlsl_writer", + actual = "//src/tint:tint_build_hlsl_writer_true", +) + diff --git a/src/tint/lang/hlsl/writer/printer/BUILD.cmake b/src/tint/lang/hlsl/writer/printer/BUILD.cmake index 08babf87c3a..ebef6979890 100644 --- a/src/tint/lang/hlsl/writer/printer/BUILD.cmake +++ b/src/tint/lang/hlsl/writer/printer/BUILD.cmake @@ -34,9 +34,11 @@ # Do not modify this file directly ################################################################################ +if(TINT_BUILD_HLSL_WRITER) ################################################################################ # Target: tint_lang_hlsl_writer_printer # Kind: lib +# Condition: TINT_BUILD_HLSL_WRITER ################################################################################ tint_add_target(tint_lang_hlsl_writer_printer lib lang/hlsl/writer/printer/printer.cc @@ -54,7 +56,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_printer lib tint_lang_hlsl_intrinsic tint_lang_hlsl_ir tint_lang_hlsl_type - tint_lang_hlsl_writer_common tint_lang_wgsl_ast tint_utils tint_utils_containers @@ -73,3 +74,11 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_printer lib tint_target_add_external_dependencies(tint_lang_hlsl_writer_printer lib "src_utils" ) + +if(TINT_BUILD_HLSL_WRITER) + tint_target_add_dependencies(tint_lang_hlsl_writer_printer lib + tint_lang_hlsl_writer_common + ) +endif(TINT_BUILD_HLSL_WRITER) + +endif(TINT_BUILD_HLSL_WRITER) \ No newline at end of file diff --git a/src/tint/lang/hlsl/writer/raise/BUILD.bazel b/src/tint/lang/hlsl/writer/raise/BUILD.bazel index e5cbc598034..c0662af3cc7 100644 --- a/src/tint/lang/hlsl/writer/raise/BUILD.bazel +++ b/src/tint/lang/hlsl/writer/raise/BUILD.bazel @@ -78,7 +78,6 @@ cc_library( "//src/tint/lang/hlsl/intrinsic", "//src/tint/lang/hlsl/ir", "//src/tint/lang/hlsl/type", - "//src/tint/lang/hlsl/writer/common", "//src/tint/utils", "//src/tint/utils/containers", "//src/tint/utils/diagnostic", @@ -90,7 +89,12 @@ cc_library( "//src/tint/utils/symbol", "//src/tint/utils/text", "//src/utils", - ], + ] + select({ + ":tint_build_hlsl_writer": [ + "//src/tint/lang/hlsl/writer/common", + ], + "//conditions:default": [], + }), copts = COPTS, visibility = ["//visibility:public"], ) @@ -119,8 +123,6 @@ cc_library( "//src/tint/lang/core/ir/transform", "//src/tint/lang/core/ir/transform:test", "//src/tint/lang/core/type", - "//src/tint/lang/hlsl/writer/common", - "//src/tint/lang/hlsl/writer/raise", "//src/tint/utils", "//src/tint/utils/containers", "//src/tint/utils/diagnostic", @@ -133,8 +135,19 @@ cc_library( "//src/tint/utils/text", "@gtest", "//src/utils", - ], + ] + select({ + ":tint_build_hlsl_writer": [ + "//src/tint/lang/hlsl/writer/common", + "//src/tint/lang/hlsl/writer/raise", + ], + "//conditions:default": [], + }), copts = COPTS, visibility = ["//visibility:public"], ) +alias( + name = "tint_build_hlsl_writer", + actual = "//src/tint:tint_build_hlsl_writer_true", +) + diff --git a/src/tint/lang/hlsl/writer/raise/BUILD.cmake b/src/tint/lang/hlsl/writer/raise/BUILD.cmake index 14257934fe9..91cc300007b 100644 --- a/src/tint/lang/hlsl/writer/raise/BUILD.cmake +++ b/src/tint/lang/hlsl/writer/raise/BUILD.cmake @@ -34,9 +34,11 @@ # Do not modify this file directly ################################################################################ +if(TINT_BUILD_HLSL_WRITER) ################################################################################ # Target: tint_lang_hlsl_writer_raise # Kind: lib +# Condition: TINT_BUILD_HLSL_WRITER ################################################################################ tint_add_target(tint_lang_hlsl_writer_raise lib lang/hlsl/writer/raise/binary_polyfill.cc @@ -77,7 +79,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_raise lib tint_lang_hlsl_intrinsic tint_lang_hlsl_ir tint_lang_hlsl_type - tint_lang_hlsl_writer_common tint_utils tint_utils_containers tint_utils_diagnostic @@ -94,9 +95,18 @@ tint_target_add_external_dependencies(tint_lang_hlsl_writer_raise lib "src_utils" ) +if(TINT_BUILD_HLSL_WRITER) + tint_target_add_dependencies(tint_lang_hlsl_writer_raise lib + tint_lang_hlsl_writer_common + ) +endif(TINT_BUILD_HLSL_WRITER) + +endif(TINT_BUILD_HLSL_WRITER) +if(TINT_BUILD_HLSL_WRITER) ################################################################################ # Target: tint_lang_hlsl_writer_raise_test # Kind: test +# Condition: TINT_BUILD_HLSL_WRITER ################################################################################ tint_add_target(tint_lang_hlsl_writer_raise_test test lang/hlsl/writer/raise/binary_polyfill_test.cc @@ -121,8 +131,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_raise_test test tint_lang_core_ir_transform tint_lang_core_ir_transform_test tint_lang_core_type - tint_lang_hlsl_writer_common - tint_lang_hlsl_writer_raise tint_utils tint_utils_containers tint_utils_diagnostic @@ -140,9 +148,19 @@ tint_target_add_external_dependencies(tint_lang_hlsl_writer_raise_test test "src_utils" ) +if(TINT_BUILD_HLSL_WRITER) + tint_target_add_dependencies(tint_lang_hlsl_writer_raise_test test + tint_lang_hlsl_writer_common + tint_lang_hlsl_writer_raise + ) +endif(TINT_BUILD_HLSL_WRITER) + +endif(TINT_BUILD_HLSL_WRITER) +if(TINT_BUILD_HLSL_WRITER) ################################################################################ # Target: tint_lang_hlsl_writer_raise_fuzz # Kind: fuzz +# Condition: TINT_BUILD_HLSL_WRITER ################################################################################ tint_add_target(tint_lang_hlsl_writer_raise_fuzz fuzz lang/hlsl/writer/raise/promote_initializers_fuzz.cc @@ -155,7 +173,6 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_raise_fuzz fuzz tint_lang_core_constant tint_lang_core_ir tint_lang_core_type - tint_lang_hlsl_writer_raise tint_utils tint_utils_bytes tint_utils_containers @@ -172,3 +189,11 @@ tint_target_add_dependencies(tint_lang_hlsl_writer_raise_fuzz fuzz tint_target_add_external_dependencies(tint_lang_hlsl_writer_raise_fuzz fuzz "src_utils" ) + +if(TINT_BUILD_HLSL_WRITER) + tint_target_add_dependencies(tint_lang_hlsl_writer_raise_fuzz fuzz + tint_lang_hlsl_writer_raise + ) +endif(TINT_BUILD_HLSL_WRITER) + +endif(TINT_BUILD_HLSL_WRITER) \ No newline at end of file