encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-07 23:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[spirv-reader] Rename "rspo" to block_order

Browse Source 
Bug: tint:3
Change-Id: I2d7e817fd30da98dc20da1be083be7e3cc5dcd89
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/20147
Reviewed-by: dan sinclair <dsinclair@google.com>
This commit is contained in:
David Neto 2020-04-22 00:27:31 +00:00 committed by dan sinclair
parent 1933185510
commit aa257c068f
3 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/reader/spirv/function.cc
View File

@ -323,10 +323,10 @@ void FunctionEmitter::ComputeBlockOrderAndPositions() {
block_info_[block.id()] = std::make_unique<BlockInfo>(block); block_info_[block.id()] = std::make_unique<BlockInfo>(block);
} }
rspo_ = StructuredTraverser(function_).ReverseStructuredPostOrder(); block_order_ = StructuredTraverser(function_).ReverseStructuredPostOrder();
for (uint32_t i = 0; i < rspo_.size(); ++i) { for (uint32_t i = 0; i < block_order_.size(); ++i) {
GetBlockInfo(rspo_[i])->pos = i; GetBlockInfo(block_order_[i])->pos = i;
} }
} }

6
src/reader/spirv/function.h
View File

@ -91,12 +91,12 @@ class FunctionEmitter {
bool EmitBody(); bool EmitBody();
/// Determines the output order for the basic blocks in the function. /// Determines the output order for the basic blocks in the function.
/// Populates |rspo_| and the |pos| block info member. /// Populates |block_order_| and the |pos| block info member.
void ComputeBlockOrderAndPositions(); void ComputeBlockOrderAndPositions();
/// @returns the reverse structured post order of the basic blocks in /// @returns the reverse structured post order of the basic blocks in
/// the function. /// the function.
const std::vector<uint32_t>& rspo() const { return rspo_; } const std::vector<uint32_t>& block_order() const { return block_order_; }
/// Emits declarations of function variables. /// Emits declarations of function variables.
/// @returns false if emission failed. /// @returns false if emission failed.
@ -174,7 +174,7 @@ class FunctionEmitter {
// The IDs of basic blocks, in reverse structured post-order (RSPO). // The IDs of basic blocks, in reverse structured post-order (RSPO).
// This is the output order for the basic blocks. // This is the output order for the basic blocks.
std::vector<uint32_t> rspo_; std::vector<uint32_t> block_order_;
// Mapping from block ID to its bookkeeping info. // Mapping from block ID to its bookkeeping info.
std::unordered_map<uint32_t, std::unique_ptr<BlockInfo>> block_info_; std::unordered_map<uint32_t, std::unique_ptr<BlockInfo>> block_info_;

116
src/reader/spirv/function_cfg_test.cc
View File

@ -59,7 +59,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_OneBlock) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(42)); EXPECT_THAT(fe.block_order(), ElementsAre(42));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_IgnoreStaticalyUnreachable) { TEST_F(SpvParserTest, ComputeBlockOrder_IgnoreStaticalyUnreachable) {
@ -81,7 +81,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_IgnoreStaticalyUnreachable) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_KillIsDeadEnd) { TEST_F(SpvParserTest, ComputeBlockOrder_KillIsDeadEnd) {
@ -103,7 +103,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_KillIsDeadEnd) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_UnreachableIsDeadEnd) { TEST_F(SpvParserTest, ComputeBlockOrder_UnreachableIsDeadEnd) {
@ -125,7 +125,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_UnreachableIsDeadEnd) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_ReorderSequence) { TEST_F(SpvParserTest, ComputeBlockOrder_ReorderSequence) {
@ -147,7 +147,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_ReorderSequence) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_DupConditionalBranch) { TEST_F(SpvParserTest, ComputeBlockOrder_DupConditionalBranch) {
@ -170,7 +170,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_DupConditionalBranch) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_RespectConditionalBranchOrder) { TEST_F(SpvParserTest, ComputeBlockOrder_RespectConditionalBranchOrder) {
@ -196,7 +196,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_RespectConditionalBranchOrder) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_TrueOnlyBranch) { TEST_F(SpvParserTest, ComputeBlockOrder_TrueOnlyBranch) {
@ -219,7 +219,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_TrueOnlyBranch) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_FalseOnlyBranch) { TEST_F(SpvParserTest, ComputeBlockOrder_FalseOnlyBranch) {
@ -242,7 +242,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_FalseOnlyBranch) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_SwitchOrderNaturallyReversed) { TEST_F(SpvParserTest, ComputeBlockOrder_SwitchOrderNaturallyReversed) {
@ -268,7 +268,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_SwitchOrderNaturallyReversed) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 30, 20, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 30, 20, 99));
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -298,7 +298,7 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 30, 20, 80, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 30, 20, 80, 99));
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -328,7 +328,7 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 40, 20, 30, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 40, 20, 30, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_RespectSwitchCaseFallthrough) { TEST_F(SpvParserTest, ComputeBlockOrder_RespectSwitchCaseFallthrough) {
@ -361,7 +361,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_RespectSwitchCaseFallthrough) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 30, 50, 20, 40, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 30, 50, 20, 40, 99))
<< assembly;
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -395,7 +396,8 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 80, 30, 40, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 80, 30, 40, 99))
<< assembly;
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -426,7 +428,7 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 80, 30, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 80, 30, 99)) << assembly;
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -462,7 +464,8 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 50, 40, 20, 30, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 50, 40, 20, 30, 99))
<< assembly;
} }
TEST_F(SpvParserTest, TEST_F(SpvParserTest,
@ -502,7 +505,7 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 30, 50, 70, 20, 40, 60, 99)) EXPECT_THAT(fe.block_order(), ElementsAre(10, 30, 50, 70, 20, 40, 60, 99))
<< assembly; << assembly;
} }
@ -551,7 +554,8 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 40, 49, 50, 60, 70, 79, 99)) EXPECT_THAT(fe.block_order(),
ElementsAre(10, 20, 30, 40, 49, 50, 60, 70, 79, 99))
<< assembly; << assembly;
} }
@ -600,7 +604,8 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 40, 49, 50, 60, 70, 79, 99)) EXPECT_THAT(fe.block_order(),
ElementsAre(10, 20, 30, 40, 49, 50, 60, 70, 79, 99))
<< assembly; << assembly;
} }
@ -649,7 +654,8 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 40, 49, 50, 60, 70, 79, 99)) EXPECT_THAT(fe.block_order(),
ElementsAre(10, 20, 30, 40, 49, 50, 60, 70, 79, 99))
<< assembly; << assembly;
} }
@ -692,7 +698,7 @@ TEST_F(SpvParserTest,
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 40, 49, 50, 60, 79, 99)) EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 40, 49, 50, 60, 79, 99))
<< assembly; << assembly;
} }
@ -716,7 +722,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_SingleBlock_Simple) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 99)) << assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_SingleBlock_Infinite) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_SingleBlock_Infinite) {
@ -739,7 +745,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_SingleBlock_Infinite) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 99)) << assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_SingleBlock_DupInfinite) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_SingleBlock_DupInfinite) {
@ -762,7 +768,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_SingleBlock_DupInfinite) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 99)) << assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_HeaderHasBreakIf) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_HeaderHasBreakIf) {
@ -790,7 +796,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_HeaderHasBreakIf) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 50, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 99)) << assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_HeaderHasBreakUnless) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_HeaderHasBreakUnless) {
@ -818,7 +824,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_HeaderHasBreakUnless) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 50, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 99)) << assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasBreak) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasBreak) {
@ -846,7 +852,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasBreak) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 50, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 99)) << assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasBreakIf) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasBreakIf) {
@ -877,7 +883,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasBreakIf) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 40, 50, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 40, 50, 99))
<< assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasBreakUnless) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasBreakUnless) {
@ -908,7 +915,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasBreakUnless) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 40, 50, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 40, 50, 99))
<< assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_If) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_If) {
@ -946,7 +954,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_If) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 40, 45, 49, 50, 99)) EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 40, 45, 49, 50, 99))
<< assembly; << assembly;
} }
@ -982,7 +990,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_If_Break) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 40, 49, 50, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 40, 49, 50, 99))
<< assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasContinueIf) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasContinueIf) {
@ -1013,7 +1022,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasContinueIf) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 40, 50, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 40, 50, 99))
<< assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasContinueUnless) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasContinueUnless) {
@ -1044,7 +1054,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasContinueUnless) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 40, 50, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 40, 50, 99))
<< assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_If_Continue) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_If_Continue) {
@ -1079,7 +1090,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_If_Continue) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 40, 49, 50, 99)) << assembly; EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 40, 49, 50, 99))
<< assembly;
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_Switch) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_Switch) {
@ -1117,7 +1129,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_Switch) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 45, 40, 49, 50, 99)) EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 45, 40, 49, 50, 99))
<< assembly; << assembly;
} }
@ -1158,7 +1170,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_Switch_CaseBreaks) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 45, 40, 49, 50, 99)) EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 45, 40, 49, 50, 99))
<< assembly; << assembly;
} }
@ -1197,7 +1209,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Body_Switch_CaseContinues) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 45, 40, 49, 50, 99)) EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 45, 40, 49, 50, 99))
<< assembly; << assembly;
} }
@ -1229,7 +1241,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_BodyHasSwitchContinueBreak) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 50, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_Sequence) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_Sequence) {
@ -1260,7 +1272,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_Sequence) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 50, 60, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 60, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_ContainsIf) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_ContainsIf) {
@ -1298,7 +1310,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_ContainsIf) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 50, 60, 70, 89, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 60, 70, 89, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_HasBreakIf) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_HasBreakIf) {
@ -1326,7 +1338,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_HasBreakIf) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 50, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_HasBreakUnless) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_HasBreakUnless) {
@ -1354,7 +1366,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_HasBreakUnless) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 50, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_SwitchBreak) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_SwitchBreak) {
@ -1382,7 +1394,7 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Continue_SwitchBreak) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 50, 99)); EXPECT_THAT(fe.block_order(), ElementsAre(10, 20, 30, 50, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop) {
@ -1423,7 +1435,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99)); EXPECT_THAT(fe.block_order(),
ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerBreak) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerBreak) {
@ -1464,7 +1477,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerBreak) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99)); EXPECT_THAT(fe.block_order(),
ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerContinue) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerContinue) {
@ -1505,7 +1519,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerContinue) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99)); EXPECT_THAT(fe.block_order(),
ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerContinueBreaks) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerContinueBreaks) {
@ -1546,7 +1561,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerContinueBreaks) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99)); EXPECT_THAT(fe.block_order(),
ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerContinueContinues) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerContinueContinues) {
@ -1587,7 +1603,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_InnerContinueContinues) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99)); EXPECT_THAT(fe.block_order(),
ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99));
} }
TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_SwitchBackedgeBreakContinue) { TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_SwitchBackedgeBreakContinue) {
@ -1633,7 +1650,8 @@ TEST_F(SpvParserTest, ComputeBlockOrder_Loop_Loop_SwitchBackedgeBreakContinue) {
FunctionEmitter fe(p, *spirv_function(100)); FunctionEmitter fe(p, *spirv_function(100));
fe.ComputeBlockOrderAndPositions(); fe.ComputeBlockOrderAndPositions();
EXPECT_THAT(fe.rspo(), ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99)); EXPECT_THAT(fe.block_order(),
ElementsAre(10, 20, 30, 35, 37, 40, 49, 50, 99));
} }
} // namespace } // namespace