rui314/mold
1
1
Fork 0
mirror of https://github.com/rui314/mold.git synced 2024-11-11 05:46:58 +03:00
Code Issues Projects Releases Wiki Activity

Revert "wip"

Browse Source 
This reverts commit fe9d2dd365.
This commit is contained in:
Rui Ueyama 2021-04-17 22:14:15 +09:00
parent c16b792e14
commit ad85fbd02b
3 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
passes.cc
View File

@ -4,8 +4,6 @@
#include <map> #include <map>
#include <tbb/parallel_do.h> #include <tbb/parallel_do.h>
#include <tbb/parallel_for_each.h> #include <tbb/parallel_for_each.h>
#include <tbb/parallel_scan.h>
#include <tbb/partitioner.h>
#include <unordered_set> #include <unordered_set>
template <typename E> template <typename E>
@ -344,35 +342,40 @@ void compute_section_sizes(Context<E> &ctx) {
if (osec->members.empty()) if (osec->members.empty())
return; return;
struct T { std::vector<std::span<InputSection<E> *>> slices =
i64 offset; split(osec->members, 10000);
i64 align;
};
T sum = tbb::parallel_scan( std::vector<i64> size(slices.size());
tbb::blocked_range<i64>(0, osec->members.size(), 10000), std::vector<i64> alignments(slices.size());
T{0, 1},
[&](const tbb::blocked_range<i64> &r, T sum, bool is_final) {
for (i64 i = r.begin(); i < r.end(); i++) {
InputSection<E> &isec = *osec->members[i];
if (is_final)
isec.offset = sum.offset;
sum.offset = align_to(sum.offset, isec.shdr.sh_addralign) + tbb::parallel_for((i64)0, (i64)slices.size(), [&](i64 i) {
isec.shdr.sh_size; i64 off = 0;
sum.align = std::max<i64>(sum.align, isec.shdr.sh_addralign); i64 align = 1;
}
return sum;
},
[](T lhs, T rhs) {
i64 offset = align_to(lhs.offset, rhs.align) + rhs.offset;
i64 align = std::max(lhs.align, rhs.align);
return T{offset, align};
},
tbb::simple_partitioner());
osec->shdr.sh_size = sum.offset; for (InputSection<E> *isec : slices[i]) {
osec->shdr.sh_addralign = sum.align; off = align_to(off, isec->shdr.sh_addralign);
isec->offset = off;
off += isec->shdr.sh_size;
align = std::max<i64>(align, isec->shdr.sh_addralign);
}
size[i] = off;
alignments[i] = align;
});
i64 align = *std::max_element(alignments.begin(), alignments.end());
std::vector<i64> start(slices.size());
for (i64 i = 1; i < slices.size(); i++)
start[i] = align_to(start[i - 1] + size[i - 1], align);
tbb::parallel_for((i64)1, (i64)slices.size(), [&](i64 i) {
for (InputSection<E> *isec : slices[i])
isec->offset += start[i];
});
osec->shdr.sh_size = start.back() + size.back();
osec->shdr.sh_addralign = align;
}); });
} }

3
perf.cc
View File

@ -90,8 +90,7 @@ static void print_rec(TimerRecord &rec, i64 indent) {
template <typename E> template <typename E>
void Timer<E>::print(Context<E> &ctx) { void Timer<E>::print(Context<E> &ctx) {
tbb::concurrent_vector<std::unique_ptr<TimerRecord>> &records = tbb::concurrent_vector<std::unique_ptr<TimerRecord>> &records = ctx.timer_records;
ctx.timer_records;
for (i64 i = records.size() - 1; i >= 0; i--) for (i64 i = records.size() - 1; i >= 0; i--)
records[i]->stop(); records[i]->stop();

8
test/dt_init.sh
View File

@ -26,9 +26,9 @@ grep -Pq '0000000000233000\s+0 FUNC GLOBAL HIDDEN \d+ _fini$' $t/log
clang -fuse-ld=`pwd`/../mold -o $t/exe $t/a.o -Wl,-init,init -Wl,-fini,fini clang -fuse-ld=`pwd`/../mold -o $t/exe $t/a.o -Wl,-init,init -Wl,-fini,fini
readelf -a $t/exe > $t/log readelf -a $t/exe > $t/log
grep -Pq '\(INIT\)\s+0x233117' $t/log grep -Pq '\(INIT\)\s+0x233119' $t/log
grep -Pq '\(FINI\)\s+0x233118' $t/log grep -Pq '\(FINI\)\s+0x23311a' $t/log
grep -Pq '0000000000233117\s+0 NOTYPE GLOBAL DEFAULT \d+ init$' $t/log grep -Pq '0000000000233119\s+0 NOTYPE GLOBAL DEFAULT \d+ init$' $t/log
grep -Pq '0000000000233118\s+0 NOTYPE GLOBAL DEFAULT \d+ fini$' $t/log grep -Pq '000000000023311a\s+0 NOTYPE GLOBAL DEFAULT \d+ fini$' $t/log
echo OK echo OK