[hlsl] Support `textureNumLevels`
This CL adds support to the HLSL IR backend for `textureNumLevels`.
Bug: 42251045
Change-Id: I22ac9fa32c9c0ef1c77635ff3658a7f05cd82f22
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/197254
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: dan sinclair <dsinclair@chromium.org>
diff --git a/src/tint/lang/core/ir/transform/demote_to_helper.cc b/src/tint/lang/core/ir/transform/demote_to_helper.cc
index eb7835f..bb7cdfe 100644
--- a/src/tint/lang/core/ir/transform/demote_to_helper.cc
+++ b/src/tint/lang/core/ir/transform/demote_to_helper.cc
@@ -216,7 +216,10 @@
} // namespace
Result<SuccessType> DemoteToHelper(Module& ir) {
- auto result = ValidateAndDumpIfNeeded(ir, "DemoteToHelper transform");
+ auto result = ValidateAndDumpIfNeeded(ir, "DemoteToHelper transform",
+ core::ir::Capabilities{
+ core::ir::Capability::kAllowVectorElementPointer,
+ });
if (result != Success) {
return result;
}
diff --git a/src/tint/lang/core/ir/transform/remove_terminator_args.cc b/src/tint/lang/core/ir/transform/remove_terminator_args.cc
index dfe865b..6492303 100644
--- a/src/tint/lang/core/ir/transform/remove_terminator_args.cc
+++ b/src/tint/lang/core/ir/transform/remove_terminator_args.cc
@@ -164,7 +164,10 @@
} // namespace
Result<SuccessType> RemoveTerminatorArgs(Module& ir) {
- auto result = ValidateAndDumpIfNeeded(ir, "RemoveTerminatorArgs transform");
+ auto result = ValidateAndDumpIfNeeded(ir, "RemoveTerminatorArgs transform",
+ core::ir::Capabilities{
+ core::ir::Capability::kAllowVectorElementPointer,
+ });
if (result != Success) {
return result;
}
diff --git a/src/tint/lang/core/ir/transform/rename_conflicts.cc b/src/tint/lang/core/ir/transform/rename_conflicts.cc
index f24cf87..1524fb7 100644
--- a/src/tint/lang/core/ir/transform/rename_conflicts.cc
+++ b/src/tint/lang/core/ir/transform/rename_conflicts.cc
@@ -293,7 +293,10 @@
} // namespace
Result<SuccessType> RenameConflicts(core::ir::Module& ir) {
- auto result = ValidateAndDumpIfNeeded(ir, "RenameConflicts transform");
+ auto result = ValidateAndDumpIfNeeded(ir, "RenameConflicts transform",
+ core::ir::Capabilities{
+ core::ir::Capability::kAllowVectorElementPointer,
+ });
if (result != Success) {
return result;
}
diff --git a/src/tint/lang/core/ir/transform/value_to_let.cc b/src/tint/lang/core/ir/transform/value_to_let.cc
index ec25a39..1e87a96 100644
--- a/src/tint/lang/core/ir/transform/value_to_let.cc
+++ b/src/tint/lang/core/ir/transform/value_to_let.cc
@@ -174,7 +174,10 @@
} // namespace
Result<SuccessType> ValueToLet(Module& ir) {
- auto result = ValidateAndDumpIfNeeded(ir, "ValueToLet transform");
+ auto result = ValidateAndDumpIfNeeded(ir, "ValueToLet transform",
+ core::ir::Capabilities{
+ core::ir::Capability::kAllowVectorElementPointer,
+ });
if (result != Success) {
return result;
}
diff --git a/src/tint/lang/core/ir/transform/vectorize_scalar_matrix_constructors.cc b/src/tint/lang/core/ir/transform/vectorize_scalar_matrix_constructors.cc
index 99d6be9..86f454a 100644
--- a/src/tint/lang/core/ir/transform/vectorize_scalar_matrix_constructors.cc
+++ b/src/tint/lang/core/ir/transform/vectorize_scalar_matrix_constructors.cc
@@ -94,7 +94,10 @@
} // namespace
Result<SuccessType> VectorizeScalarMatrixConstructors(Module& ir) {
- auto result = ValidateAndDumpIfNeeded(ir, "VectorizeScalarMatrixConstructors transform");
+ auto result = ValidateAndDumpIfNeeded(ir, "VectorizeScalarMatrixConstructors transform",
+ core::ir::Capabilities{
+ core::ir::Capability::kAllowVectorElementPointer,
+ });
if (result != Success) {
return result;
}
diff --git a/src/tint/lang/hlsl/writer/builtin_test.cc b/src/tint/lang/hlsl/writer/builtin_test.cc
index 40fedfa..97bb1b3 100644
--- a/src/tint/lang/hlsl/writer/builtin_test.cc
+++ b/src/tint/lang/hlsl/writer/builtin_test.cc
@@ -28,6 +28,7 @@
#include "src/tint/lang/core/fluent_types.h"
#include "src/tint/lang/core/ir/function.h"
#include "src/tint/lang/core/number.h"
+#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/hlsl/writer/helper_test.h"
#include "gtest/gtest.h"
@@ -758,5 +759,86 @@
)");
}
+TEST_F(HlslWriterTest, BuiltinTextureNumLevels1D) {
+ auto* t = b.FunctionParam(
+ "t", ty.Get<core::type::SampledTexture>(core::type::TextureDimension::k1d, ty.f32()));
+
+ auto* func = b.Function("foo", ty.void_());
+ func->SetParams({t});
+
+ b.Append(func->Block(), [&] {
+ b.Let("d", b.Call(ty.u32(), core::BuiltinFn::kTextureNumLevels, t));
+ b.Return(func);
+ });
+
+ ASSERT_TRUE(Generate()) << err_ << output_.hlsl;
+ EXPECT_EQ(output_.hlsl, R"(
+void foo(Texture1D<float4> t) {
+ uint2 v = (0u).xx;
+ t.GetDimensions(0u, v[0u], v[1u]);
+ uint d = v.y;
+}
+
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+}
+
+)");
+}
+
+TEST_F(HlslWriterTest, BuiltinTextureNumLevels2D) {
+ auto* t = b.FunctionParam(
+ "t", ty.Get<core::type::SampledTexture>(core::type::TextureDimension::k2d, ty.f32()));
+
+ auto* func = b.Function("foo", ty.void_());
+ func->SetParams({t});
+
+ b.Append(func->Block(), [&] {
+ b.Let("d", b.Call(ty.u32(), core::BuiltinFn::kTextureNumLevels, t));
+ b.Return(func);
+ });
+
+ ASSERT_TRUE(Generate()) << err_ << output_.hlsl;
+ EXPECT_EQ(output_.hlsl, R"(
+void foo(Texture2D<float4> t) {
+ uint3 v = (0u).xxx;
+ t.GetDimensions(0u, v[0u], v[1u], v[2u]);
+ uint d = v.z;
+}
+
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+}
+
+)");
+}
+
+TEST_F(HlslWriterTest, BuiltinTextureNumLevels3D) {
+ auto* t = b.FunctionParam(
+ "t", ty.Get<core::type::SampledTexture>(core::type::TextureDimension::k3d, ty.f32()));
+
+ auto* func = b.Function("foo", ty.void_());
+ func->SetParams({t});
+
+ b.Append(func->Block(), [&] {
+ b.Let("d", b.Call(ty.u32(), core::BuiltinFn::kTextureNumLevels, t));
+ b.Return(func);
+ });
+
+ ASSERT_TRUE(Generate()) << err_ << output_.hlsl;
+ EXPECT_EQ(output_.hlsl, R"(
+void foo(Texture3D<float4> t) {
+ uint4 v = (0u).xxxx;
+ t.GetDimensions(0u, v[0u], v[1u], v[2u], v[3u]);
+ uint d = v.w;
+}
+
+[numthreads(1, 1, 1)]
+void unused_entry_point() {
+}
+
+)");
+}
+
} // namespace
} // namespace tint::hlsl::writer
diff --git a/src/tint/lang/hlsl/writer/printer/printer.cc b/src/tint/lang/hlsl/writer/printer/printer.cc
index f45410d..0da4211 100644
--- a/src/tint/lang/hlsl/writer/printer/printer.cc
+++ b/src/tint/lang/hlsl/writer/printer/printer.cc
@@ -154,7 +154,10 @@
/// @returns the generated HLSL shader
tint::Result<PrintResult> Generate() {
- core::ir::Capabilities capabilities{core::ir::Capability::kAllowModuleScopeLets};
+ core::ir::Capabilities capabilities{
+ core::ir::Capability::kAllowModuleScopeLets,
+ core::ir::Capability::kAllowVectorElementPointer,
+ };
auto valid = core::ir::ValidateAndDumpIfNeeded(ir_, "HLSL writer", capabilities);
if (valid != Success) {
return std::move(valid.Failure());
diff --git a/src/tint/lang/hlsl/writer/raise/builtin_polyfill.cc b/src/tint/lang/hlsl/writer/raise/builtin_polyfill.cc
index ea129b5..ef5ce91 100644
--- a/src/tint/lang/hlsl/writer/raise/builtin_polyfill.cc
+++ b/src/tint/lang/hlsl/writer/raise/builtin_polyfill.cc
@@ -35,8 +35,10 @@
#include "src/tint/lang/core/ir/module.h"
#include "src/tint/lang/core/ir/validator.h"
#include "src/tint/lang/core/type/manager.h"
+#include "src/tint/lang/core/type/texture.h"
#include "src/tint/lang/hlsl/builtin_fn.h"
#include "src/tint/lang/hlsl/ir/builtin_call.h"
+#include "src/tint/lang/hlsl/ir/member_builtin_call.h"
#include "src/tint/lang/hlsl/ir/ternary.h"
#include "src/tint/utils/containers/hashmap.h"
#include "src/tint/utils/math/hash.h"
@@ -78,6 +80,7 @@
switch (call->Func()) {
case core::BuiltinFn::kSelect:
case core::BuiltinFn::kSign:
+ case core::BuiltinFn::kTextureNumLevels:
case core::BuiltinFn::kTrunc:
call_worklist.Push(call);
break;
@@ -114,6 +117,9 @@
case core::BuiltinFn::kSign:
Sign(call);
break;
+ case core::BuiltinFn::kTextureNumLevels:
+ TextureNumLevels(call);
+ break;
case core::BuiltinFn::kTrunc:
Trunc(call);
break;
@@ -378,6 +384,52 @@
[&] { b.CallWithResult(bitcast->DetachResult(), f, bitcast->Args()[0]); });
bitcast->Destroy();
}
+
+ void TextureNumLevels(core::ir::CoreBuiltinCall* call) {
+ auto* tex = call->Args()[0];
+ auto* tex_type = tex->Type()->As<core::type::Texture>();
+
+ Vector<uint32_t, 2> swizzle{};
+ uint32_t query_size = 0;
+ switch (tex_type->dim()) {
+ case core::type::TextureDimension::kNone:
+ TINT_ICE() << "texture dimension is kNone";
+ case core::type::TextureDimension::k1d:
+ query_size = 2;
+ swizzle = {1_u};
+ break;
+ case core::type::TextureDimension::k2d:
+ case core::type::TextureDimension::kCube:
+ query_size = 3;
+ swizzle = {2_u};
+ break;
+ case core::type::TextureDimension::k2dArray:
+ case core::type::TextureDimension::k3d:
+ case core::type::TextureDimension::kCubeArray:
+ query_size = 4;
+ swizzle = {3_u};
+ break;
+ }
+
+ const core::type::Type* query_ty = ty.vec(ty.u32(), query_size);
+ b.InsertBefore(call, [&] {
+ Vector<core::ir::Value*, 5> args;
+ // Pass the `level` parameter so the `num_levels` overload is used.
+ args.Push(b.Value(0_u));
+
+ core::ir::Instruction* out = b.Var(ty.ptr(function, query_ty));
+ for (uint32_t i = 0; i < query_size; ++i) {
+ args.Push(b.Access(ty.ptr<function, u32>(), out, u32(i))->Result(0));
+ }
+
+ b.MemberCall<hlsl::ir::MemberBuiltinCall>(ty.void_(), hlsl::BuiltinFn::kGetDimensions,
+ tex, args);
+
+ out = b.Swizzle(ty.u32(), out, swizzle);
+ call->Result(0)->ReplaceAllUsesWith(out->Result(0));
+ });
+ call->Destroy();
+ }
};
} // namespace
diff --git a/src/tint/lang/hlsl/writer/raise/builtin_polyfill_test.cc b/src/tint/lang/hlsl/writer/raise/builtin_polyfill_test.cc
index 4ae83d2..1b2165a 100644
--- a/src/tint/lang/hlsl/writer/raise/builtin_polyfill_test.cc
+++ b/src/tint/lang/hlsl/writer/raise/builtin_polyfill_test.cc
@@ -32,6 +32,7 @@
#include "src/tint/lang/core/ir/transform/helper_test.h"
#include "src/tint/lang/core/number.h"
#include "src/tint/lang/core/type/builtin_structs.h"
+#include "src/tint/lang/core/type/sampled_texture.h"
#include "src/tint/lang/core/type/storage_texture.h"
using namespace tint::core::fluent_types; // NOLINT
@@ -458,5 +459,43 @@
EXPECT_EQ(expect, str());
}
+TEST_F(HlslWriter_BuiltinPolyfillTest, TextureNumLevels) {
+ auto* t = b.FunctionParam(
+ "t", ty.Get<core::type::SampledTexture>(core::type::TextureDimension::k1d, ty.f32()));
+ auto* func = b.Function("foo", ty.u32());
+ func->SetParams({t});
+ b.Append(func->Block(), [&] {
+ auto* result = b.Call<u32>(core::BuiltinFn::kTextureNumLevels, t);
+ b.Return(func, result);
+ });
+
+ auto* src = R"(
+%foo = func(%t:texture_1d<f32>):u32 {
+ $B1: {
+ %3:u32 = textureNumLevels %t
+ ret %3
+ }
+}
+)";
+ EXPECT_EQ(src, str());
+
+ auto* expect = R"(
+%foo = func(%t:texture_1d<f32>):u32 {
+ $B1: {
+ %3:ptr<function, vec2<u32>, read_write> = var
+ %4:ptr<function, u32, read_write> = access %3, 0u
+ %5:ptr<function, u32, read_write> = access %3, 1u
+ %6:void = %t.GetDimensions 0u, %4, %5
+ %7:u32 = swizzle %3, y
+ ret %7
+ }
+}
+)";
+
+ capabilities = core::ir::Capabilities{core::ir::Capability::kAllowVectorElementPointer};
+ Run(BuiltinPolyfill);
+ EXPECT_EQ(expect, str());
+}
+
} // namespace
} // namespace tint::hlsl::writer::raise
diff --git a/src/tint/lang/hlsl/writer/raise/promote_initializers.cc b/src/tint/lang/hlsl/writer/raise/promote_initializers.cc
index 0ad0221..bb5a529 100644
--- a/src/tint/lang/hlsl/writer/raise/promote_initializers.cc
+++ b/src/tint/lang/hlsl/writer/raise/promote_initializers.cc
@@ -217,7 +217,10 @@
} // namespace
Result<SuccessType> PromoteInitializers(core::ir::Module& ir) {
- auto result = ValidateAndDumpIfNeeded(ir, "PromoteInitializers transform");
+ auto result = ValidateAndDumpIfNeeded(ir, "PromoteInitializers transform",
+ core::ir::Capabilities{
+ core::ir::Capability::kAllowVectorElementPointer,
+ });
if (result != Success) {
return result;
}
