AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-10-18 11:10:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

linker: Properly remove FuncParamAttr from imported symbols

Browse Source 
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/898
This commit is contained in:
Pierre Moreau 2018-04-04 18:19:43 +02:00 committed by David Neto
parent 082b8b08f1
commit caf7da87e1
2 changed files with 70 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/link/linker.cpp
View File

@ -37,8 +37,8 @@
namespace spvtools {
using ir::IRContext;
using ir::Instruction;
using ir::IRContext;
using ir::Module;
using ir::Operand;
using opt::PassManager;
@ -672,19 +672,13 @@ static spv_result_t RemoveLinkageSpecificInstructions(
for (const auto& linking_entry : linkings_to_do) {
for (const auto parameter_id :
linking_entry.imported_symbol.parameter_ids) {
for (ir::Instruction* decoration :
decoration_manager->GetDecorationsFor(parameter_id, false)) {
switch (decoration->opcode()) {
case SpvOpDecorate:
case SpvOpMemberDecorate:
if (decoration->GetSingleWordInOperand(1u) ==
SpvDecorationFuncParamAttr)
linked_context->KillInst(decoration);
break;
default:
break;
}
}
decoration_manager->RemoveDecorationsFrom(
parameter_id, [](const Instruction& inst) {
return (inst.opcode() == SpvOpDecorate ||
inst.opcode() == SpvOpMemberDecorate) &&
inst.GetSingleWordInOperand(1u) ==
SpvDecorationFuncParamAttr;
});
}
}

62
test/link/matching_imports_to_exports_test.cpp
View File

@ -334,4 +334,66 @@ OpFunctionEnd
EXPECT_EQ(expected_res, res_body);
}
TEST_F(MatchingImportsToExports, UseExportedFuncParamAttr) {
const std::string body1 = R"(
OpCapability Kernel
OpCapability Linkage
OpDecorate %1 LinkageAttributes "foo" Import
OpDecorate %2 FuncParamAttr Zext
%2 = OpDecorationGroup
OpGroupDecorate %2 %3 %4
%5 = OpTypeVoid
%6 = OpTypeInt 32 0
%7 = OpTypeFunction %5 %6
%1 = OpFunction %5 None %7
%3 = OpFunctionParameter %6
OpFunctionEnd
%8 = OpFunction %5 None %7
%4 = OpFunctionParameter %6
OpFunctionEnd
)";
const std::string body2 = R"(
OpCapability Kernel
OpCapability Linkage
OpDecorate %1 LinkageAttributes "foo" Export
OpDecorate %2 FuncParamAttr Sext
%3 = OpTypeVoid
%4 = OpTypeInt 32 0
%5 = OpTypeFunction %3 %4
%1 = OpFunction %3 None %5
%2 = OpFunctionParameter %4
%6 = OpLabel
OpReturn
OpFunctionEnd
)";
spvtest::Binary linked_binary;
EXPECT_EQ(SPV_SUCCESS, AssembleAndLink({body1, body2}, &linked_binary))
<< GetErrorMessage();
const std::string expected_res = R"(OpCapability Kernel
OpModuleProcessed "Linked by SPIR-V Tools Linker"
OpDecorate %1 FuncParamAttr Zext
%1 = OpDecorationGroup
OpGroupDecorate %1 %2
OpDecorate %3 FuncParamAttr Sext
%4 = OpTypeVoid
%5 = OpTypeInt 32 0
%6 = OpTypeFunction %4 %5
%7 = OpFunction %4 None %6
%2 = OpFunctionParameter %5
OpFunctionEnd
%8 = OpFunction %4 None %6
%3 = OpFunctionParameter %5
%9 = OpLabel
OpReturn
OpFunctionEnd
)";
std::string res_body;
SetDisassembleOptions(SPV_BINARY_TO_TEXT_OPTION_NO_HEADER);
EXPECT_EQ(SPV_SUCCESS, Disassemble(linked_binary, &res_body))
<< GetErrorMessage();
EXPECT_EQ(expected_res, res_body);
}
} // anonymous namespace