[spirv-writer] Fill out cast code.
This Cl adds tests for more of the cast code along with adding a few missing cast cases. Bug: tint:5 Change-Id: I417d46661bb310f27329f3e2459b76aa61a49d31 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/22040 Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
parent
7e5e02f805
commit
615aaed508
|
@ -4639,7 +4639,8 @@ TEST_F(SpvParserTest, ClassifyCFGEdge_IfBreak_BypassesMerge_IsError) {
|
|||
ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions()) << p->error();
|
||||
FunctionEmitter fe(p, *spirv_function(100));
|
||||
EXPECT_FALSE(FlowClassifyCFGEdges(&fe));
|
||||
EXPECT_THAT(p->error(),
|
||||
EXPECT_THAT(
|
||||
p->error(),
|
||||
Eq("Branch from block 20 to block 99 is an invalid exit from "
|
||||
"construct starting at block 10; branch bypasses merge block 50"));
|
||||
}
|
||||
|
@ -4832,7 +4833,8 @@ TEST_F(SpvParserTest, ClassifyCFGEdges_SwitchBreak_BypassesMerge_IsError) {
|
|||
ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions()) << p->error();
|
||||
FunctionEmitter fe(p, *spirv_function(100));
|
||||
EXPECT_FALSE(FlowClassifyCFGEdges(&fe));
|
||||
EXPECT_THAT(p->error(),
|
||||
EXPECT_THAT(
|
||||
p->error(),
|
||||
Eq("Branch from block 20 to block 99 is an invalid exit from "
|
||||
"construct starting at block 10; branch bypasses merge block 50"));
|
||||
}
|
||||
|
@ -4866,7 +4868,8 @@ TEST_F(SpvParserTest, ClassifyCFGEdges_SwitchBreak_FromNestedLoop_IsError) {
|
|||
ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions()) << p->error();
|
||||
FunctionEmitter fe(p, *spirv_function(100));
|
||||
EXPECT_FALSE(FlowClassifyCFGEdges(&fe));
|
||||
EXPECT_THAT(p->error(),
|
||||
EXPECT_THAT(
|
||||
p->error(),
|
||||
Eq("Branch from block 30 to block 99 is an invalid exit from "
|
||||
"construct starting at block 20; branch bypasses merge block 80"));
|
||||
}
|
||||
|
@ -4897,7 +4900,8 @@ TEST_F(SpvParserTest, ClassifyCFGEdges_SwitchBreak_FromNestedSwitch_IsError) {
|
|||
ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions()) << p->error();
|
||||
FunctionEmitter fe(p, *spirv_function(100));
|
||||
EXPECT_FALSE(FlowClassifyCFGEdges(&fe));
|
||||
EXPECT_THAT(p->error(),
|
||||
EXPECT_THAT(
|
||||
p->error(),
|
||||
Eq("Branch from block 30 to block 99 is an invalid exit from "
|
||||
"construct starting at block 20; branch bypasses merge block 80"));
|
||||
}
|
||||
|
@ -5145,7 +5149,8 @@ TEST_F(SpvParserTest,
|
|||
ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions()) << p->error();
|
||||
FunctionEmitter fe(p, *spirv_function(100));
|
||||
EXPECT_FALSE(FlowClassifyCFGEdges(&fe));
|
||||
EXPECT_THAT(p->error(),
|
||||
EXPECT_THAT(
|
||||
p->error(),
|
||||
Eq("Branch from block 30 to block 99 is an invalid exit from "
|
||||
"construct starting at block 20; branch bypasses merge block 50"));
|
||||
}
|
||||
|
@ -5181,7 +5186,8 @@ TEST_F(SpvParserTest,
|
|||
ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions()) << p->error();
|
||||
FunctionEmitter fe(p, *spirv_function(100));
|
||||
EXPECT_FALSE(FlowClassifyCFGEdges(&fe));
|
||||
EXPECT_THAT(p->error(),
|
||||
EXPECT_THAT(
|
||||
p->error(),
|
||||
Eq("Branch from block 45 to block 99 is an invalid exit from "
|
||||
"construct starting at block 40; branch bypasses merge block 50"));
|
||||
}
|
||||
|
@ -5935,7 +5941,8 @@ TEST_F(SpvParserTest,
|
|||
ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions()) << p->error();
|
||||
FunctionEmitter fe(p, *spirv_function(100));
|
||||
EXPECT_FALSE(FlowClassifyCFGEdges(&fe));
|
||||
EXPECT_THAT(p->error(),
|
||||
EXPECT_THAT(
|
||||
p->error(),
|
||||
Eq("Branch from block 30 to block 60 is an invalid exit from "
|
||||
"construct starting at block 20; branch bypasses continue target 50"));
|
||||
}
|
||||
|
@ -5968,7 +5975,8 @@ TEST_F(SpvParserTest,
|
|||
ASSERT_TRUE(p->BuildAndParseInternalModuleExceptFunctions()) << p->error();
|
||||
FunctionEmitter fe(p, *spirv_function(100));
|
||||
EXPECT_FALSE(FlowClassifyCFGEdges(&fe));
|
||||
EXPECT_THAT(p->error(),
|
||||
EXPECT_THAT(
|
||||
p->error(),
|
||||
Eq("Branch from block 50 to block 60 is an invalid exit from "
|
||||
"construct starting at block 50; branch bypasses merge block 80"));
|
||||
}
|
||||
|
|
|
@ -1231,7 +1231,15 @@ uint32_t Builder::GenerateCastExpression(ast::CastExpression* cast) {
|
|||
op = spv::Op::OpConvertFToS;
|
||||
} else if (from_type->IsF32() && to_type->IsU32()) {
|
||||
op = spv::Op::OpConvertFToU;
|
||||
} else if ((from_type->IsU32() && to_type->IsU32()) ||
|
||||
(from_type->IsI32() && to_type->IsI32()) ||
|
||||
(from_type->IsF32() && to_type->IsF32())) {
|
||||
op = spv::Op::OpCopyObject;
|
||||
} else if ((from_type->IsI32() && to_type->IsU32()) ||
|
||||
(from_type->IsU32() && to_type->IsI32())) {
|
||||
op = spv::Op::OpBitcast;
|
||||
}
|
||||
|
||||
if (op == spv::Op::OpNop) {
|
||||
error_ = "unable to determine conversion type for cast, from: " +
|
||||
from_type->type_name() + " to: " + to_type->type_name();
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
#include "src/ast/scalar_constructor_expression.h"
|
||||
#include "src/ast/type/f32_type.h"
|
||||
#include "src/ast/type/i32_type.h"
|
||||
#include "src/ast/type/u32_type.h"
|
||||
#include "src/ast/uint_literal.h"
|
||||
#include "src/context.h"
|
||||
#include "src/type_determiner.h"
|
||||
#include "src/writer/spirv/builder.h"
|
||||
|
@ -33,9 +35,57 @@ namespace {
|
|||
|
||||
using BuilderTest = testing::Test;
|
||||
|
||||
TEST_F(BuilderTest, DISABLED_Cast_FloatToU32) {}
|
||||
TEST_F(BuilderTest, Cast_FloatToU32) {
|
||||
ast::type::U32Type u32;
|
||||
ast::type::F32Type f32;
|
||||
|
||||
TEST_F(BuilderTest, DISABLED_Cast_FloatToI32) {}
|
||||
ast::CastExpression cast(&u32,
|
||||
std::make_unique<ast::ScalarConstructorExpression>(
|
||||
std::make_unique<ast::FloatLiteral>(&f32, 2.4)));
|
||||
|
||||
Context ctx;
|
||||
ast::Module mod;
|
||||
TypeDeterminer td(&ctx, &mod);
|
||||
ASSERT_TRUE(td.DetermineResultType(&cast)) << td.error();
|
||||
|
||||
Builder b(&mod);
|
||||
b.push_function(Function{});
|
||||
EXPECT_EQ(b.GenerateCastExpression(&cast), 1u);
|
||||
|
||||
EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeInt 32 0
|
||||
%3 = OpTypeFloat 32
|
||||
%4 = OpConstant %3 2.4000001
|
||||
)");
|
||||
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
||||
R"(%1 = OpConvertFToU %2 %4
|
||||
)");
|
||||
}
|
||||
|
||||
TEST_F(BuilderTest, Cast_FloatToI32) {
|
||||
ast::type::I32Type i32;
|
||||
ast::type::F32Type f32;
|
||||
|
||||
ast::CastExpression cast(&i32,
|
||||
std::make_unique<ast::ScalarConstructorExpression>(
|
||||
std::make_unique<ast::FloatLiteral>(&f32, 2.4)));
|
||||
|
||||
Context ctx;
|
||||
ast::Module mod;
|
||||
TypeDeterminer td(&ctx, &mod);
|
||||
ASSERT_TRUE(td.DetermineResultType(&cast)) << td.error();
|
||||
|
||||
Builder b(&mod);
|
||||
b.push_function(Function{});
|
||||
EXPECT_EQ(b.GenerateCastExpression(&cast), 1u);
|
||||
|
||||
EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeInt 32 1
|
||||
%3 = OpTypeFloat 32
|
||||
%4 = OpConstant %3 2.4000001
|
||||
)");
|
||||
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
||||
R"(%1 = OpConvertFToS %2 %4
|
||||
)");
|
||||
}
|
||||
|
||||
TEST_F(BuilderTest, Cast_I32ToFloat) {
|
||||
ast::type::I32Type i32;
|
||||
|
@ -63,7 +113,31 @@ TEST_F(BuilderTest, Cast_I32ToFloat) {
|
|||
)");
|
||||
}
|
||||
|
||||
TEST_F(BuilderTest, DISABLED_Cast_U32ToFloat) {}
|
||||
TEST_F(BuilderTest, Cast_U32ToFloat) {
|
||||
ast::type::U32Type u32;
|
||||
ast::type::F32Type f32;
|
||||
|
||||
ast::CastExpression cast(&f32,
|
||||
std::make_unique<ast::ScalarConstructorExpression>(
|
||||
std::make_unique<ast::UintLiteral>(&u32, 2)));
|
||||
|
||||
Context ctx;
|
||||
ast::Module mod;
|
||||
TypeDeterminer td(&ctx, &mod);
|
||||
ASSERT_TRUE(td.DetermineResultType(&cast)) << td.error();
|
||||
|
||||
Builder b(&mod);
|
||||
b.push_function(Function{});
|
||||
EXPECT_EQ(b.GenerateCastExpression(&cast), 1u);
|
||||
|
||||
EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeFloat 32
|
||||
%3 = OpTypeInt 32 0
|
||||
%4 = OpConstant %3 2
|
||||
)");
|
||||
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
||||
R"(%1 = OpConvertUToF %2 %4
|
||||
)");
|
||||
}
|
||||
|
||||
TEST_F(BuilderTest, Cast_WithLoad) {
|
||||
ast::type::F32Type f32;
|
||||
|
@ -100,9 +174,160 @@ TEST_F(BuilderTest, Cast_WithLoad) {
|
|||
)");
|
||||
}
|
||||
|
||||
TEST_F(BuilderTest, DISABLED_Cast_WithAlias) {}
|
||||
TEST_F(BuilderTest, Cast_WithAlias) {
|
||||
ast::type::I32Type i32;
|
||||
ast::type::F32Type f32;
|
||||
|
||||
// TODO(dsinclair): Are here i32 -> u32 and u32->i32 casts?
|
||||
// type Int = i32
|
||||
// cast<Int>(1.f)
|
||||
|
||||
ast::type::AliasType alias("Int", &i32);
|
||||
|
||||
ast::CastExpression cast(&alias,
|
||||
std::make_unique<ast::ScalarConstructorExpression>(
|
||||
std::make_unique<ast::FloatLiteral>(&f32, 2.3)));
|
||||
|
||||
Context ctx;
|
||||
ast::Module mod;
|
||||
TypeDeterminer td(&ctx, &mod);
|
||||
ASSERT_TRUE(td.DetermineResultType(&cast)) << td.error();
|
||||
|
||||
Builder b(&mod);
|
||||
b.push_function(Function{});
|
||||
EXPECT_EQ(b.GenerateCastExpression(&cast), 1u);
|
||||
|
||||
EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeInt 32 1
|
||||
%3 = OpTypeFloat 32
|
||||
%4 = OpConstant %3 2.29999995
|
||||
)");
|
||||
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
||||
R"(%1 = OpConvertFToS %2 %4
|
||||
)");
|
||||
}
|
||||
|
||||
TEST_F(BuilderTest, Cast_I32ToU32) {
|
||||
ast::type::U32Type u32;
|
||||
ast::type::I32Type i32;
|
||||
|
||||
ast::CastExpression cast(&u32,
|
||||
std::make_unique<ast::ScalarConstructorExpression>(
|
||||
std::make_unique<ast::IntLiteral>(&i32, 2)));
|
||||
|
||||
Context ctx;
|
||||
ast::Module mod;
|
||||
TypeDeterminer td(&ctx, &mod);
|
||||
ASSERT_TRUE(td.DetermineResultType(&cast)) << td.error();
|
||||
|
||||
Builder b(&mod);
|
||||
b.push_function(Function{});
|
||||
EXPECT_EQ(b.GenerateCastExpression(&cast), 1u);
|
||||
|
||||
EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeInt 32 0
|
||||
%3 = OpTypeInt 32 1
|
||||
%4 = OpConstant %3 2
|
||||
)");
|
||||
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
||||
R"(%1 = OpBitcast %2 %4
|
||||
)");
|
||||
}
|
||||
|
||||
TEST_F(BuilderTest, Cast_U32ToI32) {
|
||||
ast::type::U32Type u32;
|
||||
ast::type::I32Type i32;
|
||||
|
||||
ast::CastExpression cast(&i32,
|
||||
std::make_unique<ast::ScalarConstructorExpression>(
|
||||
std::make_unique<ast::UintLiteral>(&u32, 2)));
|
||||
|
||||
Context ctx;
|
||||
ast::Module mod;
|
||||
TypeDeterminer td(&ctx, &mod);
|
||||
ASSERT_TRUE(td.DetermineResultType(&cast)) << td.error();
|
||||
|
||||
Builder b(&mod);
|
||||
b.push_function(Function{});
|
||||
EXPECT_EQ(b.GenerateCastExpression(&cast), 1u);
|
||||
|
||||
EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeInt 32 1
|
||||
%3 = OpTypeInt 32 0
|
||||
%4 = OpConstant %3 2
|
||||
)");
|
||||
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
||||
R"(%1 = OpBitcast %2 %4
|
||||
)");
|
||||
}
|
||||
|
||||
TEST_F(BuilderTest, Cast_I32ToI32) {
|
||||
ast::type::I32Type i32;
|
||||
|
||||
ast::CastExpression cast(&i32,
|
||||
std::make_unique<ast::ScalarConstructorExpression>(
|
||||
std::make_unique<ast::IntLiteral>(&i32, 2)));
|
||||
|
||||
Context ctx;
|
||||
ast::Module mod;
|
||||
TypeDeterminer td(&ctx, &mod);
|
||||
ASSERT_TRUE(td.DetermineResultType(&cast)) << td.error();
|
||||
|
||||
Builder b(&mod);
|
||||
b.push_function(Function{});
|
||||
EXPECT_EQ(b.GenerateCastExpression(&cast), 1u);
|
||||
|
||||
EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeInt 32 1
|
||||
%3 = OpConstant %2 2
|
||||
)");
|
||||
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
||||
R"(%1 = OpCopyObject %2 %3
|
||||
)");
|
||||
}
|
||||
|
||||
TEST_F(BuilderTest, Cast_U32ToU32) {
|
||||
ast::type::U32Type u32;
|
||||
|
||||
ast::CastExpression cast(&u32,
|
||||
std::make_unique<ast::ScalarConstructorExpression>(
|
||||
std::make_unique<ast::UintLiteral>(&u32, 2)));
|
||||
|
||||
Context ctx;
|
||||
ast::Module mod;
|
||||
TypeDeterminer td(&ctx, &mod);
|
||||
ASSERT_TRUE(td.DetermineResultType(&cast)) << td.error();
|
||||
|
||||
Builder b(&mod);
|
||||
b.push_function(Function{});
|
||||
EXPECT_EQ(b.GenerateCastExpression(&cast), 1u);
|
||||
|
||||
EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeInt 32 0
|
||||
%3 = OpConstant %2 2
|
||||
)");
|
||||
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
||||
R"(%1 = OpCopyObject %2 %3
|
||||
)");
|
||||
}
|
||||
|
||||
TEST_F(BuilderTest, Cast_F32ToF32) {
|
||||
ast::type::F32Type f32;
|
||||
|
||||
ast::CastExpression cast(&f32,
|
||||
std::make_unique<ast::ScalarConstructorExpression>(
|
||||
std::make_unique<ast::FloatLiteral>(&f32, 2.0)));
|
||||
|
||||
Context ctx;
|
||||
ast::Module mod;
|
||||
TypeDeterminer td(&ctx, &mod);
|
||||
ASSERT_TRUE(td.DetermineResultType(&cast)) << td.error();
|
||||
|
||||
Builder b(&mod);
|
||||
b.push_function(Function{});
|
||||
EXPECT_EQ(b.GenerateCastExpression(&cast), 1u);
|
||||
|
||||
EXPECT_EQ(DumpInstructions(b.types()), R"(%2 = OpTypeFloat 32
|
||||
%3 = OpConstant %2 2
|
||||
)");
|
||||
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
||||
R"(%1 = OpCopyObject %2 %3
|
||||
)");
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace spirv
|
||||
|
|
Loading…
Reference in New Issue