commit 866bcd57846e905d6132e1aa4d168e69f59c47e2
author Ryan Harrison <rharrison@chromium.org> Thu Jul 11 18:19:20 2024 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jul 11 18:19:20 2024 +0000
tree f686acd58a9e8da49d99234f94f799f05af7b197
parent 4aee92d173581eedbaa3f591a18bd0567d398206

[tint][ir][fuzz] Fix ir_fuzz_dis build

This target broke after updating the repo and depos. Changing the
include path to match what is used elsewhere in the codebase.

Change-Id: Icb6a7b882c0ff495c25d66c4ec735150c5b0a4ac
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/197974
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Auto-Submit: Ryan Harrison <rharrison@chromium.org>

src/tint/cmd/fuzz/ir/dis/BUILD.bazel

diff --git a/src/tint/cmd/fuzz/ir/dis/BUILD.bazel b/src/tint/cmd/fuzz/ir/dis/BUILD.bazel
index f82eb66..e22b5fb 100644
--- a/src/tint/cmd/fuzz/ir/dis/BUILD.bazel
+++ b/src/tint/cmd/fuzz/ir/dis/BUILD.bazel
@@ -88,6 +88,11 @@
     ],
     "//conditions:default": [],
   }) + select({
+    ":tint_build_spv_reader_or_tint_build_spv_writer": [
+      "@spirv_tools",
+    ],
+    "//conditions:default": [],
+  }) + select({
     ":tint_build_spv_writer": [
       "//src/tint/lang/spirv/writer",
       "//src/tint/lang/spirv/writer/common",
@@ -129,6 +134,14 @@
 )
 
 selects.config_setting_group(
+    name = "tint_build_spv_reader_or_tint_build_spv_writer",
+    match_any = [
+        "tint_build_spv_reader",
+        "tint_build_spv_writer",
+    ],
+)
+
+selects.config_setting_group(
     name = "tint_build_ir_binary_and_tint_build_ir_fuzzer",
     match_all = [
         ":tint_build_ir_binary",

src/tint/cmd/fuzz/ir/dis/BUILD.cmake

diff --git a/src/tint/cmd/fuzz/ir/dis/BUILD.cmake b/src/tint/cmd/fuzz/ir/dis/BUILD.cmake
index 169c6c8..cb43cb8 100644
--- a/src/tint/cmd/fuzz/ir/dis/BUILD.cmake
+++ b/src/tint/cmd/fuzz/ir/dis/BUILD.cmake
@@ -95,6 +95,12 @@
   )
 endif(TINT_BUILD_SPV_READER)
 
+if(TINT_BUILD_SPV_READER OR TINT_BUILD_SPV_WRITER)
+  tint_target_add_external_dependencies(tint_cmd_fuzz_ir_dis_cmd cmd
+    "spirv-tools"
+  )
+endif(TINT_BUILD_SPV_READER OR TINT_BUILD_SPV_WRITER)
+
 if(TINT_BUILD_SPV_WRITER)
   tint_target_add_dependencies(tint_cmd_fuzz_ir_dis_cmd cmd
     tint_lang_spirv_writer

src/tint/cmd/fuzz/ir/dis/BUILD.gn

diff --git a/src/tint/cmd/fuzz/ir/dis/BUILD.gn b/src/tint/cmd/fuzz/ir/dis/BUILD.gn
index c1c471a..3e6b770 100644
--- a/src/tint/cmd/fuzz/ir/dis/BUILD.gn
+++ b/src/tint/cmd/fuzz/ir/dis/BUILD.gn
@@ -87,6 +87,13 @@
       deps += [ "${tint_src_dir}/lang/spirv/reader/common" ]
     }
 
+    if (tint_build_spv_reader || tint_build_spv_writer) {
+      deps += [
+        "${tint_spirv_tools_dir}:spvtools_headers",
+        "${tint_spirv_tools_dir}:spvtools_val",
+      ]
+    }
+
     if (tint_build_spv_writer) {
       deps += [
         "${tint_src_dir}/lang/spirv/writer",

src/tint/cmd/fuzz/ir/dis/main.cc

diff --git a/src/tint/cmd/fuzz/ir/dis/main.cc b/src/tint/cmd/fuzz/ir/dis/main.cc
index 40ff405..0a56295 100644
--- a/src/tint/cmd/fuzz/ir/dis/main.cc
+++ b/src/tint/cmd/fuzz/ir/dis/main.cc
@@ -44,8 +44,7 @@
 #include "src/tint/utils/text/styled_text.h"
 #include "src/tint/utils/text/styled_text_printer.h"
 
-#include "third_party/spirv-tools/src/include/spirv-tools/libspirv.h"
-#include "third_party/spirv-tools/src/include/spirv-tools/libspirv.hpp"
+#include "spirv-tools/libspirv.hpp"
 
 TINT_BEGIN_DISABLE_PROTOBUF_WARNINGS();
 #include "src/tint/utils/protos/ir_fuzz/ir_fuzz.pb.h"