From 792b51713bf4050183ef3bcb9e8cab51886e89bc Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Thu, 17 Sep 2020 21:05:10 +0200 Subject: [PATCH] android: pan/bi: Use new disassembler Fixes the following building error: external/mesa/src/panfrost/bifrost/bi_pack.c:409:24: error: implicit declaration of function 'pan_pack_fma_nop_i32' is invalid in C99 [-Werror,-Wimplicit-function-declaration] return pan_pack_fma_nop_i32(clause, NULL, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:433:32: error: implicit declaration of function 'pan_pack_fma_fadd_f32' is invalid in C99 [-Werror,-Wimplicit-function-declaration] return pan_pack_fma_fadd_f32(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:433:32: note: did you mean 'pan_pack_fma_nop_i32'? external/mesa/src/panfrost/bifrost/bi_pack.c:409:24: note: 'pan_pack_fma_nop_i32' declared here return pan_pack_fma_nop_i32(clause, NULL, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:435:32: error: implicit declaration of function 'pan_pack_fma_fadd_v2f16' is invalid in C99 [-Werror,-Wimplicit-function-declaration] return pan_pack_fma_fadd_v2f16(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:435:32: note: did you mean 'pan_pack_fma_fadd_f32'? external/mesa/src/panfrost/bifrost/bi_pack.c:433:32: note: 'pan_pack_fma_fadd_f32' declared here return pan_pack_fma_fadd_f32(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:442:32: error: implicit declaration of function 'pan_pack_fma_fcmp_f32' is invalid in C99 [-Werror,-Wimplicit-function-declaration] return pan_pack_fma_fcmp_f32(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:442:32: note: did you mean 'pan_pack_fma_fadd_f32'? external/mesa/src/panfrost/bifrost/bi_pack.c:433:32: note: 'pan_pack_fma_fadd_f32' declared here return pan_pack_fma_fadd_f32(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:444:32: error: implicit declaration of function 'pan_pack_fma_fcmp_v2f16' is invalid in C99 [-Werror,-Wimplicit-function-declaration] return pan_pack_fma_fcmp_v2f16(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:444:32: note: did you mean 'pan_pack_fma_fadd_v2f16'? external/mesa/src/panfrost/bifrost/bi_pack.c:435:32: note: 'pan_pack_fma_fadd_v2f16' declared here return pan_pack_fma_fadd_v2f16(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:449:41: error: implicit declaration of function 'pan_pack_fma_rshift_and_i32' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_rshift_and_i32(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:449:41: note: did you mean 'pan_pack_fma_fadd_f32'? external/mesa/src/panfrost/bifrost/bi_pack.c:433:32: note: 'pan_pack_fma_fadd_f32' declared here return pan_pack_fma_fadd_f32(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:450:41: error: implicit declaration of function 'pan_pack_fma_lshift_and_i32' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_lshift_and_i32(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:450:41: note: did you mean 'pan_pack_fma_rshift_and_i32'? external/mesa/src/panfrost/bifrost/bi_pack.c:449:41: note: 'pan_pack_fma_rshift_and_i32' declared here pan_pack_fma_rshift_and_i32(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:453:41: error: implicit declaration of function 'pan_pack_fma_rshift_and_v2i16' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_rshift_and_v2i16(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:453:41: note: did you mean 'pan_pack_fma_fadd_v2f16'? external/mesa/src/panfrost/bifrost/bi_pack.c:435:32: note: 'pan_pack_fma_fadd_v2f16' declared here return pan_pack_fma_fadd_v2f16(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:454:41: error: implicit declaration of function 'pan_pack_fma_lshift_and_v2i16' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_lshift_and_v2i16(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:454:41: note: did you mean 'pan_pack_fma_rshift_and_v2i16'? external/mesa/src/panfrost/bifrost/bi_pack.c:453:41: note: 'pan_pack_fma_rshift_and_v2i16' declared here pan_pack_fma_rshift_and_v2i16(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:458:41: error: implicit declaration of function 'pan_pack_fma_rshift_and_v4i8' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_rshift_and_v4i8(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:459:41: error: implicit declaration of function 'pan_pack_fma_lshift_and_v4i8' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_lshift_and_v4i8(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:459:41: note: did you mean 'pan_pack_fma_rshift_and_v4i8'? external/mesa/src/panfrost/bifrost/bi_pack.c:458:41: note: 'pan_pack_fma_rshift_and_v4i8' declared here pan_pack_fma_rshift_and_v4i8(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:465:41: error: implicit declaration of function 'pan_pack_fma_rshift_or_i32' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_rshift_or_i32(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:465:41: note: did you mean 'pan_pack_fma_nop_i32'? external/mesa/src/panfrost/bifrost/bi_pack.c:409:24: note: 'pan_pack_fma_nop_i32' declared here return pan_pack_fma_nop_i32(clause, NULL, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:466:41: error: implicit declaration of function 'pan_pack_fma_lshift_or_i32' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_lshift_or_i32(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:466:41: note: did you mean 'pan_pack_fma_rshift_or_i32'? external/mesa/src/panfrost/bifrost/bi_pack.c:465:41: note: 'pan_pack_fma_rshift_or_i32' declared here pan_pack_fma_rshift_or_i32(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:469:41: error: implicit declaration of function 'pan_pack_fma_rshift_or_v2i16' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_rshift_or_v2i16(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:470:41: error: implicit declaration of function 'pan_pack_fma_lshift_or_v2i16' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_lshift_or_v2i16(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:470:41: note: did you mean 'pan_pack_fma_rshift_or_v2i16'? external/mesa/src/panfrost/bifrost/bi_pack.c:469:41: note: 'pan_pack_fma_rshift_or_v2i16' declared here pan_pack_fma_rshift_or_v2i16(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:474:41: error: implicit declaration of function 'pan_pack_fma_rshift_or_v4i8' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_rshift_or_v4i8(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:475:41: error: implicit declaration of function 'pan_pack_fma_lshift_or_v4i8' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_lshift_or_v4i8(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:475:41: note: did you mean 'pan_pack_fma_rshift_or_v4i8'? external/mesa/src/panfrost/bifrost/bi_pack.c:474:41: note: 'pan_pack_fma_rshift_or_v4i8' declared here pan_pack_fma_rshift_or_v4i8(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:482:41: error: implicit declaration of function 'pan_pack_fma_rshift_xor_i32' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_rshift_xor_i32(clause, bundle.fma, regs) : ^ external/mesa/src/panfrost/bifrost/bi_pack.c:483:41: error: implicit declaration of function 'pan_pack_fma_lshift_xor_i32' is invalid in C99 [-Werror,-Wimplicit-function-declaration] pan_pack_fma_lshift_xor_i32(clause, bundle.fma, regs); ^ external/mesa/src/panfrost/bifrost/bi_pack.c:483:41: note: did you mean 'pan_pack_fma_rshift_xor_i32'? external/mesa/src/panfrost/bifrost/bi_pack.c:482:41: note: 'pan_pack_fma_rshift_xor_i32' declared here pan_pack_fma_rshift_xor_i32(clause, bundle.fma, regs) : ^ fatal error: too many errors emitted, stopping now [-ferror-limit=] 20 errors generated. Fixes: f8fc2105 ("pan/bi: Use new disassembler") Signed-off-by: Mauro Rossi Reviewed-by: Alyssa Rosenzweig Part-of: --- src/panfrost/Android.bifrost.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/panfrost/Android.bifrost.mk b/src/panfrost/Android.bifrost.mk index 1c4e4787736..7d3fe48ca28 100644 --- a/src/panfrost/Android.bifrost.mk +++ b/src/panfrost/Android.bifrost.mk @@ -70,6 +70,7 @@ LOCAL_STATIC_LIBRARIES := \ LOCAL_GENERATED_SOURCES := \ $(intermediates)/bifrost_nir_algebraic.c \ + $(intermediates)/bifrost_gen_disasms.c \ $(MESA_GEN_GLSL_H) bifrost_nir_algebraic_gen := $(LOCAL_PATH)/bifrost/bifrost_nir_algebraic.py @@ -80,6 +81,13 @@ $(intermediates)/bifrost_nir_algebraic.c: $(bifrost_nir_algebraic_deps) @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $(bifrost_nir_algebraic_gen) -p $< > $@ +bifrost_gen_disasms_gen := $(LOCAL_PATH)/bifrost/gen_disasm.py +bifrost_gen_disasms_deps := $(LOCAL_PATH)/bifrost/ISA.xml + +$(intermediates)/bifrost_gen_disasms.c: $(bifrost_gen_disasms_deps) + @mkdir -p $(dir $@) + $(hide) $(MESA_PYTHON2) $(bifrost_gen_disasms_gen) $< > $@ + LOCAL_EXPORT_C_INCLUDE_DIRS := \ $(MESA_TOP)/src/panfrost/bifrost/ \