fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 11:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco: don't split store data if it was already split into more elements

Browse source 
Cc: 20.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6024>
(cherry picked from commit 626081fe4b)
This commit is contained in:
Daniel Schürmann 2020-07-22 18:41:53 +02:00 • committed by Eric Engestrom
parent 797ed40aa7
commit 692df26b7d
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3919,7 +3919,7 @@
"description": "aco: don't split store data if it was already split into more elements",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

15
src/amd/compiler/aco_instruction_selection.cpp
View file

@ -3648,13 +3648,15 @@ void split_store_data(isel_context *ctx, RegType dst_type, unsigned count, Temp
/* use allocated_vec if possible */
auto it = ctx->allocated_vec.find(src.id());
if (it != ctx->allocated_vec.end()) {
unsigned total_size = 0;
for (unsigned i = 0; it->second[i].bytes() && (i < NIR_MAX_VEC_COMPONENTS); i++)
total_size += it->second[i].bytes();
if (total_size != src.bytes())
if (!it->second[0].id())
goto split;
unsigned elem_size = it->second[0].bytes();
assert(src.bytes() % elem_size == 0);
for (unsigned i = 0; i < src.bytes() / elem_size; i++) {
if (!it->second[i].id())
goto split;
}
for (unsigned i = 0; i < count; i++) {
if (offsets[i] % elem_size || dst[i].bytes() % elem_size)
@ -3686,10 +3688,11 @@ void split_store_data(isel_context *ctx, RegType dst_type, unsigned count, Temp
}
}
split:
if (dst_type == RegType::sgpr)
src = bld.as_uniform(src);
split:
/* just split it */
aco_ptr<Instruction> split{create_instruction<Pseudo_instruction>(aco_opcode::p_split_vector, Format::PSEUDO, 1, count)};
split->operands[0] = Operand(src);