HLSL-IR: add IR fuzzers
As we don't fuzz options, this CL adds two fuzzers, one that generates
HLSL for FXC, and one for DXC.
Bug: 377296327
Change-Id: I8803f60681309e25bd13c485bf67c184134951ae
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/215995
Reviewed-by: James Price <jrprice@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
diff --git a/src/tint/lang/hlsl/writer/BUILD.cmake b/src/tint/lang/hlsl/writer/BUILD.cmake
index 8f1b2e5..7302406 100644
--- a/src/tint/lang/hlsl/writer/BUILD.cmake
+++ b/src/tint/lang/hlsl/writer/BUILD.cmake
@@ -219,14 +219,18 @@
# Condition: TINT_BUILD_HLSL_WRITER
################################################################################
tint_add_target(tint_lang_hlsl_writer_fuzz fuzz
+ lang/hlsl/writer/writer_fuzz.cc
)
tint_target_add_dependencies(tint_lang_hlsl_writer_fuzz fuzz
tint_api_common
+ tint_cmd_fuzz_ir_fuzz
tint_lang_core
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
diff --git a/src/tint/lang/hlsl/writer/BUILD.gn b/src/tint/lang/hlsl/writer/BUILD.gn
index 8270d32..48b178a 100644
--- a/src/tint/lang/hlsl/writer/BUILD.gn
+++ b/src/tint/lang/hlsl/writer/BUILD.gn
@@ -189,14 +189,17 @@
}
if (tint_build_hlsl_writer) {
tint_fuzz_source_set("fuzz") {
- sources = []
+ sources = [ "writer_fuzz.cc" ]
deps = [
"${dawn_root}/src/utils:utils",
"${tint_src_dir}/api/common",
+ "${tint_src_dir}/cmd/fuzz/ir:fuzz",
"${tint_src_dir}/lang/core",
"${tint_src_dir}/lang/core/constant",
+ "${tint_src_dir}/lang/core/ir",
"${tint_src_dir}/lang/core/type",
"${tint_src_dir}/lang/hlsl/writer/common",
+ "${tint_src_dir}/lang/hlsl/writer/helpers",
"${tint_src_dir}/lang/wgsl",
"${tint_src_dir}/lang/wgsl/ast",
"${tint_src_dir}/lang/wgsl/ast/transform",
diff --git a/src/tint/lang/hlsl/writer/helpers/BUILD.bazel b/src/tint/lang/hlsl/writer/helpers/BUILD.bazel
index a1e181c..a94aa63 100644
--- a/src/tint/lang/hlsl/writer/helpers/BUILD.bazel
+++ b/src/tint/lang/hlsl/writer/helpers/BUILD.bazel
@@ -48,6 +48,7 @@
"//src/tint/api/common",
"//src/tint/lang/core",
"//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",
diff --git a/src/tint/lang/hlsl/writer/helpers/BUILD.cmake b/src/tint/lang/hlsl/writer/helpers/BUILD.cmake
index 5e0c926..48f2ece 100644
--- a/src/tint/lang/hlsl/writer/helpers/BUILD.cmake
+++ b/src/tint/lang/hlsl/writer/helpers/BUILD.cmake
@@ -47,6 +47,7 @@
tint_api_common
tint_lang_core
tint_lang_core_constant
+ tint_lang_core_ir
tint_lang_core_type
tint_lang_hlsl_writer_common
tint_lang_wgsl
diff --git a/src/tint/lang/hlsl/writer/helpers/BUILD.gn b/src/tint/lang/hlsl/writer/helpers/BUILD.gn
index 10778d5..ad8cca3 100644
--- a/src/tint/lang/hlsl/writer/helpers/BUILD.gn
+++ b/src/tint/lang/hlsl/writer/helpers/BUILD.gn
@@ -49,6 +49,7 @@
"${tint_src_dir}/api/common",
"${tint_src_dir}/lang/core",
"${tint_src_dir}/lang/core/constant",
+ "${tint_src_dir}/lang/core/ir",
"${tint_src_dir}/lang/core/type",
"${tint_src_dir}/lang/hlsl/writer/common",
"${tint_src_dir}/lang/wgsl",
diff --git a/src/tint/lang/hlsl/writer/helpers/generate_bindings.cc b/src/tint/lang/hlsl/writer/helpers/generate_bindings.cc
index b10d2f6..35dfb21 100644
--- a/src/tint/lang/hlsl/writer/helpers/generate_bindings.cc
+++ b/src/tint/lang/hlsl/writer/helpers/generate_bindings.cc
@@ -33,7 +33,10 @@
#include <vector>
#include "src/tint/api/common/binding_point.h"
+#include "src/tint/lang/core/ir/module.h"
+#include "src/tint/lang/core/ir/var.h"
#include "src/tint/lang/core/type/external_texture.h"
+#include "src/tint/lang/core/type/pointer.h"
#include "src/tint/lang/core/type/storage_texture.h"
#include "src/tint/lang/wgsl/ast/module.h"
#include "src/tint/lang/wgsl/program/program.h"
@@ -44,6 +47,78 @@
namespace tint::hlsl::writer {
+Bindings GenerateBindings(const core::ir::Module& module) {
+ Bindings bindings{};
+
+ // Collect next valid binding number per group
+ Hashmap<uint32_t, uint32_t, 4> group_to_next_binding_number;
+ Vector<tint::BindingPoint, 4> ext_tex_bps;
+ for (auto* inst : *module.root_block) {
+ auto* var = inst->As<core::ir::Var>();
+ if (!var) {
+ continue;
+ }
+
+ if (auto bp = var->BindingPoint()) {
+ if (auto val = group_to_next_binding_number.Get(bp->group)) {
+ *val = std::max(*val, bp->binding + 1);
+ } else {
+ group_to_next_binding_number.Add(bp->group, bp->binding + 1);
+ }
+
+ auto* ptr = var->Result(0)->Type()->As<core::type::Pointer>();
+
+ // Store up the external textures, we'll add them in the next step
+ if (ptr->StoreType()->Is<core::type::ExternalTexture>()) {
+ ext_tex_bps.Push(*bp);
+ continue;
+ }
+
+ binding::BindingInfo info{bp->group, bp->binding};
+ switch (ptr->AddressSpace()) {
+ case core::AddressSpace::kHandle:
+ Switch(
+ ptr->StoreType(), //
+ [&](const core::type::Sampler*) { bindings.sampler.emplace(*bp, info); },
+ [&](const core::type::StorageTexture*) {
+ bindings.storage_texture.emplace(*bp, info);
+ },
+ [&](const core::type::Texture*) { bindings.texture.emplace(*bp, info); });
+ break;
+ case core::AddressSpace::kStorage:
+ bindings.storage.emplace(*bp, info);
+ break;
+ case core::AddressSpace::kUniform:
+ bindings.uniform.emplace(*bp, info);
+ break;
+
+ case core::AddressSpace::kUndefined:
+ case core::AddressSpace::kPixelLocal:
+ case core::AddressSpace::kPrivate:
+ case core::AddressSpace::kPushConstant:
+ case core::AddressSpace::kIn:
+ case core::AddressSpace::kOut:
+ case core::AddressSpace::kFunction:
+ case core::AddressSpace::kWorkgroup:
+ break;
+ }
+ }
+ }
+
+ for (auto bp : ext_tex_bps) {
+ uint32_t g = bp.group;
+ uint32_t& next_num = group_to_next_binding_number.GetOrAddZero(g);
+
+ binding::BindingInfo plane0{bp.group, bp.binding};
+ binding::BindingInfo plane1{g, next_num++};
+ binding::BindingInfo metadata{g, next_num++};
+
+ bindings.external_texture.emplace(bp, binding::ExternalTexture{metadata, plane0, plane1});
+ }
+
+ return bindings;
+}
+
Bindings GenerateBindings(const Program& program) {
// TODO(tint:1491): Use Inspector once we can get binding info for all
// variables, not just those referenced by entry points.
diff --git a/src/tint/lang/hlsl/writer/helpers/generate_bindings.h b/src/tint/lang/hlsl/writer/helpers/generate_bindings.h
index 249075a..72abac8 100644
--- a/src/tint/lang/hlsl/writer/helpers/generate_bindings.h
+++ b/src/tint/lang/hlsl/writer/helpers/generate_bindings.h
@@ -35,8 +35,20 @@
class Program;
}
+namespace tint::core::ir {
+class Module;
+} // namespace tint::core::ir
+
namespace tint::hlsl::writer {
+/// Generate the resource bindings
+/// @param module the module to generate from
+/// @returns the bindings
+Bindings GenerateBindings(const core::ir::Module& module);
+
+/// Generate the resource bindings
+/// @param program the program to generate from
+/// @returns the bindings
Bindings GenerateBindings(const Program& program);
} // namespace tint::hlsl::writer
diff --git a/src/tint/lang/hlsl/writer/writer_fuzz.cc b/src/tint/lang/hlsl/writer/writer_fuzz.cc
new file mode 100644
index 0000000..f26320f
--- /dev/null
+++ b/src/tint/lang/hlsl/writer/writer_fuzz.cc
@@ -0,0 +1,116 @@
+// Copyright 2024 The Dawn & Tint Authors
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice, this
+// list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+// this list of conditions and the following disclaimer in the documentation
+// and/or other materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#include "src/tint/cmd/fuzz/ir/fuzz.h"
+#include "src/tint/lang/core/ir/module.h"
+#include "src/tint/lang/core/ir/var.h"
+#include "src/tint/lang/core/type/input_attachment.h"
+#include "src/tint/lang/core/type/pointer.h"
+#include "src/tint/lang/hlsl/writer/helpers/generate_bindings.h"
+#include "src/tint/lang/hlsl/writer/writer.h"
+
+namespace tint::hlsl::writer {
+namespace {
+
+Options GenerateOptions(core::ir::Module& module, Options::Compiler compiler) {
+ Options options;
+ options.disable_robustness = false;
+ options.disable_workgroup_init = false;
+ options.truncate_interstage_variables = false;
+ options.polyfill_reflect_vec2_f32 = false;
+ options.polyfill_dot_4x8_packed = false;
+ options.disable_polyfill_integer_div_mod = false;
+ options.polyfill_pack_unpack_4x8 = false;
+ options.interstage_locations = {};
+ options.root_constant_binding_point = {};
+ options.pixel_local = {};
+
+ options.compiler = compiler;
+ options.bindings = GenerateBindings(module);
+
+ options.array_length_from_uniform.ubo_binding = {30, 0};
+
+ // Add array_length_from_uniform entries for all storage buffers with runtime sized arrays.
+ std::unordered_set<tint::BindingPoint> storage_bindings;
+ for (auto* inst : *module.root_block) {
+ auto* var = inst->As<core::ir::Var>();
+ if (!var->Result(0)->Type()->UnwrapPtr()->HasFixedFootprint()) {
+ if (auto bp = var->BindingPoint()) {
+ if (storage_bindings.insert(bp.value()).second) {
+ options.array_length_from_uniform.bindpoint_to_size_index.emplace(
+ bp.value(), static_cast<uint32_t>(storage_bindings.size() - 1));
+ }
+ }
+ }
+ }
+
+ return options;
+}
+
+bool CanRun(const core::ir::Module& module) {
+ // Check for unsupported module-scope variable address spaces and types.
+ for (auto* inst : *module.root_block) {
+ auto* var = inst->As<core::ir::Var>();
+ auto* ptr = var->Result(0)->Type()->As<core::type::Pointer>();
+ if (ptr->AddressSpace() == core::AddressSpace::kPushConstant) {
+ return false;
+ }
+ if (ptr->AddressSpace() == core::AddressSpace::kPixelLocal) {
+ return false;
+ }
+ if (ptr->StoreType()->Is<core::type::InputAttachment>()) {
+ return false;
+ }
+ }
+ return true;
+}
+
+void IRFuzzerDXC(core::ir::Module& module) {
+ // TODO(377391551): Enable fuzzing of options.
+ auto options = GenerateOptions(module, Options::Compiler::kDXC);
+ if (!CanRun(module)) {
+ return;
+ }
+ [[maybe_unused]] auto output = Generate(module, options);
+ // TODO(42251292): Fuzz DXC with HLSL output
+}
+
+void IRFuzzerFXC(core::ir::Module& module) {
+ // TODO(377391551): Enable fuzzing of options.
+ auto options = GenerateOptions(module, Options::Compiler::kFXC);
+ if (!CanRun(module)) {
+ return;
+ }
+ [[maybe_unused]] auto output = Generate(module, options);
+ // TODO(42251292): Fuzz DXC with HLSL output
+}
+
+} // namespace
+} // namespace tint::hlsl::writer
+
+TINT_IR_MODULE_FUZZER(tint::hlsl::writer::IRFuzzerDXC, tint::core::ir::Capabilities{});
+TINT_IR_MODULE_FUZZER(tint::hlsl::writer::IRFuzzerFXC, tint::core::ir::Capabilities{});
