Update SubstituteOverrideHelper to work on IR.

Chanee the SubstituteOverrideHelper to use the IR directly to get the
overrides. Instead of setting every value back into the map, only insert
the ones we require which are any which don't have an initializer.

This removes the inspector method added to get this information.

Change-Id: I0e04004d5c9c92925cc41b9b40a9f4355cfd78a1
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/236815
Commit-Queue: dan sinclair <[email protected]>
Reviewed-by: Peter McNeeley <[email protected]>

Author: dj2

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

@@ -177,13 +177,12 @@ tint::Result<tint::core::ir::Module> GenerateIrModule(const tint::Program& progr
         return tint::Failure{"Unsupported enable used in shader"};
     }
 
-    auto cfg = tint::fuzz::ir::SubstituteOverridesConfig(program);
-
     auto ir = tint::wgsl::reader::ProgramToLoweredIR(program);
     if (ir != tint::Success) {
         return ir.Failure();
     }
 
+    auto cfg = tint::fuzz::ir::SubstituteOverridesConfig(ir.Get());
     auto substituteOverridesResult = tint::core::ir::transform::SubstituteOverrides(ir.Get(), cfg);
     if (substituteOverridesResult != tint::Success) {
         return substituteOverridesResult.Failure();

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

@@ -69,13 +69,13 @@ void Register(const IRFuzzer& fuzzer) {
             if (program.AST().Enables().Any(tint::wgsl::reader::IsUnsupportedByIR)) {
                 return;
             }
-            auto cfg = SubstituteOverridesConfig(program);
 
             auto ir = tint::wgsl::reader::ProgramToLoweredIR(program);
             if (ir != Success) {
                 return;
             }
 
+            auto cfg = SubstituteOverridesConfig(ir.Get());
             auto substituteOverridesResult =
                 tint::core::ir::transform::SubstituteOverrides(ir.Get(), cfg);
             if (substituteOverridesResult != Success) {

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

@@ -51,11 +51,6 @@ cc_library(
     "//src/tint/lang/core/ir",
     "//src/tint/lang/core/ir/transform",
     "//src/tint/lang/core/type",
-    "//src/tint/lang/wgsl",
-    "//src/tint/lang/wgsl/ast",
-    "//src/tint/lang/wgsl/inspector",
-    "//src/tint/lang/wgsl/program",
-    "//src/tint/lang/wgsl/sem",
     "//src/tint/utils",
     "//src/tint/utils/containers",
     "//src/tint/utils/diagnostic",
@@ -71,4 +66,35 @@ cc_library(
   copts = COPTS,
   visibility = ["//visibility:public"],
 )
+cc_library(
+  name = "test",
+  alwayslink = True,
+  srcs = [
+    "substitute_overrides_config_test.cc",
+  ],
+  deps = [
+    "//src/tint/api/common",
+    "//src/tint/cmd/fuzz/ir/helpers",
+    "//src/tint/lang/core",
+    "//src/tint/lang/core/constant",
+    "//src/tint/lang/core/intrinsic",
+    "//src/tint/lang/core/ir",
+    "//src/tint/lang/core/ir/transform",
+    "//src/tint/lang/core/type",
+    "//src/tint/utils",
+    "//src/tint/utils/containers",
+    "//src/tint/utils/diagnostic",
+    "//src/tint/utils/ice",
+    "//src/tint/utils/macros",
+    "//src/tint/utils/math",
+    "//src/tint/utils/memory",
+    "//src/tint/utils/rtti",
+    "//src/tint/utils/symbol",
+    "//src/tint/utils/text",
+    "@gtest",
+    "//src/utils",
+  ],
+  copts = COPTS,
+  visibility = ["//visibility:public"],
+)
 

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

@@ -50,11 +50,6 @@ tint_target_add_dependencies(tint_cmd_fuzz_ir_helpers lib
   tint_lang_core_ir
   tint_lang_core_ir_transform
   tint_lang_core_type
-  tint_lang_wgsl
-  tint_lang_wgsl_ast
-  tint_lang_wgsl_inspector
-  tint_lang_wgsl_program
-  tint_lang_wgsl_sem
   tint_utils
   tint_utils_containers
   tint_utils_diagnostic
@@ -70,3 +65,37 @@ tint_target_add_dependencies(tint_cmd_fuzz_ir_helpers lib
 tint_target_add_external_dependencies(tint_cmd_fuzz_ir_helpers lib
   "src_utils"
 )
+
+################################################################################
+# Target:    tint_cmd_fuzz_ir_helpers_test
+# Kind:      test
+################################################################################
+tint_add_target(tint_cmd_fuzz_ir_helpers_test test
+  cmd/fuzz/ir/helpers/substitute_overrides_config_test.cc
+)
+
+tint_target_add_dependencies(tint_cmd_fuzz_ir_helpers_test test
+  tint_api_common
+  tint_cmd_fuzz_ir_helpers
+  tint_lang_core
+  tint_lang_core_constant
+  tint_lang_core_intrinsic
+  tint_lang_core_ir
+  tint_lang_core_ir_transform
+  tint_lang_core_type
+  tint_utils
+  tint_utils_containers
+  tint_utils_diagnostic
+  tint_utils_ice
+  tint_utils_macros
+  tint_utils_math
+  tint_utils_memory
+  tint_utils_rtti
+  tint_utils_symbol
+  tint_utils_text
+)
+
+tint_target_add_external_dependencies(tint_cmd_fuzz_ir_helpers_test test
+  "gtest"
+  "src_utils"
+)

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

@@ -39,6 +39,10 @@ import("../../../../../../scripts/tint_overrides_with_defaults.gni")
 
 import("${tint_src_dir}/tint.gni")
 
+if (tint_build_unittests || tint_build_benchmarks) {
+  import("//testing/test.gni")
+}
+
 libtint_source_set("helpers") {
   sources = [
     "substitute_overrides_config.cc",
@@ -52,11 +56,6 @@ libtint_source_set("helpers") {
     "${tint_src_dir}/lang/core/ir",
     "${tint_src_dir}/lang/core/ir/transform",
     "${tint_src_dir}/lang/core/type",
-    "${tint_src_dir}/lang/wgsl",
-    "${tint_src_dir}/lang/wgsl/ast",
-    "${tint_src_dir}/lang/wgsl/inspector",
-    "${tint_src_dir}/lang/wgsl/program",
-    "${tint_src_dir}/lang/wgsl/sem",
     "${tint_src_dir}/utils",
     "${tint_src_dir}/utils/containers",
     "${tint_src_dir}/utils/diagnostic",
@@ -69,3 +68,30 @@ libtint_source_set("helpers") {
     "${tint_src_dir}/utils/text",
   ]
 }
+if (tint_build_unittests) {
+  tint_unittests_source_set("unittests") {
+    sources = [ "substitute_overrides_config_test.cc" ]
+    deps = [
+      "${dawn_root}/src/utils:utils",
+      "${tint_src_dir}:gmock_and_gtest",
+      "${tint_src_dir}/api/common",
+      "${tint_src_dir}/cmd/fuzz/ir/helpers",
+      "${tint_src_dir}/lang/core",
+      "${tint_src_dir}/lang/core/constant",
+      "${tint_src_dir}/lang/core/intrinsic",
+      "${tint_src_dir}/lang/core/ir",
+      "${tint_src_dir}/lang/core/ir/transform",
+      "${tint_src_dir}/lang/core/type",
+      "${tint_src_dir}/utils",
+      "${tint_src_dir}/utils/containers",
+      "${tint_src_dir}/utils/diagnostic",
+      "${tint_src_dir}/utils/ice",
+      "${tint_src_dir}/utils/macros",
+      "${tint_src_dir}/utils/math",
+      "${tint_src_dir}/utils/memory",
+      "${tint_src_dir}/utils/rtti",
+      "${tint_src_dir}/utils/symbol",
+      "${tint_src_dir}/utils/text",
+    ]
+  }
+}

src/tint/cmd/fuzz/ir/helpers/substitute_overrides_config.cc

@@ -27,28 +27,24 @@
 
 #include "src/tint/cmd/fuzz/ir/helpers/substitute_overrides_config.h"
 
-#include <memory>
-#include <utility>
-
+#include "src/tint/lang/core/ir/module.h"
+#include "src/tint/lang/core/ir/override.h"
 #include "src/tint/lang/core/ir/transform/substitute_overrides.h"
-#include "src/tint/lang/wgsl/inspector/inspector.h"
-#include "src/tint/lang/wgsl/program/program.h"
 
 namespace tint::fuzz::ir {
 
 tint::core::ir::transform::SubstituteOverridesConfig SubstituteOverridesConfig(
-    const Program& program) {
+    core::ir::Module& mod) {
     tint::core::ir::transform::SubstituteOverridesConfig cfg;
-    inspector::Inspector inspector(program);
-    auto default_values = inspector.GetOverrideDefaultValues();
-    for (const auto& [override_id, scalar] : default_values) {
-        // If the override is not null, then it has a default value, we can just let it use the
-        // provided default instead of overriding.
-        if (scalar.IsNull()) {
-            cfg.map.insert({override_id, 0.0});
+
+    for (auto* inst : *(mod.root_block)) {
+        auto* ov = inst->As<core::ir::Override>();
+        if (!ov || ov->Initializer()) {
+            continue;
         }
-    }
 
+        cfg.map[ov->OverrideId().value()] = 0.0;
+    }
     return cfg;
 }
 

src/tint/cmd/fuzz/ir/helpers/substitute_overrides_config.h

@@ -31,16 +31,16 @@
 #include "src/tint/lang/core/ir/transform/substitute_overrides.h"
 
 // Forward declarations
-namespace tint {
-class Program;
+namespace tint::core::ir {
+class Module;
 }
 
 namespace tint::fuzz::ir {
 
 /// Returns a IR substitute override config which may contain an empty map if there a no overrides
-/// @param program A valid program
+/// @param mod The IR to find the overrides from
 /// @return An IR substitute override config
-core::ir::transform::SubstituteOverridesConfig SubstituteOverridesConfig(const Program& program);
+core::ir::transform::SubstituteOverridesConfig SubstituteOverridesConfig(core::ir::Module& mod);
 
 }  // namespace tint::fuzz::ir