Mesa (master): android: pan/bi: Generate builder routines

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 6a2ae4e35ca6be429c41be267d753014c2eac3fa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a2ae4e35ca6be429c41be267d753014c2eac3fa

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat Jan  2 12:08:34 2021 +0100

android: pan/bi: Generate builder routines

Fixes the following building error:

external/mesa/src/panfrost/bifrost/bifrost_compile.c:38:10: fatal error: 'bi_builder.h' file not found
         ^~~~~~~~~~~~~~
1 error generated.

Fixes: 8ef0d411708a ("pan/bi: Generate builder routines")
Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8294>

---

 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 305fb1f388f..f4fa77ec5c3 100644
--- a/src/panfrost/Android.bifrost.mk
+++ b/src/panfrost/Android.bifrost.mk
@@ -83,6 +83,7 @@ LOCAL_STATIC_LIBRARIES := \
 
 LOCAL_GENERATED_SOURCES := \
 	$(intermediates)/bifrost_nir_algebraic.c \
+	$(intermediates)/bi_builder.h \
 	$(intermediates)/bi_generated_pack.h \
 	$(intermediates)/bi_opcodes.c \
 	$(intermediates)/bi_opcodes.h \
@@ -97,6 +98,13 @@ $(intermediates)/bifrost_nir_algebraic.c: $(bifrost_nir_algebraic_deps)
 	@mkdir -p $(dir $@)
 	$(hide) $(MESA_PYTHON3) $(bifrost_nir_algebraic_gen) -p $< > $@
 
+bi_builder_h_gen := $(LOCAL_PATH)/bifrost/bi_builder.h.py
+bi_builder_h_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py
+
+$(intermediates)/bi_builder.h: $(bi_builder_h_deps)
+	@mkdir -p $(dir $@)
+	$(hide) $(MESA_PYTHON3) $(bi_builder_h_gen) $< > $@
+
 bi_generated_pack_gen := $(LOCAL_PATH)/bifrost/gen_pack.py
 bi_generated_pack_deps := $(LOCAL_PATH)/bifrost/ISA.xml $(LOCAL_PATH)/bifrost/bifrost_isa.py