[hlsl] Add Unary support to HLSL IR backend.
This CL adds unary negation and complement support to the HLSL IR
backend. The unary not is converted into a `a == false` instruction by
the builder.
Bug; 42251045
Change-Id: I52dd8396cfe5b783a1a6a21de97e10c47c0d02f3
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/194161
Commit-Queue: dan sinclair <dsinclair@chromium.org>
Reviewed-by: James Price <jrprice@google.com>
diff --git a/src/tint/lang/hlsl/writer/BUILD.bazel b/src/tint/lang/hlsl/writer/BUILD.bazel
index 34be45e..4c1e253 100644
--- a/src/tint/lang/hlsl/writer/BUILD.bazel
+++ b/src/tint/lang/hlsl/writer/BUILD.bazel
@@ -96,6 +96,7 @@
"helper_test.h",
"if_test.cc",
"loop_test.cc",
+ "unary_test.cc",
"var_let_test.cc",
],
deps = [
diff --git a/src/tint/lang/hlsl/writer/BUILD.cmake b/src/tint/lang/hlsl/writer/BUILD.cmake
index 6b65aad..fb50331 100644
--- a/src/tint/lang/hlsl/writer/BUILD.cmake
+++ b/src/tint/lang/hlsl/writer/BUILD.cmake
@@ -107,6 +107,7 @@
lang/hlsl/writer/helper_test.h
lang/hlsl/writer/if_test.cc
lang/hlsl/writer/loop_test.cc
+ lang/hlsl/writer/unary_test.cc
lang/hlsl/writer/var_let_test.cc
)
diff --git a/src/tint/lang/hlsl/writer/BUILD.gn b/src/tint/lang/hlsl/writer/BUILD.gn
index 5f069d7..f31ce42 100644
--- a/src/tint/lang/hlsl/writer/BUILD.gn
+++ b/src/tint/lang/hlsl/writer/BUILD.gn
@@ -99,6 +99,7 @@
"helper_test.h",
"if_test.cc",
"loop_test.cc",
+ "unary_test.cc",
"var_let_test.cc",
]
deps = [
diff --git a/src/tint/lang/hlsl/writer/printer/printer.cc b/src/tint/lang/hlsl/writer/printer/printer.cc
index 51e103f..d29fdad 100644
--- a/src/tint/lang/hlsl/writer/printer/printer.cc
+++ b/src/tint/lang/hlsl/writer/printer/printer.cc
@@ -410,6 +410,7 @@
[&](const core::ir::Access* a) { EmitAccess(out, a); }, //
[&](const core::ir::CoreBinary* b) { EmitBinary(out, b); }, //
[&](const core::ir::CoreBuiltinCall* c) { EmitCoreBuiltinCall(out, c); }, //
+ [&](const core::ir::CoreUnary* u) { EmitUnary(out, u); }, //
[&](const core::ir::Let* l) { out << NameOf(l->Result(0)); }, //
[&](const core::ir::Load* l) { EmitLoad(out, l); }, //
[&](const core::ir::UserCall* c) { EmitUserCall(out, c); }, //
@@ -421,6 +422,25 @@
TINT_ICE_ON_NO_MATCH);
}
+ void EmitUnary(StringStream& out, const core::ir::CoreUnary* u) {
+ switch (u->Op()) {
+ case core::UnaryOp::kNegation:
+ out << "-";
+ break;
+ case core::UnaryOp::kComplement:
+ out << "~";
+ break;
+ case core::UnaryOp::kNot:
+ out << "!";
+ break;
+ default:
+ TINT_UNIMPLEMENTED() << u->Op();
+ }
+ out << "(";
+ EmitValue(out, u->Val());
+ out << ")";
+ }
+
void EmitSwizzle(StringStream& out, const core::ir::Swizzle* swizzle) {
EmitValue(out, swizzle->Object());
out << ".";
diff --git a/src/tint/lang/hlsl/writer/unary_test.cc b/src/tint/lang/hlsl/writer/unary_test.cc
new file mode 100644
index 0000000..e3ce903
--- /dev/null
+++ b/src/tint/lang/hlsl/writer/unary_test.cc
@@ -0,0 +1,99 @@
+// 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/lang/core/fluent_types.h"
+#include "src/tint/lang/hlsl/writer/helper_test.h"
+#include "src/tint/utils/text/string_stream.h"
+
+using namespace tint::core::number_suffixes; // NOLINT
+using namespace tint::core::fluent_types; // NOLINT
+
+namespace tint::hlsl::writer {
+namespace {
+
+TEST_F(HlslWriterTest, UnaryComplement) {
+ auto* func = b.Function("foo", ty.void_(), core::ir::Function::PipelineStage::kCompute);
+ func->SetWorkgroupSize(1, 1, 1);
+ b.Append(func->Block(), [&] {
+ auto* a = b.Var("a", b.Zero<i32>());
+ b.Var("b", b.Complement<i32>(b.Load(a)));
+ b.Return(func);
+ });
+
+ ASSERT_TRUE(Generate()) << err_ << output_.hlsl;
+ EXPECT_EQ(output_.hlsl, R"(
+[numthreads(1, 1, 1)]
+void foo() {
+ int a = 0;
+ int b = ~(a);
+}
+
+)");
+}
+
+TEST_F(HlslWriterTest, UnaryNot) {
+ auto* func = b.Function("foo", ty.void_(), core::ir::Function::PipelineStage::kCompute);
+ func->SetWorkgroupSize(1, 1, 1);
+ b.Append(func->Block(), [&] {
+ auto* a = b.Var("a", b.Zero<bool>());
+ b.Var("b", b.Not<bool>(b.Load(a)));
+ b.Return(func);
+ });
+
+ ASSERT_TRUE(Generate()) << err_ << output_.hlsl;
+ EXPECT_EQ(output_.hlsl, R"(
+[numthreads(1, 1, 1)]
+void foo() {
+ bool a = false;
+ bool b = !(a);
+}
+
+)");
+}
+
+TEST_F(HlslWriterTest, UnaryNegation) {
+ auto* func = b.Function("foo", ty.void_(), core::ir::Function::PipelineStage::kCompute);
+ func->SetWorkgroupSize(1, 1, 1);
+ b.Append(func->Block(), [&] {
+ auto* a = b.Var("a", b.Zero<f32>());
+ b.Var("b", b.Negation<f32>(b.Load(a)));
+ b.Return(func);
+ });
+
+ ASSERT_TRUE(Generate()) << err_ << output_.hlsl;
+ EXPECT_EQ(output_.hlsl, R"(
+[numthreads(1, 1, 1)]
+void foo() {
+ float a = 0.0f;
+ float b = -(a);
+}
+
+)");
+}
+
+} // namespace
+} // namespace tint::hlsl::writer
