AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco: add Program::wgp_mode

Browse Source 
Instead of assuming WGP mode on GFX10+ in different places, add a member
to Program that can be used instead.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8761>
This commit is contained in:
Rhys Perry
2021-01-28 11:07:26 +00:00
parent 592d64611c
commit f520f4c299
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_live_var_analysis.cpp
+3 -5
View File
@@ -315,8 +315,7 @@ void calc_min_waves(Program* program)
unsigned waves_per_workgroup = calc_waves_per_workgroup(program);
unsigned simd_per_cu = program->chip_class >= GFX10 ? 2 : 4;
bool wgp = program->chip_class >= GFX10; /* assume WGP is used on Navi */
unsigned simd_per_cu_wgp = wgp ? simd_per_cu * 2 : simd_per_cu;
unsigned simd_per_cu_wgp = program->wgp_mode ? simd_per_cu * 2 : simd_per_cu;
program->min_waves = DIV_ROUND_UP(waves_per_workgroup, simd_per_cu_wgp);
}
@@ -333,9 +332,8 @@ void update_vgpr_sgpr_demand(Program* program, const RegisterDemand new_demand)
unsigned simd_per_cu = program->chip_class >= GFX10 ? 2 : 4;
bool wgp = program->chip_class >= GFX10; /* assume WGP is used on Navi */
unsigned simd_per_cu_wgp = wgp ? simd_per_cu * 2 : simd_per_cu;
unsigned lds_limit = wgp ? program->lds_limit * 2 : program->lds_limit;
unsigned simd_per_cu_wgp = program->wgp_mode ? simd_per_cu * 2 : simd_per_cu;
unsigned lds_limit = program->wgp_mode ? program->lds_limit * 2 : program->lds_limit;
assert(program->min_waves >= 1);
uint16_t sgpr_limit = get_addr_sgpr_from_waves(program, program->min_waves);