2019-09-17 13:22:17 +02:00
|
|
|
/*
|
|
|
|
|
* Copyright © 2019 Valve Corporation
|
|
|
|
|
*
|
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
|
*
|
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
|
* Software.
|
|
|
|
|
*
|
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
|
|
|
* IN THE SOFTWARE.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include "aco_builder.h"
|
2021-06-09 15:40:03 +02:00
|
|
|
#include "aco_ir.h"
|
2021-06-09 10:14:54 +02:00
|
|
|
|
2019-10-14 17:46:02 +01:00
|
|
|
#include "util/u_math.h"
|
2019-09-17 13:22:17 +02:00
|
|
|
|
2021-06-09 15:40:03 +02:00
|
|
|
#include <set>
|
|
|
|
|
#include <vector>
|
|
|
|
|
|
2019-09-17 13:22:17 +02:00
|
|
|
namespace aco {
|
|
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
|
|
enum WQMState : uint8_t {
|
|
|
|
|
Unspecified = 0,
|
|
|
|
|
Exact = 1 << 0,
|
|
|
|
|
WQM = 1 << 1, /* with control flow applied */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
enum mask_type : uint8_t {
|
|
|
|
|
mask_type_global = 1 << 0,
|
|
|
|
|
mask_type_exact = 1 << 1,
|
|
|
|
|
mask_type_wqm = 1 << 2,
|
|
|
|
|
mask_type_loop = 1 << 3, /* active lanes of a loop */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct loop_info {
|
|
|
|
|
Block* loop_header;
|
|
|
|
|
uint16_t num_exec_masks;
|
|
|
|
|
bool has_divergent_break;
|
|
|
|
|
bool has_divergent_continue;
|
2019-09-26 10:33:43 +01:00
|
|
|
bool has_discard; /* has a discard or demote */
|
2022-02-07 18:56:11 +01:00
|
|
|
loop_info(Block* b, uint16_t num, bool breaks, bool cont, bool discard)
|
|
|
|
|
: loop_header(b), num_exec_masks(num), has_divergent_break(breaks),
|
2019-09-17 13:22:17 +02:00
|
|
|
has_divergent_continue(cont), has_discard(discard)
|
|
|
|
|
{}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct block_info {
|
2021-05-07 15:02:58 +02:00
|
|
|
std::vector<std::pair<Operand, uint8_t>>
|
|
|
|
|
exec; /* Vector of exec masks. Either a temporary or const -1. */
|
2019-09-17 13:22:17 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct exec_ctx {
|
|
|
|
|
Program* program;
|
|
|
|
|
std::vector<block_info> info;
|
|
|
|
|
std::vector<loop_info> loop;
|
|
|
|
|
bool handle_wqm = false;
|
2020-11-03 14:40:05 +01:00
|
|
|
exec_ctx(Program* program_) : program(program_), info(program->blocks.size()) {}
|
2019-09-17 13:22:17 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
bool
|
|
|
|
|
needs_exact(aco_ptr<Instruction>& instr)
|
|
|
|
|
{
|
2021-01-20 15:27:16 +00:00
|
|
|
if (instr->isMUBUF()) {
|
2021-01-21 16:13:34 +00:00
|
|
|
return instr->mubuf().disable_wqm;
|
2021-01-20 15:27:16 +00:00
|
|
|
} else if (instr->isMTBUF()) {
|
2021-01-21 16:13:34 +00:00
|
|
|
return instr->mtbuf().disable_wqm;
|
2021-01-20 15:27:16 +00:00
|
|
|
} else if (instr->isMIMG()) {
|
2021-01-21 16:13:34 +00:00
|
|
|
return instr->mimg().disable_wqm;
|
2021-01-20 15:27:16 +00:00
|
|
|
} else if (instr->isFlatLike()) {
|
2021-01-21 16:13:34 +00:00
|
|
|
return instr->flatlike().disable_wqm;
|
2019-09-17 13:22:17 +02:00
|
|
|
} else {
|
2022-07-18 10:10:26 +02:00
|
|
|
/* Require Exact for p_jump_to_epilog because if p_exit_early_if is
|
|
|
|
|
* emitted inside the same block, the main FS will always jump to the PS
|
|
|
|
|
* epilog without considering the exec mask.
|
|
|
|
|
*/
|
2022-11-16 15:18:54 +01:00
|
|
|
return instr->isEXP() || instr->opcode == aco_opcode::p_jump_to_epilog ||
|
2023-08-25 14:25:20 +08:00
|
|
|
instr->opcode == aco_opcode::p_dual_src_export_gfx11;
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-04 10:07:27 +02:00
|
|
|
WQMState
|
|
|
|
|
get_instr_needs(aco_ptr<Instruction>& instr)
|
2019-09-17 13:22:17 +02:00
|
|
|
{
|
2023-09-04 10:07:27 +02:00
|
|
|
if (needs_exact(instr))
|
|
|
|
|
return Exact;
|
2022-01-27 13:25:55 +01:00
|
|
|
|
2023-09-04 10:07:27 +02:00
|
|
|
bool pred_by_exec = needs_exec_mask(instr.get()) || instr->opcode == aco_opcode::p_logical_end ||
|
|
|
|
|
instr->isBranch();
|
2019-09-17 13:22:17 +02:00
|
|
|
|
2023-09-04 10:07:27 +02:00
|
|
|
return pred_by_exec ? WQM : Unspecified;
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
|
2021-05-06 15:20:40 +02:00
|
|
|
Operand
|
|
|
|
|
get_exec_op(Operand t)
|
2021-02-15 11:24:22 +00:00
|
|
|
{
|
2021-05-06 15:20:40 +02:00
|
|
|
if (t.isUndefined())
|
2021-02-15 11:24:22 +00:00
|
|
|
return Operand(exec, t.regClass());
|
|
|
|
|
else
|
2021-05-06 15:20:40 +02:00
|
|
|
return t;
|
2021-02-15 11:24:22 +00:00
|
|
|
}
|
|
|
|
|
|
2019-09-17 13:22:17 +02:00
|
|
|
void
|
|
|
|
|
transition_to_WQM(exec_ctx& ctx, Builder bld, unsigned idx)
|
|
|
|
|
{
|
|
|
|
|
if (ctx.info[idx].exec.back().second & mask_type_wqm)
|
|
|
|
|
return;
|
|
|
|
|
if (ctx.info[idx].exec.back().second & mask_type_global) {
|
2021-05-06 15:20:40 +02:00
|
|
|
Operand exec_mask = ctx.info[idx].exec.back().first;
|
|
|
|
|
if (exec_mask.isUndefined()) {
|
2022-02-07 18:56:11 +01:00
|
|
|
exec_mask = bld.copy(bld.def(bld.lm), Operand(exec, bld.lm));
|
2021-02-15 11:24:22 +00:00
|
|
|
ctx.info[idx].exec.back().first = exec_mask;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
exec_mask = bld.sop1(Builder::s_wqm, Definition(exec, bld.lm), bld.def(s1, scc),
|
|
|
|
|
get_exec_op(exec_mask));
|
2019-09-17 13:22:17 +02:00
|
|
|
ctx.info[idx].exec.emplace_back(exec_mask, mask_type_global | mask_type_wqm);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
/* otherwise, the WQM mask should be one below the current mask */
|
|
|
|
|
ctx.info[idx].exec.pop_back();
|
|
|
|
|
assert(ctx.info[idx].exec.back().second & mask_type_wqm);
|
2019-11-27 11:04:47 +01:00
|
|
|
assert(ctx.info[idx].exec.back().first.size() == bld.lm.size());
|
2021-05-06 15:20:40 +02:00
|
|
|
assert(ctx.info[idx].exec.back().first.isTemp());
|
2022-02-07 18:56:11 +01:00
|
|
|
ctx.info[idx].exec.back().first =
|
|
|
|
|
bld.copy(Definition(exec, bld.lm), ctx.info[idx].exec.back().first);
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
transition_to_Exact(exec_ctx& ctx, Builder bld, unsigned idx)
|
|
|
|
|
{
|
|
|
|
|
if (ctx.info[idx].exec.back().second & mask_type_exact)
|
|
|
|
|
return;
|
2019-09-26 15:38:09 +01:00
|
|
|
/* We can't remove the loop exec mask, because that can cause exec.size() to
|
|
|
|
|
* be less than num_exec_masks. The loop exec mask also needs to be kept
|
|
|
|
|
* around for various uses. */
|
|
|
|
|
if ((ctx.info[idx].exec.back().second & mask_type_global) &&
|
|
|
|
|
!(ctx.info[idx].exec.back().second & mask_type_loop)) {
|
2019-09-17 13:22:17 +02:00
|
|
|
ctx.info[idx].exec.pop_back();
|
|
|
|
|
assert(ctx.info[idx].exec.back().second & mask_type_exact);
|
2019-11-27 11:04:47 +01:00
|
|
|
assert(ctx.info[idx].exec.back().first.size() == bld.lm.size());
|
2021-05-06 15:20:40 +02:00
|
|
|
assert(ctx.info[idx].exec.back().first.isTemp());
|
2022-02-07 18:56:11 +01:00
|
|
|
ctx.info[idx].exec.back().first =
|
|
|
|
|
bld.copy(Definition(exec, bld.lm), ctx.info[idx].exec.back().first);
|
2019-09-17 13:22:17 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
/* otherwise, we create an exact mask and push to the stack */
|
2021-05-06 15:20:40 +02:00
|
|
|
Operand wqm = ctx.info[idx].exec.back().first;
|
|
|
|
|
if (wqm.isUndefined()) {
|
2021-02-15 11:24:22 +00:00
|
|
|
wqm = bld.sop1(Builder::s_and_saveexec, bld.def(bld.lm), bld.def(s1, scc),
|
|
|
|
|
Definition(exec, bld.lm), ctx.info[idx].exec[0].first, Operand(exec, bld.lm));
|
|
|
|
|
} else {
|
|
|
|
|
bld.sop2(Builder::s_and, Definition(exec, bld.lm), bld.def(s1, scc),
|
|
|
|
|
ctx.info[idx].exec[0].first, wqm);
|
|
|
|
|
}
|
2021-05-06 15:20:40 +02:00
|
|
|
ctx.info[idx].exec.back().first = Operand(wqm);
|
|
|
|
|
ctx.info[idx].exec.emplace_back(Operand(bld.lm), mask_type_exact);
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
}
|
|
|
|
|
|
2019-09-17 13:22:17 +02:00
|
|
|
unsigned
|
|
|
|
|
add_coupling_code(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instruction>>& instructions)
|
|
|
|
|
{
|
|
|
|
|
unsigned idx = block->index;
|
|
|
|
|
Builder bld(ctx.program, &instructions);
|
|
|
|
|
std::vector<unsigned>& preds = block->linear_preds;
|
2024-01-08 15:12:17 +01:00
|
|
|
bool restore_exec = false;
|
2019-09-17 13:22:17 +02:00
|
|
|
|
|
|
|
|
/* start block */
|
2023-01-19 17:36:06 +01:00
|
|
|
if (preds.empty()) {
|
2019-09-17 13:22:17 +02:00
|
|
|
aco_ptr<Instruction>& startpgm = block->instructions[0];
|
|
|
|
|
assert(startpgm->opcode == aco_opcode::p_startpgm);
|
|
|
|
|
bld.insert(std::move(startpgm));
|
|
|
|
|
|
2022-05-19 14:12:08 +01:00
|
|
|
unsigned count = 1;
|
|
|
|
|
if (block->instructions[1]->opcode == aco_opcode::p_init_scratch) {
|
|
|
|
|
bld.insert(std::move(block->instructions[1]));
|
|
|
|
|
count++;
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-07 15:02:58 +02:00
|
|
|
Operand start_exec(bld.lm);
|
|
|
|
|
|
2019-10-14 17:46:02 +01:00
|
|
|
/* exec seems to need to be manually initialized with combined shaders */
|
2023-05-13 17:55:54 +02:00
|
|
|
if (ctx.program->stage.num_sw_stages() > 1 ||
|
2023-08-21 15:50:23 +02:00
|
|
|
ctx.program->stage.hw == AC_HW_NEXT_GEN_GEOMETRY_SHADER ||
|
2023-08-24 09:41:55 +02:00
|
|
|
(ctx.program->stage.sw == SWStage::VS &&
|
|
|
|
|
(ctx.program->stage.hw == AC_HW_HULL_SHADER ||
|
|
|
|
|
ctx.program->stage.hw == AC_HW_LEGACY_GEOMETRY_SHADER)) ||
|
|
|
|
|
(ctx.program->stage.sw == SWStage::TES &&
|
|
|
|
|
ctx.program->stage.hw == AC_HW_LEGACY_GEOMETRY_SHADER)) {
|
2021-07-13 11:22:46 +02:00
|
|
|
start_exec = Operand::c32_or_c64(-1u, bld.lm == s2);
|
2021-05-07 15:02:58 +02:00
|
|
|
bld.copy(Definition(exec, bld.lm), start_exec);
|
2019-10-14 17:46:02 +01:00
|
|
|
}
|
|
|
|
|
|
aco: Enable constant exec mask based optimization on compute shaders.
We know for sure exec is initially -1 when the shader always has full subgroups.
Fossil DB stats on GFX11:
Totals from 3884 (2.88% of 134913) affected shaders:
SpillSGPRs: 1673 -> 1697 (+1.43%); split: -1.67%, +3.11%
SpillVGPRs: 2316 -> 2310 (-0.26%); split: -0.65%, +0.39%
CodeSize: 19584436 -> 19567156 (-0.09%); split: -0.13%, +0.04%
Scratch: 217088 -> 216832 (-0.12%)
Instrs: 3784596 -> 3780303 (-0.11%); split: -0.15%, +0.03%
Latency: 39971204 -> 39794967 (-0.44%); split: -0.47%, +0.03%
InvThroughput: 7885552 -> 7801247 (-1.07%); split: -1.14%, +0.07%
VClause: 74654 -> 74611 (-0.06%); split: -0.07%, +0.01%
SClause: 103139 -> 103043 (-0.09%); split: -0.13%, +0.04%
Copies: 279864 -> 281995 (+0.76%); split: -0.72%, +1.48%
Branches: 92082 -> 92084 (+0.00%); split: -0.03%, +0.03%
PreSGPRs: 155637 -> 149491 (-3.95%)
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20670>
2023-01-10 19:15:25 +01:00
|
|
|
/* EXEC is automatically initialized by the HW for compute shaders.
|
|
|
|
|
* We know for sure exec is initially -1 when the shader always has full subgroups.
|
|
|
|
|
*/
|
|
|
|
|
if (ctx.program->stage == compute_cs && ctx.program->info.cs.uses_full_subgroups)
|
|
|
|
|
start_exec = Operand::c32_or_c64(-1u, bld.lm == s2);
|
|
|
|
|
|
2019-09-17 13:22:17 +02:00
|
|
|
if (ctx.handle_wqm) {
|
2023-01-19 17:36:06 +01:00
|
|
|
ctx.info[idx].exec.emplace_back(start_exec, mask_type_global | mask_type_exact);
|
2023-09-03 11:05:08 +02:00
|
|
|
/* Initialize WQM already */
|
|
|
|
|
transition_to_WQM(ctx, bld, idx);
|
2019-09-17 13:22:17 +02:00
|
|
|
} else {
|
|
|
|
|
uint8_t mask = mask_type_global;
|
|
|
|
|
if (ctx.program->needs_wqm) {
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
bld.sop1(Builder::s_wqm, Definition(exec, bld.lm), bld.def(s1, scc),
|
|
|
|
|
Operand(exec, bld.lm));
|
2019-09-17 13:22:17 +02:00
|
|
|
mask |= mask_type_wqm;
|
|
|
|
|
} else {
|
|
|
|
|
mask |= mask_type_exact;
|
|
|
|
|
}
|
2023-01-19 17:36:06 +01:00
|
|
|
ctx.info[idx].exec.emplace_back(start_exec, mask);
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
|
2022-05-19 14:12:08 +01:00
|
|
|
return count;
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* loop entry block */
|
|
|
|
|
if (block->kind & block_kind_loop_header) {
|
|
|
|
|
assert(preds[0] == idx - 1);
|
|
|
|
|
ctx.info[idx].exec = ctx.info[idx - 1].exec;
|
|
|
|
|
loop_info& info = ctx.loop.back();
|
2024-01-06 12:59:51 +01:00
|
|
|
assert(ctx.info[idx].exec.size() == info.num_exec_masks);
|
2019-09-17 13:22:17 +02:00
|
|
|
|
|
|
|
|
/* create ssa names for outer exec masks */
|
2024-01-06 16:46:54 +01:00
|
|
|
if (info.has_discard && preds.size() > 1) {
|
2019-09-17 13:22:17 +02:00
|
|
|
aco_ptr<Pseudo_instruction> phi;
|
|
|
|
|
for (int i = 0; i < info.num_exec_masks - 1; i++) {
|
|
|
|
|
phi.reset(create_instruction<Pseudo_instruction>(aco_opcode::p_linear_phi,
|
|
|
|
|
Format::PSEUDO, preds.size(), 1));
|
2019-11-27 11:04:47 +01:00
|
|
|
phi->definitions[0] = bld.def(bld.lm);
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
phi->operands[0] = get_exec_op(ctx.info[preds[0]].exec[i].first);
|
2019-09-17 13:22:17 +02:00
|
|
|
ctx.info[idx].exec[i].first = bld.insert(std::move(phi));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-06 12:59:51 +01:00
|
|
|
ctx.info[idx].exec.back().second |= mask_type_loop;
|
2019-09-17 13:22:17 +02:00
|
|
|
|
|
|
|
|
if (info.has_divergent_continue) {
|
2024-01-06 16:46:54 +01:00
|
|
|
/* create ssa name for loop active mask */
|
|
|
|
|
aco_ptr<Pseudo_instruction> phi{create_instruction<Pseudo_instruction>(
|
|
|
|
|
aco_opcode::p_linear_phi, Format::PSEUDO, preds.size(), 1)};
|
|
|
|
|
phi->definitions[0] = bld.def(bld.lm);
|
|
|
|
|
phi->operands[0] = get_exec_op(ctx.info[preds[0]].exec.back().first);
|
|
|
|
|
ctx.info[idx].exec.back().first = bld.insert(std::move(phi));
|
|
|
|
|
|
2024-01-08 15:12:17 +01:00
|
|
|
restore_exec = true;
|
2019-09-17 13:22:17 +02:00
|
|
|
uint8_t mask_type = ctx.info[idx].exec.back().second & (mask_type_wqm | mask_type_exact);
|
2024-01-08 15:12:17 +01:00
|
|
|
ctx.info[idx].exec.emplace_back(ctx.info[idx].exec.back().first, mask_type);
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
|
2024-01-08 15:12:17 +01:00
|
|
|
} else if (block->kind & block_kind_loop_exit) {
|
2019-09-17 13:22:17 +02:00
|
|
|
Block* header = ctx.loop.back().loop_header;
|
|
|
|
|
loop_info& info = ctx.loop.back();
|
|
|
|
|
|
|
|
|
|
for (ASSERTED unsigned pred : preds)
|
|
|
|
|
assert(ctx.info[pred].exec.size() >= info.num_exec_masks);
|
|
|
|
|
|
|
|
|
|
/* fill the loop header phis */
|
|
|
|
|
std::vector<unsigned>& header_preds = header->linear_preds;
|
2020-11-03 14:40:05 +01:00
|
|
|
int instr_idx = 0;
|
2024-01-06 16:46:54 +01:00
|
|
|
if (info.has_discard && header_preds.size() > 1) {
|
2020-11-03 14:40:05 +01:00
|
|
|
while (instr_idx < info.num_exec_masks - 1) {
|
|
|
|
|
aco_ptr<Instruction>& phi = header->instructions[instr_idx];
|
2019-09-17 13:22:17 +02:00
|
|
|
assert(phi->opcode == aco_opcode::p_linear_phi);
|
|
|
|
|
for (unsigned i = 1; i < phi->operands.size(); i++)
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
phi->operands[i] = get_exec_op(ctx.info[header_preds[i]].exec[instr_idx].first);
|
2020-11-03 14:40:05 +01:00
|
|
|
instr_idx++;
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
}
|
2020-11-03 14:40:05 +01:00
|
|
|
|
2024-01-06 16:46:54 +01:00
|
|
|
if (info.has_divergent_continue) {
|
2020-11-03 14:40:05 +01:00
|
|
|
aco_ptr<Instruction>& phi = header->instructions[instr_idx++];
|
|
|
|
|
assert(phi->opcode == aco_opcode::p_linear_phi);
|
|
|
|
|
for (unsigned i = 1; i < phi->operands.size(); i++)
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
phi->operands[i] =
|
|
|
|
|
get_exec_op(ctx.info[header_preds[i]].exec[info.num_exec_masks - 1].first);
|
2020-11-03 14:40:05 +01:00
|
|
|
}
|
2019-09-17 13:22:17 +02:00
|
|
|
|
|
|
|
|
if (info.has_divergent_break) {
|
2024-01-08 15:12:17 +01:00
|
|
|
restore_exec = true;
|
2024-01-06 12:59:51 +01:00
|
|
|
/* Drop the loop active mask. */
|
|
|
|
|
info.num_exec_masks--;
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
assert(!(block->kind & block_kind_top_level) || info.num_exec_masks <= 2);
|
|
|
|
|
|
|
|
|
|
/* create the loop exit phis if not trivial */
|
2020-11-03 14:40:05 +01:00
|
|
|
for (unsigned exec_idx = 0; exec_idx < info.num_exec_masks; exec_idx++) {
|
2021-05-06 15:20:40 +02:00
|
|
|
Operand same = ctx.info[preds[0]].exec[exec_idx].first;
|
2020-11-03 14:40:05 +01:00
|
|
|
uint8_t type = ctx.info[header_preds[0]].exec[exec_idx].second;
|
2019-09-17 13:22:17 +02:00
|
|
|
bool trivial = true;
|
|
|
|
|
|
|
|
|
|
for (unsigned i = 1; i < preds.size() && trivial; i++) {
|
2020-11-03 14:40:05 +01:00
|
|
|
if (ctx.info[preds[i]].exec[exec_idx].first != same)
|
2019-09-17 13:22:17 +02:00
|
|
|
trivial = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (trivial) {
|
|
|
|
|
ctx.info[idx].exec.emplace_back(same, type);
|
|
|
|
|
} else {
|
|
|
|
|
/* create phi for loop footer */
|
|
|
|
|
aco_ptr<Pseudo_instruction> phi{create_instruction<Pseudo_instruction>(
|
|
|
|
|
aco_opcode::p_linear_phi, Format::PSEUDO, preds.size(), 1)};
|
2019-11-27 11:04:47 +01:00
|
|
|
phi->definitions[0] = bld.def(bld.lm);
|
2019-09-17 13:22:17 +02:00
|
|
|
for (unsigned i = 0; i < phi->operands.size(); i++)
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
phi->operands[i] = get_exec_op(ctx.info[preds[i]].exec[exec_idx].first);
|
2019-09-17 13:22:17 +02:00
|
|
|
ctx.info[idx].exec.emplace_back(bld.insert(std::move(phi)), type);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-07 18:56:11 +01:00
|
|
|
assert(ctx.info[idx].exec.size() == info.num_exec_masks);
|
2019-09-17 13:22:17 +02:00
|
|
|
ctx.loop.pop_back();
|
|
|
|
|
|
2022-02-07 18:56:11 +01:00
|
|
|
} else if (preds.size() == 1) {
|
2019-09-17 13:22:17 +02:00
|
|
|
ctx.info[idx].exec = ctx.info[preds[0]].exec;
|
|
|
|
|
} else {
|
|
|
|
|
assert(preds.size() == 2);
|
|
|
|
|
/* if one of the predecessors ends in exact mask, we pop it from stack */
|
|
|
|
|
unsigned num_exec_masks =
|
|
|
|
|
std::min(ctx.info[preds[0]].exec.size(), ctx.info[preds[1]].exec.size());
|
2020-12-11 17:44:19 +01:00
|
|
|
|
2024-01-08 15:12:17 +01:00
|
|
|
if (block->kind & block_kind_merge) {
|
|
|
|
|
restore_exec = true;
|
2020-12-11 17:44:19 +01:00
|
|
|
num_exec_masks--;
|
2024-01-08 15:12:17 +01:00
|
|
|
}
|
2021-02-03 15:32:32 +01:00
|
|
|
if (block->kind & block_kind_top_level)
|
2019-09-17 13:22:17 +02:00
|
|
|
num_exec_masks = std::min(num_exec_masks, 2u);
|
|
|
|
|
|
|
|
|
|
/* create phis for diverged exec masks */
|
|
|
|
|
for (unsigned i = 0; i < num_exec_masks; i++) {
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
/* skip trivial phis */
|
|
|
|
|
if (ctx.info[preds[0]].exec[i].first == ctx.info[preds[1]].exec[i].first) {
|
2021-05-06 15:20:40 +02:00
|
|
|
Operand t = ctx.info[preds[0]].exec[i].first;
|
2021-02-15 11:31:13 +01:00
|
|
|
/* discard/demote can change the state of the current exec mask */
|
2021-05-06 15:20:40 +02:00
|
|
|
assert(!t.isTemp() ||
|
|
|
|
|
ctx.info[preds[0]].exec[i].second == ctx.info[preds[1]].exec[i].second);
|
2021-02-15 11:31:13 +01:00
|
|
|
uint8_t mask = ctx.info[preds[0]].exec[i].second & ctx.info[preds[1]].exec[i].second;
|
|
|
|
|
ctx.info[idx].exec.emplace_back(t, mask);
|
2019-09-17 13:22:17 +02:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-07 18:56:11 +01:00
|
|
|
Temp phi = bld.pseudo(aco_opcode::p_linear_phi, bld.def(bld.lm),
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
get_exec_op(ctx.info[preds[0]].exec[i].first),
|
|
|
|
|
get_exec_op(ctx.info[preds[1]].exec[i].first));
|
2019-09-17 13:22:17 +02:00
|
|
|
uint8_t mask_type = ctx.info[preds[0]].exec[i].second & ctx.info[preds[1]].exec[i].second;
|
|
|
|
|
ctx.info[idx].exec.emplace_back(phi, mask_type);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unsigned i = 0;
|
|
|
|
|
while (block->instructions[i]->opcode == aco_opcode::p_phi ||
|
|
|
|
|
block->instructions[i]->opcode == aco_opcode::p_linear_phi) {
|
|
|
|
|
bld.insert(std::move(block->instructions[i]));
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (ctx.handle_wqm) {
|
2023-09-03 11:05:08 +02:00
|
|
|
/* End WQM handling if not needed anymore */
|
2019-09-17 13:22:17 +02:00
|
|
|
if (block->kind & block_kind_top_level && ctx.info[idx].exec.size() == 2) {
|
2023-09-03 11:05:08 +02:00
|
|
|
if (block->instructions[i]->opcode == aco_opcode::p_end_wqm) {
|
2019-09-17 13:22:17 +02:00
|
|
|
ctx.info[idx].exec.back().second |= mask_type_global;
|
|
|
|
|
transition_to_Exact(ctx, bld, idx);
|
|
|
|
|
ctx.handle_wqm = false;
|
2024-01-08 15:12:17 +01:00
|
|
|
restore_exec = false;
|
2023-09-03 11:05:08 +02:00
|
|
|
i++;
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-02-07 18:56:11 +01:00
|
|
|
/* restore exec mask after divergent control flow */
|
2024-01-08 15:12:17 +01:00
|
|
|
if (restore_exec) {
|
|
|
|
|
Operand restore = get_exec_op(ctx.info[idx].exec.back().first);
|
2019-11-27 11:04:47 +01:00
|
|
|
assert(restore.size() == bld.lm.size());
|
2022-02-07 18:56:11 +01:00
|
|
|
bld.copy(Definition(exec, bld.lm), restore);
|
2021-05-07 15:02:58 +02:00
|
|
|
if (!restore.isConstant())
|
|
|
|
|
ctx.info[idx].exec.back().first = Operand(bld.lm);
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
2022-03-11 19:12:50 +01:00
|
|
|
/* Avoid live-range splits in Exact mode:
|
|
|
|
|
* Because the data register of atomic VMEM instructions
|
|
|
|
|
* is shared between src and dst, it might be necessary
|
|
|
|
|
* to create live-range splits during RA.
|
|
|
|
|
* Make the live-range splits explicit in WQM mode.
|
|
|
|
|
*/
|
|
|
|
|
void
|
|
|
|
|
handle_atomic_data(exec_ctx& ctx, Builder& bld, unsigned block_idx, aco_ptr<Instruction>& instr)
|
|
|
|
|
{
|
|
|
|
|
/* check if this is an atomic VMEM instruction */
|
|
|
|
|
int idx = -1;
|
|
|
|
|
if (!instr->isVMEM() || instr->definitions.empty())
|
|
|
|
|
return;
|
|
|
|
|
else if (instr->isMIMG())
|
|
|
|
|
idx = instr->operands[2].isTemp() ? 2 : -1;
|
|
|
|
|
else if (instr->operands.size() == 4)
|
|
|
|
|
idx = 3;
|
|
|
|
|
|
|
|
|
|
if (idx != -1) {
|
|
|
|
|
/* insert explicit copy of atomic data in WQM-mode */
|
|
|
|
|
transition_to_WQM(ctx, bld, block_idx);
|
|
|
|
|
Temp data = instr->operands[idx].getTemp();
|
|
|
|
|
data = bld.copy(bld.def(data.regClass()), data);
|
|
|
|
|
instr->operands[idx].setTemp(data);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-09-17 13:22:17 +02:00
|
|
|
void
|
|
|
|
|
process_instructions(exec_ctx& ctx, Block* block, std::vector<aco_ptr<Instruction>>& instructions,
|
|
|
|
|
unsigned idx)
|
|
|
|
|
{
|
2024-01-17 12:27:03 +01:00
|
|
|
block_info& info = ctx.info[block->index];
|
2019-09-17 13:22:17 +02:00
|
|
|
WQMState state;
|
2024-01-17 12:27:03 +01:00
|
|
|
if (info.exec.back().second & mask_type_wqm) {
|
2019-09-17 13:22:17 +02:00
|
|
|
state = WQM;
|
2022-02-07 18:56:11 +01:00
|
|
|
} else {
|
2024-01-17 12:27:03 +01:00
|
|
|
assert(!ctx.handle_wqm || info.exec.back().second & mask_type_exact);
|
2019-09-17 13:22:17 +02:00
|
|
|
state = Exact;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Builder bld(ctx.program, &instructions);
|
|
|
|
|
|
|
|
|
|
for (; idx < block->instructions.size(); idx++) {
|
|
|
|
|
aco_ptr<Instruction> instr = std::move(block->instructions[idx]);
|
|
|
|
|
|
2023-09-04 10:07:27 +02:00
|
|
|
WQMState needs = ctx.handle_wqm ? get_instr_needs(instr) : Unspecified;
|
2019-09-17 13:22:17 +02:00
|
|
|
|
2022-02-04 17:13:19 +01:00
|
|
|
if (needs == WQM && state != WQM) {
|
|
|
|
|
transition_to_WQM(ctx, bld, block->index);
|
|
|
|
|
state = WQM;
|
2022-03-11 19:12:50 +01:00
|
|
|
} else if (needs == Exact) {
|
2023-09-04 10:07:27 +02:00
|
|
|
if (ctx.handle_wqm)
|
2022-03-11 19:12:50 +01:00
|
|
|
handle_atomic_data(ctx, bld, block->index, instr);
|
2022-02-04 17:13:19 +01:00
|
|
|
transition_to_Exact(ctx, bld, block->index);
|
|
|
|
|
state = Exact;
|
|
|
|
|
}
|
|
|
|
|
|
2019-09-17 13:22:17 +02:00
|
|
|
if (instr->opcode == aco_opcode::p_discard_if) {
|
2022-02-04 17:13:19 +01:00
|
|
|
Operand current_exec = Operand(exec, bld.lm);
|
|
|
|
|
|
2023-09-03 11:05:08 +02:00
|
|
|
if (block->instructions[idx + 1]->opcode == aco_opcode::p_end_wqm) {
|
|
|
|
|
/* Transition to Exact without extra instruction. */
|
2024-01-17 12:27:03 +01:00
|
|
|
info.exec.resize(1);
|
|
|
|
|
assert(info.exec[0].second == (mask_type_exact | mask_type_global));
|
|
|
|
|
current_exec = get_exec_op(info.exec[0].first);
|
|
|
|
|
info.exec[0].first = Operand(bld.lm);
|
2023-09-03 11:05:08 +02:00
|
|
|
state = Exact;
|
2024-01-17 12:27:03 +01:00
|
|
|
} else if (info.exec.size() >= 2 && ctx.handle_wqm) {
|
2023-09-03 11:05:08 +02:00
|
|
|
/* Preserve the WQM mask */
|
2024-01-17 12:27:03 +01:00
|
|
|
info.exec[1].second &= ~mask_type_global;
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
|
2022-01-31 14:26:50 +01:00
|
|
|
Temp cond, exit_cond;
|
|
|
|
|
if (instr->operands[0].isConstant()) {
|
|
|
|
|
assert(instr->operands[0].constantValue() == -1u);
|
|
|
|
|
/* save condition and set exec to zero */
|
|
|
|
|
exit_cond = bld.tmp(s1);
|
|
|
|
|
cond =
|
|
|
|
|
bld.sop1(Builder::s_and_saveexec, bld.def(bld.lm), bld.scc(Definition(exit_cond)),
|
|
|
|
|
Definition(exec, bld.lm), Operand::zero(), Operand(exec, bld.lm));
|
|
|
|
|
} else {
|
|
|
|
|
cond = instr->operands[0].getTemp();
|
|
|
|
|
/* discard from current exec */
|
|
|
|
|
exit_cond = bld.sop2(Builder::s_andn2, Definition(exec, bld.lm), bld.def(s1, scc),
|
2022-02-04 17:13:19 +01:00
|
|
|
current_exec, cond)
|
2022-01-31 14:26:50 +01:00
|
|
|
.def(1)
|
|
|
|
|
.getTemp();
|
|
|
|
|
}
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
|
|
|
|
|
/* discard from inner to outer exec mask on stack */
|
2024-01-17 12:27:03 +01:00
|
|
|
int num = info.exec.size() - 2;
|
2022-01-31 14:26:50 +01:00
|
|
|
for (int i = num; i >= 0; i--) {
|
2019-11-27 11:04:47 +01:00
|
|
|
Instruction* andn2 = bld.sop2(Builder::s_andn2, bld.def(bld.lm), bld.def(s1, scc),
|
2024-01-17 12:27:03 +01:00
|
|
|
info.exec[i].first, cond);
|
|
|
|
|
info.exec[i].first = Operand(andn2->definitions[0].getTemp());
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
exit_cond = andn2->definitions[1].getTemp();
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
|
|
|
|
|
instr->opcode = aco_opcode::p_exit_early_if;
|
|
|
|
|
instr->operands[0] = bld.scc(exit_cond);
|
2024-01-17 12:27:03 +01:00
|
|
|
assert(!ctx.handle_wqm || (info.exec[0].second & mask_type_wqm) == 0);
|
2019-09-17 13:22:17 +02:00
|
|
|
|
2022-02-04 17:13:19 +01:00
|
|
|
} else if (instr->opcode == aco_opcode::p_is_helper) {
|
2019-09-17 13:22:17 +02:00
|
|
|
Definition dst = instr->definitions[0];
|
2019-11-27 11:04:47 +01:00
|
|
|
assert(dst.size() == bld.lm.size());
|
2019-09-17 13:22:17 +02:00
|
|
|
if (state == Exact) {
|
2019-11-27 11:04:47 +01:00
|
|
|
instr.reset(create_instruction<SOP1_instruction>(bld.w64or32(Builder::s_mov),
|
|
|
|
|
Format::SOP1, 1, 1));
|
2021-07-13 11:22:46 +02:00
|
|
|
instr->operands[0] = Operand::zero();
|
2019-09-17 13:22:17 +02:00
|
|
|
instr->definitions[0] = dst;
|
|
|
|
|
} else {
|
2024-01-17 12:27:03 +01:00
|
|
|
std::pair<Operand, uint8_t>& exact_mask = info.exec[0];
|
2019-09-17 13:22:17 +02:00
|
|
|
assert(exact_mask.second & mask_type_exact);
|
|
|
|
|
|
2019-11-27 11:04:47 +01:00
|
|
|
instr.reset(create_instruction<SOP2_instruction>(bld.w64or32(Builder::s_andn2),
|
|
|
|
|
Format::SOP2, 2, 2));
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
instr->operands[0] = Operand(exec, bld.lm); /* current exec */
|
2019-09-17 13:22:17 +02:00
|
|
|
instr->operands[1] = Operand(exact_mask.first);
|
|
|
|
|
instr->definitions[0] = dst;
|
|
|
|
|
instr->definitions[1] = bld.def(s1, scc);
|
|
|
|
|
}
|
|
|
|
|
} else if (instr->opcode == aco_opcode::p_demote_to_helper) {
|
2024-01-17 12:27:03 +01:00
|
|
|
assert((info.exec[0].second & mask_type_exact) &&
|
|
|
|
|
(info.exec[0].second & mask_type_global));
|
2019-09-17 13:22:17 +02:00
|
|
|
|
aco: always terminate quads if they have been demoted entirely
Previously, quads got only terminated in top-level control flow.
This patch makes the behavior consistent.
Totals from 7811 (9.86% of 79242) affected shaders: (GFX11)
Instrs: 7859667 -> 7850757 (-0.11%); split: -0.18%, +0.07%
CodeSize: 41642280 -> 41611836 (-0.07%); split: -0.13%, +0.06%
Latency: 73692815 -> 73707588 (+0.02%); split: -0.02%, +0.04%
InvThroughput: 10672160 -> 10672323 (+0.00%); split: -0.01%, +0.01%
VClause: 137478 -> 137469 (-0.01%); split: -0.02%, +0.02%
SClause: 314905 -> 314924 (+0.01%); split: -0.19%, +0.20%
Copies: 587014 -> 576039 (-1.87%); split: -2.10%, +0.23%
Branches: 213101 -> 213123 (+0.01%); split: -0.01%, +0.02%
PreSGPRs: 313588 -> 313355 (-0.07%); split: -0.09%, +0.01%
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27112>
2024-01-17 11:46:16 +01:00
|
|
|
const bool nested_cf = !(info.exec.back().second & mask_type_global);
|
|
|
|
|
if (ctx.handle_wqm && state == Exact && nested_cf) {
|
|
|
|
|
/* Transition back to WQM without extra instruction. */
|
|
|
|
|
info.exec.pop_back();
|
|
|
|
|
state = WQM;
|
|
|
|
|
} else if (block->instructions[idx + 1]->opcode == aco_opcode::p_end_wqm) {
|
|
|
|
|
/* Transition to Exact without extra instruction. */
|
|
|
|
|
info.exec.resize(1);
|
|
|
|
|
state = Exact;
|
|
|
|
|
} else if (nested_cf) {
|
|
|
|
|
/* Save curent exec temporarily. */
|
|
|
|
|
info.exec.back().first = bld.copy(bld.def(bld.lm), Operand(exec, bld.lm));
|
|
|
|
|
}
|
2020-01-10 17:19:40 +01:00
|
|
|
|
aco: always terminate quads if they have been demoted entirely
Previously, quads got only terminated in top-level control flow.
This patch makes the behavior consistent.
Totals from 7811 (9.86% of 79242) affected shaders: (GFX11)
Instrs: 7859667 -> 7850757 (-0.11%); split: -0.18%, +0.07%
CodeSize: 41642280 -> 41611836 (-0.07%); split: -0.13%, +0.06%
Latency: 73692815 -> 73707588 (+0.02%); split: -0.02%, +0.04%
InvThroughput: 10672160 -> 10672323 (+0.00%); split: -0.01%, +0.01%
VClause: 137478 -> 137469 (-0.01%); split: -0.02%, +0.02%
SClause: 314905 -> 314924 (+0.01%); split: -0.19%, +0.20%
Copies: 587014 -> 576039 (-1.87%); split: -2.10%, +0.23%
Branches: 213101 -> 213123 (+0.01%); split: -0.01%, +0.02%
PreSGPRs: 313588 -> 313355 (-0.07%); split: -0.09%, +0.01%
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27112>
2024-01-17 11:46:16 +01:00
|
|
|
/* Remove invocations from global exact mask. */
|
|
|
|
|
Definition def = state == Exact ? Definition(exec, bld.lm) : bld.def(bld.lm);
|
|
|
|
|
Operand src = instr->operands[0].isConstant() ? Operand(exec, bld.lm) : instr->operands[0];
|
|
|
|
|
|
|
|
|
|
Definition exit_cond =
|
|
|
|
|
bld.sop2(Builder::s_andn2, def, bld.def(s1, scc), get_exec_op(info.exec[0].first), src)
|
|
|
|
|
.def(1);
|
|
|
|
|
info.exec[0].first = Operand(def.getTemp());
|
|
|
|
|
|
|
|
|
|
/* Update global WQM mask and store in exec. */
|
|
|
|
|
if (state == WQM) {
|
|
|
|
|
assert(info.exec.size() > 1);
|
|
|
|
|
exit_cond =
|
|
|
|
|
bld.sop1(Builder::s_wqm, Definition(exec, bld.lm), bld.def(s1, scc), def.getTemp())
|
|
|
|
|
.def(1);
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
|
aco: always terminate quads if they have been demoted entirely
Previously, quads got only terminated in top-level control flow.
This patch makes the behavior consistent.
Totals from 7811 (9.86% of 79242) affected shaders: (GFX11)
Instrs: 7859667 -> 7850757 (-0.11%); split: -0.18%, +0.07%
CodeSize: 41642280 -> 41611836 (-0.07%); split: -0.13%, +0.06%
Latency: 73692815 -> 73707588 (+0.02%); split: -0.02%, +0.04%
InvThroughput: 10672160 -> 10672323 (+0.00%); split: -0.01%, +0.01%
VClause: 137478 -> 137469 (-0.01%); split: -0.02%, +0.02%
SClause: 314905 -> 314924 (+0.01%); split: -0.19%, +0.20%
Copies: 587014 -> 576039 (-1.87%); split: -2.10%, +0.23%
Branches: 213101 -> 213123 (+0.01%); split: -0.01%, +0.02%
PreSGPRs: 313588 -> 313355 (-0.07%); split: -0.09%, +0.01%
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27112>
2024-01-17 11:46:16 +01:00
|
|
|
/* End shader if global mask is zero. */
|
|
|
|
|
instr->opcode = aco_opcode::p_exit_early_if;
|
|
|
|
|
instr->operands[0] = bld.scc(exit_cond.getTemp());
|
|
|
|
|
bld.insert(std::move(instr));
|
|
|
|
|
|
|
|
|
|
/* Update all other exec masks. */
|
|
|
|
|
if (nested_cf) {
|
|
|
|
|
const unsigned global_idx = state == WQM ? 1 : 0;
|
|
|
|
|
for (unsigned i = global_idx + 1; i < info.exec.size() - 1; i++) {
|
|
|
|
|
info.exec[i].first =
|
|
|
|
|
bld.sop2(Builder::s_and, bld.def(bld.lm), bld.def(s1, scc),
|
|
|
|
|
get_exec_op(info.exec[i].first), Operand(exec, bld.lm));
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
aco: always terminate quads if they have been demoted entirely
Previously, quads got only terminated in top-level control flow.
This patch makes the behavior consistent.
Totals from 7811 (9.86% of 79242) affected shaders: (GFX11)
Instrs: 7859667 -> 7850757 (-0.11%); split: -0.18%, +0.07%
CodeSize: 41642280 -> 41611836 (-0.07%); split: -0.13%, +0.06%
Latency: 73692815 -> 73707588 (+0.02%); split: -0.02%, +0.04%
InvThroughput: 10672160 -> 10672323 (+0.00%); split: -0.01%, +0.01%
VClause: 137478 -> 137469 (-0.01%); split: -0.02%, +0.02%
SClause: 314905 -> 314924 (+0.01%); split: -0.19%, +0.20%
Copies: 587014 -> 576039 (-1.87%); split: -2.10%, +0.23%
Branches: 213101 -> 213123 (+0.01%); split: -0.01%, +0.02%
PreSGPRs: 313588 -> 313355 (-0.07%); split: -0.09%, +0.01%
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27112>
2024-01-17 11:46:16 +01:00
|
|
|
/* Update current exec and save WQM mask. */
|
|
|
|
|
info.exec[global_idx].first =
|
|
|
|
|
bld.sop1(Builder::s_and_saveexec, bld.def(bld.lm), bld.def(s1, scc),
|
|
|
|
|
Definition(exec, bld.lm), info.exec.back().first, Operand(exec, bld.lm));
|
|
|
|
|
info.exec.back().first = Operand(bld.lm);
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
aco: always terminate quads if they have been demoted entirely
Previously, quads got only terminated in top-level control flow.
This patch makes the behavior consistent.
Totals from 7811 (9.86% of 79242) affected shaders: (GFX11)
Instrs: 7859667 -> 7850757 (-0.11%); split: -0.18%, +0.07%
CodeSize: 41642280 -> 41611836 (-0.07%); split: -0.13%, +0.06%
Latency: 73692815 -> 73707588 (+0.02%); split: -0.02%, +0.04%
InvThroughput: 10672160 -> 10672323 (+0.00%); split: -0.01%, +0.01%
VClause: 137478 -> 137469 (-0.01%); split: -0.02%, +0.02%
SClause: 314905 -> 314924 (+0.01%); split: -0.19%, +0.20%
Copies: 587014 -> 576039 (-1.87%); split: -2.10%, +0.23%
Branches: 213101 -> 213123 (+0.01%); split: -0.01%, +0.02%
PreSGPRs: 313588 -> 313355 (-0.07%); split: -0.09%, +0.01%
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27112>
2024-01-17 11:46:16 +01:00
|
|
|
continue;
|
2021-06-18 15:21:43 +02:00
|
|
|
|
|
|
|
|
} else if (instr->opcode == aco_opcode::p_elect) {
|
2024-01-17 12:27:03 +01:00
|
|
|
bool all_lanes_enabled = info.exec.back().first.constantEquals(-1u);
|
2021-06-18 15:21:43 +02:00
|
|
|
Definition dst = instr->definitions[0];
|
|
|
|
|
|
|
|
|
|
if (all_lanes_enabled) {
|
|
|
|
|
bld.copy(Definition(dst), Operand::c32_or_c64(1u, dst.size() == 2));
|
|
|
|
|
} else {
|
|
|
|
|
Temp first_lane_idx = bld.sop1(Builder::s_ff1_i32, bld.def(s1), Operand(exec, bld.lm));
|
|
|
|
|
bld.sop2(Builder::s_lshl, Definition(dst), bld.def(s1, scc),
|
|
|
|
|
Operand::c32_or_c64(1u, dst.size() == 2), Operand(first_lane_idx));
|
|
|
|
|
}
|
2023-09-03 11:05:08 +02:00
|
|
|
continue;
|
|
|
|
|
} else if (instr->opcode == aco_opcode::p_end_wqm) {
|
|
|
|
|
assert(block->kind & block_kind_top_level);
|
2024-01-17 12:27:03 +01:00
|
|
|
assert(info.exec.size() <= 2);
|
2023-09-03 11:05:08 +02:00
|
|
|
/* This instruction indicates the end of WQM mode. */
|
2024-01-17 12:27:03 +01:00
|
|
|
info.exec.back().second |= mask_type_global;
|
2023-09-03 11:05:08 +02:00
|
|
|
transition_to_Exact(ctx, bld, block->index);
|
|
|
|
|
state = Exact;
|
|
|
|
|
ctx.handle_wqm = false;
|
2021-06-18 15:21:43 +02:00
|
|
|
continue;
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bld.insert(std::move(instr));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
add_branch_code(exec_ctx& ctx, Block* block)
|
|
|
|
|
{
|
|
|
|
|
unsigned idx = block->index;
|
|
|
|
|
Builder bld(ctx.program, block);
|
|
|
|
|
|
2023-01-19 17:36:06 +01:00
|
|
|
if (block->linear_succs.empty())
|
2019-09-17 13:22:17 +02:00
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (block->kind & block_kind_loop_preheader) {
|
|
|
|
|
/* collect information about the succeeding loop */
|
|
|
|
|
bool has_divergent_break = false;
|
|
|
|
|
bool has_divergent_continue = false;
|
|
|
|
|
bool has_discard = false;
|
|
|
|
|
unsigned loop_nest_depth = ctx.program->blocks[idx + 1].loop_nest_depth;
|
|
|
|
|
|
|
|
|
|
for (unsigned i = idx + 1; ctx.program->blocks[i].loop_nest_depth >= loop_nest_depth; i++) {
|
|
|
|
|
Block& loop_block = ctx.program->blocks[i];
|
|
|
|
|
|
2022-01-31 16:30:08 +01:00
|
|
|
if (loop_block.kind & block_kind_uses_discard)
|
2019-09-17 13:22:17 +02:00
|
|
|
has_discard = true;
|
|
|
|
|
if (loop_block.loop_nest_depth != loop_nest_depth)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (loop_block.kind & block_kind_uniform)
|
|
|
|
|
continue;
|
|
|
|
|
else if (loop_block.kind & block_kind_break)
|
|
|
|
|
has_divergent_break = true;
|
|
|
|
|
else if (loop_block.kind & block_kind_continue)
|
|
|
|
|
has_divergent_continue = true;
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-06 12:59:51 +01:00
|
|
|
if (has_divergent_break) {
|
|
|
|
|
/* save restore exec mask */
|
|
|
|
|
uint8_t mask = ctx.info[idx].exec.back().second;
|
|
|
|
|
if (ctx.info[idx].exec.back().first.constantEquals(-1u)) {
|
|
|
|
|
ctx.info[idx].exec.emplace_back(Operand(exec, bld.lm), mask);
|
|
|
|
|
} else {
|
|
|
|
|
bld.reset(bld.instructions, std::prev(bld.instructions->end()));
|
|
|
|
|
Operand restore = bld.copy(bld.def(bld.lm), Operand(exec, bld.lm));
|
|
|
|
|
ctx.info[idx].exec.emplace(std::prev(ctx.info[idx].exec.end()), restore, mask);
|
|
|
|
|
bld.reset(bld.instructions);
|
|
|
|
|
}
|
|
|
|
|
ctx.info[idx].exec.back().second &= (mask_type_wqm | mask_type_exact);
|
|
|
|
|
}
|
2019-09-17 13:22:17 +02:00
|
|
|
unsigned num_exec_masks = ctx.info[idx].exec.size();
|
|
|
|
|
|
2022-02-07 18:56:11 +01:00
|
|
|
ctx.loop.emplace_back(&ctx.program->blocks[block->linear_succs[0]], num_exec_masks,
|
2019-09-17 13:22:17 +02:00
|
|
|
has_divergent_break, has_divergent_continue, has_discard);
|
|
|
|
|
}
|
|
|
|
|
|
2020-08-26 11:10:37 +01:00
|
|
|
/* For normal breaks, this is the exec mask. For discard+break, it's the
|
|
|
|
|
* old exec mask before it was zero'd.
|
|
|
|
|
*/
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
Operand break_cond = Operand(exec, bld.lm);
|
2020-08-26 11:10:37 +01:00
|
|
|
|
2019-09-17 13:22:17 +02:00
|
|
|
if (block->kind & block_kind_continue_or_break) {
|
2019-10-29 11:57:11 +01:00
|
|
|
assert(ctx.program->blocks[ctx.program->blocks[block->linear_succs[1]].linear_succs[0]].kind &
|
|
|
|
|
block_kind_loop_header);
|
|
|
|
|
assert(ctx.program->blocks[ctx.program->blocks[block->linear_succs[0]].linear_succs[0]].kind &
|
|
|
|
|
block_kind_loop_exit);
|
2019-09-17 13:22:17 +02:00
|
|
|
assert(block->instructions.back()->opcode == aco_opcode::p_branch);
|
|
|
|
|
block->instructions.pop_back();
|
|
|
|
|
|
2020-01-20 17:40:13 +00:00
|
|
|
bool need_parallelcopy = false;
|
|
|
|
|
while (!(ctx.info[idx].exec.back().second & mask_type_loop)) {
|
2019-12-04 13:41:37 +01:00
|
|
|
ctx.info[idx].exec.pop_back();
|
2020-01-20 17:40:13 +00:00
|
|
|
need_parallelcopy = true;
|
|
|
|
|
}
|
2019-09-17 13:22:17 +02:00
|
|
|
|
2020-01-20 17:40:13 +00:00
|
|
|
if (need_parallelcopy)
|
2022-02-07 18:56:11 +01:00
|
|
|
ctx.info[idx].exec.back().first =
|
|
|
|
|
bld.copy(Definition(exec, bld.lm), ctx.info[idx].exec.back().first);
|
2021-07-28 15:11:03 +01:00
|
|
|
bld.branch(aco_opcode::p_cbranch_nz, bld.def(s2), Operand(exec, bld.lm),
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
block->linear_succs[1], block->linear_succs[0]);
|
2019-09-17 13:22:17 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (block->kind & block_kind_uniform) {
|
2021-01-21 16:13:34 +00:00
|
|
|
Pseudo_branch_instruction& branch = block->instructions.back()->branch();
|
|
|
|
|
if (branch.opcode == aco_opcode::p_branch) {
|
|
|
|
|
branch.target[0] = block->linear_succs[0];
|
2019-09-17 13:22:17 +02:00
|
|
|
} else {
|
2021-01-21 16:13:34 +00:00
|
|
|
branch.target[0] = block->linear_succs[1];
|
|
|
|
|
branch.target[1] = block->linear_succs[0];
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (block->kind & block_kind_branch) {
|
|
|
|
|
// orig = s_and_saveexec_b64
|
|
|
|
|
assert(block->linear_succs.size() == 2);
|
|
|
|
|
assert(block->instructions.back()->opcode == aco_opcode::p_cbranch_z);
|
|
|
|
|
Temp cond = block->instructions.back()->operands[0].getTemp();
|
2023-03-31 21:31:13 +02:00
|
|
|
const bool sel_ctrl = block->instructions.back()->branch().selection_control_remove;
|
2019-09-17 13:22:17 +02:00
|
|
|
block->instructions.pop_back();
|
|
|
|
|
|
|
|
|
|
uint8_t mask_type = ctx.info[idx].exec.back().second & (mask_type_wqm | mask_type_exact);
|
aco: Don't use s_and_saveexec with branches when exec is constant.
When exec is constant, we can remember the constant as the old exec,
and just copy the condition and use it as the new exec. There is no
need to save the constant.
Due to using p_parallelcopy which is lowered to s_mov_b64 (or 32),
many exec restores now become copies, hence the increase in the copy
stats.
Fossil DB changes on Sienna Cichlid:
Totals from 73969 (49.37% of 149839) affected shaders:
SpillSGPRs: 1768 -> 1610 (-8.94%)
CodeSize: 99053892 -> 99047884 (-0.01%); split: -0.02%, +0.01%
Instrs: 19372852 -> 19370398 (-0.01%); split: -0.02%, +0.01%
VClause: 515154 -> 515142 (-0.00%); split: -0.00%, +0.00%
SClause: 719236 -> 718395 (-0.12%); split: -0.14%, +0.02%
Copies: 1109770 -> 1254634 (+13.05%); split: -0.07%, +13.12%
Branches: 374338 -> 374348 (+0.00%); split: -0.00%, +0.00%
PreSGPRs: 1776481 -> 1653761 (-6.91%)
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Tony Wasserka <tony.wasserka@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10691>
2021-05-07 15:03:36 +02:00
|
|
|
if (ctx.info[idx].exec.back().first.constantEquals(-1u)) {
|
2022-02-07 18:56:11 +01:00
|
|
|
bld.copy(Definition(exec, bld.lm), cond);
|
aco: Don't use s_and_saveexec with branches when exec is constant.
When exec is constant, we can remember the constant as the old exec,
and just copy the condition and use it as the new exec. There is no
need to save the constant.
Due to using p_parallelcopy which is lowered to s_mov_b64 (or 32),
many exec restores now become copies, hence the increase in the copy
stats.
Fossil DB changes on Sienna Cichlid:
Totals from 73969 (49.37% of 149839) affected shaders:
SpillSGPRs: 1768 -> 1610 (-8.94%)
CodeSize: 99053892 -> 99047884 (-0.01%); split: -0.02%, +0.01%
Instrs: 19372852 -> 19370398 (-0.01%); split: -0.02%, +0.01%
VClause: 515154 -> 515142 (-0.00%); split: -0.00%, +0.00%
SClause: 719236 -> 718395 (-0.12%); split: -0.14%, +0.02%
Copies: 1109770 -> 1254634 (+13.05%); split: -0.07%, +13.12%
Branches: 374338 -> 374348 (+0.00%); split: -0.00%, +0.00%
PreSGPRs: 1776481 -> 1653761 (-6.91%)
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Tony Wasserka <tony.wasserka@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10691>
2021-05-07 15:03:36 +02:00
|
|
|
} else {
|
|
|
|
|
Temp old_exec = bld.sop1(Builder::s_and_saveexec, bld.def(bld.lm), bld.def(s1, scc),
|
|
|
|
|
Definition(exec, bld.lm), cond, Operand(exec, bld.lm));
|
2019-09-17 13:22:17 +02:00
|
|
|
|
aco: Don't use s_and_saveexec with branches when exec is constant.
When exec is constant, we can remember the constant as the old exec,
and just copy the condition and use it as the new exec. There is no
need to save the constant.
Due to using p_parallelcopy which is lowered to s_mov_b64 (or 32),
many exec restores now become copies, hence the increase in the copy
stats.
Fossil DB changes on Sienna Cichlid:
Totals from 73969 (49.37% of 149839) affected shaders:
SpillSGPRs: 1768 -> 1610 (-8.94%)
CodeSize: 99053892 -> 99047884 (-0.01%); split: -0.02%, +0.01%
Instrs: 19372852 -> 19370398 (-0.01%); split: -0.02%, +0.01%
VClause: 515154 -> 515142 (-0.00%); split: -0.00%, +0.00%
SClause: 719236 -> 718395 (-0.12%); split: -0.14%, +0.02%
Copies: 1109770 -> 1254634 (+13.05%); split: -0.07%, +13.12%
Branches: 374338 -> 374348 (+0.00%); split: -0.00%, +0.00%
PreSGPRs: 1776481 -> 1653761 (-6.91%)
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Tony Wasserka <tony.wasserka@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10691>
2021-05-07 15:03:36 +02:00
|
|
|
ctx.info[idx].exec.back().first = Operand(old_exec);
|
|
|
|
|
}
|
2019-09-17 13:22:17 +02:00
|
|
|
|
|
|
|
|
/* add next current exec to the stack */
|
2021-05-06 15:20:40 +02:00
|
|
|
ctx.info[idx].exec.emplace_back(Operand(bld.lm), mask_type);
|
2019-09-17 13:22:17 +02:00
|
|
|
|
2022-02-23 10:13:54 +01:00
|
|
|
Builder::Result r = bld.branch(aco_opcode::p_cbranch_z, bld.def(s2), Operand(exec, bld.lm),
|
|
|
|
|
block->linear_succs[1], block->linear_succs[0]);
|
2023-03-31 21:31:13 +02:00
|
|
|
r->branch().selection_control_remove = sel_ctrl;
|
2019-09-17 13:22:17 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (block->kind & block_kind_invert) {
|
|
|
|
|
// exec = s_andn2_b64 (original_exec, exec)
|
2021-05-19 15:42:10 +02:00
|
|
|
assert(block->instructions.back()->opcode == aco_opcode::p_branch);
|
2023-03-31 21:31:13 +02:00
|
|
|
const bool sel_ctrl = block->instructions.back()->branch().selection_control_remove;
|
2019-09-17 13:22:17 +02:00
|
|
|
block->instructions.pop_back();
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
assert(ctx.info[idx].exec.size() >= 2);
|
2021-05-06 15:20:40 +02:00
|
|
|
Operand orig_exec = ctx.info[idx].exec[ctx.info[idx].exec.size() - 2].first;
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
bld.sop2(Builder::s_andn2, Definition(exec, bld.lm), bld.def(s1, scc), orig_exec,
|
|
|
|
|
Operand(exec, bld.lm));
|
2019-09-17 13:22:17 +02:00
|
|
|
|
2022-02-23 10:13:54 +01:00
|
|
|
Builder::Result r = bld.branch(aco_opcode::p_cbranch_z, bld.def(s2), Operand(exec, bld.lm),
|
|
|
|
|
block->linear_succs[1], block->linear_succs[0]);
|
2023-03-31 21:31:13 +02:00
|
|
|
r->branch().selection_control_remove = sel_ctrl;
|
2019-09-17 13:22:17 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (block->kind & block_kind_break) {
|
|
|
|
|
// loop_mask = s_andn2_b64 (loop_mask, exec)
|
|
|
|
|
assert(block->instructions.back()->opcode == aco_opcode::p_branch);
|
|
|
|
|
block->instructions.pop_back();
|
|
|
|
|
|
|
|
|
|
Temp cond = Temp();
|
|
|
|
|
for (int exec_idx = ctx.info[idx].exec.size() - 2; exec_idx >= 0; exec_idx--) {
|
|
|
|
|
cond = bld.tmp(s1);
|
2021-05-06 15:20:40 +02:00
|
|
|
Operand exec_mask = ctx.info[idx].exec[exec_idx].first;
|
2019-11-27 11:04:47 +01:00
|
|
|
exec_mask = bld.sop2(Builder::s_andn2, bld.def(bld.lm), bld.scc(Definition(cond)),
|
2020-08-26 11:10:37 +01:00
|
|
|
exec_mask, break_cond);
|
2019-09-17 13:22:17 +02:00
|
|
|
ctx.info[idx].exec[exec_idx].first = exec_mask;
|
|
|
|
|
if (ctx.info[idx].exec[exec_idx].second & mask_type_loop)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* check if the successor is the merge block, otherwise set exec to 0 */
|
|
|
|
|
// TODO: this could be done better by directly branching to the merge block
|
|
|
|
|
unsigned succ_idx = ctx.program->blocks[block->linear_succs[1]].linear_succs[0];
|
|
|
|
|
Block& succ = ctx.program->blocks[succ_idx];
|
|
|
|
|
if (!(succ.kind & block_kind_invert || succ.kind & block_kind_merge)) {
|
2021-07-13 11:22:46 +02:00
|
|
|
bld.copy(Definition(exec, bld.lm), Operand::zero(bld.lm.bytes()));
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
|
2021-07-28 15:11:03 +01:00
|
|
|
bld.branch(aco_opcode::p_cbranch_nz, bld.def(s2), bld.scc(cond), block->linear_succs[1],
|
|
|
|
|
block->linear_succs[0]);
|
2019-09-17 13:22:17 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (block->kind & block_kind_continue) {
|
|
|
|
|
assert(block->instructions.back()->opcode == aco_opcode::p_branch);
|
|
|
|
|
block->instructions.pop_back();
|
|
|
|
|
|
|
|
|
|
Temp cond = Temp();
|
|
|
|
|
for (int exec_idx = ctx.info[idx].exec.size() - 2; exec_idx >= 0; exec_idx--) {
|
|
|
|
|
if (ctx.info[idx].exec[exec_idx].second & mask_type_loop)
|
|
|
|
|
break;
|
|
|
|
|
cond = bld.tmp(s1);
|
2021-05-06 15:20:40 +02:00
|
|
|
Operand exec_mask = ctx.info[idx].exec[exec_idx].first;
|
2019-11-27 11:04:47 +01:00
|
|
|
exec_mask = bld.sop2(Builder::s_andn2, bld.def(bld.lm), bld.scc(Definition(cond)),
|
aco: make all exec accesses non-temporaries
So that they are not counted into the register demand.
Totals from 107336 (77.00% of 139391) affected shaders (Navi10):
VGPRs: 4023452 -> 4023248 (-0.01%); split: -0.01%, +0.01%
SpillSGPRs: 14088 -> 12571 (-10.77%); split: -11.03%, +0.26%
CodeSize: 266816164 -> 266765528 (-0.02%); split: -0.04%, +0.02%
MaxWaves: 1553339 -> 1553374 (+0.00%); split: +0.00%, -0.00%
Instrs: 50977701 -> 50973093 (-0.01%); split: -0.02%, +0.01%
Cycles: 1733911128 -> 1733605320 (-0.02%); split: -0.05%, +0.03%
VMEM: 40867650 -> 40900204 (+0.08%); split: +0.13%, -0.05%
SMEM: 6835980 -> 6829073 (-0.10%); split: +0.10%, -0.20%
VClause: 1032783 -> 1032788 (+0.00%); split: -0.01%, +0.01%
SClause: 2103705 -> 2104115 (+0.02%); split: -0.09%, +0.11%
Copies: 3195658 -> 3193656 (-0.06%); split: -0.30%, +0.24%
Branches: 1140213 -> 1140120 (-0.01%); split: -0.05%, +0.04%
PreSGPRs: 3603785 -> 3437064 (-4.63%); split: -5.13%, +0.50%
PreVGPRs: 3321996 -> 3321850 (-0.00%)
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8870>
2021-02-03 15:44:49 +01:00
|
|
|
exec_mask, Operand(exec, bld.lm));
|
2019-09-17 13:22:17 +02:00
|
|
|
ctx.info[idx].exec[exec_idx].first = exec_mask;
|
|
|
|
|
}
|
|
|
|
|
assert(cond != Temp());
|
|
|
|
|
|
|
|
|
|
/* check if the successor is the merge block, otherwise set exec to 0 */
|
|
|
|
|
// TODO: this could be done better by directly branching to the merge block
|
|
|
|
|
unsigned succ_idx = ctx.program->blocks[block->linear_succs[1]].linear_succs[0];
|
|
|
|
|
Block& succ = ctx.program->blocks[succ_idx];
|
|
|
|
|
if (!(succ.kind & block_kind_invert || succ.kind & block_kind_merge)) {
|
2021-07-13 11:22:46 +02:00
|
|
|
bld.copy(Definition(exec, bld.lm), Operand::zero(bld.lm.bytes()));
|
2019-09-17 13:22:17 +02:00
|
|
|
}
|
|
|
|
|
|
2021-07-28 15:11:03 +01:00
|
|
|
bld.branch(aco_opcode::p_cbranch_nz, bld.def(s2), bld.scc(cond), block->linear_succs[1],
|
|
|
|
|
block->linear_succs[0]);
|
2019-09-17 13:22:17 +02:00
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
process_block(exec_ctx& ctx, Block* block)
|
|
|
|
|
{
|
|
|
|
|
std::vector<aco_ptr<Instruction>> instructions;
|
|
|
|
|
instructions.reserve(block->instructions.size());
|
|
|
|
|
|
|
|
|
|
unsigned idx = add_coupling_code(ctx, block, instructions);
|
|
|
|
|
|
2023-01-19 17:36:06 +01:00
|
|
|
assert(!block->linear_succs.empty() || ctx.info[block->index].exec.size() <= 2);
|
2019-09-17 13:22:17 +02:00
|
|
|
|
|
|
|
|
process_instructions(ctx, block, instructions, idx);
|
|
|
|
|
|
|
|
|
|
block->instructions = std::move(instructions);
|
|
|
|
|
|
|
|
|
|
add_branch_code(ctx, block);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} /* end namespace */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
insert_exec_mask(Program* program)
|
|
|
|
|
{
|
|
|
|
|
exec_ctx ctx(program);
|
|
|
|
|
|
|
|
|
|
if (program->needs_wqm && program->needs_exact)
|
2023-09-04 10:07:27 +02:00
|
|
|
ctx.handle_wqm = true;
|
2019-09-17 13:22:17 +02:00
|
|
|
|
|
|
|
|
for (Block& block : program->blocks)
|
|
|
|
|
process_block(ctx, &block);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace aco
|