AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-12-24 16:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

linker: Address conversion error introduced in earlier rework (#4685)

Browse Source 
* linker: Address conversion error introduced in earlier rework

Also rework the code slightly to first compute the new ID bound and
validate it, and only then, offset all existing IDs.

This makes those two steps clearer, and avoids potentially overflowing
the IDs within a module (even if that would have been caught later on).

Fixes: c3849565 ("Linker improvements (#4679)")
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/4684

* test/linker: Disable IdsLimit tests for now

They are taking too long to run and results in the CI jobs timing out.
This commit is contained in:
Pierre Moreau 2022-01-24 19:40:57 +01:00 committed by GitHub
parent c38495656d
commit 58d8b4e29c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/link/linker.cpp
View File

@ -19,6 +19,7 @@
#include <cstring>
#include <iostream>
#include <memory>
#include <numeric>
#include <string>
#include <unordered_map>
#include <unordered_set>
@ -169,19 +170,11 @@ spv_result_t ShiftIdsInModules(const MessageConsumer& consumer,
return DiagnosticStream(position, consumer, "", SPV_ERROR_INVALID_DATA)
<< "|max_id_bound| of ShiftIdsInModules should not be null.";
size_t id_bound = modules->front()->IdBound() - 1u;
for (auto module_iter = modules->begin() + 1; module_iter != modules->end();
++module_iter) {
Module* module = *module_iter;
module->ForEachInst([&id_bound](Instruction* insn) {
insn->ForEachId([&id_bound](uint32_t* id) { *id += id_bound; });
});
id_bound += module->IdBound() - 1u;
// Invalidate the DefUseManager
module->context()->InvalidateAnalyses(opt::IRContext::kAnalysisDefUse);
}
++id_bound;
const size_t id_bound =
std::accumulate(modules->begin(), modules->end(), static_cast<size_t>(1),
[](const size_t& accumulation, opt::Module* module) {
return accumulation + module->IdBound() - 1u;
});
if (id_bound > std::numeric_limits<uint32_t>::max())
return DiagnosticStream(position, consumer, "", SPV_ERROR_INVALID_DATA)
<< "Too many IDs (" << id_bound
@ -190,6 +183,19 @@ spv_result_t ShiftIdsInModules(const MessageConsumer& consumer,
*max_id_bound = static_cast<uint32_t>(id_bound);
uint32_t id_offset = modules->front()->IdBound() - 1u;
for (auto module_iter = modules->begin() + 1; module_iter != modules->end();
++module_iter) {
Module* module = *module_iter;
module->ForEachInst([&id_offset](Instruction* insn) {
insn->ForEachId([&id_offset](uint32_t* id) { *id += id_offset; });
});
id_offset += module->IdBound() - 1u;
// Invalidate the DefUseManager
module->context()->InvalidateAnalyses(opt::IRContext::kAnalysisDefUse);
}
return SPV_SUCCESS;
}

6
test/link/ids_limit_test.cpp
View File

@ -92,14 +92,14 @@ spvtest::Binary CreateBinary(uint32_t id_bound) {
};
}
TEST_F(IdsLimit, UnderLimit) {
TEST_F(IdsLimit, DISABLED_UnderLimit) {
spvtest::Binary linked_binary;
ASSERT_EQ(SPV_SUCCESS, Link(binaries, &linked_binary)) << GetErrorMessage();
EXPECT_THAT(GetErrorMessage(), std::string());
EXPECT_EQ(0x3FFFFFu, linked_binary[3]);
}
TEST_F(IdsLimit, OverLimit) {
TEST_F(IdsLimit, DISABLED_OverLimit) {
spvtest::Binary& binary = binaries.back();
const uint32_t id_bound = binary[3];
@ -118,7 +118,7 @@ TEST_F(IdsLimit, OverLimit) {
EXPECT_EQ(0x400000u, linked_binary[3]);
}
TEST_F(IdsLimit, Overflow) {
TEST_F(IdsLimit, DISABLED_Overflow) {
spvtest::Binaries binaries = {CreateBinary(0xFFFFFFFFu),
CreateBinary(0x00000002u)};