openharmony/third_party_spirv-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_spirv-tools synced 2025-02-18 13:59:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix missing OpNoLine layout checks

Browse Source
This commit is contained in:
Umar Arshad 2016-01-18 13:41:52 -05:00
parent e8b1d12c2f
commit 2a790fbc6d
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/validate_layout.cpp
View File

@ -133,7 +133,8 @@ spv_result_t FunctionScopedInstructions(ValidationState_t& _,
}
break;
case SpvOpLine: // ??
case SpvOpLine:
case SpvOpNoLine:
break;
case SpvOpLabel:
// If the label is encountered then the current function is a

1
source/validate_types.cpp
View File

@ -133,6 +133,7 @@ bool IsInstructionInLayoutSection(ModuleLayoutSection layout, SpvOp op) {
case SpvOpSpecConstantOp:
case SpvOpVariable:
case SpvOpLine:
case SpvOpNoLine:
out = true;
break;
default: break;

27
test/Validate.Layout.cpp
View File

@ -116,6 +116,7 @@ const vector<string>& getInstructions() {
// TODO(umar): OpConstant fails because the type is not defined
// TODO(umar): OpGroupMemberDecorate
"OpLine %str 3 4",
"OpNoLine",
"%func = OpFunction %voidt None %vfunct",
"OpFunctionEnd",
"%func2 = OpFunction %voidt None %viifunct",
@ -152,18 +153,20 @@ INSTANTIATE_TEST_CASE_P(InstructionsOrder,
, make_tuple(string("OpMemberDecorate ") , Range<12, 15>() , All)
, make_tuple(string("OpGroupDecorate ") , Range<12, 15>() , All)
, make_tuple(string("OpDecorationGroup") , Range<12, 15>() , All)
, make_tuple(string("OpTypeBool") , Range<16, 28>() , All)
, make_tuple(string("OpTypeVoid") , Range<16, 28>() , All)
, make_tuple(string("OpTypeFloat") , Range<16, 28>() , All)
, make_tuple(string("OpTypeInt") , Range<16, 28>() , static_cast<pred_type>(Range<0, 25>()))
, make_tuple(string("OpTypeVector %intt 4") , Range<16, 28>() , All)
, make_tuple(string("OpTypeMatrix %vec4 4") , Range<16, 28>() , All)
, make_tuple(string("OpTypeStruct") , Range<16, 28>() , All)
, make_tuple(string("%vfunct = OpTypeFunction"), Range<16, 28>() , All)
, make_tuple(string("OpConstant") , Range<19, 28>() , static_cast<pred_type>(Range<19, kRangeEnd>()))
, make_tuple(string("OpLabel") , Equals<34> , All)
, make_tuple(string("OpNop") , Equals<35> , All)
, make_tuple(string("OpReturn") , Equals<36> , All)
, make_tuple(string("OpTypeBool") , Range<16, 29>() , All)
, make_tuple(string("OpTypeVoid") , Range<16, 29>() , All)
, make_tuple(string("OpTypeFloat") , Range<16, 29>() , All)
, make_tuple(string("OpTypeInt") , Range<16, 29>() , static_cast<pred_type>(Range<0, 25>()))
, make_tuple(string("OpTypeVector %intt 4") , Range<16, 29>() , All)
, make_tuple(string("OpTypeMatrix %vec4 4") , Range<16, 29>() , All)
, make_tuple(string("OpTypeStruct") , Range<16, 29>() , All)
, make_tuple(string("%vfunct = OpTypeFunction"), Range<16,29>() , All)
, make_tuple(string("OpConstant") , Range<19, 29>() , static_cast<pred_type>(Range<19, kRangeEnd>()))
, make_tuple(string("OpLine ") , Range<16, kRangeEnd>() , All)
, make_tuple(string("OpNoLine") , Range<16, kRangeEnd>() , All)
, make_tuple(string("OpLabel") , Equals<35> , All)
, make_tuple(string("OpNop") , Equals<36> , All)
, make_tuple(string("OpReturn") , Equals<37> , All)
)));
// clang-format on