mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-23 22:00:13 +01:00
freedreno/ir3: Switch over to new encoder/decoder
Signed-off-by: Rob Clark <robdclark@chromium.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7997>
This commit is contained in:
parent
01e8bd55de
commit
5cae4779c2
2 changed files with 9 additions and 2 deletions
|
|
@ -36,6 +36,8 @@
|
||||||
#include "ir3_compiler.h"
|
#include "ir3_compiler.h"
|
||||||
#include "ir3_nir.h"
|
#include "ir3_nir.h"
|
||||||
|
|
||||||
|
#include "isa/isa.h"
|
||||||
|
|
||||||
#include "disasm.h"
|
#include "disasm.h"
|
||||||
|
|
||||||
int
|
int
|
||||||
|
|
@ -144,7 +146,7 @@ void * ir3_shader_assemble(struct ir3_shader_variant *v)
|
||||||
*/
|
*/
|
||||||
info->size = align(info->size, compiler->instr_align * sizeof(instr_t));
|
info->size = align(info->size, compiler->instr_align * sizeof(instr_t));
|
||||||
|
|
||||||
bin = ir3_assemble(v);
|
bin = isa_assemble(v);
|
||||||
if (!bin)
|
if (!bin)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
@ -613,7 +615,11 @@ ir3_shader_disasm(struct ir3_shader_variant *so, uint32_t *bin, FILE *out)
|
||||||
const_state->immediates[i * 4 + 3]);
|
const_state->immediates[i * 4 + 3]);
|
||||||
}
|
}
|
||||||
|
|
||||||
disasm_a3xx(bin, so->info.sizedwords, 0, out, ir->compiler->gpu_id);
|
isa_decode(bin, so->info.sizedwords * 4, out, &(struct isa_decode_options){
|
||||||
|
.gpu_id = ir->compiler->gpu_id,
|
||||||
|
.show_errors = true,
|
||||||
|
.branch_labels = true,
|
||||||
|
});
|
||||||
|
|
||||||
fprintf(out, "; %s: outputs:", type);
|
fprintf(out, "; %s: outputs:", type);
|
||||||
for (i = 0; i < so->outputs_count; i++) {
|
for (i = 0; i < so->outputs_count; i++) {
|
||||||
|
|
|
||||||
|
|
@ -112,6 +112,7 @@ libfreedreno_ir3 = static_library(
|
||||||
include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
|
include_directories : [inc_freedreno, inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
|
||||||
c_args : [no_override_init_args],
|
c_args : [no_override_init_args],
|
||||||
gnu_symbol_visibility : 'hidden',
|
gnu_symbol_visibility : 'hidden',
|
||||||
|
link_with: [libir3decode, libir3encode],
|
||||||
dependencies : [idep_nir_headers, dep_dl, idep_mesautil],
|
dependencies : [idep_nir_headers, dep_dl, idep_mesautil],
|
||||||
build_by_default : false,
|
build_by_default : false,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue